Fix Angular "bug" whereby anchor tags don't work over slow connections

(by removing Angular)

Author: aeijdenberg

Gopkg.lock

@@ -1,25 +1,3 @@
-
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#  name = "github.com/x/y"
-#  version = "2.4.0"
-
 [prune]
   non-go = true
   go-tests = true
@@ -37,10 +15,6 @@
   branch = "master"
   name = "github.com/onsi/gomega"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/tedsuo/rata"
-
 [[constraint]]
   branch = "master"
   name = "github.com/unrolled/secure"

Gopkg.toml

@@ -3,14 +3,16 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"os"
+	"path/filepath"
 	"sort"
+	"text/template"
 
 	"code.cloudfoundry.org/cli-plugin-repo/web"
-	"github.com/tedsuo/rata"
 	"github.com/unrolled/secure"
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 )
 
 type CLIPR struct {
@@ -36,18 +38,34 @@ func (cmd *CLIPR) Execute(args []string) error {
 
 	sort.Sort(plugins)
 
-	handlers := map[string]http.Handler{
-		Index: http.FileServer(http.Dir("ui")),
-		List:  web.NewListPluginsHandler(plugins, logger),
-		UI:    http.RedirectHandler("/", http.StatusMovedPermanently),
-	}
-
-	router, err := rata.NewRouter(Routes, handlers)
-
+	tmpl, err := template.ParseFiles(filepath.Join("ui", "index.html"))
 	if err != nil {
 		return err
 	}
 
+	mux := http.NewServeMux()
+
+	staticHandler := http.FileServer(http.Dir("ui"))
+	mux.Handle("/images/", staticHandler)
+	mux.Handle("/css/", staticHandler)
+	mux.Handle("/font/", staticHandler)
+	mux.Handle("/favicon.ico", http.RedirectHandler("/images/favicon.png", http.StatusFound))
+	mux.Handle("/list", web.NewListPluginsHandler(plugins, logger)) // we no longer use for rendering, but keeping around in case others do
+	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/" {
+			http.Redirect(w, r, "/", http.StatusMovedPermanently)
+			return
+		}
+		w.Header().Set("Content-Type", "text/html")
+		err := tmpl.Execute(w, plugins)
+		if err != nil { // should only error if template has syntax errors
+			log.Println(err)
+		}
+	})
+
+	var router http.Handler
+	router = mux
+
 	if cmd.ForceSSL {
 		secureMiddleware := secure.New(secure.Options{
 			SSLRedirect:     true,
@@ -56,9 +74,5 @@ func (cmd *CLIPR) Execute(args []string) error {
 		router = secureMiddleware.Handler(router)
 	}
 
-	return http.ListenAndServe(cmd.bindAddr(), router)
-}
-
-func (cmd *CLIPR) bindAddr() string {
-	return fmt.Sprintf(":%d", cmd.Port)
+	return http.ListenAndServe(fmt.Sprintf(":%d", cmd.Port), router)
 }

clipr.go

@@ -1,6 +1,8 @@
 package main_test
 
 import (
+	"strings"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
@@ -47,14 +49,15 @@ var _ = Describe("Integration", func() {
 				Expect(err).NotTo(HaveOccurred())
 				Expect(response).To(BeSuccessful())
 
-				b, err := ioutil.ReadFile("ui/index.html")
-				Expect(err).NotTo(HaveOccurred())
-
 				defer response.Body.Close()
 				contents, err := ioutil.ReadAll(response.Body)
 				Expect(err).NotTo(HaveOccurred())
 
-				Expect(string(contents)).To(Equal(string(b)))
+				// sanity test that at least one thing is present
+				Expect(strings.Index(string(contents), "doctor scans your deployed applications") >= 0).To(BeTrue())
+
+				// and that the template finishes rendering without aborting due to an error
+				Expect(strings.Index(string(contents), "</html>") >= 0).To(BeTrue())
 			})
 		})