Add favicon_url config option; use Gitgrep for app title

karmakaze · karmakaze · commit 7506e2bd47c1 · 2018-11-13T21:07:22.000-05:00
diff --git a/cmds/houndd/main.go b/cmds/houndd/main.go
@@ -80,7 +80,9 @@ func registerShutdownSignal() <-chan os.Signal {
 func makeTemplateData(cfg *config.Config) (interface{}, error) {
 	var data struct {
 		ReposAsJson string
+		FaviconURL  string
 	}
+	data.FaviconURL = cfg.FaviconURL
 
 	res := map[string]*config.Repo{}
 	for name, repo := range cfg.Repos {
diff --git a/config/config.go b/config/config.go
@@ -63,6 +63,7 @@ type Config struct {
 	JwtLoginURL           string           `json:"jwt_login_url"`
 	JwtCookieName         string           `json:"jwt_cookie_name"`
 	JwtSecretKey          string           `json:"jwt_secret_key"`
+	FaviconURL            string           `json:"favicon_url"`
 }
 
 // SecretMessage is just like json.RawMessage but it will not
diff --git a/ui/assets/excluded_files.tpl.html b/ui/assets/excluded_files.tpl.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>Hound - Excluded Files</title>
+        <title>Gitgrep - Excluded Files</title>
         <link rel="stylesheet" href="css/octicons/octicons.css">
         <link rel="stylesheet" href="css/hound.css">
     </head>
diff --git a/ui/assets/index.tpl.html b/ui/assets/index.tpl.html
@@ -3,12 +3,15 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
-        <title>Hound</title>
+        <title>Gitgrep</title>
+        {{ if not (eq .FaviconURL "") }}
+        <link rel="icon" type="image/x-icon" href="{{ .FaviconURL }}"/>
+        {{ end }}
         <link rel="stylesheet" href="css/octicons/octicons.css">
         <link rel="stylesheet" href="css/hound.css">
         <link rel="search" href="//{{ .Host }}/open_search.xml"
               type="application/opensearchdescription+xml"
-              title="Hound" />
+              title="Gitgrep" />
     </head>
     <body>
         <div id="root">
diff --git a/ui/assets/open_search.tpl.xml b/ui/assets/open_search.tpl.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-    <ShortName>Hound</ShortName>
-    <Description>Search code with Hound</Description>
-    <Tags>Hound</Tags>
+    <ShortName>Gitgrep</ShortName>
+    <Description>Search code with Gitgrep</Description>
+    <Tags>Gitgrep</Tags>
     <Url type="text/html"
          method="get"
          template="http://{{ .Host }}/?q={searchTerms}" />
diff --git a/ui/ui.go b/ui/ui.go
@@ -100,6 +100,7 @@ func renderForDev(w io.Writer, root string, c *content, cfg *config.Config, r *h
 		"ReposAsJson":   json,
 		"Source":        html_template.HTML(buf.String()),
 		"Host":          r.Host,
+		"FaviconURL":    cfg.FaviconURL,
 	})
 }
 
@@ -128,7 +129,7 @@ func (h *prdHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	ct := h.content[p]
 	if ct != nil {
 		// if so, render it
-		if err := renderForPrd(w, ct, h.cfgJson, r); err != nil {
+		if err := renderForPrd(w, ct, h.cfg, h.cfgJson, r); err != nil {
 			log.Panic(err)
 		}
 		return
@@ -142,7 +143,7 @@ func (h *prdHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 // Renders a templated asset in prd-mode. This strategy will embed
 // the sources directly in a script tag on the templated page.
-func renderForPrd(w io.Writer, c *content, cfgJson string, r *http.Request) error {
+func renderForPrd(w io.Writer, c *content, cfg *config.Config, cfgJson string, r *http.Request) error {
 	var buf bytes.Buffer
 	buf.WriteString("<script>")
 	for _, src := range c.sources {
@@ -160,6 +161,7 @@ func renderForPrd(w io.Writer, c *content, cfgJson string, r *http.Request) erro
 		"ReposAsJson":   cfgJson,
 		"Source":        html_template.HTML(buf.String()),
 		"Host":          r.Host,
+		"FaviconURL":    cfg.FaviconURL,
 	})
 }
 
diff --git a/web/web.go b/web/web.go
@@ -37,7 +37,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		s.mux.ServeHTTP(w, r)
 	} else {
 		http.Error(w,
-			"Hound is not ready.",
+			"Gitgrep is not ready.",
 			http.StatusServiceUnavailable)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,9 @@ func registerShutdownSignal() <-chan os.Signal {`
`80`	`80`	`func makeTemplateData(cfg *config.Config) (interface{}, error) {`
`81`	`81`	`var data struct {`
`82`	`82`	`ReposAsJson string`
	`83`	`+ FaviconURL string`
`83`	`84`	`}`
	`85`	`+ data.FaviconURL = cfg.FaviconURL`
`84`	`86`
`85`	`87`	`res := map[string]*config.Repo{}`
`86`	`88`	`for name, repo := range cfg.Repos {`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ type Config struct {`
`63`	`63`	JwtLoginURL string `json:"jwt_login_url"`
`64`	`64`	JwtCookieName string `json:"jwt_cookie_name"`
`65`	`65`	JwtSecretKey string `json:"jwt_secret_key"`
	`66`	+ FaviconURL string `json:"favicon_url"`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`// SecretMessage is just like json.RawMessage but it will not`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func (s Server) ServeHTTP(w http.ResponseWriter, r http.Request) {`
`37`	`37`	`s.mux.ServeHTTP(w, r)`
`38`	`38`	`} else {`
`39`	`39`	`http.Error(w,`
`40`		`- "Hound is not ready.",`
	`40`	`+ "Gitgrep is not ready.",`
`41`	`41`	`http.StatusServiceUnavailable)`
`42`	`42`	`}`
`43`	`43`	`}`