Remove noisy log statements

Add mechanism to set tags on note
Allow navbar to collapse on small screens
2025-11-05 09:27:35 +00:00 · 2025-11-05 09:27:08 +00:00 · 2025-11-05 08:55:10 +00:00 · 2025-11-05 08:49:01 +00:00 · 2025-11-05 08:46:22 +00:00
4 changed files with 74 additions and 23 deletions
--- a/internal/conf/templates/base.tmpl.html
+++ b/internal/conf/templates/base.tmpl.html
@ -31,25 +31,43 @@
    <body>
        <nav class="navbar navbar-expand-sm bg-body-tertiary mb-3">
            <div class="container-fluid">
-                <a class="navbar-brand" href="/">
-                    <img src="/static/icons/favicon.svg" width="30" height="30" class="d-inline-block align-top" alt="">
-                    GoNotes
-                </a>
-                <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                    <li class="nav-item">
-                        <a class="nav-link" href="/notes/">All Notes</a>
-                    </li>
-                    {{range .userTags}}
+                <button class="navbar-toggler"
+                    type="button"
+                    data-bs-toggle="collapse" data-bs-target="#navCollapse"
+                    aria-controls="navCollapse" aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="collapse navbar-collapse mt-2" id="navCollapse">
+                    <a class="navbar-brand" href="/">
+                        <img src="/static/icons/favicon.svg" width="30" height="30" class="d-inline-block align-top" alt="">
+                        GoNotes
+                    </a>
+                    <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                        <li class="nav-item">
-                        <a class="nav-link" href="/notes/?tag={{.}}">{{.}}</a>
+                            <a class="nav-link" href="/notes/">All Notes</a>
                        </li>
-                    {{end}}
-                    {{template "navLinks" .}}
-                    <li>
-                        <a class="nav-link" href="/logout/">Logout {{.user}}</a>
-                    </li>
-                </ul>
-                {{template "navExtra" .}}
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                Tags
+                            </a>
+                            <ul class="dropdown-menu">
+                                <li>
+                                    <a class="dropdown-item nav-link" href="/notes/">All</a>
+                                </li>
+                                {{range .userTags}}
+                                <li>
+                                    <a class="dropdown-item nav-link" href="/notes/?tag={{.}}">{{.}}</a>
+                                </li>
+                                {{end}}
+                            </ul>
+                        </li>
+                        {{template "navLinks" .}}
+                        <li>
+                            <a class="nav-link" href="/logout/">Logout {{.user}}</a>
+                        </li>
+                    </ul>
+                    {{template "navExtra" .}}
+                </div>
            </div>
        </nav>
        <div class="container">
--- a/internal/conf/templates/view.tmpl.html
+++ b/internal/conf/templates/view.tmpl.html
@ -46,7 +46,7 @@
                        <div id="viewerHelp" class="form-text">Share with other user</div>
                    </div>
                    <button class="btn btn-primary" type="submit">Share</button>
-
+                </form>
            </div>
        </div>
    </div>
@ -65,7 +65,7 @@
            <div class="accordion-body">
                <form action="{{.urlSetTags}}" method="POST">
                    <div class="mb-3">
-                        <input type="text" class="form-control" id="tagInput" name="tags" aria-described-by="tagHelp" value="{{.note.Tags}}"/>
+                        <input type="text" class="form-control" id="tagInput" name="tags" aria-described-by="tagHelp" value="{{.tags}}"/>
                        <div id="tagHelp" class="form-text">Tags</div>
                    </div>
                    <button class="btn btn-primary" type="submit">Set Tags</button>
--- a/internal/notes/notes.go
+++ b/internal/notes/notes.go
@ -398,3 +398,12 @@ func (n *Note) ToggleBox(nthBox int) {
 	n.Body = buf.Bytes()
 	n.Save()
 }
+
+func (n *Note) HasTag(tag string) bool {
+	for _, tag_ := range n.Tags {
+		if tag_ == tag {
+			return true
+		}
+	}
+	return false
+}
--- a/internal/notes/views/views.go
+++ b/internal/notes/views/views.go
@ -4,6 +4,7 @@ import (
 	"log"
 	"net/http"
 	"strconv"
+	"strings"

 	urls "forgejo.gwairfelin.com/max/gispatcho"
 	"forgejo.gwairfelin.com/max/gonotes/internal/middleware"
@ -25,6 +26,7 @@ func GetRoutes(prefix string) *http.ServeMux {
 			"new":       {Path: "/new", Protocol: "GET", Handler: new},
 			"view_":     {Path: "/{note}", Protocol: "GET", Handler: view},
 			"view":      {Path: "/{note}/", Protocol: "GET", Handler: view},
+			"setTags":   {Path: "/{note}/tags/", Protocol: "POST", Handler: setTags},
 			"delete":    {Path: "/{note}/delete/", Protocol: "GET", Handler: delete},
 			"edit":      {Path: "/{note}/edit/", Protocol: "GET", Handler: edit},
 			"share":     {Path: "/{note}/share/", Protocol: "POST", Handler: share},
@ -55,7 +57,9 @@ func view(w http.ResponseWriter, r *http.Request) {
 		"urlNew":     myurls.Reverse("new", urls.Repl{}),
 		"urlShare":   myurls.Reverse("share", urls.Repl{"note": uid}),
 		"urlUnshare": myurls.Reverse("unshare", urls.Repl{"note": uid}),
+		"urlSetTags": myurls.Reverse("setTags", urls.Repl{"note": uid}),
 		"viewers":    viewers,
+		"tags":       strings.Join(note.Tags, " "),
 		"isOwner":    user == note.Owner,
 	}

@ -199,6 +203,8 @@ type titleAndURL struct {
 func list(w http.ResponseWriter, r *http.Request) {
 	user := r.Context().Value(middleware.ContextKey("user")).(string)

+	tag := r.FormValue("tag")
+
 	titlesAndUrls := make([]titleAndURL, 0)

 	ns := notes.Notes.Get(user)
@ -206,10 +212,12 @@ func list(w http.ResponseWriter, r *http.Request) {
 	log.Printf("Notes for %s: %+v", user, ns)

 	for note := range ns {
-		titlesAndUrls = append(
-			titlesAndUrls,
-			titleAndURL{Title: note.Title, URL: myurls.Reverse("view", urls.Repl{"note": note.Uid})},
-		)
+		if tag == "" || note.HasTag(tag) {
+			titlesAndUrls = append(
+				titlesAndUrls,
+				titleAndURL{Title: note.Title, URL: myurls.Reverse("view", urls.Repl{"note": note.Uid})},
+			)
+		}
 	}

 	urlNew := myurls.Reverse("new", urls.Repl{})
@ -221,3 +229,19 @@ func list(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 }
+
+func setTags(w http.ResponseWriter, r *http.Request) {
+	user := r.Context().Value(middleware.ContextKey("user")).(string)
+	uid := r.PathValue("note")
+	tags := r.FormValue("tags")
+
+	note, ok := notes.Notes.GetOne(user, uid)
+	if !ok || note.Owner != user {
+		http.Redirect(w, r, myurls.Reverse("view", urls.Repl{"note": uid}), http.StatusFound)
+		return
+	}
+
+	note.Tags = strings.Split(tags, " ")
+	note.Save()
+	http.Redirect(w, r, myurls.Reverse("view", urls.Repl{"note": note.Uid}), http.StatusFound)
+}
Author	SHA1	Message	Date
Maximilian Friedersdorff	38bbc35922	Remove noisy log statements	2025-11-05 09:27:35 +00:00
Maximilian Friedersdorff	1df4f3f807	Add mechanism to set tags on note	2025-11-05 09:27:08 +00:00
Maximilian Friedersdorff	7a44876e77	Allow navbar to collapse on small screens	2025-11-05 08:55:10 +00:00
Maximilian Friedersdorff	e52f0cbe98	Pretty up filtering by tag	2025-11-05 08:49:01 +00:00
Maximilian Friedersdorff	95865257a3	Support listing notes by tag	2025-11-05 08:46:22 +00:00