From adbf2ef45036af690f9574d310506e0571d6cb88 Mon Sep 17 00:00:00 2001
From: Justin Hawkins <justin@hawkins.id.au>
Date: Thu, 26 May 2022 06:41:17 +0930
Subject: [PATCH] Add bookmarklet support, show tags in manage list.

---
 web/templates/_layout.html           |  4 ++++
 web/templates/add_url_form.html      | 18 +++++++++++++-----
 web/templates/add_url_form_bulk.html |  7 ++++---
 web/templates/bookmarklet.html       |  7 +++++++
 web/templates/manage.html            | 21 ++++++++++++++-------
 web/templates/search.html            | 10 +++++-----
 web/templates/tags_widget.html       |  7 ++-----
 web/web.go                           | 13 +++++++++++--
 8 files changed, 60 insertions(+), 27 deletions(-)
 create mode 100644 web/templates/bookmarklet.html

diff --git a/web/templates/_layout.html b/web/templates/_layout.html
index 104af09..9975478 100644
--- a/web/templates/_layout.html
+++ b/web/templates/_layout.html
@@ -25,6 +25,8 @@
             <li><a href="/export">Export all URLs</a></li>
           </ul>
         </li>
+        <li><a href="javascript:void(window.open('http://localhost:8080/bookmarklet?url=' +encodeURIComponent(window.location), 'windowName', 'width=640,height=480'))">Bookmarklet</a></li>
+
       </ul>
     </div>
     <div class="top-bar-right">
@@ -39,6 +41,8 @@
     <div class="grid-container">
       {{ if eq .page "root" }}
       {{ template "search.html" . }}
+      {{ else if eq .page "bookmarklet_click" }}
+      {{ template "bookmarklet.html" . }}
       {{ else if eq .page "manage" }}
       {{ template "manage.html" . }}
       {{ end }}
diff --git a/web/templates/add_url_form.html b/web/templates/add_url_form.html
index 83999ae..9a52059 100644
--- a/web/templates/add_url_form.html
+++ b/web/templates/add_url_form.html
@@ -1,19 +1,27 @@
 <div class="large-8 medium-8 cell" id="add-url-form" >
-    <h5>Add a new URL</h5>
-    <span>[<a hx-get="/bulk_add" hx-target="#add-url-form" href="#">bulk</a>]</span>
+    <div>
+        <h5 style="display:inline-block;">Add a new URL</h5>
+        <p  style="display:inline-block;">[<a hx-get="/bulk_add" hx-target="#add-url-form" href="#">bulk add</a>]</h5>
+    </div>
+
     <form onsubmit="return false">
         <div class="grid-x grid-padding-x">
             <div class="large-6 cell">
                 <label>Paste a URL</label>
-                <input type="text" name="url" 
-                    hx-post="/add"
-                    hx-target="#add-url-form"  hx-trigger=""
+                <input type="text" name="url" value="{{ .url }}"
+                      hx-trigger=""
                 />
             </div>
             <div class="large-6 cell">
                 {{ template "tags_widget.html" . }}
             </div>
         </div>
+        <div class="grid-x grid-padding-x">
+            <div class="medium-6 cell">
+                <a href="#" class="button" hx-post="/add"
+                hx-target="#add-url-form">add</a>
+            </div>
+        </div>
     </form>
     {{ if .error }}
      <p class="error">{{ .error }}</p>
diff --git a/web/templates/add_url_form_bulk.html b/web/templates/add_url_form_bulk.html
index 1ea89e3..2a398cd 100644
--- a/web/templates/add_url_form_bulk.html
+++ b/web/templates/add_url_form_bulk.html
@@ -1,7 +1,8 @@
 <div class="large-8 medium-8 cell" id="add-url-form" >
-    <h5>Add URLs in bulk</h5>
-    <span>[<a hx-get="/single_add" hx-target="#add-url-form" href="#">single</a>]</span>
-    <form onsubmit="return false">
+    <div>
+        <h5 style="display:inline-block;">Add bulk URLs</h5>
+        <p  style="display:inline-block;">[<a hx-get="/single_add" hx-target="#add-url-form" href="#">single add</a>]</h5>
+    </div>    <form onsubmit="return false">
         <div class="grid-x grid-padding-x">
             <div class="large-12 cell">
                 <label>Paste URL's, one per line</label>
diff --git a/web/templates/bookmarklet.html b/web/templates/bookmarklet.html
new file mode 100644
index 0000000..73c23d1
--- /dev/null
+++ b/web/templates/bookmarklet.html
@@ -0,0 +1,7 @@
+<div class="grid-x grid-padding-x">
+    <div class="large-12 cell">
+
+        {{ template "add_url_form.html" .}}
+
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/templates/manage.html b/web/templates/manage.html
index 91f6f73..8b83596 100644
--- a/web/templates/manage.html
+++ b/web/templates/manage.html
@@ -1,12 +1,16 @@
 <div class="grid-x grid-padding-x">
     <div class="large-12 cell">
 
-        <h5>Manage:
-         
-        </h5>
+        <h5>Manage links</h5>
 
         <table>
-            <tr><th>id</th><th>url</th><th>created</th><th>scraped</th></tr>
+            <tr>
+                <th>id</th>
+                <th>title/url</th>
+                <th>tags</th>
+                <th class="show-for-large">created</th>
+                <th class="show-for-large">scraped</th>
+            </tr>
             {{ range .bookmarks }}
             <tr>
                 <th>{{ .ID }}</th>
@@ -15,11 +19,14 @@
                     <br>
                     <a href="{{ .URL }}">{{ niceURL .URL }}</a>
                 </td>
-                <td>{{ (nicetime .TimestampCreated).HumanDuration }} ago</td>
-                <td>{{ (nicetime .TimestampLastScraped).HumanDuration }} ago</td>
+                <td>
+                    {{ join .Tags ", " }}
+                </td>
+                <td class="show-for-large">{{ (nicetime .TimestampCreated).HumanDuration }} ago</td>
+                <td class="show-for-large">{{ (nicetime .TimestampLastScraped).HumanDuration }} ago</td>
 
                 <td>
-                    <button class="button" hx-post="/scrape/{{ .ID }}">scrape</button>
+                    <a class="button" hx-swap="outerHTML" hx-post="/scrape/{{ .ID }}">scrape</button>
                 </td>
             </tr>
             {{ end }}
diff --git a/web/templates/search.html b/web/templates/search.html
index 1e3d84d..54057b3 100644
--- a/web/templates/search.html
+++ b/web/templates/search.html
@@ -1,9 +1,9 @@
 <div class="grid-x grid-padding-x">
-    <div class="large-8 medium-8 cell">
+    <div class="large-6 medium-12 cell">
 
-        <h5>Search:
+        <h5>Search
             <span id="htmx-indicator-search" class="htmx-indicator">
-                <img src="/assets/image/beating.gif" /> Searching...
+                <img style="height:1em;" src="/assets/image/beating.gif" /> Searching...
             </span>
         </h5>
         <form onsubmit="return false"> 
@@ -19,9 +19,9 @@
         <div id="search-results">
         </div>
     </div>
-
+    <div class="large-6 medium-12 cell">
     {{ template "add_url_form.html" . }}
-  
+    </div>  
 
     <!-- <div class="large-4 medium-4 cell">
         <h5>Try one of these buttons:</h5>
diff --git a/web/templates/tags_widget.html b/web/templates/tags_widget.html
index 2482f89..1df50fc 100644
--- a/web/templates/tags_widget.html
+++ b/web/templates/tags_widget.html
@@ -1,7 +1,5 @@
 <div id="label-widget">
     <div class="grid-x grid-padding-x">
-        <div class="small-3 medium-2 large-1 cell">
-        </div>
         <div class="small-9 medium-10 large-5 cell" 
             hx-post="/tags"
             hx-target="#label-widget"
@@ -17,12 +15,11 @@
                title="remove {{ . }}"
                hx-trigger="click"
                hx-target="#label-widget"
-               hx-post="/tags?remove={{ . }}">
+               hx-post="/tags?remove={{ . }}">[-]</a>
                 {{ . }}
-            </a>
+            
             {{ end }}
             <input type="hidden" name="tags_hidden" value="{{ .tags_hidden }}">
-
         </div>    
     </div>
 </div>
\ No newline at end of file
diff --git a/web/web.go b/web/web.go
index 291eb04..0665822 100644
--- a/web/web.go
+++ b/web/web.go
@@ -50,7 +50,7 @@ func Create(bmm *db.BookmarkManager) *Server {
 	}
 
 	// templ := template.Must(template.New("").Funcs(template.FuncMap{"dict": dictHelper}).ParseFS(templateFiles, "templates/*.html"))
-	templ := template.Must(template.New("").Funcs(template.FuncMap{"nicetime": niceTime, "niceURL": niceURL}).ParseFS(templateFiles, "templates/*.html"))
+	templ := template.Must(template.New("").Funcs(template.FuncMap{"nicetime": niceTime, "niceURL": niceURL, "join": strings.Join}).ParseFS(templateFiles, "templates/*.html"))
 
 	r := gin.Default()
 
@@ -186,7 +186,7 @@ func Create(bmm *db.BookmarkManager) *Server {
 		idNum, _ := strconv.ParseInt(id, 10, 32)
 		bm := bmm.LoadBookmarkByID(uint64(idNum))
 		bmm.QueueScrape(&bm)
-		c.String(http.StatusOK, "queued")
+		c.String(http.StatusOK, "<p>scrape queued</p>")
 	})
 
 	r.GET("/export", func(c *gin.Context) {
@@ -199,6 +199,15 @@ func Create(bmm *db.BookmarkManager) *Server {
 		}
 	})
 
+	r.GET("/bookmarklet", func(c *gin.Context) {
+		url := c.Query("url")
+		log.Printf(url)
+		meta := gin.H{"page": "bookmarklet_click", "url": url}
+		c.HTML(http.StatusOK,
+			"_layout.html", meta,
+		)
+	})
+
 	return server
 }