dashboard / erock/git-pr / refactor: custom index page #56 rss

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56

diff --git a/cli.go b/cli.go
index 249df42..381741c 100644
--- a/cli.go
+++ b/cli.go
@@ -173,7 +173,7 @@ func printPatchsetFromPrID(sesh ssh.Session, pr GitPatchRequest, prID int64) err
 }
 
 func NewCli(sesh ssh.Session, be *Backend, pr GitPatchRequest) *cli.App {
-	desc := `Patchbin: a supercharged pastebin for git collaboration.
+	desc := `git-pr: the simplest git collaboration tool.
 
 Here's how it works:
 	- External contributor clones repo (git-clone)
@@ -196,7 +196,7 @@ Here's how it works:
 	app := &cli.App{
 		Name:        "ssh",
 		Description: desc,
-		Usage:       "Collaborate with contributors for your git project",
+		Usage:       "Send, receive, and review git patches",
 		Writer:      sesh,
 		ErrWriter:   sesh,
 		ExitErrHandler: func(cCtx *cli.Context, err error) {
@@ -211,6 +211,33 @@ Here's how it works:
 			return nil
 		},
 		Commands: []*cli.Command{
+			{
+				Name:  "index",
+				Usage: "Generate an index page",
+				Args:  true,
+				Action: func(cCtx *cli.Context) error {
+					indexFile := `{{template "base" .}}
+{{define "title"}}git-pr{{end}}
+
+{{define "meta"}}
+{{end}}
+
+{{define "body"}}
+<header class="group">
+  <h1 class="text-2xl">git-pr</h1>
+  <div>
+    <span>The simplest git collaboration service</span> &middot; <a href="/e">explore</a>
+  </div>
+</header>
+
+<main></main>
+
+<footer class="mt">Built by <a href="https://pico.sh">pico.sh</a></footer>
+{{end}}`
+					wish.Println(sesh, indexFile)
+					return nil
+				},
+			},
 			{
 				Name:  "logs",
 				Usage: "List event logs with filters",

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40

diff --git a/tmpl/explore.html b/tmpl/explore.html
new file mode 100644
index 0000000..852bbcf
--- /dev/null
+++ b/tmpl/explore.html
@@ -0,0 +1,34 @@
+{{template "base" .}}
+
+{{define "title"}}explore prs{{end}}
+
+{{define "meta"}}
+<link rel="alternate" type="application/atom+xml"
+      title="RSS feed for git collaboration server"
+      href="/rss" />
+{{end}}
+
+{{define "body"}}
+<header class="group">
+  <h1 class="text-2xl">explore</h1>
+  <div>
+    <span>View all of the latest patch requests</span>
+  </div>
+</header>
+
+<main>
+  <div>
+    filter
+    <a href="/">open</a> <code>{{.NumOpen}}</code>
+    &middot;
+    <a href="/?status=accepted">accepted</a> <code>{{.NumAccepted}}</code>
+    &middot;
+    <a href="/?status=closed">closed</a> <code>{{.NumClosed}}</code>
+  </div>
+  {{template "pr-table" .Prs}}
+</main>
+
+<footer class="mt">
+  <div><a href="/rss">rss</a></div>
+</footer>
+{{end}}

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76

diff --git a/tmpl/index.html b/tmpl/index.html
index efcb653..f8a3065 100644
--- a/tmpl/index.html
+++ b/tmpl/index.html
@@ -3,60 +3,27 @@
 {{define "title"}}git-pr{{end}}
 
 {{define "meta"}}
-<link rel="alternate" type="application/atom+xml"
-      title="RSS feed for git collaboration server"
-      href="/rss" />
 {{end}}
 
 {{define "body"}}
 <header class="group">
-  <h1 class="text-2xl">patchbin</h1>
+  <h1 class="text-2xl">git-pr</h1>
   <div>
-    <span>A pastebin supercharged for git collaboration</span> &middot;
-    <a href="/docs">docs</a>
-  </div>
-
-  <div class="box-sm">
-    <div>
-      Welcome to <a href="https://pico.sh">pico's</a> managed patchbin service!
-      This is a <strong>public</strong> service that is free to anyone who wants
-      to collaborate on git patches.  The idea is simple: submit a patchset to
-      our service and let anyone collaborate on it by submitting follow-up patchsets.
-      Using this service for the first time?  Creating a patch request is simple:
-    </div>
-
-    <pre class="text-sm">git format-patch main --stdout | ssh pr.pico.sh pr create {repo}</pre>
-
-    <div>
-      When running that command we will automatically create a user and a repo
-      if one doesn't exist. Once the patches have been submitted you'll receive
-      a link that you can send to a reviewer.  Anyone can review patch requests.
-      Want to submit a v2 of the patch request?
-    </div>
-
-    <pre class="text-sm">git format-patch main --stdout | ssh pr.pico.sh pr add {prID}</pre>
-
-    <div>
-      Downloading a patchset is easy as well:
-    </div>
-
-    <pre class="text-sm">ssh pr.pico.sh print pr-{prID}</pre>
+    <span>The simplest git collaboration service</span> &middot; <a href="/e">explore</a>
   </div>
 </header>
 
 <main>
-  <div>
-    filter
-    <a href="/">open</a> <code>{{.NumOpen}}</code>
-    &middot;
-    <a href="/?status=accepted">accepted</a> <code>{{.NumAccepted}}</code>
-    &middot;
-    <a href="/?status=closed">closed</a> <code>{{.NumClosed}}</code>
+  <div class="box-sm container-sm">
+    <div>
+      Welcome to <code>git-pr</code>!  If you are the owner of this service we
+      recommend replacing this index page with your own custom one.  To do that,
+      copy the contents of this command into your <code>data_dir</code>:
+    </div>
+    
+    <pre class="m-0 mt">ssh {{.MetaData.URL}} index > ./data/index.html</pre>
   </div>
-  {{template "pr-table" .Prs}}
 </main>
 
-<footer class="mt">
-  <div><a href="/rss">rss</a></div>
-</footer>
+<footer class="mt">Built by <a href="https://pico.sh">pico.sh</a></footer>
 {{end}}

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49

diff --git a/web.go b/web.go
index 9224082..7cffc9c 100644
--- a/web.go
+++ b/web.go
@@ -313,6 +313,25 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	w.Header().Set("content-type", "text/html")
+	tmpl := getTemplate("index.html")
+	err = tmpl.ExecuteTemplate(w, "index.html", BasicData{
+		MetaData: MetaData{
+			URL: web.Backend.Cfg.Url,
+		},
+	})
+	if err != nil {
+		web.Backend.Logger.Error("cannot execute template", "err", err)
+	}
+}
+
+func exploreHandler(w http.ResponseWriter, r *http.Request) {
+	web, err := getWebCtx(r)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
 	prs, err := web.Pr.GetPatchRequests()
 	if err != nil {
 		web.Logger.Error("could not get prs", "err", err)
@@ -342,8 +361,8 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	w.Header().Set("content-type", "text/html")
-	tmpl := getTemplate("index.html")
-	err = tmpl.ExecuteTemplate(w, "index.html", PrTableData{
+	tmpl := getTemplate("explore.html")
+	err = tmpl.ExecuteTemplate(w, "explore.html", PrTableData{
 		NumOpen:     numOpen,
 		NumAccepted: numAccepted,
 		NumClosed:   numClosed,
@@ -1149,6 +1168,7 @@ func StartWebServer(cfg *GitCfg) {
 	http.HandleFunc("GET /rss", ctxMdw(ctx, rssHandler))
 	http.HandleFunc("GET /docs", ctxMdw(ctx, docsHandler))
 	http.HandleFunc("GET /", ctxMdw(ctx, indexHandler))
+	http.HandleFunc("GET /e", ctxMdw(ctx, exploreHandler))
 	http.HandleFunc("GET /syntax.css", ctxMdw(ctx, chromaStyleHandler))
 	embedFS, err := getEmbedFS(embedStaticFS, "static")
 	if err != nil {