.air.toml

@@ -7,14 +7,14 @@ tmp_dir = "tmp"
   bin = "./tmp/main"
   cmd = "go build -o ./tmp/main ."
   delay = 1000
-  exclude_dir = ["uploads", "test", "db", "res"]
+  exclude_dir = ["admin/static", "admin\\static", "public", "uploads", "test", "db", "res"]
   exclude_file = []
   exclude_regex = ["_test.go"]
   exclude_unchanged = false
   follow_symlink = false
   full_bin = ""
   include_dir = []
-  include_ext = ["go", "tpl", "tmpl", "html", "css"]
+  include_ext = ["go", "tpl", "tmpl", "html"]
   include_file = []
   kill_delay = "0s"
   log = "build-errors.log"

.forgejo/workflows/push-prod.yaml

@@ -1,50 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-
-env:
-  EXEC: arimelody-web
-  REMOTE: ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}
-  PORT: ${{ secrets.SSH_PORT }}
-
-jobs:
-  deploy:
-    runs-on: docker
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '^1.25.1'
-
-      - name: Run tests
-        run: go test -v ./model
-
-      - name: Build binary
-        run: make build
-
-      - name: Bundle tarball
-        run: make bundle
-
-      - name: Set up SSH keys
-        uses: webfactory/ssh-agent@v0.9.0
-        with:
-          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-
-      - name: Copy to production server
-        run: |
-          ssh-keyscan -p $PORT ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
-          scp -P $PORT ./$EXEC.tar.gz $REMOTE:~/
-
-      - name: Restart production
-        run: |
-          ssh -o StrictHostKeyChecking=no $REMOTE -p $PORT << EOT
-            cd ${{ secrets.DEPLOY_DIR }}
-            tar xzf ~/$EXEC.tar.gz
-            /bin/bash ~/restart.sh
-            rm ~/$EXEC.tar.gz
-          EOT
-

Makefile

@@ -2,11 +2,11 @@ EXEC = arimelody-web
 
 .PHONY: $(EXEC)
 
-build:
+$(EXEC):
 	GOOS=linux GOARCH=amd64 go build -o $(EXEC)
 
-bundle: build
+bundle: $(EXEC)
-	tar czf $(EXEC).tar.gz --exclude ".DS_Store" $(EXEC) admin/static/ public/
+	tar czf $(EXEC).tar.gz $(EXEC) admin/components/ admin/views/ admin/static/ views/ public/ schema-migration/
 
 clean:
 	rm $(EXEC) $(EXEC).tar.gz

README.md

@@ -1,12 +1,17 @@
-# ari melody website
+# arimelody.me
 
 home to your local SPACEGIRL! 💫
 
 ---
 
-a slightly-overcomplicated webserver built to show off everything i've worked
+built up from the initial [static](https://git.arimelody.me/ari/arimelody.me-static)
-on, and then some! this server comes complete with twitch live status tracking,
+branch, this powerful, server-side rendered version comes complete with live
-a portfolio database, and a full-fledged admin CMS panel to manage it all!
+updates, powered by a new database and handy admin panel!
+
+the admin panel currently facilitates live updating of my music discography,
+though i plan to expand it towards art portfolio and blog posts in the future.
+if all goes well, i'd like to later separate these components into their own
+library for others to use in their own sites. exciting stuff!
 
 ## build
 

admin/accounthttp.go

@@ -1,29 +1,28 @@
 package admin
 
 import (
-	"database/sql"
+    "database/sql"
-	"fmt"
+    "fmt"
-	"net/http"
+    "net/http"
-	"net/url"
+    "net/url"
-	"os"
+    "os"
 
-	"arimelody-web/admin/templates"
+    "arimelody-web/controller"
-	"arimelody-web/controller"
+    "arimelody-web/log"
-	"arimelody-web/log"
+    "arimelody-web/model"
-	"arimelody-web/model"
 
-	"golang.org/x/crypto/bcrypt"
+    "golang.org/x/crypto/bcrypt"
 )
 
 func accountHandler(app *model.AppState) http.Handler {
     mux := http.NewServeMux()
 
-    mux.Handle("/account/totp-setup", totpSetupHandler(app))
+    mux.Handle("/totp-setup", totpSetupHandler(app))
-    mux.Handle("/account/totp-confirm", totpConfirmHandler(app))
+    mux.Handle("/totp-confirm", totpConfirmHandler(app))
-    mux.Handle("/account/totp-delete", totpDeleteHandler(app))
+    mux.Handle("/totp-delete/", http.StripPrefix("/totp-delete", totpDeleteHandler(app)))
 
-    mux.Handle("/account/password", changePasswordHandler(app))
+    mux.Handle("/password", changePasswordHandler(app))
-    mux.Handle("/account/delete", deleteAccountHandler(app))
+    mux.Handle("/delete", deleteAccountHandler(app))
 
     return mux
 }
@@ -45,7 +44,7 @@ func accountIndexHandler(app *model.AppState) http.Handler {
             }
 
             accountResponse struct {
-                adminPageData
+                Session *model.Session
                 TOTPs []TOTP
             }
         )
@@ -65,8 +64,8 @@ func accountIndexHandler(app *model.AppState) http.Handler {
         session.Message = sessionMessage
         session.Error = sessionError
 
-        err = templates.AccountTemplate.Execute(w, accountResponse{
+        err = accountTemplate.Execute(w, accountResponse{
-            adminPageData: adminPageData{ Path: r.URL.Path, Session: session },
+            Session: session,
             TOTPs: totps,
         })
         if err != nil {
@@ -170,7 +169,7 @@ func deleteAccountHandler(app *model.AppState) http.Handler {
 }
 
 type totpConfirmData struct {
-    adminPageData
+    Session *model.Session
     TOTP *model.TOTP
     NameEscaped string
     QRBase64Image string
@@ -179,9 +178,13 @@ type totpConfirmData struct {
 func totpSetupHandler(app *model.AppState) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
         if r.Method == http.MethodGet {
+            type totpSetupData struct {
+                Session *model.Session
+            }
+
             session := r.Context().Value("session").(*model.Session)
 
-            err := templates.TOTPSetupTemplate.Execute(w, adminPageData{ Path: "/account", Session: session })
+            err := totpSetupTemplate.Execute(w, totpSetupData{ Session: session })
             if err != nil {
                 fmt.Printf("WARN: Failed to render TOTP setup page: %s\n", err)
                 http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@@ -218,9 +221,7 @@ func totpSetupHandler(app *model.AppState) http.Handler {
         if err != nil {
             fmt.Printf("WARN: Failed to create TOTP method: %s\n", err)
             controller.SetSessionError(app.DB, session, "Something went wrong. Please try again.")
-            err := templates.TOTPSetupTemplate.Execute(w, totpConfirmData{
+            err := totpSetupTemplate.Execute(w, totpConfirmData{ Session: session })
-                adminPageData: adminPageData{ Path: r.URL.Path, Session: session },
-            })
             if err != nil {
                 fmt.Printf("WARN: Failed to render TOTP setup page: %s\n", err)
                 http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@@ -234,8 +235,8 @@ func totpSetupHandler(app *model.AppState) http.Handler {
             fmt.Fprintf(os.Stderr, "WARN: Failed to generate TOTP QR code: %v\n", err)
         }
 
-        err = templates.TOTPConfirmTemplate.Execute(w, totpConfirmData{
+        err = totpConfirmTemplate.Execute(w, totpConfirmData{
-            adminPageData: adminPageData{ Path: r.URL.Path, Session: session },
+            Session: session,
             TOTP: &totp,
             NameEscaped: url.PathEscape(totp.Name),
             QRBase64Image: qrBase64Image,
@@ -266,6 +267,11 @@ func totpConfirmHandler(app *model.AppState) http.Handler {
             http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
             return
         }
+        code := r.FormValue("totp")
+        if len(code) != controller.TOTP_CODE_LENGTH {
+            http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
+            return
+        }
 
         totp, err := controller.GetTOTP(app.DB, session.Account.ID, name)
         if err != nil {
@@ -285,22 +291,23 @@ func totpConfirmHandler(app *model.AppState) http.Handler {
             fmt.Fprintf(os.Stderr, "WARN: Failed to generate TOTP QR code: %v\n", err)
         }
 
-        code := r.FormValue("totp")
         confirmCode := controller.GenerateTOTP(totp.Secret, 0)
-        confirmCodeOffset := controller.GenerateTOTP(totp.Secret, 1)
+        if code != confirmCode {
-        if len(code) != controller.TOTP_CODE_LENGTH || (code != confirmCode && code != confirmCodeOffset) {
+            confirmCodeOffset := controller.GenerateTOTP(totp.Secret, 1)
-            session.Error = sql.NullString{ Valid: true, String: "Incorrect TOTP code. Please try again." }
+            if code != confirmCodeOffset {
-            err = templates.TOTPConfirmTemplate.Execute(w, totpConfirmData{
+                session.Error = sql.NullString{ Valid: true, String: "Incorrect TOTP code. Please try again." }
-                adminPageData: adminPageData{ Path: r.URL.Path, Session: session },
+                err = totpConfirmTemplate.Execute(w, totpConfirmData{
-                TOTP: totp,
+                    Session: session,
-                NameEscaped: url.PathEscape(totp.Name),
+                    TOTP: totp,
-                QRBase64Image: qrBase64Image,
+                    NameEscaped: url.PathEscape(totp.Name),
-            })
+                    QRBase64Image: qrBase64Image,
-            if err != nil {
+                })
-                fmt.Fprintf(os.Stderr, "WARN: Failed to render TOTP setup page: %v\n", err)
+                if err != nil {
-                http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+                    fmt.Fprintf(os.Stderr, "WARN: Failed to render TOTP setup page: %v\n", err)
+                    http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+                }
+                return
             }
-            return
         }
 
         err = controller.ConfirmTOTP(app.DB, session.Account.ID, name)
@@ -321,23 +328,18 @@ func totpConfirmHandler(app *model.AppState) http.Handler {
 
 func totpDeleteHandler(app *model.AppState) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        if r.Method != http.MethodPost {
+        if r.Method != http.MethodGet {
             http.NotFound(w, r)
             return
         }
 
-        session := r.Context().Value("session").(*model.Session)
+        if len(r.URL.Path) < 2 {
+            http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
+            return
+        }
+        name := r.URL.Path[1:]
 
-        err := r.ParseForm()
+        session := r.Context().Value("session").(*model.Session)
-        if err != nil {
-            http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
-            return
-        }
-        name := r.FormValue("totp-name")
-        if len(name) == 0 {
-            http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
-            return
-        }
 
         totp, err := controller.GetTOTP(app.DB, session.Account.ID, name)
         if err != nil {

admin/artisthttp.go

@@ -1,86 +1,53 @@
 package admin
 
 import (
-	"fmt"
+    "fmt"
-	"net/http"
+    "net/http"
-	"strings"
+    "strings"
 
-	"arimelody-web/admin/templates"
+    "arimelody-web/model"
-	"arimelody-web/controller"
+    "arimelody-web/controller"
-	"arimelody-web/model"
 )
 
-func serveArtists(app *model.AppState) http.Handler {
+func serveArtist(app *model.AppState) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        session := r.Context().Value("session").(*model.Session)
+        slices := strings.Split(r.URL.Path[1:], "/")
-
+        id := slices[0]
-        slices := strings.Split(strings.TrimPrefix(r.URL.Path, "/artists")[1:], "/")
+        artist, err := controller.GetArtist(app.DB, id)
-        artistID := slices[0]
-
-        if len(artistID) > 0 {
-            serveArtist(app, artistID).ServeHTTP(w, r)
-            return
-        }
-
-        artists, err := controller.GetAllArtists(app.DB)
-        if err != nil {
-            fmt.Printf("WARN: Failed to fetch artists: %s\n", err)
-            http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-            return
-        }
-
-        type ArtistsResponse struct {
-            adminPageData
-            Artists []*model.Artist
-        }
-
-        err = templates.ArtistsTemplate.Execute(w, ArtistsResponse{
-            adminPageData: adminPageData{ Path: r.URL.Path, Session: session },
-            Artists: artists,
-        })
-        if err != nil {
-            fmt.Printf("WARN: Failed to serve admin artists page: %s\n", err)
-            http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-        }
-    })
-}
-
-func serveArtist(app *model.AppState, artistID string) http.Handler {
-    return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        session := r.Context().Value("session").(*model.Session)
-
-        artist, err := controller.GetArtist(app.DB, artistID)
         if err != nil {
             if artist == nil {
                 http.NotFound(w, r)
                 return
             }
-            fmt.Printf("WARN: Failed to fetch artist %s: %s\n", artistID, err)
+            fmt.Printf("Error rendering admin artist page for %s: %s\n", id, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
             return
         }
 
         credits, err := controller.GetArtistCredits(app.DB, artist.ID, true)
         if err != nil {
-            fmt.Printf("WARN: Failed to serve admin artist page for %s: %s\n", artistID, err)
+            fmt.Printf("Error rendering admin track page for %s: %s\n", id, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
             return
         }
 
         type ArtistResponse struct {
-            adminPageData
+            Session *model.Session
             Artist *model.Artist
             Credits []*model.Credit
         }
 
-        err = templates.EditArtistTemplate.Execute(w, ArtistResponse{
+        session := r.Context().Value("session").(*model.Session)
-            adminPageData: adminPageData{ Path: r.URL.Path, Session: session },
+
+        err = artistTemplate.Execute(w, ArtistResponse{
+            Session: session,
             Artist: artist,
             Credits: credits,
         })
         if err != nil {
-            fmt.Printf("WARN: Failed to serve admin artist page for %s: %s\n", artistID, err)
+            fmt.Printf("Error rendering admin track page for %s: %s\n", id, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
         }
     })
 }
+

admin/components/credits/addcredit.html

@@ -7,7 +7,7 @@
         {{range $Artist := .Artists}}
         <li class="new-artist"
             data-id="{{$Artist.ID}}"
-            hx-get="/admin/releases/{{$.ReleaseID}}/newcredit/{{$Artist.ID}}"
+            hx-get="/admin/release/{{$.ReleaseID}}/newcredit/{{$Artist.ID}}"
             hx-target="#editcredits ul"
             hx-swap="beforeend"
         >

admin/components/credits/editcredits.html

@@ -3,8 +3,8 @@
         <h2>Editing: Credits</h2>
         <a id="add-credit"
            class="button new"
-           href="/admin/releases/{{.ID}}/addcredit"
+           href="/admin/release/{{.ID}}/addcredit"
-           hx-get="/admin/releases/{{.ID}}/addcredit"
+           hx-get="/admin/release/{{.ID}}/addcredit"
            hx-target="body"
            hx-swap="beforeend"
         >Add</a>

admin/components/release/release-list-item.html

@@ -5,7 +5,7 @@
     </div>
     <div class="release-info">
         <h3 class="release-title">
-            <a href="/admin/releases/{{.ID}}">{{.Title}}</a>
+            <a href="/admin/release/{{.ID}}">{{.Title}}</a>
             <small>
                 <span title="{{.PrintReleaseDate}}">{{.ReleaseDate.Year}}</span>
                 {{if not .Visible}}(hidden){{end}}
@@ -13,9 +13,9 @@
         </h3>
         <p class="release-artists">{{.PrintArtists true true}}</p>
         <p class="release-type-single">{{.ReleaseType}}
-        (<a href="/admin/releases/{{.ID}}#tracks">{{len .Tracks}} track{{if not (eq (len .Tracks) 1)}}s{{end}}</a>)</p>
+        (<a href="/admin/release/{{.ID}}#tracks">{{len .Tracks}} track{{if not (eq (len .Tracks) 1)}}s{{end}}</a>)</p>
         <div class="release-actions">
-            <a href="/admin/releases/{{.ID}}">Edit</a>
+            <a href="/admin/release/{{.ID}}">Edit</a>
             <a href="/music/{{.ID}}" target="_blank">Gateway <img class="icon" src="/img/external-link.svg"/></a>
         </div>
     </div>

admin/components/tracks/addtrack.html

@@ -8,7 +8,7 @@
         </li>
         <li class="new-track"
             data-id="{{$Track.ID}}"
-            hx-get="/admin/releases/{{$.ReleaseID}}/newtrack/{{$Track.ID}}"
+            hx-get="/admin/release/{{$.ReleaseID}}/newtrack/{{$Track.ID}}"
             hx-target="#edittracks ul"
             hx-swap="beforeend"
         >

admin/components/tracks/edittracks.html

@@ -3,8 +3,8 @@
         <h2>Editing: Tracks</h2>
         <a id="add-track"
            class="button new"
-           href="/admin/releases/{{.Release.ID}}/addtrack"
+           href="/admin/release/{{.Release.ID}}/addtrack"
-           hx-get="/admin/releases/{{.Release.ID}}/addtrack"
+           hx-get="/admin/release/{{.Release.ID}}/addtrack"
            hx-target="body"
            hx-swap="beforeend"
         >Add</a>

admin/http.go

@@ -1,28 +1,22 @@
 package admin
 
 import (
-	"context"
+    "context"
-	"database/sql"
+    "database/sql"
-	"fmt"
+    "fmt"
-	"net/http"
+    "net/http"
-	"os"
+    "os"
-	"strings"
+    "path/filepath"
-	"time"
+    "strings"
+    "time"
 
-	"arimelody-web/admin/templates"
+    "arimelody-web/controller"
-	"arimelody-web/controller"
+    "arimelody-web/log"
-	"arimelody-web/log"
+    "arimelody-web/model"
-	"arimelody-web/model"
-	"arimelody-web/view"
 
-	"golang.org/x/crypto/bcrypt"
+    "golang.org/x/crypto/bcrypt"
 )
 
-type adminPageData struct {
-    Path    string
-    Session *model.Session
-}
-
 func Handler(app *model.AppState) http.Handler {
     mux := http.NewServeMux()
 
@@ -44,30 +38,15 @@ func Handler(app *model.AppState) http.Handler {
     mux.Handle("/register", registerAccountHandler(app))
 
     mux.Handle("/account", requireAccount(accountIndexHandler(app)))
-    mux.Handle("/account/", requireAccount(accountHandler(app)))
+    mux.Handle("/account/", requireAccount(http.StripPrefix("/account", accountHandler(app))))
 
     mux.Handle("/logs", requireAccount(logsHandler(app)))
 
-    mux.Handle("/releases", requireAccount(serveReleases(app)))
+    mux.Handle("/release/", requireAccount(http.StripPrefix("/release", serveRelease(app))))
-    mux.Handle("/releases/", requireAccount(serveReleases(app)))
+    mux.Handle("/artist/", requireAccount(http.StripPrefix("/artist", serveArtist(app))))
-    mux.Handle("/artists", requireAccount(serveArtists(app)))
+    mux.Handle("/track/", requireAccount(http.StripPrefix("/track", serveTrack(app))))
-    mux.Handle("/artists/", requireAccount(serveArtists(app)))
-    mux.Handle("/tracks", requireAccount(serveTracks(app)))
-    mux.Handle("/tracks/", requireAccount(serveTracks(app)))
 
-    mux.Handle("/static/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+    mux.Handle("/static/", http.StripPrefix("/static", staticHandler()))
-        if r.URL.Path == "/static/admin.css" {
-            http.ServeFile(w, r, "./admin/static/admin.css")
-            return
-        }
-        if r.URL.Path == "/static/admin.js" {
-            http.ServeFile(w, r, "./admin/static/admin.js")
-            return
-        }
-        requireAccount(
-            http.StripPrefix("/static",
-            view.ServeFiles("./admin/static"))).ServeHTTP(w, r)
-        }))
 
     mux.Handle("/", requireAccount(AdminIndexHandler(app)))
 
@@ -84,18 +63,12 @@ func AdminIndexHandler(app *model.AppState) http.Handler {
 
         session := r.Context().Value("session").(*model.Session)
 
-        releases, err := controller.GetAllReleases(app.DB, false, 3, true)
+        releases, err := controller.GetAllReleases(app.DB, false, 0, true)
         if err != nil {
             fmt.Fprintf(os.Stderr, "WARN: Failed to pull releases: %s\n", err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
             return
         }
-        releaseCount, err := controller.GetReleaseCount(app.DB, false)
-        if err != nil {
-            fmt.Fprintf(os.Stderr, "WARN: Failed to pull releases count: %s\n", err)
-            http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-            return
-        }
 
         artists, err := controller.GetAllArtists(app.DB)
         if err != nil {
@@ -103,12 +76,6 @@ func AdminIndexHandler(app *model.AppState) http.Handler {
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
             return
         }
-        artistCount, err := controller.GetArtistCount(app.DB)
-        if err != nil {
-            fmt.Fprintf(os.Stderr, "WARN: Failed to pull artist count: %s\n", err)
-            http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-            return
-        }
 
         tracks, err := controller.GetOrphanTracks(app.DB)
         if err != nil {
@@ -116,31 +83,19 @@ func AdminIndexHandler(app *model.AppState) http.Handler {
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
             return
         }
-        trackCount, err := controller.GetTrackCount(app.DB)
-        if err != nil {
-            fmt.Fprintf(os.Stderr, "WARN: Failed to pull track count: %s\n", err)
-            http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-            return
-        }
 
         type IndexData struct {
-            adminPageData
+            Session     *model.Session
-            Releases        []*model.Release
+            Releases    []*model.Release
-            ReleaseCount    int
+            Artists     []*model.Artist
-            Artists         []*model.Artist
+            Tracks      []*model.Track
-            ArtistCount     int
-            Tracks          []*model.Track
-            TrackCount      int
         }
 
-        err = templates.IndexTemplate.Execute(w, IndexData{
+        err = indexTemplate.Execute(w, IndexData{
-            adminPageData: adminPageData{ Path: r.URL.Path, Session: session },
+            Session: session,
             Releases: releases,
-            ReleaseCount: releaseCount,
             Artists: artists,
-            ArtistCount: artistCount,
             Tracks: tracks,
-            TrackCount: trackCount,
         })
         if err != nil {
             fmt.Fprintf(os.Stderr, "WARN: Failed to render admin index: %s\n", err)
@@ -160,8 +115,12 @@ func registerAccountHandler(app *model.AppState) http.Handler {
             return
         }
 
+        type registerData struct {
+            Session *model.Session
+        }
+
         render := func() {
-            err := templates.RegisterTemplate.Execute(w, adminPageData{ Path: r.URL.Path, Session: session })
+            err := registerTemplate.Execute(w, registerData{ Session: session })
             if err != nil {
                 fmt.Printf("WARN: Error rendering create account page: %s\n", err)
                 http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@@ -266,8 +225,12 @@ func loginHandler(app *model.AppState) http.Handler {
 
         session := r.Context().Value("session").(*model.Session)
 
+        type loginData struct {
+            Session *model.Session
+        }
+
         render := func() {
-            err := templates.LoginTemplate.Execute(w, adminPageData{ Path: r.URL.Path, Session: session })
+            err := loginTemplate.Execute(w, loginData{ Session: session })
             if err != nil {
                 fmt.Fprintf(os.Stderr, "WARN: Error rendering admin login page: %s\n", err)
                 http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@@ -378,8 +341,12 @@ func loginTOTPHandler(app *model.AppState) http.Handler {
             return
         }
 
+        type loginTOTPData struct {
+            Session *model.Session
+        }
+
         render := func() {
-            err := templates.LoginTOTPTemplate.Execute(w, adminPageData{ Path: r.URL.Path, Session: session })
+            err := loginTOTPTemplate.Execute(w, loginTOTPData{ Session: session })
             if err != nil {
                 fmt.Fprintf(os.Stderr, "WARN: Failed to render login TOTP page: %v\n", err)
                 http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@@ -473,7 +440,7 @@ func logoutHandler(app *model.AppState) http.Handler {
             Path: "/",
         })
 
-        err = templates.LogoutTemplate.Execute(w, nil)
+        err = logoutTemplate.Execute(w, nil)
         if err != nil {
             fmt.Fprintf(os.Stderr, "WARN: Failed to render logout page: %v\n", err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@@ -493,26 +460,26 @@ func requireAccount(next http.Handler) http.HandlerFunc {
     })
 }
 
-/*
-//go:embed "static"
-var staticFS embed.FS
-
 func staticHandler() http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        uri := strings.TrimPrefix(r.URL.Path, "/static")
+        info, err := os.Stat(filepath.Join("admin", "static", filepath.Clean(r.URL.Path)))
-        file, err := staticFS.ReadFile(filepath.Join("static", filepath.Clean(uri)))
+        // does the file exist?
         if err != nil {
+            if os.IsNotExist(err) {
+                http.NotFound(w, r)
+                return
+            }
+        }
+
+        // is thjs a directory? (forbidden)
+        if info.IsDir() {
             http.NotFound(w, r)
             return
         }
 
-        w.Header().Set("Content-Type", mime.TypeByExtension(path.Ext(r.URL.Path)))
+        http.FileServer(http.Dir(filepath.Join("admin", "static"))).ServeHTTP(w, r)
-        w.WriteHeader(http.StatusOK)
-
-        w.Write(file)
     })
 }
-*/
 
 func enforceSession(app *model.AppState, next http.Handler) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

admin/logshttp.go

@@ -1,13 +1,12 @@
 package admin
 
 import (
-	"arimelody-web/admin/templates"
+    "arimelody-web/log"
-	"arimelody-web/log"
+    "arimelody-web/model"
-	"arimelody-web/model"
+    "fmt"
-	"fmt"
+    "net/http"
-	"net/http"
+    "os"
-	"os"
+    "strings"
-	"strings"
 )
 
 func logsHandler(app *model.AppState) http.Handler {
@@ -51,12 +50,12 @@ func logsHandler(app *model.AppState) http.Handler {
         }
 
         type LogsResponse struct {
-            adminPageData
+            Session *model.Session
             Logs []*log.Log
         }
 
-        err = templates.LogsTemplate.Execute(w, LogsResponse{
+        err = logsTemplate.Execute(w, LogsResponse{
-            adminPageData: adminPageData{ Path: r.URL.Path, Session: session },
+            Session: session,
             Logs: logs,
         })
         if err != nil {

admin/releasehttp.go

@@ -1,62 +1,19 @@
 package admin
 
 import (
-	"fmt"
+    "fmt"
-	"net/http"
+    "net/http"
-	"os"
+    "strings"
-	"strings"
 
-	"arimelody-web/admin/templates"
+    "arimelody-web/controller"
-	"arimelody-web/controller"
+    "arimelody-web/model"
-	"arimelody-web/model"
 )
 
-func serveReleases(app *model.AppState) http.Handler {
+func serveRelease(app *model.AppState) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        session := r.Context().Value("session").(*model.Session)
+        slices := strings.Split(r.URL.Path[1:], "/")
-
-        slices := strings.Split(strings.TrimPrefix(r.URL.Path, "/releases")[1:], "/")
         releaseID := slices[0]
 
-        var action string = ""
-        if len(slices) > 1 {
-            action = slices[1]
-        }
-
-        if len(releaseID) > 0 {
-            serveRelease(app, releaseID, action).ServeHTTP(w, r)
-            return
-        }
-
-        type ReleasesData struct {
-            adminPageData
-            Releases    []*model.Release
-        }
-
-        releases, err := controller.GetAllReleases(app.DB, false, 0, true)
-        if err != nil {
-            fmt.Fprintf(os.Stderr, "WARN: Failed to fetch releases: %s\n", err)
-            http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-            return
-        }
-
-        err = templates.ReleasesTemplate.Execute(w, ReleasesData{
-            adminPageData: adminPageData{
-                Path: r.URL.Path,
-                Session: session,
-            },
-            Releases: releases,
-        })
-        if err != nil {
-            fmt.Fprintf(os.Stderr, "WARN: Failed to serve releases page: %s\n", err)
-            http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-            return
-        }
-    })
-}
-
-func serveRelease(app *model.AppState, releaseID string, action string) http.Handler {
-    return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
         session := r.Context().Value("session").(*model.Session)
 
         release, err := controller.GetRelease(app.DB, releaseID, true)
@@ -65,13 +22,13 @@ func serveRelease(app *model.AppState, releaseID string, action string) http.Han
                 http.NotFound(w, r)
                 return
             }
-            fmt.Printf("WARN: Failed to fetch full release data for %s: %s\n", releaseID, err)
+            fmt.Printf("WARN: Failed to pull full release data for %s: %s\n", releaseID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
             return
         }
 
-        if len(action) > 0 {
+        if len(slices) > 1 {
-            switch action {
+            switch slices[1] {
             case "editcredits":
                 serveEditCredits(release).ServeHTTP(w, r)
                 return
@@ -99,20 +56,16 @@ func serveRelease(app *model.AppState, releaseID string, action string) http.Han
         }
 
         type ReleaseResponse struct {
-            adminPageData
+            Session *model.Session
             Release *model.Release
         }
 
-        for i, track := range release.Tracks {
+        err = releaseTemplate.Execute(w, ReleaseResponse{
-            track.Number = i + 1
+            Session: session,
-        }
-
-        err = templates.EditReleaseTemplate.Execute(w, ReleaseResponse{
-            adminPageData: adminPageData{ Path: r.URL.Path, Session: session },
             Release: release,
         })
         if err != nil {
-            fmt.Printf("WARN: Failed to serve admin release page for %s: %s\n", release.ID, err)
+            fmt.Printf("Error rendering admin release page for %s: %s\n", release.ID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
         }
     })
@@ -121,9 +74,9 @@ func serveRelease(app *model.AppState, releaseID string, action string) http.Han
 func serveEditCredits(release *model.Release) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
         w.Header().Set("Content-Type", "text/html")
-        err := templates.EditCreditsTemplate.Execute(w, release)
+        err := editCreditsTemplate.Execute(w, release)
         if err != nil {
-            fmt.Printf("WARN: Failed to serve edit credits component for %s: %s\n", release.ID, err)
+            fmt.Printf("Error rendering edit credits component for %s: %s\n", release.ID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
         }
     })
@@ -133,7 +86,7 @@ func serveAddCredit(app *model.AppState, release *model.Release) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
         artists, err := controller.GetArtistsNotOnRelease(app.DB, release.ID)
         if err != nil {
-            fmt.Printf("WARN: Failed to fetch artists not on %s: %s\n", release.ID, err)
+            fmt.Printf("WARN: Failed to pull artists not on %s: %s\n", release.ID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
             return
         }
@@ -144,12 +97,12 @@ func serveAddCredit(app *model.AppState, release *model.Release) http.Handler {
         }
 
         w.Header().Set("Content-Type", "text/html")
-        err = templates.AddCreditTemplate.Execute(w, response{
+        err = addCreditTemplate.Execute(w, response{
             ReleaseID: release.ID,
             Artists: artists,
         })
         if err != nil {
-            fmt.Printf("WARN: Failed to serve add credits component for %s: %s\n", release.ID, err)
+            fmt.Printf("Error rendering add credits component for %s: %s\n", release.ID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
         }
     })
@@ -160,7 +113,7 @@ func serveNewCredit(app *model.AppState) http.Handler {
         artistID := strings.Split(r.URL.Path, "/")[3]
         artist, err := controller.GetArtist(app.DB, artistID)
         if err != nil {
-            fmt.Printf("WARN: Failed to fetch artist %s: %s\n", artistID, err)
+            fmt.Printf("WARN: Failed to pull artists %s: %s\n", artistID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
             return
         }
@@ -170,9 +123,9 @@ func serveNewCredit(app *model.AppState) http.Handler {
         }
 
         w.Header().Set("Content-Type", "text/html")
-        err = templates.NewCreditTemplate.Execute(w, artist)
+        err = newCreditTemplate.Execute(w, artist)
         if err != nil {
-            fmt.Printf("WARN: Failed to serve new credit component for %s: %s\n", artist.ID, err)
+            fmt.Printf("Error rendering new credit component for %s: %s\n", artist.ID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
         }
     })
@@ -181,9 +134,9 @@ func serveNewCredit(app *model.AppState) http.Handler {
 func serveEditLinks(release *model.Release) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
         w.Header().Set("Content-Type", "text/html")
-        err := templates.EditLinksTemplate.Execute(w, release)
+        err := editLinksTemplate.Execute(w, release)
         if err != nil {
-            fmt.Printf("WARN: Failed to serve edit links component for %s: %s\n", release.ID, err)
+            fmt.Printf("Error rendering edit links component for %s: %s\n", release.ID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
         }
     })
@@ -193,11 +146,17 @@ func serveEditTracks(release *model.Release) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
         w.Header().Set("Content-Type", "text/html")
 
-        type editTracksData struct { Release *model.Release }
+        type editTracksData struct {
+            Release *model.Release
+            Add func(a int, b int) int
+        }
 
-        err := templates.EditTracksTemplate.Execute(w, editTracksData{ Release: release })
+        err := editTracksTemplate.Execute(w, editTracksData{
+            Release: release,
+            Add: func(a, b int) int { return a + b },
+        })
         if err != nil {
-            fmt.Printf("WARN: Failed to serve edit tracks component for %s: %s\n", release.ID, err)
+            fmt.Printf("Error rendering edit tracks component for %s: %s\n", release.ID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
         }
     })
@@ -207,7 +166,7 @@ func serveAddTrack(app *model.AppState, release *model.Release) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
         tracks, err := controller.GetTracksNotOnRelease(app.DB, release.ID)
         if err != nil {
-            fmt.Printf("WARN: Failed to fetch tracks not on %s: %s\n", release.ID, err)
+            fmt.Printf("WARN: Failed to pull tracks not on %s: %s\n", release.ID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
             return
         }
@@ -218,14 +177,15 @@ func serveAddTrack(app *model.AppState, release *model.Release) http.Handler {
         }
 
         w.Header().Set("Content-Type", "text/html")
-        err = templates.AddTrackTemplate.Execute(w, response{
+        err = addTrackTemplate.Execute(w, response{
             ReleaseID: release.ID,
             Tracks: tracks,
         })
         if err != nil {
-            fmt.Printf("WARN: Failed to add tracks component for %s: %s\n", release.ID, err)
+            fmt.Printf("Error rendering add tracks component for %s: %s\n", release.ID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
         }
+        return
     })
 }
 
@@ -234,7 +194,7 @@ func serveNewTrack(app *model.AppState) http.Handler {
         trackID := strings.Split(r.URL.Path, "/")[3]
         track, err := controller.GetTrack(app.DB, trackID)
         if err != nil {
-            fmt.Printf("WARN: Failed to fetch track %s: %s\n", trackID, err)
+            fmt.Printf("Error rendering new track component for %s: %s\n", trackID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
             return
         }
@@ -244,10 +204,11 @@ func serveNewTrack(app *model.AppState) http.Handler {
         }
 
         w.Header().Set("Content-Type", "text/html")
-        err = templates.NewTrackTemplate.Execute(w, track)
+        err = newTrackTemplate.Execute(w, track)
         if err != nil {
-            fmt.Printf("WARN: Failed to serve new track component for %s: %s\n", track.ID, err)
+            fmt.Printf("Error rendering new track component for %s: %s\n", track.ID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
         }
+        return
     })
 }

admin/static/admin.css

@@ -1,266 +1,88 @@
 @import url("/style/prideflag.css");
 @import url("/font/inter/inter.css");
 
-:root {
-    --bg-0: #101010;
-    --bg-1: #181818;
-    --bg-2: #282828;
-    --bg-3: #404040;
-
-    --fg-0: #b0b0b0;
-    --fg-1: #c0c0c0;
-    --fg-2: #d0d0d0;
-    --fg-3: #e0e0e0;
-
-    --col-shadow-0: #0002;
-    --col-shadow-1: #0004;
-    --col-shadow-2: #0006;
-    --col-highlight-0: #ffffff08;
-    --col-highlight-1: #fff1;
-    --col-highlight-2: #fff2;
-
-    --col-new: #b3ee5b;
-    --col-on-new: #1b2013;
-    --col-save: #6fd7ff;
-    --col-on-save: #283f48;
-    --col-delete: #ff7171;
-    --col-on-delete: #371919;
-
-    --col-warn: #ffe86a;
-    --col-on-warn: var(--bg-0);
-    --col-warn-hover: #ffec81;
-
-    --shadow-sm:
-    0 1px 2px var(--col-shadow-2),
-    inset 0 1px 1px var(--col-highlight-2);
-    --shadow-md:
-    0 2px 4px var(--col-shadow-1),
-    inset 0 2px 2px var(--col-highlight-1);
-    --shadow-lg:
-    0 4px 8px var(--col-shadow-0),
-    inset 0 4px 4px var(--col-highlight-0);
-}
-
-@media (prefers-color-scheme: light) {
-    :root {
-        --bg-0: #e8e8e8;
-        --bg-1: #f0f0f0;
-        --bg-2: #f8f8f8;
-        --bg-3: #ffffff;
-
-        --fg-0: #606060;
-        --fg-1: #404040;
-        --fg-2: #303030;
-        --fg-3: #202020;
-
-        --col-shadow-0: #0002;
-        --col-shadow-1: #0004;
-        --col-shadow-2: #0008;
-        --col-highlight-0: #fff2;
-        --col-highlight-1: #fff4;
-        --col-highlight-2: #fff8;
-
-        --col-warn: #ffe86a;
-        --col-on-warn: var(--fg-3);
-        --col-warn-hover: #ffec81;
-    }
-}
-
-@media (prefers-color-scheme: green) {
-    :root {
-        --bg-0: #d0d9c7;
-        --bg-1: #e2e5de;
-        --bg-2: #f1f1f1;
-        --bg-3: #ffffff;
-        --fg-0: #626f54;
-        --fg-1: #505c43;
-        --fg-2: #49523e;
-        --fg-3: #2c3522;
-    }
-}
-
-@media (prefers-color-scheme: purple) {
-    :root {
-        --bg-0: #15121c;
-        --bg-1: #1e1a27;
-        --bg-2: #302a3d;
-        --bg-3: #4a4358;
-        --fg-0: #9e8fbf;
-        --fg-1: #a29bb3;
-        --fg-2: #b9b0cd;
-        --fg-3: #dcd5ec;
-    }
-}
-
-@media (prefers-color-scheme: dark) {
-    img.icon {
-        -webkit-filter: invert(.9);
-        filter: invert(.9);
-    }
-}
-
 body {
-    width: calc(100% - 180px);
+    width: 100%;
     height: calc(100vh - 1em);
 
-    margin: 0 0 0 180px;
+    margin: 0;
     padding: 0;
-    display: flex;
-    flex-direction: row;
 
     font-family: "Inter", sans-serif;
     font-size: 16px;
-    color: var(--fg-0);
-    background: var(--bg-0);
 
-    transition: background .1s ease-out, color .1s ease-out;
+    color: #303030;
+    background: #f0f0f0;
 }
 
-h1, h2, h3, h4, h5, h6 {
-    color: var(--fg-3);
-}
-
-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
 nav {
-    position: fixed;
+    width: min(720px, calc(100% - 2em));
-    top: 0;
+    height: 2em;
-    left: 0;
+    margin: 1em auto;
-    width: 180px;
-    height: calc(100vh - 2em);
-    margin: 0;
-    padding: 1em 0;
     display: flex;
-    flex-direction: column;
+    flex-direction: row;
     justify-content: left;
 
-    background-color: var(--bg-1);
+    background: #f8f8f8;
-    box-shadow: var(--shadow-md);
+    border-radius: 4px;
-    transition: background .1s ease-out, color .1s ease-out;
+    border: 1px solid #808080;
-
-    user-select: none;
 }
 nav .icon {
-    width: fit-content;
+    height: 100%;
-    height: fit-content;
+}
-    padding: 0;
+nav .title {
-    margin: 0 auto 1em auto;
+    width: auto;
+    height: 100%;
+
+    margin: 0 1em 0 0;
+
     display: flex;
 
-    border-radius: 100%;
+    line-height: 2em;
-    box-shadow: var(--shadow-sm);
+    text-decoration: none;
-    overflow: clip;
+
-}
+    color: inherit;
-nav .icon img {
-    width: 3em;
-    height: 3em;
 }
 .nav-item {
+    width: auto;
+    height: 100%;
+
+    margin: 0px;
+    padding: 0 1em;
+
     display: flex;
-    color: var(--fg-2);
+
     line-height: 2em;
-    font-weight: 500;
-    transition: color .1s ease-out, background-color .1s ease-out;
 }
 .nav-item:hover {
-    color: var(--bg-2);
+    background: #00000010;
-    background-color: var(--fg-2);
     text-decoration: none;
 }
-.nav-item.active {
-    border-left: 4px solid var(--fg-2);
-}
-.nav-item.active a {
-    padding-left: calc(1em - 3.5px);
-}
 nav a {
-    padding: .2em 1em;
     text-decoration: none;
     color: inherit;
-    width: 100%;
 }
-nav a.active {
+nav #logout {
-    border-left: 5px solid var(--fg-0);
+    /* margin-left: auto; */
-    padding-left: calc(1em - 5px);
-}
-nav hr {
-    width: calc(100% - 2em);
-    margin: .5em auto;
-    border: none;
-    border-bottom: 1px solid var(--fg-0);
-}
-nav .section-label {
-    margin: .6em 0 .1em 1.6em;
-    font-size: .6em;
-    text-transform: uppercase;
-    font-weight: 600;
-}
-#toggle-nav {
-    position: fixed;
-    top: 16px;
-    left: 16px;
-    padding: 8px;
-    width: 48px;
-    height: 48px;
-    display: none;
-    justify-content: center;
-    align-items: center;
-    z-index: 1;
-}
-#toggle-nav img {
-    width: 100%;
-    height: 100%;
-    object-fit: cover;
-    transform: translate(1px, 1px);
-}
-#toggle-nav img:hover {
-    -webkit-filter: invert(.9);
-    filter: invert(.9);
-}
-@media (prefers-color-scheme: dark) {
-    #toggle-nav img {
-        -webkit-filter: invert(.9);
-        filter: invert(.9);
-    }
-    #toggle-nav img:hover {
-        -webkit-filter: none;
-        filter: none;
-    }
 }
 
 main {
-    width: 720px;
+    width: min(720px, calc(100% - 2em));
-    max-width: calc(100% - 2em);
-    height: fit-content;
-    min-height: calc(100vh - 2em);
     margin: 0 auto;
     padding: 1em;
 }
-main.dashboard {
-    width: 100%;
-}
 
 a {
     color: inherit;
     text-decoration: none;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    transition: color .1s ease-out, background-color .1s ease-out;
 }
 
-/*
 a:hover {
     text-decoration: underline;
 }
-*/
 
-img.icon {
+a img.icon {
     height: .8em;
-    transition: filter .1s ease-out;
 }
 
 code {
@@ -272,24 +94,7 @@ code {
 
 
 
-.cards {
-    width: 100%;
-    height: fit-content;
-    display: flex;
-    gap: 2em;
-    flex-wrap: wrap;
-}
-
 .card {
-    flex-basis: 40em;
-    padding: 1em;
-    background: var(--bg-1);
-    border-radius: 16px;
-    box-shadow: var(--shadow-lg);
-
-    transition: background .1s ease-out, color .1s ease-out;
-}
-main:not(.dashboard) .card {
     margin-bottom: 1em;
 }
 
@@ -297,7 +102,7 @@ main:not(.dashboard) .card {
     margin: 0 0 .5em 0;
 }
 
-.card-header {
+.card-title {
     margin-bottom: 1em;
     display: flex;
     gap: 1em;
@@ -305,31 +110,21 @@ main:not(.dashboard) .card {
     align-items: center;
     justify-content: space-between;
 }
-.card-header h1,
-.card-header h2,
-.card-header h3 {
-    margin: 0;
-}
-.card-header a:hover {
-    text-decoration: underline;
-}
 
-header :is(h1, h2, h3) small,
+.card-title h1,
-.card-header :is(h1, h2, h3) small {
+.card-title h2,
-    display: inline-block;
+.card-title h3 {
-    font-size: .6em;
+    margin: 0;
-    transform: translateY(-0.1em);
-    color: var(--fg-0);
 }
 
 .flex-fill {
     flex-grow: 1;
 }
 
-.artists-group {
+@media screen and (max-width: 520px) {
-    display: grid;
+    body {
-    grid-template-columns: repeat(5, 1fr);
+        font-size: 12px;
-    gap: 1em;
+    }
 }
 
 
@@ -338,15 +133,17 @@ header :is(h1, h2, h3) small,
 #error {
     margin: 0 0 1em 0;
     padding: 1em;
-    border-radius: 8px;
+    border-radius: 4px;
-    color: #101010;
     background: #ffffff;
+    border: 1px solid #888;
 }
 #message {
     background: #a9dfff;
+    border-color: #599fdc;
 }
 #error {
     background: #ffa9b8;
+    border-color: #dc5959;
 }
 
 
@@ -355,54 +152,52 @@ a.delete:not(.button) {
     color: #d22828;
 }
 
-.button, button {
+button, .button {
     padding: .5em .8em;
     font-family: inherit;
     font-size: inherit;
-
+    border-radius: 4px;
+    border: 1px solid #a0a0a0;
+    background: #f0f0f0;
     color: inherit;
-    background: var(--bg-2);
-    border: none;
-    border-radius: 10em;
-    box-shadow: var(--shadow-sm);
-    font-weight: 500;
-    transition: background .1s ease-out, color .1s ease-out;
-
-    cursor: pointer;
-    user-select: none;
 }
 button:hover, .button:hover {
     background: #fff;
+    border-color: #d0d0d0;
 }
 button:active, .button:active {
     background: #d0d0d0;
+    border-color: #808080;
 }
 
+.button, button {
+    color: inherit;
+}
 .button.new, button.new {
-    color: var(--col-on-new);
+    background: #c4ff6a;
-    background: var(--col-new);
+    border-color: #84b141;
 }
 .button.save, button.save {
-    color: var(--col-on-save);
+    background: #6fd7ff;
-    background: var(--col-save);
+    border-color: #6f9eb0;
 }
 .button.delete, button.delete {
-    color: var(--col-on-delete);
+    background: #ff7171;
-    background: var(--col-delete);
+    border-color: #7d3535;
 }
 .button:hover, button:hover {
-    color: var(--bg-3);
+    background: #fff;
-    background: var(--fg-3);
+    border-color: #d0d0d0;
 }
 .button:active, button:active {
-    color: var(--bg-2);
+    background: #d0d0d0;
-    background: var(--fg-0);
+    border-color: #808080;
 }
 .button[disabled], button[disabled] {
-    color: var(--fg-0) !important;
+    background: #d0d0d0 !important;
-    background: var(--bg-3) !important;
+    border-color: #808080 !important;
     opacity: .5;
-    cursor: default !important;
+    cursor: not-allowed !important;
 }
 
 
@@ -410,79 +205,24 @@ button:active, .button:active {
 form {
     width: 100%;
     display: block;
-    color: var(--fg-0);
 }
 form label {
     width: 100%;
     margin: 1rem 0 .5rem 0;
     display: block;
+    color: #10101080;
 }
-form input[type="text"],
+form input {
-form input[type="password"] {
+    margin: .5rem 0;
-    width: 16em;
+    padding: .3rem .5rem;
-    max-width: 100%;
-    margin: .5em 0;
-    padding: .3em .5em;
     display: block;
     border-radius: 4px;
     border: 1px solid #808080;
     font-size: inherit;
     font-family: inherit;
     color: inherit;
-    background-color: var(--bg-0);
 }
 input[disabled] {
     opacity: .5;
     cursor: not-allowed;
 }
-
-@media screen and (max-width: 720px) {
-    main {
-        padding-top: 0;
-    }
-
-    body {
-        width: 100%;
-        margin: 0;
-        font-size: 16px;
-    }
-
-    nav {
-        width: 100%;
-        left: -100%;
-        font-size: 24px;
-        z-index: 1;
-        transition: transform .2s cubic-bezier(.2,0,.5,1);
-    }
-    nav.open {
-        transform: translateX(100%);
-    }
-
-    #toggle-nav {
-        display: flex;
-    }
-
-    main > h1:first-of-type {
-        margin-left: 68px;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-    }
-    main > header {
-        margin-left: 68px;
-    }
-    main > header h1 {
-        display: flex;
-        flex-direction: column;
-        font-size: 1.5em;
-    }
-
-    .card {
-        flex-basis: 100%;
-        max-width: calc(100vw - 4em);
-    }
-
-    .artists-group {
-        grid-template-columns: repeat(3, 1fr);
-    }
-}

admin/static/admin.js

@@ -69,28 +69,3 @@ export function makeMagicList(container, itemSelector, callback) {
         if (callback) callback();
     });
 }
-
-export function hijackClickEvent(container, link) {
-    container.addEventListener('click', event => {
-        if (event.target.tagName.toLowerCase() === 'a') return;
-        event.preventDefault();
-        link.dispatchEvent(new MouseEvent('click', {
-            bubbles: true,
-            cancelable: true,
-            view: window,
-            ctrlKey: event.ctrlKey,
-            metaKey: event.metaKey,
-            shiftKey: event.shiftKey,
-            altKey: event.altKey,
-            button: event.button,
-        }));
-    });
-}
-
-document.addEventListener("readystatechange", () => {
-    const navbar = document.getElementById("navbar");
-    document.getElementById("toggle-nav").addEventListener("click", event => {
-        event.preventDefault();
-        navbar.classList.toggle("open");
-    })
-});

admin/static/artists.css

@@ -1,27 +0,0 @@
-.artist {
-    padding: .5em;
-
-    color: var(--fg-3);
-    background: var(--bg-2);
-    box-shadow: var(--shadow-md);
-    border-radius: 16px;
-    text-align: center;
-
-    cursor: pointer;
-    transition: background .1s ease-out, color .1s ease-out;
-}
-
-.artist:hover {
-    background: var(--bg-1);
-    text-decoration: hover;
-}
-
-.artist .artist-avatar {
-    width: 100%;
-    object-fit: cover;
-    border-radius: 8px;
-}
-
-.artist .artist-name {
-    display: block;
-}

admin/static/artists.js

@@ -1,7 +0,0 @@
-import { hijackClickEvent } from "./admin.js";
-
-document.addEventListener("readystatechange", () => {
-    document.querySelectorAll(".artists-group .artist").forEach(el => {
-        hijackClickEvent(el, el.querySelector("a.artist-name"))
-    });
-});

admin/static/edit-account.css

@@ -11,11 +11,8 @@ label {
     align-items: center;
     color: inherit;
 }
-form#change-password input,
+input {
-form#delete-account input {
+    width: min(20rem, calc(100% - 1rem));
-    width: 20em;
-    min-width: auto;
-    max-width: calc(100% - 1em - 2px);
     margin: .5rem 0;
     padding: .3rem .5rem;
     display: block;
@@ -28,14 +25,12 @@ form#delete-account input {
 
 .mfa-device {
     padding: .75em;
+    background: #f8f8f8f8;
+    border: 1px solid #808080;
+    border-radius: 8px;
     margin-bottom: .5em;
     display: flex;
     justify-content: space-between;
-
-    color: var(--fg-3);
-    background: var(--bg-2);
-    box-shadow: var(--shadow-md);
-    border-radius: 16px;
 }
 
 .mfa-device div {
@@ -51,14 +46,3 @@ form#delete-account input {
 .mfa-device .mfa-device-name {
     font-weight: bold;
 }
-
-.mfa-device form input {
-    display: none !important;
-}
-
-.mfa-actions {
-    display: flex;
-    flex-direction: row;
-    gap: .5em;
-    flex-wrap: wrap;
-}

admin/static/edit-artist.css

@@ -1,3 +1,7 @@
+h1 {
+    margin: 0 0 1em 0;
+}
+
 #artist {
     margin-bottom: 1em;
     padding: 1.5em;
@@ -5,9 +9,9 @@
     flex-direction: row;
     gap: 1.2em;
 
-    border-radius: 16px;
+    border-radius: 8px;
-    background: var(--bg-2);
+    background: #f8f8f8f8;
-    box-shadow: var(--shadow-md);
+    border: 1px solid #808080;
 }
 
 .artist-avatar {
@@ -23,8 +27,7 @@
     cursor: pointer;
 }
 .artist-avatar #remove-avatar {
-    margin-top: .5em;
+    padding: .3em .4em;
-    padding: .3em .6em;
 }
 
 .artist-info {
@@ -50,8 +53,8 @@ input[type="text"] {
     font-family: inherit;
     font-weight: inherit;
     color: inherit;
-    background: var(--bg-0);
+    background: #ffffff;
-    border: none;
+    border: 1px solid transparent;
     border-radius: 4px;
     outline: none;
 }
@@ -71,7 +74,7 @@ input[type="text"]:focus {
     justify-content: right;
 }
 
-.card-header a.button {
+.card-title a.button {
     text-decoration: none;
 }
 
@@ -82,17 +85,9 @@ input[type="text"]:focus {
     flex-direction: row;
     gap: 1em;
     align-items: center;
-
+    background: #f8f8f8;
-    border-radius: 16px;
+    border-radius: 8px;
-    background: var(--bg-2);
+    border: 1px solid #808080;
-    box-shadow: var(--shadow-md);
-
-    cursor: pointer;
-    transition: background .1s;
-}
-
-.credit:hover {
-    background: var(--bg-1);
 }
 
 .release-artwork {
@@ -101,14 +96,8 @@ input[type="text"]:focus {
     border-radius: 4px;
 }
 
-.credit-info {
-    overflow: hidden;
-}
 .credit-info h3,
 .credit-info p {
     margin: 0;
     font-size: .9em;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
 }

admin/static/edit-artist.js

@@ -1,5 +1,3 @@
-import { hijackClickEvent } from "./admin.js";
-
 const artistID = document.getElementById("artist").dataset.id;
 const nameInput = document.getElementById("name");
 const avatarImg = document.getElementById("avatar");
@@ -79,9 +77,3 @@ removeAvatarBtn.addEventListener("click", () => {
     avatarImg.src = "/img/default-avatar.png"
     saveBtn.disabled = false;
 });
-
-document.addEventListener('readystatechange', () => {
-    document.querySelectorAll('#releases .credit').forEach(el => {
-        hijackClickEvent(el, el.querySelector('.credit-name a'));
-    });
-});

admin/static/edit-release.css

@@ -12,10 +12,8 @@ input[type="text"] {
     gap: 1.2em;
 
     border-radius: 8px;
-    background: var(--bg-2);
+    background: #f8f8f8f8;
-    box-shadow: var(--shadow-md);
+    border: 1px solid #808080;
-
-    transition: background .1s ease-out, color .1s ease-out;
 }
 
 .release-artwork {
@@ -31,9 +29,7 @@ input[type="text"] {
     cursor: pointer;
 }
 .release-artwork #remove-artwork {
-    margin-top: .5em;
+    padding: .3em .4em;
-    padding: .3em .6em;
-    background: var(--bg-3);
 }
 
 .release-info {
@@ -58,17 +54,17 @@ input[type="text"] {
     background: transparent;
     outline: none;
     cursor: pointer;
-    transition: background .1s ease-out, border-color .1s ease-out;
 }
 
 #title:hover {
-    background: var(--bg-3);
+    background: #ffffff;
-    border-color: var(--fg-0);
+    border-color: #80808080;
 }
 
 #title:active,
 #title:focus {
-    background: var(--bg-3);
+    background: #ffffff;
+    border-color: #808080;
 }
 
 .release-title small {
@@ -79,21 +75,19 @@ input[type="text"] {
     width: 100%;
     margin: .5em 0;
     border-collapse: collapse;
-    color: var(--fg-2);
 }
 .release-info table td {
     padding: .2em;
-    border-bottom: 1px solid color-mix(in srgb, var(--fg-0) 25%, transparent);
+    border-bottom: 1px solid #d0d0d0;
-    transition: background .1s ease-out, border-color .1s ease-out;
 }
 .release-info table tr td:first-child {
     vertical-align: top;
-    opacity: .5;
+    opacity: .66;
 }
 .release-info table tr td:not(:first-child) select:hover,
 .release-info table tr td:not(:first-child) input:hover,
 .release-info table tr td:not(:first-child) textarea:hover {
-    background: var(--bg-3);
+    background: #e8e8e8;
     cursor: pointer;
 }
 .release-info table td select,
@@ -121,25 +115,13 @@ input[type="text"] {
     gap: .5em;
     flex-direction: row;
     justify-content: right;
-    color: var(--fg-3);
-}
-
-.release-actions button,
-.release-actions .button {
-    color: var(--fg-2);
-    background: var(--bg-3);
 }
 
 dialog {
     width: min(720px, calc(100% - 2em));
     padding: 2em;
-    border: none;
+    border: 1px solid #101010;
-    border-radius: 16px;
+    border-radius: 8px;
-    color: var(--fg-0);
-    background-color: var(--bg-0);
-    box-shadow: var(--shadow-lg);
-
-    transition: color .1s ease-out, background-color .1s ease-out;
 }
 
 dialog header {
@@ -162,7 +144,7 @@ dialog div.dialog-actions {
     gap: .5em;
 }
 
-.card-header a.button {
+.card-title a.button {
     text-decoration: none;
 }
 
@@ -170,7 +152,7 @@ dialog div.dialog-actions {
  * RELEASE CREDITS
  */
 
-#credits .credit {
+.card.credits .credit {
     margin-bottom: .5em;
     padding: .5em;
     display: flex;
@@ -178,47 +160,28 @@ dialog div.dialog-actions {
     align-items: center;
     gap: 1em;
 
-    border-radius: 16px;
+    border-radius: 8px;
-    background-color: var(--bg-2);
+    background: #f8f8f8f8;
-    box-shadow: var(--shadow-md);
+    border: 1px solid #808080;
-
-    cursor: pointer;
-    transition: background .1s ease-out;
-}
-#credits .credit:hover {
-    background-color: var(--bg-1);
 }
 
-#credits .credit p {
+.card.credits .credit p {
     margin: 0;
 }
 
-#credits .credit .artist-avatar {
+.card.credits .credit .artist-avatar {
-    border-radius: 12px;
+    border-radius: 8px;
 }
 
-#credits .credit .artist-name {
+.card.credits .credit .artist-name {
-    color: var(--fg-3);
     font-weight: bold;
 }
 
-#credits .credit .artist-role small {
+.card.credits .credit .artist-role small {
     font-size: inherit;
     opacity: .66;
 }
 
-#credits .credit .credit-info {
-    overflow: hidden;
-}
-
-#credits .credit .credit-info :is(h3, p) {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-
-
 #editcredits ul {
     margin: 0;
     padding: 0;
@@ -234,8 +197,8 @@ dialog div.dialog-actions {
     gap: 1em;
 
     border-radius: 8px;
-    background: var(--bg-2);
+    background: #f8f8f8f8;
-    box-shadow: var(--shadow-md);
+    border: 1px solid #808080;
 }
 
 #editcredits .credit {
@@ -269,7 +232,6 @@ dialog div.dialog-actions {
     margin: 0;
     display: flex;
     align-items: center;
-    color: inherit;
 }
 
 #editcredits .credit .credit-info .credit-attribute input[type="text"] {
@@ -277,17 +239,15 @@ dialog div.dialog-actions {
     padding: .2em .4em;
     flex-grow: 1;
     font-family: inherit;
-    border: none;
+    border: 1px solid #8888;
     border-radius: 4px;
-    color: var(--fg-2);
+    color: inherit;
-    background: var(--bg-0);
 }
 #editcredits .credit .credit-info .credit-attribute input[type="checkbox"] {
     margin: 0 .3em;
 }
 
 #editcredits .credit .artist-name {
-    color: var(--fg-2);
     font-weight: bold;
 }
 
@@ -296,12 +256,8 @@ dialog div.dialog-actions {
     opacity: .66;
 }
 
-#editcredits .credit .delete {
+#editcredits .credit button.delete {
-    margin-right: .5em;
+    margin-left: auto;
-    cursor: pointer;
-}
-#editcredits .credit .delete:hover {
-    text-decoration: underline;
 }
 
 #addcredit ul {
@@ -333,39 +289,24 @@ dialog div.dialog-actions {
  * RELEASE LINKS
  */
 
-#links ul {
+.card.links {
-    padding: 0;
     display: flex;
     gap: .2em;
 }
 
-#links a img.icon {
+.card.links a.button[data-name="spotify"] {
-    -webkit-filter: none;
-    filter: none;
-}
-
-#links a.button:hover {
-    color: var(--bg-3) !important;
-    background-color: var(--fg-3) !important;
-}
-
-#links a.button[data-name="spotify"] {
-    color: #101010;
     background-color: #8cff83
 }
 
-#links a.button[data-name="apple music"] {
+.card.links a.button[data-name="apple music"] {
-    color: #101010;
     background-color: #8cd9ff
 }
 
-#links a.button[data-name="soundcloud"] {
+.card.links a.button[data-name="soundcloud"] {
-    color: #101010;
     background-color: #fdaa6d
 }
 
-#links a.button[data-name="youtube"] {
+.card.links a.button[data-name="youtube"] {
-    color: #101010;
     background-color: #ff6e6e
 }
 
@@ -448,6 +389,62 @@ dialog div.dialog-actions {
     outline: 1px solid #808080;
 }
 
+/*
+ * RELEASE TRACKS
+ */
+
+.card.tracks .track {
+    margin-bottom: 1em;
+    padding: 1em;
+    display: flex;
+    flex-direction: column;
+    gap: .5em;
+
+    border-radius: 8px;
+    background: #f8f8f8f8;
+    border: 1px solid #808080;
+}
+
+.card.tracks .track h3,
+.card.tracks .track p {
+    margin: 0;
+}
+
+.card.tracks h2.track-title {
+    margin: 0;
+    display: flex;
+    gap: .5em;
+}
+
+.card.tracks h2.track-title .track-number {
+    opacity: .5;
+}
+
+.card.tracks .track-album {
+    margin-left: auto;
+    font-style: italic;
+    font-size: .75em;
+    opacity: .5;
+}
+
+.card.tracks .track-album.empty {
+    color: #ff2020;
+    opacity: 1;
+}
+
+.card.tracks .track-description {
+    font-style: italic;
+}
+
+.card.tracks .track-lyrics {
+    max-height: 10em;
+    overflow-y: scroll;
+}
+
+.card.tracks .track .empty {
+    opacity: 0.75;
+}
+
 #edittracks ul {
     padding: 0;
     list-style: none;
@@ -499,17 +496,15 @@ dialog div.dialog-actions {
     padding: .5em;
     display: flex;
     gap: .5em;
-    background-color: var(--bg-0);
     cursor: pointer;
-    transition: background-color .1s ease-out, color .1s ease-out;
 }
 
 #addtrack ul li.new-track:nth-child(even) {
-    background: color-mix(in srgb, var(--bg-0) 95%, #fff);
+    background: #f0f0f0;
 }
 
 #addtrack ul li.new-track:hover {
-    background: color-mix(in srgb, var(--bg-0) 90%, #fff);
+    background: #e0e0e0;
 }
 
 @media only screen and (max-width: 1105px) {

admin/static/edit-release.js

@@ -1,5 +1,3 @@
-import { hijackClickEvent } from "./admin.js";
-
 const releaseID = document.getElementById("release").dataset.id;
 const titleInput = document.getElementById("title");
 const artworkImg = document.getElementById("artwork");
@@ -98,9 +96,3 @@ removeArtworkBtn.addEventListener("click", () => {
     artworkData = "";
     saveBtn.disabled = false;
 });
-
-document.addEventListener("readystatechange", () => {
-    document.querySelectorAll("#credits .credit").forEach(el => {
-        hijackClickEvent(el, el.querySelector(".artist-name a"));
-    });
-});

admin/static/edit-track.css

@@ -1,5 +1,9 @@
 @import url("/admin/static/release-list-item.css");
 
+h1 {
+    margin: 0 0 .5em 0;
+}
+
 #track {
     margin-bottom: 1em;
     padding: .5em 1.5em 1.5em 1.5em;
@@ -7,9 +11,9 @@
     flex-direction: row;
     gap: 1.2em;
 
-    border-radius: 16px;
+    border-radius: 8px;
-    background: var(--bg-2);
+    background: #f8f8f8f8;
-    box-shadow: var(--shadow-md);
+    border: 1px solid #808080;
 }
 
 .track-info {
@@ -45,8 +49,7 @@
     font-weight: inherit;
     font-family: inherit;
     font-size: inherit;
-    background: var(--bg-0);
+    border: 1px solid transparent;
-    border: none;
     border-radius: 4px;
     outline: none;
     color: inherit;

admin/static/index.css

@@ -0,0 +1,82 @@
+@import url("/admin/static/release-list-item.css");
+
+.artist {
+    margin-bottom: .5em;
+    padding: .5em;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: .5em;
+
+    border-radius: 8px;
+    background: #f8f8f8f8;
+    border: 1px solid #808080;
+}
+
+.artist:hover {
+    text-decoration: hover;
+}
+
+.artist-avatar {
+    width: 32px;
+    height: 32px;
+    object-fit: cover;
+    border-radius: 100%;
+}
+
+.track {
+    margin-bottom: 1em;
+    padding: 1em;
+    display: flex;
+    flex-direction: column;
+    gap: .5em;
+
+    border-radius: 8px;
+    background: #f8f8f8f8;
+    border: 1px solid #808080;
+}
+
+.track p {
+    margin: 0;
+}
+
+.card h2.track-title {
+    margin: 0;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+
+.track-id {
+    width: fit-content;
+    font-family: "Monaspace Argon", monospace;
+    font-size: .8em;
+    font-style: italic;
+    line-height: 1em;
+    user-select: all;
+}
+
+.track-album {
+    margin-left: auto;
+    font-style: italic;
+    font-size: .75em;
+    opacity: .5;
+}
+
+.track-album.empty {
+    color: #ff2020;
+    opacity: 1;
+}
+
+.track-description {
+    font-style: italic;
+}
+
+.track-lyrics {
+    max-height: 10em;
+    overflow-y: scroll;
+}
+
+.track .empty {
+    opacity: 0.75;
+}

admin/static/index.js

@@ -12,7 +12,7 @@ newReleaseBtn.addEventListener("click", event => {
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({id})
     }).then(res => {
-        if (res.ok) location = "/admin/releases/" + id;
+        if (res.ok) location = "/admin/release/" + id;
         else {
             res.text().then(err => {
                 alert("Request failed: " + err);
@@ -37,7 +37,7 @@ newArtistBtn.addEventListener("click", event => {
     }).then(res => {
         res.text().then(text => {
             if (res.ok) {
-                location = "/admin/artists/" + id;
+                location = "/admin/artist/" + id;
             } else {
                 alert("Request failed: " + text);
                 console.error(text);
@@ -61,7 +61,7 @@ newTrackBtn.addEventListener("click", event => {
     }).then(res => {
         res.text().then(text => {
             if (res.ok) {
-                location = "/admin/tracks/" + text;
+                location = "/admin/track/" + text;
             } else {
                 alert("Request failed: " + text);
                 console.error(text);

admin/static/logs.css

@@ -2,14 +2,8 @@ main {
     width: min(1080px, calc(100% - 2em))!important
 }
 
-form#search-form {
+form {
-    width: calc(100% - 2em);
     margin: 1em 0;
-    padding: 1em;
-    border-radius: 16px;
-    color: var(--fg-0);
-    background: var(--bg-2);
-    box-shadow: var(--shadow-md);
 }
 
 div#search {
@@ -18,25 +12,24 @@ div#search {
 
 #search input {
     margin: 0;
-    padding: .3em .8em;
     flex-grow: 1;
-    border: none;
+
-    border-radius: 16px;
+    border-right: none;
-    color: var(--fg-1);
+    border-top-right-radius: 0;
-    background: var(--bg-0);
+    border-bottom-right-radius: 0;
-    box-shadow: var(--shadow-sm);
 }
 
 #search button {
-    margin-left: .5em;
+    padding: 0 .5em;
-    padding: 0 .8em;
+
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
 }
 
 form #filters p {
     margin: .5em 0 0 0;
 }
 form #filters label {
-    color: inherit;
     display: inline;
 }
 form #filters input {
@@ -46,15 +39,6 @@ form #filters input {
 
 #logs {
     width: 100%;
-    overflow: scroll;
-}
-@media screen and (max-width: 720px) {
-    #logs {
-        font-size: 12px;
-    }
-}
-
-#logs table{
     border-collapse: collapse;
 }
 
@@ -73,10 +57,6 @@ form #filters input {
     padding: .4em .8em;
 }
 
-#logs .log {
-    color: var(--fg-2);
-}
-
 td, th {
     width: 1%;
     text-align: left;
@@ -94,14 +74,13 @@ td.log-content {
     white-space: collapse;
 }
 
-#logs .log:hover {
+.log:hover {
-    background: color-mix(in srgb, var(--fg-3) 10%, transparent);
+    background: #fff8;
 }
 
-#logs .log.warn {
+.log.warn {
-    color: var(--col-on-warn);
+    background: #ffe86a;
-    background: var(--col-warn);
 }
-#logs .log.warn:hover {
+.log.warn:hover {
-    background: var(--col-warn-hover);
+    background: #ffec81;
 }

admin/static/release-list-item.css

@@ -0,0 +1,87 @@
+.release {
+    margin-bottom: 1em;
+    padding: 1em;
+    display: flex;
+    flex-direction: row;
+    gap: 1em;
+
+    border-radius: 8px;
+    background: #f8f8f8f8;
+    border: 1px solid #808080;
+}
+
+.release h3,
+.release p {
+    margin: 0;
+}
+
+.release-artwork {
+    width: 96px;
+
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.release-artwork img {
+    width: 100%;
+    aspect-ratio: 1;
+}
+
+.release-title small {
+    opacity: .75;
+}
+
+.release-links {
+    margin: .5em 0;
+    padding: 0;
+    display: flex;
+    flex-direction: row;
+    list-style: none;
+    flex-wrap: wrap;
+    gap: .5em;
+}
+
+.release-links li {
+    flex-grow: 1;
+}
+
+.release-links a {
+    padding: .5em;
+    display: block;
+
+    border-radius: 8px;
+    text-decoration: none;
+    color: #f0f0f0;
+    background: #303030;
+    text-align: center;
+
+    transition: color .1s, background .1s;
+}
+
+.release-links a:hover {
+    color: #303030;
+    background: #f0f0f0;
+}
+
+.release-actions {
+    margin-top: .5em;
+}
+
+.release-actions a {
+    margin-right: .3em;
+    padding: .3em .5em;
+    display: inline-block;
+
+    border-radius: 4px;
+    background: #e0e0e0;
+
+    transition: color .1s, background .1s;
+}
+
+.release-actions a:hover {
+    color: #303030;
+    background: #f0f0f0;
+
+    text-decoration: none;
+}

admin/static/releases.css

@@ -1,80 +0,0 @@
-.release {
-    margin-bottom: 1em;
-    padding: 1em;
-    display: flex;
-    flex-direction: row;
-    gap: 1em;
-
-    border-radius: 16px;
-    background: var(--bg-2);
-    box-shadow: var(--shadow-md);
-
-    transition: background .1s ease-out, color .1s ease-out;
-}
-
-.release h3,
-.release p {
-    margin: 0;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-
-.release .release-artwork {
-    margin: auto 0;
-    width: 96px;
-
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border-radius: 4px;
-    overflow: hidden;
-    box-shadow: var(--shadow-sm);
-}
-
-.release .release-artwork img {
-    width: 100%;
-    aspect-ratio: 1;
-}
-
-.release .release-info {
-    max-width: calc(100% - 96px - 1em);
-}
-
-.release .release-title small {
-    opacity: .75;
-}
-
-.release .release-links {
-    margin: .5em 0;
-    padding: 0;
-    display: flex;
-    flex-direction: row;
-    list-style: none;
-    flex-wrap: wrap;
-    gap: .5em;
-}
-
-.release .release-actions {
-    margin-top: .5em;
-    user-select: none;
-    color: var(--fg-3);
-}
-
-.release .release-actions a {
-    margin-right: .3em;
-    padding: .3em .5em;
-    display: inline-block;
-
-    border-radius: 4px;
-    background: var(--bg-3);
-    box-shadow: var(--shadow-sm);
-
-    transition: color .1s ease-out, background .1s ease-out;
-}
-
-.release .release-actions a:hover {
-    background: var(--bg-0);
-    color: var(--fg-3);
-    text-decoration: none;
-}

admin/static/tracks.css

@@ -1,127 +0,0 @@
-#tracks h2.track-title {
-    margin: 0;
-    display: flex;
-    gap: .5em;
-}
-
-#tracks .track {
-    margin-bottom: 1em;
-    padding: 1em;
-    display: flex;
-    flex-direction: column;
-    gap: .5em;
-
-    border-radius: 16px;
-    background: var(--bg-2);
-    box-shadow: var(--shadow-md);
-
-    transition: background .1s ease-out, color .1s ease-out;
-}
-
-#tracks .track h3,
-#tracks .track p {
-    margin: 0;
-}
-
-#tracks h2.track-title {
-    margin: 0;
-    display: flex;
-    gap: .5em;
-}
-
-#tracks h2.track-title .track-number {
-    opacity: .5;
-}
-
-#tracks a:hover {
-    text-decoration: underline;
-}
-
-#tracks .track-album {
-    margin-left: auto;
-    font-style: italic;
-    font-size: .75em;
-    opacity: .5;
-}
-
-#tracks .track-album.empty {
-    color: #ff2020;
-    opacity: 1;
-}
-
-#tracks .track-description {
-    font-style: italic;
-}
-
-#tracks .track-lyrics {
-    max-height: 10em;
-    overflow-y: scroll;
-}
-
-#tracks .track .empty {
-    opacity: 0.75;
-}
-
-
-.card h2.track-title {
-    margin: 0;
-    display: flex;
-    flex-direction: row;
-    /*
-    justify-content: space-between;
-    */
-}
-
-/*
-.track {
-    margin-bottom: 1em;
-    padding: 1em;
-    display: flex;
-    flex-direction: column;
-    gap: .5em;
-
-    border-radius: 8px;
-    background-color: var(--bg-2);
-    box-shadow: var(--shadow-md);
-
-    transition: color .1s ease-out, background-color .1s ease-out;
-}
-
-.track p {
-    margin: 0;
-}
-
-.track-id {
-    width: fit-content;
-    font-family: "Monaspace Argon", monospace;
-    font-size: .8em;
-    font-style: italic;
-    line-height: 1em;
-    user-select: all;
-}
-
-.track-album {
-    margin-left: auto;
-    font-style: italic;
-    font-size: .75em;
-    opacity: .5;
-}
-
-.track-album.empty {
-    color: #ff2020;
-    opacity: 1;
-}
-
-.track-description {
-    font-style: italic;
-}
-
-.track-lyrics {
-    max-height: 10em;
-    overflow-y: scroll;
-}
-
-.track .empty {
-    opacity: 0.75;
-}
-*/

admin/templates.go

@@ -0,0 +1,125 @@
+package admin
+
+import (
+    "arimelody-web/log"
+    "fmt"
+    "html/template"
+    "path/filepath"
+    "strings"
+    "time"
+)
+
+var indexTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "views", "layout.html"),
+    filepath.Join("views", "prideflag.html"),
+    filepath.Join("admin", "components", "release", "release-list-item.html"),
+    filepath.Join("admin", "views", "index.html"),
+))
+
+var loginTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "views", "layout.html"),
+    filepath.Join("views", "prideflag.html"),
+    filepath.Join("admin", "views", "login.html"),
+))
+var loginTOTPTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "views", "layout.html"),
+    filepath.Join("views", "prideflag.html"),
+    filepath.Join("admin", "views", "login-totp.html"),
+))
+var registerTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "views", "layout.html"),
+    filepath.Join("views", "prideflag.html"),
+    filepath.Join("admin", "views", "register.html"),
+))
+var logoutTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "views", "layout.html"),
+    filepath.Join("views", "prideflag.html"),
+    filepath.Join("admin", "views", "logout.html"),
+))
+var accountTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "views", "layout.html"),
+    filepath.Join("views", "prideflag.html"),
+    filepath.Join("admin", "views", "edit-account.html"),
+))
+var totpSetupTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "views", "layout.html"),
+    filepath.Join("views", "prideflag.html"),
+    filepath.Join("admin", "views", "totp-setup.html"),
+))
+var totpConfirmTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "views", "layout.html"),
+    filepath.Join("views", "prideflag.html"),
+    filepath.Join("admin", "views", "totp-confirm.html"),
+))
+
+var logsTemplate = template.Must(template.New("layout.html").Funcs(template.FuncMap{
+    "parseLevel": func(level log.LogLevel) string {
+        switch level {
+        case log.LEVEL_INFO:
+            return "INFO"
+        case log.LEVEL_WARN:
+            return "WARN"
+        }
+        return fmt.Sprintf("%d?", level)
+    },
+    "titleCase": func(logType string) string {
+        runes := []rune(logType)
+        for i, r := range runes {
+            if (i == 0 || runes[i - 1] == ' ') && r >= 'a' && r <= 'z' {
+                runes[i] = r + ('A' - 'a')
+            }
+        }
+        return string(runes)
+    },
+    "lower": func(str string) string { return strings.ToLower(str) },
+    "prettyTime": func(t time.Time) string {
+        // return t.Format("2006-01-02 15:04:05")
+        // return t.Format("15:04:05, 2 Jan 2006")
+        return t.Format("02 Jan 2006, 15:04:05")
+    },
+}).ParseFiles(
+    filepath.Join("admin", "views", "layout.html"),
+    filepath.Join("views", "prideflag.html"),
+    filepath.Join("admin", "views", "logs.html"),
+))
+
+var releaseTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "views", "layout.html"),
+    filepath.Join("views", "prideflag.html"),
+    filepath.Join("admin", "views", "edit-release.html"),
+))
+var artistTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "views", "layout.html"),
+    filepath.Join("views", "prideflag.html"),
+    filepath.Join("admin", "views", "edit-artist.html"),
+))
+var trackTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "views", "layout.html"),
+    filepath.Join("views", "prideflag.html"),
+    filepath.Join("admin", "components", "release", "release-list-item.html"),
+    filepath.Join("admin", "views", "edit-track.html"),
+))
+
+var editCreditsTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "components", "credits", "editcredits.html"),
+))
+var addCreditTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "components", "credits", "addcredit.html"),
+))
+var newCreditTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "components", "credits", "newcredit.html"),
+))
+
+var editLinksTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "components", "links", "editlinks.html"),
+))
+
+var editTracksTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "components", "tracks", "edittracks.html"),
+))
+var addTrackTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "components", "tracks", "addtrack.html"),
+))
+var newTrackTemplate = template.Must(template.ParseFiles(
+    filepath.Join("admin", "components", "tracks", "newtrack.html"),
+))

admin/templates/html/artists.html

@@ -1,26 +0,0 @@
-{{define "head"}}
-<title>Artists - ari melody 💫</title>
-<link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
-<link rel="stylesheet" href="/admin/static/artists.css">
-{{end}}
-
-{{define "content"}}
-<main>
-    <header>
-        <h1>Artists <small>({{len .Artists}} total)</small></h2>
-        <a class="button new" id="create-artist">Create New</a>
-    </header>
-
-    {{if .Artists}}
-    <div class="artists-group">
-        {{range .Artists}}
-        {{block "artist" .}}{{end}}
-        {{end}}
-    </div>
-    {{else}}
-    <p>There are no artists.</p>
-    {{end}}
-</main>
-
-<script type="module" src="/admin/static/artists.js"></script>
-{{end}}

admin/templates/html/components/artist/artist.html

@@ -1,6 +0,0 @@
-{{define "artist"}}
-<div class="artist">
-    <img src="{{.GetAvatar}}" alt="" width="64" loading="lazy" class="artist-avatar">
-    <a href="/admin/artists/{{.ID}}" class="artist-name">{{.Name}}</a>
-</div>       
-{{end}}

admin/templates/html/components/track/track.html

@@ -1,24 +0,0 @@
-{{define "track"}}
-<div class="track" data-id="{{.ID}}">
-    <h2 class="track-title">
-        {{if .Number}}
-        <span class="track-number">{{.Number}}</span>
-        {{end}}
-        <a href="/admin/tracks/{{.ID}}">{{.Title}}</a>
-    </h2>
-
-    <h3>Description</h3>
-    {{if .Description}}
-    <p class="track-description">{{.GetDescriptionHTML}}</p>
-    {{else}}
-    <p class="track-description empty">No description provided.</p>
-    {{end}}
-
-    <h3>Lyrics</h3>
-    {{if .Lyrics}}
-    <p class="track-lyrics">{{.GetLyricsHTML}}</p>
-    {{else}}
-    <p class="track-lyrics empty">There are no lyrics.</p>
-    {{end}}
-</div>       
-{{end}}

admin/templates/html/index.html

@@ -1,61 +0,0 @@
-{{define "head"}}
-<title>Admin - ari melody 💫</title>
-<link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
-<link rel="stylesheet" href="/admin/static/releases.css">
-<link rel="stylesheet" href="/admin/static/artists.css">
-<link rel="stylesheet" href="/admin/static/tracks.css">
-{{end}}
-
-{{define "content"}}
-<main class="dashboard">
-    <h1>Dashboard</h1>
-
-    <div class="cards">
-        <div class="card" id="releases">
-            <div class="card-header">
-                <h2><a href="/admin/releases/">Releases</a> <small>({{.ReleaseCount}} total)</small></h2>
-                <a class="button new" id="create-release">Create New</a>
-            </div>
-            {{if .Artists}}
-            {{range .Releases}}
-            {{block "release" .}}{{end}}
-            {{end}}
-            {{else}}
-            <p>There are no releases.</p>
-            {{end}}
-        </div>
-
-        <div class="card" id="artists">
-            <div class="card-header">
-                <h2><a href="/admin/artists/">Artists</a> <small>({{.ArtistCount}} total)</small></h2>
-                <a class="button new" id="create-artist">Create New</a>
-            </div>
-            {{if .Artists}}
-            <div class="artists-group">
-                {{range .Artists}}
-                {{block "artist" .}}{{end}}
-                {{end}}
-            </div>
-            {{else}}
-            <p>There are no artists.</p>
-            {{end}}
-        </div>
-
-        <div class="card" id="tracks">
-            <div class="card-header">
-                <h2><a href="/admin/tracks/">Tracks</a> <small>({{.TrackCount}} total)</small></h2>
-                <a class="button new" id="create-track">Create New</a>
-            </div>
-            <p><em>"Orphaned" tracks that have not yet been bound to a release.</em></p>
-            <br>
-            {{range .Tracks}}
-            {{block "track" .}}{{end}}
-            {{end}}
-        </div>
-    </div>
-
-</main>
-
-<script type="module" src="/admin/static/artists.js"></script>
-<script type="module" src="/admin/static/index.js"></script>
-{{end}}

admin/templates/html/layout.html

@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-    <head>
-        <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-        {{block "head" .}}{{end}}
-
-        <link rel="stylesheet" href="/admin/static/admin.css">
-        <script type="module" src="/admin/static/admin.js"></script>
-        <script type="module" src="/script/vendor/htmx.min.js"></script>
-    </head>
-
-    <body>
-        <header>
-            <nav id="navbar">
-                <a href="/" class="nav icon" aria-label="ari melody" title="Return to Home">
-                    <img src="/img/favicon.png" alt="" width="64" height="64">
-                </a>
-                <div class="nav-item{{if eq .Path "/"}} active{{end}}">
-                    <a href="/admin">home</a>
-                </div>
-                {{if .Session.Account}}
-                <div class="nav-item{{if eq .Path "/logs"}} active{{end}}">
-                    <a href="/admin/logs">logs</a>
-                </div>
-                <hr>
-                <p class="section-label">music</p>
-                <div class="nav-item{{if hasPrefix .Path "/releases"}} active{{end}}">
-                    <a href="/admin/releases/">releases</a>
-                </div>
-                <div class="nav-item{{if hasPrefix .Path "/artists"}} active{{end}}">
-                    <a href="/admin/artists/">artists</a>
-                </div>
-                <div class="nav-item{{if hasPrefix .Path "/tracks"}} active{{end}}">
-                    <a href="/admin/tracks/">tracks</a>
-                </div>
-                {{end}}
-
-                <div class="flex-fill"></div>
-
-                {{if .Session.Account}}
-                <div class="nav-item{{if eq .Path "/account"}} active{{end}}">
-                    <a href="/admin/account">account ({{.Session.Account.Username}})</a>
-                </div>
-                <div class="nav-item">
-                    <a href="/admin/logout" id="logout">log out</a>
-                </div>
-                {{else}}
-                <div class="nav-item{{if eq .Path "/login"}} active{{end}}">
-                    <a href="/admin/login" id="login">log in</a>
-                </div>
-                <div class="nav-item{{if eq .Path "/register"}} active{{end}}">
-                    <a href="/admin/register" id="register">create account</a>
-                </div>
-                {{end}}
-            </nav>
-            <button type="button" id="toggle-nav" aria-label="Navigation toggle">
-                <img src="/img/hamburger.svg" alt="">
-            </button>
-        </header>
-
-        {{block "content" .}}{{end}}
-
-        {{template "prideflag"}}
-    </body>
-
-</html>

admin/templates/html/releases.html

@@ -1,24 +0,0 @@
-{{define "head"}}
-<title>Releases - ari melody 💫</title>
-<link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
-<link rel="stylesheet" href="/admin/static/releases.css">
-{{end}}
-
-{{define "content"}}
-<main>
-    <header>
-        <h1>Releases <small>({{len .Releases}} total)</small></h1>
-        <a class="button new" id="create-release">Create New</a>
-    </header>
-
-    {{if .Releases}}
-    <div id="releases">
-        {{range .Releases}}
-        {{block "release" .}}{{end}}
-        {{end}}
-    </div>
-    {{else}}
-    <p>There are no releases.</p>
-    {{end}}
-</main>
-{{end}}

admin/templates/html/tracks.html

@@ -1,34 +0,0 @@
-{{define "head"}}
-<title>Releases - ari melody 💫</title>
-<link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
-<link rel="stylesheet" href="/admin/static/tracks.css">
-{{end}}
-
-{{define "content"}}
-<main>
-    <header>
-        <h1>Tracks <small>({{len .Tracks}} total)</small></h1>
-        <a class="button new" id="create-track">Create New</a>
-    </header>
-        
-    <div id="tracks">
-        {{range $Track := .Tracks}}
-        <div class="track">
-            <h2 class="track-title">
-                <a href="/admin/tracks/{{$Track.ID}}">{{$Track.Title}}</a>
-            </h2>
-            {{if $Track.Description}}
-            <p class="track-description">{{$Track.GetDescriptionHTML}}</p>
-            {{else}}
-            <p class="track-description empty">No description provided.</p>
-            {{end}}
-            {{if $Track.Lyrics}}
-            <p class="track-lyrics">{{$Track.GetLyricsHTML}}</p>
-            {{else}}
-            <p class="track-lyrics empty">There are no lyrics.</p>
-            {{end}}
-        </div>       
-        {{end}}
-    </div>
-</main>
-{{end}}

admin/templates/templates.go

@@ -1,191 +0,0 @@
-package templates
-
-import (
-	"arimelody-web/log"
-	_ "embed"
-	"fmt"
-	"html/template"
-	"strings"
-	"time"
-)
-
-//go:embed "html/layout.html"
-var layoutHTML string
-//go:embed "html/prideflag.html"
-var prideflagHTML string
-
-//go:embed "html/index.html"
-var indexHTML string
-
-//go:embed "html/register.html"
-var registerHTML string
-//go:embed "html/login.html"
-var loginHTML string
-//go:embed "html/login-totp.html"
-var loginTotpHTML string
-//go:embed "html/totp-confirm.html"
-var totpConfirmHTML string
-//go:embed "html/totp-setup.html"
-var totpSetupHTML string
-//go:embed "html/logout.html"
-var logoutHTML string
-
-//go:embed "html/logs.html"
-var logsHTML string
-
-//go:embed "html/edit-account.html"
-var editAccountHTML string
-
-//go:embed "html/releases.html"
-var releasesHTML string
-//go:embed "html/artists.html"
-var artistsHTML string
-//go:embed "html/tracks.html"
-var tracksHTML string
-
-//go:embed "html/edit-release.html"
-var editReleaseHTML string
-//go:embed "html/edit-artist.html"
-var editArtistHTML string
-//go:embed "html/edit-track.html"
-var editTrackHTML string
-
-//go:embed "html/components/credit/newcredit.html"
-var componentNewCreditHTML string
-//go:embed "html/components/credit/addcredit.html"
-var componentAddCreditHTML string
-//go:embed "html/components/credit/editcredits.html"
-var componentEditCreditsHTML string
-
-//go:embed "html/components/link/editlinks.html"
-var componentEditLinksHTML string
-
-//go:embed "html/components/release/release.html"
-var componentReleaseHTML string
-//go:embed "html/components/artist/artist.html"
-var componentArtistHTML string
-//go:embed "html/components/track/track.html"
-var componentTrackHTML string
-
-//go:embed "html/components/track/newtrack.html"
-var componentNewTrackHTML string
-//go:embed "html/components/track/addtrack.html"
-var componentAddTrackHTML string
-//go:embed "html/components/track/edittracks.html"
-var componentEditTracksHTML string
-
-var BaseTemplate = template.Must(
-    template.New("base").Funcs(
-        template.FuncMap{
-            "hasPrefix": strings.HasPrefix,
-        },
-    ).Parse(strings.Join([]string{
-        layoutHTML,
-        prideflagHTML,
-    }, "\n")))
-
-var IndexTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(
-    strings.Join([]string{
-        indexHTML,
-        componentReleaseHTML,
-        componentArtistHTML,
-        componentTrackHTML,
-    }, "\n"),
-))
-
-
-
-var LoginTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(loginHTML))
-var LoginTOTPTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(loginTotpHTML))
-var RegisterTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(registerHTML))
-var LogoutTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(logoutHTML))
-var AccountTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(editAccountHTML))
-var TOTPSetupTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(totpSetupHTML))
-var TOTPConfirmTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(totpConfirmHTML))
-
-
-
-var LogsTemplate = template.Must(template.Must(BaseTemplate.Clone()).Funcs(template.FuncMap{
-    "parseLevel": parseLevel,
-    "titleCase": titleCase,
-    "toLower": toLower,
-    "prettyTime": prettyTime,
-}).Parse(logsHTML))
-
-
-
-var ReleasesTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(
-    strings.Join([]string{
-        releasesHTML,
-        componentReleaseHTML,
-    }, "\n"),
-))
-var ArtistsTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(
-    strings.Join([]string{
-        artistsHTML,
-        componentArtistHTML,
-    }, "\n"),
-))
-var TracksTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(
-    strings.Join([]string{
-        tracksHTML,
-        componentTrackHTML,
-    }, "\n"),
-))
-
-
-
-var EditReleaseTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(
-    strings.Join([]string{
-        editReleaseHTML,
-        componentTrackHTML,
-    }, "\n"),
-))
-var EditArtistTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(editArtistHTML))
-var EditTrackTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(
-    strings.Join([]string{
-        editTrackHTML,
-        componentReleaseHTML,
-    }, "\n"),
-))
-
-
-
-var EditCreditsTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(componentEditCreditsHTML))
-var AddCreditTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(componentAddCreditHTML))
-var NewCreditTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(componentNewCreditHTML))
-
-var EditLinksTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(componentEditLinksHTML))
-
-var EditTracksTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(componentEditTracksHTML))
-var AddTrackTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(componentAddTrackHTML))
-var NewTrackTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(componentNewTrackHTML))
-
-
-
-func parseLevel(level log.LogLevel) string {
-    switch level {
-    case log.LEVEL_INFO:
-        return "INFO"
-    case log.LEVEL_WARN:
-        return "WARN"
-    }
-    return fmt.Sprintf("%d?", level)
-}
-func titleCase(logType string) string {
-    runes := []rune(logType)
-    for i, r := range runes {
-        if (i == 0 || runes[i - 1] == ' ') && r >= 'a' && r <= 'z' {
-            runes[i] = r + ('A' - 'a')
-        }
-    }
-    return string(runes)
-}
-func toLower(str string) string {
-    return strings.ToLower(str)
-}
-func prettyTime(t time.Time) string {
-    // return t.Format("2006-01-02 15:04:05")
-    // return t.Format("15:04:05, 2 Jan 2006")
-    return t.Format("02 Jan 2006, 15:04:05")
-}

admin/trackhttp.go

@@ -1,57 +1,21 @@
 package admin
 
 import (
-	"fmt"
+    "fmt"
-	"net/http"
+    "net/http"
-	"strings"
+    "strings"
 
-	"arimelody-web/admin/templates"
+    "arimelody-web/model"
-	"arimelody-web/controller"
+    "arimelody-web/controller"
-	"arimelody-web/model"
 )
 
-func serveTracks(app *model.AppState) http.Handler {
+func serveTrack(app *model.AppState) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        session := r.Context().Value("session").(*model.Session)
+        slices := strings.Split(r.URL.Path[1:], "/")
-
+        id := slices[0]
-        slices := strings.Split(strings.TrimPrefix(r.URL.Path, "/tracks")[1:], "/")
+        track, err := controller.GetTrack(app.DB, id)
-        trackID := slices[0]
-
-        if len(trackID) > 0 {
-            serveTrack(app, trackID).ServeHTTP(w, r)
-            return
-        }
-
-        tracks, err := controller.GetAllTracks(app.DB)
         if err != nil {
-            fmt.Printf("WARN: Failed to fetch tracks: %s\n", err)
+            fmt.Printf("Error rendering admin track page for %s: %s\n", id, err)
-            http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-            return
-        }
-
-        type TracksResponse struct {
-            adminPageData
-            Tracks []*model.Track
-        }
-
-        err = templates.TracksTemplate.Execute(w, TracksResponse{
-            adminPageData: adminPageData{ Path: r.URL.Path, Session: session },
-            Tracks: tracks,
-        })
-        if err != nil {
-            fmt.Printf("WARN: Failed to serve admin tracks page: %s\n", err)
-            http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-        }
-    })
-}
-
-func serveTrack(app *model.AppState, trackID string) http.Handler {
-    return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        session := r.Context().Value("session").(*model.Session)
-
-        track, err := controller.GetTrack(app.DB, trackID)
-        if err != nil {
-            fmt.Printf("WARN: Failed to serve admin track page for %s: %s\n", trackID, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
             return
         }
@@ -62,25 +26,28 @@ func serveTrack(app *model.AppState, trackID string) http.Handler {
 
         releases, err := controller.GetTrackReleases(app.DB, track.ID, true)
         if err != nil {
-            fmt.Printf("WARN: Failed to fetch releases for track %s: %s\n", trackID, err)
+            fmt.Printf("FATAL: Failed to pull releases for %s: %s\n", id, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
             return
         }
 
         type TrackResponse struct {
-            adminPageData
+            Session     *model.Session
             Track       *model.Track
             Releases    []*model.Release
         }
 
-        err = templates.EditTrackTemplate.Execute(w, TrackResponse{
+        session := r.Context().Value("session").(*model.Session)
-            adminPageData: adminPageData{ Path: r.URL.Path, Session: session },
+
+        err = trackTemplate.Execute(w, TrackResponse{
+            Session: session,
             Track: track,
             Releases: releases,
         })
         if err != nil {
-            fmt.Printf("WARN: Failed to serve admin track page for %s: %s\n", trackID, err)
+            fmt.Printf("Error rendering admin track page for %s: %s\n", id, err)
             http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
         }
     })
 }
+

admin/views/edit-account.html

@@ -14,10 +14,10 @@
     {{end}}
     <h1>Account Settings ({{.Session.Account.Username}})</h1>
 
+    <div class="card-title">
+        <h2>Change Password</h2>
+    </div>
     <div class="card">
-        <div class="card-header">
-            <h2>Change Password</h2>
-        </div>
         <form action="/admin/account/password" method="POST" id="change-password">
             <label for="current-password">Current Password</label>
             <input type="password" id="current-password" name="current-password" value="" autocomplete="current-password" required>
@@ -28,16 +28,14 @@
             <label for="confirm-password">Confirm Password</label>
             <input type="password" id="confirm-password" value="" autocomplete="new-password" required>
 
-            <br>
-
             <button type="submit" class="save">Change Password</button>
         </form>
     </div>
         
+    <div class="card-title">
+        <h2>MFA Devices</h2>
+    </div>
     <div class="card mfa-devices">
-        <div class="card-header">
-            <h2>MFA Devices</h2>
-        </div>
         {{if .TOTPs}}
         {{range .TOTPs}}
         <div class="mfa-device">
@@ -46,10 +44,7 @@
                 <p class="mfa-device-date">Added: {{.CreatedAtString}}</p>
             </div>
             <div>
-                <form method="POST" action="/admin/account/totp-delete">
+                <a class="button delete" href="/admin/account/totp-delete/{{.TOTP.Name}}">Delete</a>
-                    <input type="text" name="totp-name" value="{{.TOTP.Name}}" hidden>
-                    <button type="submit" class="delete">Delete</button>
-                </form>
             </div>
         </div>
         {{end}}
@@ -57,30 +52,28 @@
         <p>You have no MFA devices.</p>
         {{end}}
 
-        <div class="mfa-actions">
+        <div>
             <button type="submit" class="save" id="enable-email" disabled>Enable Email TOTP</button>
             <a class="button new" id="add-totp-device" href="/admin/account/totp-setup">Add TOTP Device</a>
         </div>
     </div>
 
+    <div class="card-title">
+        <h2>Danger Zone</h2>
+    </div>
     <div class="card danger">
-        <div class="card-header">
-            <h2>Danger Zone</h2>
-        </div>
         <p>
         Clicking the button below will delete your account.
         This action is <strong>irreversible</strong>.
         You will need to enter your password and TOTP below.
         </p>
-        <form action="/admin/account/delete" method="POST" id="delete-account">
+        <form action="/admin/account/delete" method="POST">
             <label for="password">Password</label>
             <input type="password" name="password" value="" autocomplete="current-password" required>
 
             <label for="totp">TOTP</label>
             <input type="text" name="totp" value="" autocomplete="one-time-code" required>
 
-            <br>
-
             <button type="submit" class="delete">Delete Account</button>
         </form>
     </div>

admin/views/edit-artist.html

@@ -2,7 +2,6 @@
 <title>Editing {{.Artist.Name}} - ari melody 💫</title>
 <link rel="shortcut icon" href="{{.Artist.GetAvatar}}" type="image/x-icon">
 <link rel="stylesheet" href="/admin/static/edit-artist.css">
-<link rel="stylesheet" href="/admin/static/artists.css">
 {{end}}
 
 {{define "content"}}
@@ -30,16 +29,16 @@
         </div>
     </div>
 
-    <div class="card" id="releases">
+    <div class="card-title">
-        <div class="card-header">
+        <h2>Featured in</h2>
-            <h2>Featured in</h2>
+    </div>
-        </div>
+    <div class="card releases">
         {{if .Credits}}
         {{range .Credits}}
         <div class="credit">
             <img src="{{.Release.Artwork}}" alt="" width="64" loading="lazy" class="release-artwork">
             <div class="credit-info">
-                <h3 class="credit-name"><a href="/admin/releases/{{.Release.ID}}">{{.Release.Title}}</a></h3>
+                <h3 class="credit-name"><a href="/admin/release/{{.Release.ID}}">{{.Release.Title}}</a></h3>
                 <p class="credit-artists">{{.Release.PrintArtists true true}}</p>
                 <p class="artist-role">
                 Role: {{.Role}}
@@ -55,10 +54,10 @@
         {{end}}
     </div>
 
-    <div class="card" id="danger">
+    <div class="card-title">
-        <div class="card-header">
+        <h2>Danger Zone</h2>
-            <h2>Danger Zone</h2>
+    </div>
-        </div>
+    <div class="card danger">
         <p>
         Clicking the button below will delete this artist.
         This action is <strong>irreversible</strong>.

admin/views/edit-release.html

@@ -2,13 +2,10 @@
 <title>Editing {{.Release.Title}} - ari melody 💫</title>
 <link rel="shortcut icon" href="{{.Release.GetArtwork}}" type="image/x-icon">
 <link rel="stylesheet" href="/admin/static/edit-release.css">
-<link rel="stylesheet" href="/admin/static/releases.css">
-<link rel="stylesheet" href="/admin/static/tracks.css">
 {{end}}
 
 {{define "content"}}
 <main>
-    <h1>Editing {{.Release.Title}}</h1>
 
     <div id="release" data-id="{{.Release.ID}}">
         <div class="release-artwork">
@@ -100,21 +97,21 @@
         </div>
     </div>
 
-    <div class="card" id="credits">
+    <div class="card-title">
-        <div class="card-header">
+        <h2>Credits ({{len .Release.Credits}})</h2>
-            <h2>Credits <small>({{len .Release.Credits}} total)</small></h2>
+        <a class="button edit"
-            <a class="button edit"
+           href="/admin/release/{{.Release.ID}}/editcredits"
-               href="/admin/releases/{{.Release.ID}}/editcredits"
+           hx-get="/admin/release/{{.Release.ID}}/editcredits"
-               hx-get="/admin/releases/{{.Release.ID}}/editcredits"
+           hx-target="body"
-               hx-target="body"
+           hx-swap="beforeend"
-               hx-swap="beforeend"
+           >Edit</a>
-               >Edit</a>
+    </div>
-        </div>
+    <div class="card credits">
         {{range .Release.Credits}}
         <div class="credit">
             <img src="{{.Artist.GetAvatar}}" alt="" width="64" loading="lazy" class="artist-avatar">
             <div class="credit-info">
-                <p class="artist-name"><a href="/admin/artists/{{.Artist.ID}}">{{.Artist.Name}}</a></p>
+                <p class="artist-name"><a href="/admin/artist/{{.Artist.ID}}">{{.Artist.Name}}</a></p>
                 <p class="artist-role">
                 {{.Role}}
                 {{if .Primary}}
@@ -129,42 +126,59 @@
         {{end}}
     </div>
 
-    <div class="card" id="links">
+    <div class="card-title">
-        <div class="card-header">
+        <h2>Links ({{len .Release.Links}})</h2>
-            <h2>Links ({{len .Release.Links}})</h2>
+        <a class="button edit"
-            <a class="button edit"
+           href="/admin/release/{{.Release.ID}}/editlinks"
-               href="/admin/releases/{{.Release.ID}}/editlinks"
+           hx-get="/admin/release/{{.Release.ID}}/editlinks"
-               hx-get="/admin/releases/{{.Release.ID}}/editlinks"
+           hx-target="body"
-               hx-target="body"
+           hx-swap="beforeend"
-               hx-swap="beforeend"
+           >Edit</a>
-               >Edit</a>
-        </div>
-        <ul>
-            {{range .Release.Links}}
-            <a href="{{.URL}}" target="_blank" class="button" data-name="{{.Name}}">{{.Name}} <img class="icon" src="/img/external-link.svg"/></a>
-            {{end}}
-        </ul>
     </div>
-
+    <div class="card links">
-    <div class="card" id="tracks">
+        {{range .Release.Links}}
-        <div class="card-header" id="tracks">
+        <a href="{{.URL}}" target="_blank" class="button" data-name="{{.Name}}">{{.Name}} <img class="icon" src="/img/external-link.svg"/></a>
-            <h2>Tracklist ({{len .Release.Tracks}})</h2>
-            <a class="button edit"
-               href="/admin/releases/{{.Release.ID}}/edittracks"
-               hx-get="/admin/releases/{{.Release.ID}}/edittracks"
-               hx-target="body"
-               hx-swap="beforeend"
-               >Edit</a>
-        </div>
-        {{range $i, $track := .Release.Tracks}}
-        {{block "track" .}}{{end}}
         {{end}}
     </div>
 
-    <div class="card" id="danger">
+    <div class="card-title" id="tracks">
-        <div class="card-header">
+        <h2>Tracklist ({{len .Release.Tracks}})</h2>
-            <h2>Danger Zone</h2>
+        <a class="button edit"
-        </div>
+           href="/admin/release/{{.Release.ID}}/edittracks"
+           hx-get="/admin/release/{{.Release.ID}}/edittracks"
+           hx-target="body"
+           hx-swap="beforeend"
+           >Edit</a>
+    </div>
+    <div class="card tracks">
+        {{range $i, $track := .Release.Tracks}}
+        <div class="track" data-id="{{$track.ID}}">
+            <h2 class="track-title">
+                <span class="track-number">{{.Add $i 1}}</span>
+                <a href="/admin/track/{{$track.ID}}">{{$track.Title}}</a>
+            </h2>
+
+            <h3>Description</h3>
+            {{if $track.Description}}
+            <p class="track-description">{{$track.GetDescriptionHTML}}</p>
+            {{else}}
+            <p class="track-description empty">No description provided.</p>
+            {{end}}
+
+            <h3>Lyrics</h3>
+            {{if $track.Lyrics}}
+            <p class="track-lyrics">{{$track.GetLyricsHTML}}</p>
+            {{else}}
+            <p class="track-lyrics empty">There are no lyrics.</p>
+            {{end}}
+        </div>       
+        {{end}}
+    </div>
+
+    <div class="card-title">
+        <h2>Danger Zone</h2>
+    </div>
+    <div class="card danger">
         <p>
         Clicking the button below will delete this release.
         This action is <strong>irreversible</strong>.

admin/views/edit-track.html

@@ -2,8 +2,6 @@
 <title>Editing Track - ari melody 💫</title>
 <link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
 <link rel="stylesheet" href="/admin/static/edit-track.css">
-<link rel="stylesheet" href="/admin/static/tracks.css">
-<link rel="stylesheet" href="/admin/static/releases.css">
 {{end}}
 
 {{define "content"}}
@@ -41,10 +39,10 @@
         </div>
     </div>
 
+    <div class="card-title">
+        <h2>Featured in</h2>
+    </div>
     <div class="card releases">
-        <div class="card-header">
-            <h2>Featured in</h2>
-        </div>
         {{if .Releases}}
         {{range .Releases}}
         {{block "release" .}}{{end}}
@@ -54,10 +52,10 @@
         {{end}}
     </div>
 
+    <div class="card-title">
+        <h2>Danger Zone</h2>
+    </div>
     <div class="card danger">
-        <div class="card-header">
-            <h2>Danger Zone</h2>
-        </div>
         <p>
         Clicking the button below will delete this track.
         This action is <strong>irreversible</strong>.

admin/views/index.html

@@ -0,0 +1,72 @@
+{{define "head"}}
+<title>Admin - ari melody 💫</title>
+<link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
+<link rel="stylesheet" href="/admin/static/index.css">
+{{end}}
+
+{{define "content"}}
+<main>
+
+    <div class="card-title">
+        <h1>Releases</h1>
+        <a class="button new" id="create-release">Create New</a>
+    </div>
+    <div class="card releases">
+        {{range .Releases}}
+        {{block "release" .}}{{end}}
+        {{end}}
+        {{if not .Releases}}
+        <p>There are no releases.</p>
+        {{end}}
+    </div>
+
+    <div class="card-title">
+        <h1>Artists</h1>
+        <a class="button new" id="create-artist">Create New</a>
+    </div>
+    <div class="card artists">
+        {{range $Artist := .Artists}}
+        <div class="artist">
+            <img src="{{$Artist.GetAvatar}}" alt="" width="64" loading="lazy" class="artist-avatar">
+            <a href="/admin/artist/{{$Artist.ID}}" class="artist-name">{{$Artist.Name}}</a>
+        </div>       
+        {{end}}
+        {{if not .Artists}}
+        <p>There are no artists.</p>
+        {{end}}
+    </div>
+
+    <div class="card-title">
+        <h1>Tracks</h1>
+        <a class="button new" id="create-track">Create New</a>
+    </div>
+    <div class="card tracks">
+        <p><em>"Orphaned" tracks that have not yet been bound to a release.</em></p>
+        <br>
+        {{range $Track := .Tracks}}
+        <div class="track">
+            <h2 class="track-title">
+                <a href="/admin/track/{{$Track.ID}}">{{$Track.Title}}</a>
+            </h2>
+            {{if $Track.Description}}
+            <p class="track-description">{{$Track.GetDescriptionHTML}}</p>
+            {{else}}
+            <p class="track-description empty">No description provided.</p>
+            {{end}}
+            {{if $Track.Lyrics}}
+            <p class="track-lyrics">{{$Track.GetLyricsHTML}}</p>
+            {{else}}
+            <p class="track-lyrics empty">There are no lyrics.</p>
+            {{end}}
+        </div>       
+        {{end}}
+        {{if not .Artists}}
+        <p>There are no artists.</p>
+        {{end}}
+    </div>
+
+</main>
+
+<script type="module" src="/admin/static/admin.js"></script>
+<script type="module" src="/admin/static/index.js"></script>
+{{end}}

admin/views/layout.html

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang="en">
+
+    <head>
+        <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+        <meta charset="UTF-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+        {{block "head" .}}{{end}}
+
+        <link rel="stylesheet" href="/admin/static/admin.css">
+        <script type="module" src="/script/vendor/htmx.min.js"></script>
+    </head>
+
+    <body>
+        <header>
+            <nav>
+                <img src="/img/favicon.png" alt="" class="icon">
+                <div class="nav-item">
+                    <a href="/">arimelody.me</a>
+                </div>
+                <div class="nav-item">
+                    <a href="/admin">home</a>
+                </div>
+                {{if .Session.Account}}
+                <div class="nav-item">
+                    <a href="/admin/logs">logs</a>
+                </div>
+                {{end}}
+
+                <div class="flex-fill"></div>
+
+                {{if .Session.Account}}
+                <div class="nav-item">
+                    <a href="/admin/account">account ({{.Session.Account.Username}})</a>
+                </div>
+                <div class="nav-item">
+                    <a href="/admin/logout" id="logout">log out</a>
+                </div>
+                {{else}}
+                <div class="nav-item">
+                    <a href="/admin/register" id="register">create account</a>
+                </div>
+                {{end}}
+            </nav>
+        </header>
+
+        {{block "content" .}}{{end}}
+
+        {{template "prideflag"}}
+    </body>
+
+</html>

admin/views/login-totp.html

@@ -1,6 +1,7 @@
 {{define "head"}}
 <title>Login - ari melody 💫</title>
 <link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
+<link rel="stylesheet" href="/admin/static/admin.css">
 <style>
 form#login-totp {
     width: 100%;
@@ -17,15 +18,8 @@ form button {
     margin-top: 1rem;
 }
 
-form input {
+input {
-    width: calc(100% - 1rem - 2px) !important;
+    width: calc(100% - 1rem - 2px);
-}
-
-@media screen and (max-width: 720px) {
-    h1 {
-        margin-top: 3em;
-        text-align: center;
-    }
 }
 </style>
 {{end}}

admin/views/login.html

@@ -1,14 +1,8 @@
 {{define "head"}}
 <title>Login - ari melody 💫</title>
 <link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
+<link rel="stylesheet" href="/admin/static/admin.css">
 <style>
-@media screen and (max-width: 720px) {
-    h1 {
-        margin-top: 3em;
-        text-align: center;
-    }
-}
-
 form#login {
     width: 100%;
     display: flex;
@@ -24,8 +18,8 @@ form button {
     margin-top: 1rem;
 }
 
-form input {
+input {
-    width: calc(100% - 1rem - 2px) !important;
+    width: calc(100% - 1rem - 2px);
 }
 </style>
 {{end}}

admin/views/logs.html

@@ -1,6 +1,7 @@
 {{define "head"}}
 <title>Audit Logs - ari melody 💫</title>
 <link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
+<link rel="stylesheet" href="/admin/static/admin.css">
 <link rel="stylesheet" href="/admin/static/logs.css">
 {{end}}
 
@@ -8,7 +9,7 @@
 <main>
     <h1>Audit Logs</h1>
 
-    <form action="/admin/logs" method="GET" id="search-form">
+    <form action="/admin/logs" method="GET">
         <div id="search">
             <input type="text" name="q" value="" placeholder="Filter by message...">
             <button type="submit" class="save">Search</button>
@@ -43,27 +44,25 @@
     
     <hr>
 
-    <div id="logs">
+    <table id="logs">
-        <table>
+        <thead>
-            <thead>
+            <tr>
-                <tr>
+                <th class="log-time">Time</th>
-                    <th class="log-time">Time</th>
+                <th class="log-level">Level</th>
-                    <th class="log-level">Level</th>
+                <th class="log-type">Type</th>
-                    <th class="log-type">Type</th>
+                <th class="log-content">Message</th>
-                    <th class="log-content">Message</th>
+            </tr>
-                </tr>
+        </thead>
-            </thead>
+        <tbody>
-            <tbody>
+            {{range .Logs}}
-                {{range .Logs}}
+            <tr class="log {{lower (parseLevel .Level)}}">
-                <tr class="log {{toLower (parseLevel .Level)}}">
+                <td class="log-time">{{prettyTime .CreatedAt}}</td>
-                    <td class="log-time">{{prettyTime .CreatedAt}}</td>
+                <td class="log-level">{{parseLevel .Level}}</td>
-                    <td class="log-level">{{parseLevel .Level}}</td>
+                <td class="log-type">{{titleCase .Type}}</td>
-                    <td class="log-type">{{titleCase .Type}}</td>
+                <td class="log-content">{{.Content}}</td>
-                    <td class="log-content">{{.Content}}</td>
+            </tr>
-                </tr>
+            {{end}}
-                {{end}}
+        </tbody>
-            </tbody>
+    </table>
-        </table>
-    </div>
 </main>
 {{end}}

admin/views/register.html

@@ -1,6 +1,7 @@
 {{define "head"}}
 <title>Register - ari melody 💫</title>
 <link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
+<link rel="stylesheet" href="/admin/static/admin.css">
 <style>
 p a {
     color: #2a67c8;

admin/views/totp-confirm.html

@@ -1,6 +1,7 @@
 {{define "head"}}
 <title>TOTP Confirmation - ari melody 💫</title>
 <link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
+<link rel="stylesheet" href="/admin/static/admin.css">
 <style>
 .qr-code {
     border: 1px solid #8888;
@@ -8,20 +9,11 @@
 code {
     user-select: all;
 }
-#totp-setup input {
-    width: 3.8em;
-    min-width: auto;
-    font-size: 32px;
-    font-family: 'Monaspace Argon', monospace;
-    text-align: center;
-}
 </style>
 {{end}}
 
 {{define "content"}}
 <main>
-    <h1>Two-Factor Authentication</h1>
-
     {{if .Session.Error.Valid}}
     <p id="error">{{html .Session.Error.String}}</p>
     {{end}}
@@ -48,14 +40,7 @@ code {
         <p><code>{{.TOTP.Secret}}</code></p>
 
         <label for="totp">TOTP:</label>
-        <input type="text"
+        <input type="text" name="totp" value="" autocomplete="one-time-code" required autofocus>
-               name="totp"
-               value=""
-               minlength="6"
-               maxlength="6"
-               autocomplete="one-time-code"
-               required
-               autofocus>
 
         <button type="submit" class="new">Create</button>
     </form>

admin/views/totp-setup.html

@@ -1,12 +1,11 @@
 {{define "head"}}
 <title>TOTP Setup - ari melody 💫</title>
 <link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
+<link rel="stylesheet" href="/admin/static/admin.css">
 {{end}}
 
 {{define "content"}}
 <main>
-    <h1>Two-Factor Authentication</h1>
-
     {{if .Session.Error.Valid}}
     <p id="error">{{html .Session.Error.String}}</p>
     {{end}}

api/api.go

@@ -2,6 +2,7 @@ package api
 
 import (
     "context"
+    "errors"
     "fmt"
     "net/http"
     "os"
@@ -172,7 +173,7 @@ func getSession(app *model.AppState, r *http.Request) (*model.Session, error) {
     // check cookies first
     sessionCookie, err := r.Cookie(model.COOKIE_TOKEN)
     if err != nil && err != http.ErrNoCookie {
-        return nil, fmt.Errorf("Failed to retrieve session cookie: %v\n", err)
+        return nil, errors.New(fmt.Sprintf("Failed to retrieve session cookie: %v\n", err))
     }
     if sessionCookie != nil {
         token = sessionCookie.Value
@@ -187,7 +188,7 @@ func getSession(app *model.AppState, r *http.Request) (*model.Session, error) {
     session, err := controller.GetSession(app.DB, token)
 
     if err != nil && !strings.Contains(err.Error(), "no rows") {
-        return nil, fmt.Errorf("Failed to retrieve session: %v\n", err)
+        return nil, errors.New(fmt.Sprintf("Failed to retrieve session: %v\n", err))
     }
 
     if session != nil {

api/uploads.go

@@ -50,7 +50,7 @@ func HandleImageUpload(app *model.AppState, data *string, directory string, file
         return "", nil
     }
 
-    app.Log.Info(log.TYPE_FILES, "\"%s\" created.", imagePath)
+    app.Log.Info(log.TYPE_FILES, "\"%s/%s.%s\" created.", directory, filename, ext)
 
     return filename, nil
 }

controller/artist.go

@@ -29,11 +29,6 @@ func GetAllArtists(db *sqlx.DB) ([]*model.Artist, error) {
 
     return artists, nil
 }
-func GetArtistCount(db *sqlx.DB) (int, error) {
-    var count int
-    err := db.Get(&count, "SELECT count(*) FROM artist")
-    return count, err
-}
 
 func GetArtistsNotOnRelease(db *sqlx.DB, releaseID string) ([]*model.Artist, error) {
     var artists = []*model.Artist{}

controller/config.go

@@ -18,7 +18,7 @@ func GetConfig() model.Config {
     }
 
     config := model.Config{
-        BaseUrl: "https://arimelody.space",
+        BaseUrl: "https://arimelody.me",
         Host: "0.0.0.0",
         Port: 8080,
         TrustedProxies: []string{ "127.0.0.1" },

controller/controller.go

@@ -5,7 +5,7 @@ import "math/rand"
 func GenerateAlnumString(length int) []byte {
     const CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
     res := []byte{}
-    for range length {
+    for i := 0; i < length; i++ {
         res = append(res, CHARS[rand.Intn(len(CHARS))])
     }
     return res

controller/migrator.go

@@ -1,12 +1,11 @@
 package controller
 
 import (
-	"embed"
+    "fmt"
-	"fmt"
+    "os"
-	"os"
+    "time"
-	"time"
 
-	"github.com/jmoiron/sqlx"
+    "github.com/jmoiron/sqlx"
 )
 
 const DB_VERSION int = 4
@@ -56,13 +55,10 @@ func CheckDBVersionAndMigrate(db *sqlx.DB) {
     fmt.Printf("Database schema up to date.\n")
 }
 
-//go:embed "schema-migration"
-var schemaFS embed.FS
-
 func ApplyMigration(db *sqlx.DB, scriptFile string) {
     fmt.Printf("Applying schema migration %s...\n", scriptFile)
 
-    bytes, err := schemaFS.ReadFile("schema-migration/" + scriptFile + ".sql")
+    bytes, err := os.ReadFile("schema-migration/" + scriptFile + ".sql")
     if err != nil {
         fmt.Fprintf(os.Stderr, "FATAL: Failed to open schema file \"%s\": %v\n", scriptFile, err)
         os.Exit(1)

controller/qr.go

@@ -2,8 +2,8 @@ package controller
 
 import (
     "encoding/base64"
-    // "image"
+    "image"
-    // "image/color"
+    "image/color"
 
     "github.com/skip2/go-qrcode"
 )
@@ -18,35 +18,36 @@ func GenerateQRCode(data string) (string, error) {
 }
 
 // vvv DEPRECATED vvv
-// const margin = 4
+
-//
+const margin = 4
-// type QRCodeECCLevel int64
+
-// const (
+type QRCodeECCLevel int64
-//     LOW QRCodeECCLevel = iota
+const (
-//     MEDIUM
+    LOW QRCodeECCLevel = iota
-//     QUARTILE
+    MEDIUM
-//     HIGH
+    QUARTILE
-// )
+    HIGH
-//
+)
-// func drawLargeAlignmentSquare(x int, y int, img *image.Gray) {
+
-//     for yi := range 7 {
+func drawLargeAlignmentSquare(x int, y int, img *image.Gray) {
-//         for xi := range 7 {
+    for yi := range 7 {
-//             if (xi == 0 || xi == 6) || (yi == 0 || yi == 6) {
+        for xi := range 7 {
-//                 img.Set(x + xi, y + yi, color.Black)
+            if (xi == 0 || xi == 6) || (yi == 0 || yi == 6) {
-//             } else if (xi > 1 && xi < 5) && (yi > 1 && yi < 5) {
+                img.Set(x + xi, y + yi, color.Black)
-//                 img.Set(x + xi, y + yi, color.Black)
+            } else if (xi > 1 && xi < 5) && (yi > 1 && yi < 5) {
-//             }
+                img.Set(x + xi, y + yi, color.Black)
-//         }
+            }
-//     }
+        }
-// }
+    }
-//
+}
-// func drawSmallAlignmentSquare(x int, y int, img *image.Gray) {
+
-//     for yi := range 5 {
+func drawSmallAlignmentSquare(x int, y int, img *image.Gray) {
-//         for xi := range 5 {
+    for yi := range 5 {
-//             if (xi == 0 || xi == 4) || (yi == 0 || yi == 4) {
+        for xi := range 5 {
-//                 img.Set(x + xi, y + yi, color.Black)
+            if (xi == 0 || xi == 4) || (yi == 0 || yi == 4) {
-//             }
+                img.Set(x + xi, y + yi, color.Black)
-//         }
+            }
-//     }
+        }
-//     img.Set(x + 2, y + 2, color.Black)
+    }
-// }
+    img.Set(x + 2, y + 2, color.Black)
+}

controller/release.go

@@ -1,6 +1,7 @@
 package controller
 
 import (
+    "errors"
     "fmt"
 
     "arimelody-web/model"
@@ -20,7 +21,7 @@ func GetRelease(db *sqlx.DB, id string, full bool) (*model.Release, error) {
         // get credits
         credits, err := GetReleaseCredits(db, id)
         if err != nil {
-            return nil, fmt.Errorf("Credits: %s", err)
+            return nil, errors.New(fmt.Sprintf("Credits: %s", err))
         }
         for _, credit := range credits {
             release.Credits = append(release.Credits, credit)
@@ -29,7 +30,7 @@ func GetRelease(db *sqlx.DB, id string, full bool) (*model.Release, error) {
         // get tracks
         tracks, err := GetReleaseTracks(db, id)
         if err != nil {
-            return nil, fmt.Errorf("Tracks: %s", err)
+            return nil, errors.New(fmt.Sprintf("Tracks: %s", err))
         }
         for _, track := range tracks {
             release.Tracks = append(release.Tracks, track)
@@ -38,7 +39,7 @@ func GetRelease(db *sqlx.DB, id string, full bool) (*model.Release, error) {
         // get links
         links, err := GetReleaseLinks(db, id)
         if err != nil {
-            return nil, fmt.Errorf("Links: %s", err)
+            return nil, errors.New(fmt.Sprintf("Links: %s", err))
         }
         for _, link := range links {
             release.Links = append(release.Links, link)
@@ -70,7 +71,7 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod
         // get credits
         credits, err := GetReleaseCredits(db, release.ID)
         if err != nil {
-            return nil, fmt.Errorf("Credits: %s", err)
+            return nil, errors.New(fmt.Sprintf("Credits: %s", err))
         }
         for _, credit := range credits {
             release.Credits = append(release.Credits, credit)
@@ -80,7 +81,7 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod
             // get tracks
             tracks, err := GetReleaseTracks(db, release.ID)
             if err != nil {
-                return nil, fmt.Errorf("Tracks: %s", err)
+                return nil, errors.New(fmt.Sprintf("Tracks: %s", err))
             }
             for _, track := range tracks {
                 release.Tracks = append(release.Tracks, track)
@@ -89,7 +90,7 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod
             // get links
             links, err := GetReleaseLinks(db, release.ID)
             if err != nil {
-                return nil, fmt.Errorf("Links: %s", err)
+                return nil, errors.New(fmt.Sprintf("Links: %s", err))
             }
             for _, link := range links {
                 release.Links = append(release.Links, link)
@@ -99,17 +100,6 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod
 
     return releases, nil
 }
-func GetReleaseCount(db *sqlx.DB, onlyVisible bool) (int, error) {
-    query := "SELECT count(*) FROM musicrelease"
-    if onlyVisible {
-        query += " WHERE visible=true"
-    }
-
-    var count int
-    err := db.Get(&count, query)
-
-    return count, err
-}
 
 func CreateRelease(db *sqlx.DB, release *model.Release) error {
     _, err := db.Exec(

controller/session.go

@@ -2,6 +2,7 @@ package controller
 
 import (
     "database/sql"
+    "errors"
     "fmt"
     "net/http"
     "strings"
@@ -18,7 +19,7 @@ const TOKEN_LEN = 64
 func GetSessionFromRequest(app *model.AppState, r *http.Request) (*model.Session, error) {
     sessionCookie, err := r.Cookie(model.COOKIE_TOKEN)
     if err != nil && err != http.ErrNoCookie {
-        return nil, fmt.Errorf("Failed to retrieve session cookie: %v", err)
+        return nil, errors.New(fmt.Sprintf("Failed to retrieve session cookie: %v", err))
     }
 
     var session *model.Session
@@ -28,7 +29,7 @@ func GetSessionFromRequest(app *model.AppState, r *http.Request) (*model.Session
         session, err = GetSession(app.DB, sessionCookie.Value)
 
         if err != nil && !strings.Contains(err.Error(), "no rows") {
-            return nil, fmt.Errorf("Failed to retrieve session: %v", err)
+            return nil, errors.New(fmt.Sprintf("Failed to retrieve session: %v", err))
         }
 
         if session != nil {
@@ -187,7 +188,3 @@ func DeleteSession(db *sqlx.DB, token string) error {
     return err
 }
 
-func DeleteExpiredSessions(db *sqlx.DB) error {
-    _, err := db.Exec("DELETE FROM session WHERE expires_at<current_timestamp")
-    return err
-}

controller/totp.go

@@ -58,12 +58,12 @@ func GenerateTOTPURI(username string, secret string) string {
     url := url.URL{
         Scheme: "otpauth",
         Host: "totp",
-        Path: url.QueryEscape("arimelody.space") + ":" + url.QueryEscape(username),
+        Path: url.QueryEscape("arimelody.me") + ":" + url.QueryEscape(username),
     }
 
     query := url.Query()
     query.Set("secret", secret)
-    query.Set("issuer", "arimelody.space")
+    query.Set("issuer", "arimelody.me")
     // query.Set("algorithm", "SHA1")
     // query.Set("digits", fmt.Sprintf("%d", TOTP_CODE_LENGTH))
     // query.Set("period", fmt.Sprintf("%d", TOTP_TIME_STEP))

controller/track.go

@@ -29,11 +29,6 @@ func GetAllTracks(db *sqlx.DB) ([]*model.Track, error) {
 
     return tracks, nil
 }
-func GetTrackCount(db *sqlx.DB) (int, error) {
-    var count int
-    err := db.Get(&count, "SELECT count(*) FROM musictrack")
-    return count, err
-}
 
 func GetOrphanTracks(db *sqlx.DB) ([]*model.Track, error) {
     var tracks = []*model.Track{}

docker-compose.example.yml

@@ -1,6 +1,6 @@
 services:
   web:
-    image: docker.arimelody.space/arimelody-web:latest
+    image: docker.arimelody.me/arimelody.me:latest
     build: .
     ports:
       - 8080:8080

main.go

@@ -1,43 +1,38 @@
 package main
 
 import (
-	"bufio"
+    "bufio"
-	"embed"
+    "errors"
-	"errors"
+    "fmt"
-	"fmt"
+    stdLog "log"
-	stdLog "log"
+    "math"
-	"math"
+    "math/rand"
-	"math/rand"
+    "net"
-	"net"
+    "net/http"
-	"net/http"
+    "os"
-	"os"
+    "path/filepath"
-	"path/filepath"
+    "strconv"
-	"strconv"
+    "strings"
-	"strings"
+    "time"
-	"time"
 
-	"arimelody-web/admin"
+    "arimelody-web/admin"
-	"arimelody-web/api"
+    "arimelody-web/api"
-	"arimelody-web/colour"
+    "arimelody-web/colour"
-	"arimelody-web/controller"
+    "arimelody-web/controller"
-	"arimelody-web/cursor"
+    "arimelody-web/cursor"
-	"arimelody-web/log"
+    "arimelody-web/log"
-	"arimelody-web/model"
+    "arimelody-web/model"
-	"arimelody-web/view"
+    "arimelody-web/view"
 
-	"github.com/jmoiron/sqlx"
+    "github.com/jmoiron/sqlx"
-	_ "github.com/lib/pq"
+    _ "github.com/lib/pq"
-	"golang.org/x/crypto/bcrypt"
+    "golang.org/x/crypto/bcrypt"
 )
 
 // used for database migrations
 const DB_VERSION = 1
 
 const DEFAULT_PORT int64 = 8080
-const HRT_DATE int64 = 1756478697
-
-//go:embed "public"
-var publicFS embed.FS
 
 func main() {
     fmt.Printf("made with <3 by ari melody\n\n")
@@ -45,7 +40,6 @@ func main() {
     app := model.AppState{
         Config: controller.GetConfig(),
         Twitch: nil,
-        PublicFS: publicFS,
     }
 
     // initialise database connection
@@ -493,13 +487,6 @@ func main() {
         fmt.Printf("No accounts exist! Generated invite code: %s\n", invite.Code)
     }
 
-    // delete expired sessions
-    err = controller.DeleteExpiredSessions(app.DB)
-    if err != nil {
-        fmt.Fprintf(os.Stderr, "FATAL: Failed to clear expired sessions: %v\n", err)
-        os.Exit(1)
-    }
-
     // delete expired invites
     err = controller.DeleteExpiredInvites(app.DB)
     if err != nil {
@@ -521,7 +508,7 @@ func main() {
     fmt.Printf("Now serving at http://%s:%d\n", app.Config.Host, app.Config.Port)
     stdLog.Fatal(
         http.ListenAndServe(fmt.Sprintf("%s:%d", app.Config.Host, app.Config.Port), 
-        CheckRequest(&app, HTTPLog(DefaultHeaders(mux))),
+        HTTPLog(DefaultHeaders(mux)),
     ))
 }
 
@@ -531,7 +518,7 @@ func createServeMux(app *model.AppState) *http.ServeMux {
     mux.Handle("/admin/", http.StripPrefix("/admin", admin.Handler(app)))
     mux.Handle("/api/", http.StripPrefix("/api", api.Handler(app)))
     mux.Handle("/music/", http.StripPrefix("/music", view.MusicHandler(app)))
-    mux.Handle("/uploads/", http.StripPrefix("/uploads", view.ServeFiles(filepath.Join(app.Config.DataDirectory, "uploads"))))
+    mux.Handle("/uploads/", http.StripPrefix("/uploads", view.StaticHandler(filepath.Join(app.Config.DataDirectory, "uploads"))))
     mux.Handle("/cursor-ws", cursor.Handler(app))
     mux.Handle("/", view.IndexHandler(app))
 
@@ -568,39 +555,9 @@ var PoweredByStrings = []string{
     "30 billion dollars in VC funding",
 }
 
-func CheckRequest(app *model.AppState, next http.Handler) http.Handler {
-    return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        // requests with empty user agents are considered suspicious.
-        // every browser supplies them; hell, even curl supplies them.
-        // i only ever see null user-agents paired with malicious requests,
-        // so i'm canning them altogether.
-        if len(r.Header.Get("User-Agent")) == 0 {
-            http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
-            return
-        }
-
-        // obviously .php requests these don't affect me, but these tend to be
-        // lazy wordpress intrusion attempts. if that's what you're about, i
-        // don't want you on my site.
-        if strings.HasSuffix(r.URL.Path, ".php") ||
-        strings.HasSuffix(r.URL.Path, ".php7") {
-            http.NotFound(w, r)
-            fmt.Fprintf(
-                os.Stderr,
-                "WARN: Suspicious activity blocked: {\"path\":\"%s\",\"address\":\"%s\"}\n",
-                r.URL.Path,
-                r.RemoteAddr,
-            )
-            return
-        }
-
-        next.ServeHTTP(w, r)
-    })
-}
-
 func DefaultHeaders(next http.Handler) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        w.Header().Add("Server", "ari melody webbed site")
+        w.Header().Add("Server", "arimelody.me")
         w.Header().Add("Do-Not-Stab", "1")
         w.Header().Add("X-Clacks-Overhead", "GNU Terry Pratchett")
         w.Header().Add("X-Hacker", "spare me please")
@@ -610,10 +567,6 @@ func DefaultHeaders(next http.Handler) http.Handler {
             "X-Powered-By",
             PoweredByStrings[rand.Intn(len(PoweredByStrings))],
         )
-        w.Header().Add(
-            "X-Days-Since-HRT",
-            fmt.Sprint(math.Round(time.Since(time.Unix(HRT_DATE, 0)).Hours() / 24)),
-        )
         next.ServeHTTP(w, r)
     })
 }
@@ -666,6 +619,6 @@ func HTTPLog(next http.Handler) http.Handler {
         lrw.Status,
         colour.Reset,
         elapsed,
-        r.Header.Get("User-Agent"))
+        r.Header["User-Agent"][0])
     })
 }

model/appstate.go

@@ -1,11 +1,9 @@
 package model
 
 import (
-	"embed"
+    "github.com/jmoiron/sqlx"
 
-	"github.com/jmoiron/sqlx"
+    "arimelody-web/log"
-
-	"arimelody-web/log"
 )
 
 type (
@@ -45,6 +43,5 @@ type (
         Config Config
         Log log.Logger
         Twitch *TwitchState
-        PublicFS embed.FS
     }
 )

model/release.go

@@ -39,7 +39,7 @@ const (
 // GETTERS
 
 func (release Release) GetDescriptionHTML() template.HTML {
-    return template.HTML(strings.ReplaceAll(release.Description, "\n", "<br>"))
+    return template.HTML(strings.Replace(release.Description, "\n", "<br>", -1))
 }
 
 func (release Release) TextReleaseDate() string {

model/track.go

@@ -13,16 +13,16 @@ type (
         Lyrics      string  `json:"lyrics" db:"lyrics"`
         PreviewURL  string  `json:"previewURL" db:"preview_url"`
 
-        Number      int     `json:"-"`
+        Number      int
     }
 )
 
 func (track Track) GetDescriptionHTML() template.HTML {
-    return template.HTML(strings.ReplaceAll(track.Description, "\n", "<br>"))
+    return template.HTML(strings.Replace(track.Description, "\n", "<br>", -1))
 }
 
 func (track Track) GetLyricsHTML() template.HTML {
-    return template.HTML(strings.ReplaceAll(track.Lyrics, "\n", "<br>"))
+    return template.HTML(strings.Replace(track.Lyrics, "\n", "<br>", -1))
 }
 
 // this function is stupid and i hate that i need it

public/img/hamburger.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><rect id="Artboard1" x="0" y="0" width="15.36" height="15.36" style="fill:none;"/><g id="Artboard11" serif:id="Artboard1"><path d="M13.44,7.68c0,0.53 -0.43,0.96 -0.96,0.96l-9.6,0c-0.53,0 -0.96,-0.43 -0.96,-0.96c-0,-0.53 0.43,-0.96 0.96,-0.96l9.6,-0c0.53,-0 0.96,0.43 0.96,0.96Z"/><path d="M13.44,11.52c0,0.53 -0.43,0.96 -0.96,0.96l-9.6,0c-0.53,0 -0.96,-0.43 -0.96,-0.96c-0,-0.53 0.43,-0.96 0.96,-0.96l9.6,0c0.53,0 0.96,0.43 0.96,0.96Z"/><path d="M13.44,3.84c0,0.53 -0.43,0.96 -0.96,0.96l-9.6,0c-0.53,0 -0.96,-0.43 -0.96,-0.96c-0,-0.53 0.43,-0.96 0.96,-0.96l9.6,0c0.53,0 0.96,0.43 0.96,0.96Z"/></g></svg>

public/img/prideflag.svg

@@ -1,32 +1,32 @@
-<!--
+<!--
-  pride flag - copyright (c) 2024 ari melody
+  pride flag - copyright (c) 2024 ari melody
-  
+  
-  this code is provided AS-IS, WITHOUT ANY WARRANTY, to be
+  this code is provided AS-IS, WITHOUT ANY WARRANTY, to be
-  freely redistributed and/or modified as you please, however
+  freely redistributed and/or modified as you please, however
-  retaining this license in any redistribution.
+  retaining this license in any redistribution.
-  
+  
-  please use this flag to link to an LGBTQI+-supporting page
+  please use this flag to link to an LGBTQI+-supporting page
-  of your choosing!
+  of your choosing!
-  
+  
-  web: https://arimelody.space
+  web: https://arimelody.me
-  source: https://forge.arimelody.space/ari/prideflag
+  source: https://git.arimelody.me/ari/prideflag
--->
+-->
-
+
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" width="120" height="120">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" width="120" height="120">
-  <path id="red" d="M120,80 L100,100 L120,120 Z" style="fill:#d20605"/>
+  <path id="red" d="M120,80 L100,100 L120,120 Z" style="fill:#d20605"/>
-  <path id="orange" d="M120,80 V40 L80,80 L100,100 Z" style="fill:#ef9c00"/>
+  <path id="orange" d="M120,80 V40 L80,80 L100,100 Z" style="fill:#ef9c00"/>
-  <path id="yellow" d="M120,40 V0 L60,60 L80,80 Z" style="fill:#e5fe02"/>
+  <path id="yellow" d="M120,40 V0 L60,60 L80,80 Z" style="fill:#e5fe02"/>
-  <path id="green" d="M120,0 H80 L40,40 L60,60 Z" style="fill:#09be01"/>
+  <path id="green" d="M120,0 H80 L40,40 L60,60 Z" style="fill:#09be01"/>
-  <path id="blue" d="M80,0 H40 L20,20 L40,40 Z" style="fill:#081a9a"/>
+  <path id="blue" d="M80,0 H40 L20,20 L40,40 Z" style="fill:#081a9a"/>
-  <path id="purple" d="M40,0 H0 L20,20 Z" style="fill:#76008a"/>
+  <path id="purple" d="M40,0 H0 L20,20 Z" style="fill:#76008a"/>
-
+
-  <rect id="black" x="60" width="60" height="60" style="fill:#010101"/>
+  <rect id="black" x="60" width="60" height="60" style="fill:#010101"/>
-  <rect id="brown" x="70" width="50" height="50" style="fill:#603814"/>
+  <rect id="brown" x="70" width="50" height="50" style="fill:#603814"/>
-  <rect id="lightblue" x="80" width="40" height="40" style="fill:#73d6ed"/>
+  <rect id="lightblue" x="80" width="40" height="40" style="fill:#73d6ed"/>
-  <rect id="pink" x="90" width="30" height="30" style="fill:#ffafc8"/>
+  <rect id="pink" x="90" width="30" height="30" style="fill:#ffafc8"/>
-  <rect id="white" x="100" width="20" height="20" style="fill:#fff"/>
+  <rect id="white" x="100" width="20" height="20" style="fill:#fff"/>
-  
+  
-  <rect id="intyellow" x="110" width="10" height="10" style="fill:#fed800"/>
+  <rect id="intyellow" x="110" width="10" height="10" style="fill:#fed800"/>
-  <circle id="intpurple" cx="120" cy="0" r="5" stroke="#7601ad" stroke-width="2" fill="none"/>
+  <circle id="intpurple" cx="120" cy="0" r="5" stroke="#7601ad" stroke-width="2" fill="none"/>
-</svg>
+</svg>
-
+

public/keys/ari melody_0x92678188_public.asc

@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZNW03RYJKwYBBAHaRw8BAQdAuMUNVjXT7m/YisePPnSYY6lc1Xmm3oS79ZEO
+JriRCZy0HWFyaSBtZWxvZHkgPGFyaUBhcmltZWxvZHkubWU+iJkEExYKAEECGwMF
+CwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AWIQTujeuNYocuegkeKt/PmYKckmeB
+iAUCZ7UqUAUJCIMP8wAKCRDPmYKckmeBiO/NAP0SoJL4aKZqCeYiSoDF/Uw6nMmZ
++oR1Uig41wQ/IDbhCAEApP2vbjSIu6pcp0AQlL7qcoyPWv+XkqPSFqW9KEZZVwqI
+kwQTFgoAOxYhBO6N641ihy56CR4q38+ZgpySZ4GIBQJk1bTdAhsDBQsJCAcCAiIC
+BhUKCQgLAgQWAgMBAh4HAheAAAoJEM+ZgpySZ4GIYJsA/jBNwsJTlmV9JMmsW0aF
+ApYDoPG1Q7sJ6CRW7xKCRjcqAQDX9iqNnW9Jqo8M3jXfu+aGSF926hg6M3SKm02P
+f27bAbgzBGe1JooWCSsGAQQB2kcPAQEHQJbfh5iLHEpZndMgekqYzqTrUoAJ8ZIL
+d4WH0dcw9tOaiPUEGBYKACYCGwIWIQTujeuNYocuegkeKt/PmYKckmeBiAUCZ7Uq
+VgUJBaOeTACBdiAEGRYKAB0WIQQlu5dWmBR/P3ZxngxgtfA4bj3bfgUCZ7UmigAK
+CRBgtfA4bj3bfux+AP4y5ydrjnGBMX7GuB2nh55SRdscSiXsZ66ntnjXyQcbWgEA
+pDuu7FqXzXcnluuZxNFDT740Rnzs60tTeplDqGGWcAQJEM+ZgpySZ4GIc0kA/iSw
+Nw+r3FC75omwrPpJF13B5fq93FweFx+oSaES6qzkAQDvgCK77qKKbvCju0g8zSsK
+EZnv6xR4uvtGdVkvLpBdC7gzBGe1JpkWCSsGAQQB2kcPAQEHQGnU4lXFLchhKYkC
+PshP+jvuRsNoedaDOK2p4dkQC8JuiH4EGBYKACYCGyAWIQTujeuNYocuegkeKt/P
+mYKckmeBiAUCZ7UqXgUJBaOeRQAKCRDPmYKckmeBiL9KAQCJZIBhuSsoYa61I0XZ
+cKzGZbB0h9pD6eg1VRswNIgHtQEAwu9Hgs1rs9cySvKbO7WgK6Qh6EfrvGgGOXCO
+m3wVsg24OARntSo5EgorBgEEAZdVAQUBAQdA+/k586W1OHxndzDJNpbd+wqjyjr0
+D5IXxfDs00advB0DAQgHiH4EGBYKACYWIQTujeuNYocuegkeKt/PmYKckmeBiAUC
+Z7UqOQIbDAUJBaOagAAKCRDPmYKckmeBiEFxAQCgziQt2l3u7jnZVij4zop+K2Lv
+TVFtkbG61tf6brRzBgD/X6c6X5BRyQC51JV1I1RFRBdeMAIXzcLFg2v3WUMccQs=
+=YmHI
+-----END PGP PUBLIC KEY BLOCK-----

public/keys/ari@arimelody.space_public.asc

@@ -1,59 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEZNW03RYJKwYBBAHaRw8BAQdAuMUNVjXT7m/YisePPnSYY6lc1Xmm3oS79ZEO
-JriRCZy0IGFyaSBtZWxvZHkgPGFyaUBhcmltZWxvZHkuc3BhY2U+iQJJBBMWCgHx
-AhsDBQsJCAcCAiICBhUKCQgLAgQWAgMBAh4HAheAAhkBNRSAAAAAABAAHHByb29m
-QGFyaWFkbmUuaWRkbnM6YXJpbWVsb2R5LnNwYWNlP3R5cGU9VFhUOhSAAAAAABAA
-IXByb29mQGFyaWFkbmUuaWRodHRwczovL2ZlZGkuYXJpbWVsb2R5LnNwYWNlL0Bh
-cmlEFIAAAAAAEAArcHJvb2ZAYXJpYWRuZS5pZGh0dHBzOi8vZm9yZ2UuYmxpc3Mu
-dG93bi9hcmkva2V5b3hpZGUtcHJvb2ZJFIAAAAAAEAAwcHJvb2ZAYXJpYWRuZS5p
-ZGh0dHBzOi8vZm9yZ2UuYXJpbWVsb2R5LnNwYWNlL2FyaS9rZXlveGlkZS1wcm9v
-ZkYUgAAAAAAQAC1wcm9vZkBhcmlhZG5lLmlkaHR0cHM6Ly9jb2RlYmVyZy5vcmcv
-YXJpbWVsb2R5L2tleW94aWRlLXByb29mZRSAAAAAABAATHByb29mQGFyaWFkbmUu
-aWRodHRwczovL2Jza3kuYXBwL3Byb2ZpbGUvZGlkOnBsYzp5Y3Q2Y3ZnZmlwbmdp
-enJ5NXVtemt4cjMvcG9zdC8zbGlpbnFvdHF0YzIyFiEE7o3rjWKHLnoJHirfz5mC
-nJJngYgFAmivQJsFCQ0/jT4ACgkQz5mCnJJngYgdtQD+K8AMkLvR1ZKxl0tw8/FO
-vwS9HknEW13GajSAY/W1/NoA/17mnVnlTFhepKo1ETnxe2BpdOaKR85K0n2qffzC
-8SAAtB1hcmkgbWVsb2R5IDxhcmlAYXJpbWVsb2R5Lm1lPoiTBBMWCgA7FiEE7o3r
-jWKHLnoJHirfz5mCnJJngYgFAmTVtN0CGwMFCwkIBwICIgIGFQoJCAsCBBYCAwEC
-HgcCF4AACgkQz5mCnJJngYhgmwD+ME3CwlOWZX0kyaxbRoUClgOg8bVDuwnoJFbv
-EoJGNyoBANf2Ko2db0mqjwzeNd+75oZIX3bqGDozdIqbTY9/btsBiQIKBBMWCgGy
-AhsDBQsJCAcCAiICBhUKCQgLAgQWAgMBAh4HAheABQkIgw/zFiEE7o3rjWKHLnoJ
-Hirfz5mCnJJngYgFAme1wUA2FIAAAAAAEAAdcHJvb2ZAYXJpYWRuZS5pZGh0dHBz
-Oi8vaWNlLmFyaW1lbG9keS5tZS9AYXJpWxSAAAAAABAAQnByb29mQGFyaWFkbmUu
-aWRodHRwczovL2dpc3QuZ2l0aHViLmNvbS9hcmltZWxvZHkvMzY2ZGMyYjZhYWVk
-ZWMxOWU2MTRiN2NlY2U5Yzg2OWQyFIAAAAAAEAAZcHJvb2ZAYXJpYWRuZS5pZGRu
-czphcmltZWxvZHkubWU/dHlwZT1UWFRlFIAAAAAAEABMcHJvb2ZAYXJpYWRuZS5p
-ZGh0dHBzOi8vYnNreS5hcHAvcHJvZmlsZS9kaWQ6cGxjOnljdDZjdmdmaXBuZ2l6
-cnk1dW16a3hyMy9wb3N0LzNsaWlucW90cXRjMjJEFIAAAAAAEAArcHJvb2ZAYXJp
-YWRuZS5pZGh0dHBzOi8vZ2l0LmFyaW1lbG9keS5tZS9hcmkva2V5b3hpZGVfcHJv
-b2YACgkQz5mCnJJngYh3+QD+Pbo3bM4oWtUicGUGEp4jiFoBqSNlyl9rFPY0ODDS
-DxEBANaXz/No/Hn3mEwNdrFigj/YPm7TH/4UBbHAxN6hDggPiQJGBBMWCgHuAhsD
-BQsJCAcCAiICBhUKCQgLAgQWAgMBAh4HAheASRSAAAAAABAAMHByb29mQGFyaWFk
-bmUuaWRodHRwczovL2ZvcmdlLmFyaW1lbG9keS5zcGFjZS9hcmkva2V5b3hpZGUt
-cHJvb2ZGFIAAAAAAEAAtcHJvb2ZAYXJpYWRuZS5pZGh0dHBzOi8vY29kZWJlcmcu
-b3JnL2FyaW1lbG9keS9rZXlveGlkZS1wcm9vZjoUgAAAAAAQACFwcm9vZkBhcmlh
-ZG5lLmlkaHR0cHM6Ly9mZWRpLmFyaW1lbG9keS5zcGFjZS9AYXJpZRSAAAAAABAA
-THByb29mQGFyaWFkbmUuaWRodHRwczovL2Jza3kuYXBwL3Byb2ZpbGUvZGlkOnBs
-Yzp5Y3Q2Y3ZnZmlwbmdpenJ5NXVtemt4cjMvcG9zdC8zbGlpbnFvdHF0YzIyNRSA
-AAAAABAAHHByb29mQGFyaWFkbmUuaWRkbnM6YXJpbWVsb2R5LnNwYWNlP3R5cGU9
-VFhURBSAAAAAABAAK3Byb29mQGFyaWFkbmUuaWRodHRwczovL2ZvcmdlLmJsaXNz
-LnRvd24vYXJpL2tleW94aWRlLXByb29mFiEE7o3rjWKHLnoJHirfz5mCnJJngYgF
-AmivQJsFCQ0/jT4ACgkQz5mCnJJngYhk/wEAuQMYpUgyLqcYvOh1A+7f/t+DUXjz
-YjQtLYw37oAESREA/074iJNi9GHGIjxYfp5lBkZxqGew1GAFIKx7Yzp64WQFuDME
-Z7UmihYJKwYBBAHaRw8BAQdAlt+HmIscSlmd0yB6SpjOpOtSgAnxkgt3hYfR1zD2
-05qI9QQYFgoAJgIbAhYhBO6N641ihy56CR4q38+ZgpySZ4GIBQJor0AjBQkKYBsZ
-AIF2IAQZFgoAHRYhBCW7l1aYFH8/dnGeDGC18DhuPdt+BQJntSaKAAoJEGC18Dhu
-Pdt+7H4A/jLnJ2uOcYExfsa4HaeHnlJF2xxKJexnrqe2eNfJBxtaAQCkO67sWpfN
-dyeW65nE0UNPvjRGfOzrS1N6mUOoYZZwBAkQz5mCnJJngYgc2gD/cFhjrwPdex9g
-ZYk7jH29wQ9RpR9dEhf0C20nFZJLawgBAOBbzw4/O7OslSoIjhGs4pw9hJIBK7ds
-PI6g3CeX0DUFuDMEZ7UmmRYJKwYBBAHaRw8BAQdAadTiVcUtyGEpiQI+yE/6O+5G
-w2h51oM4ranh2RALwm6IfgQYFgoAJgIbIBYhBO6N641ihy56CR4q38+ZgpySZ4GI
-BQJor0AjBQkKYBsKAAoJEM+ZgpySZ4GIoMAA/jB/exnjGvsMKuNW09bI29bsKHNW
-SQLjEnuuByN6Spq6AP9yPUumsSEHr0W71iefMuNFJZnF+8qSk+uywQ/5ET+PBbg4
-BGe1KjkSCisGAQQBl1UBBQEBB0D7+TnzpbU4fGd3MMk2lt37CqPKOvQPkhfF8OzT
-Rp28HQMBCAeIfgQYFgoAJgIbDBYhBO6N641ihy56CR4q38+ZgpySZ4GIBQJor0Ak
-BQkKYBdqAAoJEM+ZgpySZ4GIlIoA/0fv2UQyhixu7Vkq7IeQ+NxUuEVCIGmrAu6k
-ScT13ikjAQCPpIubU848yXcDUvxgcGAS7yNADU1dAWAZOi34WxajAQ==
-=caf3
------END PGP PUBLIC KEY BLOCK-----

public/script/config.js

@@ -1,4 +1,4 @@
-const ARIMELODY_CONFIG_NAME = "arimelody-web-config";
+const ARIMELODY_CONFIG_NAME = "arimelody.me-config";
 
 class Config {
     _crt = false;

public/script/music-gateway.js

@@ -20,6 +20,7 @@ function update_extras_buttons() {
     const info_container = document.getElementById("info")
     info_container.addEventListener("scroll", update_extras_buttons);
     const info_rect = info_container.getBoundingClientRect();
+    const info_y = info_rect.y;
     const font_size = parseFloat(getComputedStyle(document.documentElement).fontSize);
     let current = extras_pairs[0];
     extras_pairs.forEach(pair => {
@@ -52,7 +53,7 @@ function bind_go_back_btn() {
 function bind_share_btn() {
     const share_btn = document.getElementById("share");
     if (navigator.clipboard === undefined) {
-        share_btn.onclick = () => {
+        share_btn.onclick = event => {
             console.error("clipboard is not supported by this browser!");
         };
         return;

public/script/prideflag.js

@@ -8,11 +8,11 @@
 // please use this flag to link to an LGBTQI+-supporting page
 // of your choosing!
 // 
-// web: https://arimelody.space
+// web: https://arimelody.me
-// source: https://forge.arimelody.space/ari/prideflag
+// source: https://git.arimelody.me/ari/prideflag
 //
 
-const pride_url = "https://forge.arimelody.space/ari/prideflag";
+const pride_url = "https://git.arimelody.me/ari/prideflag";
 
 const pride_flag_svg =
     `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" width="120" height="120">

public/style/index.css

@@ -242,7 +242,7 @@ div#web-buttons {
 .live-preview {
     display: flex;
     flex-direction: row;
-    justify-content: start;
+    justify-content: center;
     gap: 1em;
 }
 

public/style/music-gateway.css

@@ -333,7 +333,7 @@ ul#links a {
     background-color: #fff;
     text-align: center;
     text-decoration: none;
-    transition: filter .1s ease-out, -webkit-filter .1s ease-out;
+    transition: filter .1s,-webkit-filter .1s
 }
 
 #buylink {

templates/html/prideflag.html

@@ -1,21 +0,0 @@
-{{define "prideflag"}}
-<a href="https://github.com/arimelody/prideflag" target="_blank" id="prideflag">
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" width="120" height="120" hx-preserve="true">
-        <path id="red" d="M120,80 L100,100 L120,120 Z" style="fill:#d20605"/>
-        <path id="orange" d="M120,80 V40 L80,80 L100,100 Z" style="fill:#ef9c00"/>
-        <path id="yellow" d="M120,40 V0 L60,60 L80,80 Z" style="fill:#e5fe02"/>
-        <path id="green" d="M120,0 H80 L40,40 L60,60 Z" style="fill:#09be01"/>
-        <path id="blue" d="M80,0 H40 L20,20 L40,40 Z" style="fill:#081a9a"/>
-        <path id="purple" d="M40,0 H0 L20,20 Z" style="fill:#76008a"/>
-
-        <rect id="black" x="60" width="60" height="60" style="fill:#010101"/>
-        <rect id="brown" x="70" width="50" height="50" style="fill:#603814"/>
-        <rect id="lightblue" x="80" width="40" height="40" style="fill:#73d6ed"/>
-        <rect id="pink" x="90" width="30" height="30" style="fill:#ffafc8"/>
-        <rect id="white" x="100" width="20" height="20" style="fill:#fff"/>
-
-        <rect id="intyellow" x="110" width="10" height="10" style="fill:#fed800"/>
-        <circle id="intpurple" cx="120" cy="0" r="5" stroke="#7601ad" stroke-width="2" fill="none"/>
-    </svg>
-</a>
-{{end}}

templates/templates.go

@@ -1,36 +1,28 @@
 package templates
 
 import (
-	_ "embed"
+    "html/template"
-	"html/template"
+    "path/filepath"
-	"strings"
 )
 
-//go:embed "html/layout.html"
+var IndexTemplate = template.Must(template.ParseFiles(
-var layoutHTML string
+    filepath.Join("views", "layout.html"),
-//go:embed "html/header.html"
+    filepath.Join("views", "header.html"),
-var headerHTML string
+    filepath.Join("views", "footer.html"),
-//go:embed "html/footer.html"
+    filepath.Join("views", "prideflag.html"),
-var footerHTML string
+    filepath.Join("views", "index.html"),
-//go:embed "html/prideflag.html"
+))
-var prideflagHTML string
+var MusicTemplate = template.Must(template.ParseFiles(
-//go:embed "html/index.html"
+    filepath.Join("views", "layout.html"),
-var indexHTML string
+    filepath.Join("views", "header.html"),
-//go:embed "html/music.html"
+    filepath.Join("views", "footer.html"),
-var musicHTML string
+    filepath.Join("views", "prideflag.html"),
-//go:embed "html/music-gateway.html"
+    filepath.Join("views", "music.html"),
-var musicGatewayHTML string
+))
-// //go:embed "html/404.html"
+var MusicGatewayTemplate = template.Must(template.ParseFiles(
-// var error404HTML string
+    filepath.Join("views", "layout.html"),
-
+    filepath.Join("views", "header.html"),
-var BaseTemplate = template.Must(template.New("base").Parse(
+    filepath.Join("views", "footer.html"),
-    strings.Join([]string{
+    filepath.Join("views", "prideflag.html"),
-        layoutHTML,
+    filepath.Join("views", "music-gateway.html"),
-        headerHTML,
-        footerHTML,
-        prideflagHTML,
-    }, "\n"),
 ))
-var IndexTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(indexHTML))
-var MusicTemplate  = template.Must(template.Must(BaseTemplate.Clone()).Parse(musicHTML))
-var MusicGatewayTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(musicGatewayHTML))

view/index.go

@@ -16,19 +16,21 @@ func IndexHandler(app *model.AppState) http.Handler {
             return
         }
 
+        type IndexData struct {
+            TwitchStatus *model.TwitchStreamInfo
+        }
+
+        var err error
+        var twitchStatus *model.TwitchStreamInfo = nil
+        if app.Twitch != nil && len(app.Config.Twitch.Broadcaster) > 0 {
+            twitchStatus, err = controller.GetTwitchStatus(app, app.Config.Twitch.Broadcaster)
+            if err != nil {
+                fmt.Fprintf(os.Stderr, "WARN: Failed to get Twitch status for %s: %v\n", app.Config.Twitch.Broadcaster, err)
+            }
+        }
+
         if r.URL.Path == "/" || r.URL.Path == "/index.html" {
-            type IndexData struct {
+            err := templates.IndexTemplate.Execute(w, IndexData{
-                TwitchStatus *model.TwitchStreamInfo
-            }
-            var err error
-            var twitchStatus *model.TwitchStreamInfo = nil
-            if app.Twitch != nil && len(app.Config.Twitch.Broadcaster) > 0 {
-                twitchStatus, err = controller.GetTwitchStatus(app, app.Config.Twitch.Broadcaster)
-                if err != nil {
-                    fmt.Fprintf(os.Stderr, "WARN: Failed to get Twitch status for %s: %v\n", app.Config.Twitch.Broadcaster, err)
-                }
-            }
-            err = templates.IndexTemplate.Execute(w, IndexData{
                 TwitchStatus: twitchStatus,
             })
             if err != nil {
@@ -38,7 +40,6 @@ func IndexHandler(app *model.AppState) http.Handler {
             return
         }
 
-        http.FileServer(http.Dir("./public")).ServeHTTP(w, r)
+        StaticHandler("public").ServeHTTP(w, r)
-        //ServeEmbedFS(app.PublicFS, "public").ServeHTTP(w, r)
     })
 }

view/static.go

@@ -1,31 +1,13 @@
 package view
 
 import (
-	"embed"
 	"errors"
-	"mime"
 	"net/http"
 	"os"
-	"path"
 	"path/filepath"
 )
 
-func ServeEmbedFS(fs embed.FS, dir string) http.Handler {
+func StaticHandler(directory string) http.Handler {
-    return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        file, err := fs.ReadFile(filepath.Join(dir, filepath.Clean(r.URL.Path)))
-        if err != nil {
-            http.NotFound(w, r)
-            return
-        }
-
-        w.Header().Set("Content-Type", mime.TypeByExtension(path.Ext(r.URL.Path)))
-        w.WriteHeader(http.StatusOK)
-
-        w.Write(file)
-    })
-}
-
-func ServeFiles(directory string) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
         info, err := os.Stat(filepath.Join(directory, filepath.Clean(r.URL.Path)))
 
@@ -46,3 +28,4 @@ func ServeFiles(directory string) http.Handler {
         http.FileServer(http.Dir(directory)).ServeHTTP(w, r)
     })
 }
+

views/footer.html

@@ -5,7 +5,7 @@
       <small>
           <em>
               *made with <span aria-label="love">♥</span> by ari, 2025*
-              <a href="https://forge.arimelody.space/ari/arimelody-web" target="_blank">source</a>
+              <a href="https://git.arimelody.me/ari/arimelody.me" target="_blank">source</a>
           </em>
       </small>
   </div>

views/index.html

@@ -6,15 +6,16 @@
 
 <meta property="og:title" content="ari melody">
 <meta property="og:type" content="website">
-<meta property="og:url" content="www.arimelody.space">
+<meta property="og:url" content="www.arimelody.me">
-<meta property="og:image" content="https://www.arimelody.space/img/favicon.png">
+<meta property="og:image" content="https://www.arimelody.me/img/favicon.png">
-<meta property="og:site_name" content="ari melody 💫">
+<meta property="og:site_name" content="ari melody">
 <meta property="og:description" content="home to your local SPACEGIRL 💫">
 
 <link rel="stylesheet" href="/style/main.css">
 <link rel="stylesheet" href="/style/index.css">
 
-<link rel="me" href="https://fedi.arimelody.space/@ari">
+<link rel="me" href="https://ice.arimelody.me/@ari">
+<link rel="me" href="https://wetdry.world/@ari">
 
 <script type="module" src="/script/index.js" defer></script>
 {{end}}
@@ -66,7 +67,7 @@
     </p>
     <p>
     for anything else, you can reach me for any and all communications through
-    <a href="mailto:ari@arimelody.space">ari@arimelody.space</a>. if your message
+    <a href="mailto:ari@arimelody.me">ari@arimelody.me</a>. if your message
     contains anything beyond a silly gag, i strongly recommend encrypting
     your message using my public pgp key, listed below!
     </p>
@@ -93,13 +94,35 @@
     <strong>my keys 🔑</strong>
     </p>
     <ul>
-        <li>pgp: <a href="/keys/ari@arimelody.space_public.asc" target="_blank">[link]</a></li>
+        <li>pgp: <a href="/keys/ari melody_0x92678188_public.asc" target="_blank">[link]</a></li>
         <li>ssh (ed25519): <a href="/keys/id_ari_ed25519.pub" target="_blank">[link]</a></li>
     </ul>
 
     <p>
     <strong>where to find me 🛰️</strong>
     </p>
+    <!--
+    <ul class="links">
+        <li>
+            <a href="https://youtube.com/@arispacegirl">youtube</a>
+        </li>
+        <li>
+            <a href="https://twitch.tv/arispacegirl">twitch</a>
+        </li>
+        <li>
+            <a href="https://arimelody.bandcamp.com">bandcamp</a>
+        </li>
+        <li>
+            <a href="https://codeberg.org/arimelody">codeberg</a>
+        </li>
+        <li>
+            <a href="https://bsky.app/profile/arimelody.me">bluesky</a>
+        </li>
+        <li>
+            <a href="https://discord.gg/MmJtBebF28">discord</a>
+        </li>
+    </ul>
+    -->
     <ul class="platform-links">
         <li>
             <a href="https://youtube.com/@arispacegirl" title="youtube">
@@ -126,13 +149,13 @@
             </a>
         </li>
         <li>
-            <a href="https://bsky.app/profile/arimelody.space" title="bluesky">
+            <a href="https://bsky.app/profile/arimelody.me" title="bluesky">
                 <img src="/img/brand/bluesky.svg" alt="bluesky" width="32" height="32"/>
                 bluesky
             </a>
         </li>
         <li>
-            <a href="https://arimelody.space/discord" title="discord">
+            <a href="https://discord.gg/MmJtBebF28" title="discord">
                 <img src="/img/brand/discord.svg" alt="discord" width="32" height="32"/>
                 discord
             </a>
@@ -151,16 +174,16 @@
             </div>
         </li>
         <li class="project-item">
-            <img src="https://catdance.arimelody.space/img/favicon.png" alt="catdance icon" aria-hidden=true class="project-icon" width="64" height="64">
+            <img src="https://catdance.arimelody.me/img/favicon.png" alt="catdance icon" aria-hidden=true class="project-icon" width="64" height="64">
             <div class="project-info">
-                <a href="https://catdance.arimelody.space">catdance</a>
+                <a href="https://catdance.arimelody.me">catdance</a>
                 <p>watch the cat dance 🐱</p>
             </div>
         </li>
         <li class="project-item">
-            <img src="https://forge.arimelody.space/repo-avatars/6b0a1ffb78cbc6f906f83152ea42a710220174e8f48a3e44f159ae58dacd7a2f" alt="pride flag icon" aria-hidden=true class="project-icon" width="64" height="64">
+            <img src="https://git.arimelody.me/repo-avatars/6b0a1ffb78cbc6f906f83152ea42a710220174e8f48a3e44f159ae58dacd7a2f" alt="catdance icon" aria-hidden=true class="project-icon" width="64" height="64">
             <div class="project-info">
-                <a href="https://forge.arimelody.space/ari/prideflag">pride flag</a>
+                <a href="https://git.arimelody.me/ari/prideflag">pride flag</a>
                 <p>progressive pride flag widget for websites</p>
             </div>
         </li>
@@ -172,16 +195,16 @@
             </div>
         </li>
         <li class="project-item">
-            <img src="https://impact.arimelody.space/favicon.png" alt="impact meme icon" aria-hidden=true class="project-icon" width="64" height="64">
+            <img src="https://impact.arimelody.me/favicon.png" alt="impact meme icon" aria-hidden=true class="project-icon" width="64" height="64">
             <div class="project-info">
-                <a href="https://impact.arimelody.space/">impact meme</a>
+                <a href="https://impact.arimelody.me/">impact meme</a>
                 <p>impact meme generator</p>
             </div>
         </li>
         <li class="project-item">
             <img src="https://codeberg.org/repo-avatars/e67303eeda4fa6d268948e71b7b0837357d8c519772701ffc36b84ae7975319f" alt="OpenTerminal icon" aria-hidden=true class="project-icon" width="64" height="64">
             <div class="project-info">
-                <a href="https://term.arimelody.space/">OpenTerminal</a>
+                <a href="https://term.arimelody.me/">OpenTerminal</a>
                 <p>communal online text buffer</p>
             </div>
         </li>
@@ -201,7 +224,7 @@
     </h2>
 
     <div id="web-buttons">
-        <a href="https://arimelody.space">
+        <a href="https://arimelody.me">
             <img src="/img/buttons/ari melody.gif" alt="ari melody web button" width="88" height="31">
         </a>
         <a href="https://supitszaire.com">
@@ -213,9 +236,6 @@
         <a href="https://girlthi.ng/~thermia/">
             <img src="/img/buttons/thermia.gif" alt="thermia web button" width="88" height="31">
         </a>
-        <a href="https://wangleline.com">
-            <img src="/img/buttons/wangleline.png" alt="WangleLine button" width="88" height="31">
-        </a>
         <a href="https://elke.cafe">
             <img src="/img/buttons/elke.gif" alt="elke web button" width="88" height="31">
         </a>
@@ -243,9 +263,6 @@
         <a href="https://isabelroses.com/">
             <img src="/img/buttons/isabelroses.gif" alt="isabel roses web button" width="88" height="31">
         </a>
-        <a href="https://bubblegum.girlonthemoon.xyz/">
-            <img src="/img/buttons/girlonthemoon.png" alt="sweet like bubblegum web button" width="88" height="31">
-        </a>
 
         <hr>
 

views/music-gateway.html

@@ -6,22 +6,22 @@
 <meta name="author" content="{{.PrintArtists true true}}">
 <meta name="keywords" content="{{.PrintArtists true false}}, music, {{.Title}}, {{.ID}}, {{.ReleaseDate.Year}}">
 
-<meta property="og:url" content="https://arimelody.space/music/{{.ID}}">
+<meta property="og:url" content="https://arimelody.me/music/{{.ID}}">
 <meta property="og:type" content="website">
 <meta property="og:locale" content="en_IE">
-<meta property="og:site_name" content="ari melody 💫">
+<meta property="og:site_name" content="ari melody music">
-<meta property="og:title" content="{{.PrintArtists true true}} - {{.Title}}">
+<meta property="og.Title" content="{{.Title}} - {{.PrintArtists true true}}">
 <meta property="og:description" content="Stream &quot;{{.Title}}&quot; by {{.PrintArtists true true}} on all platforms!">
-<meta property="og:image" content="https://arimelody.space{{.GetArtwork}}">
+<meta property="og:image" content="https://arimelody.me{{.GetArtwork}}">
 
 <meta name="twitter:card" content="summary_large_image">
 <meta name="twitter:site" content="@funniduck">
 <meta name="twitter:creator" content="@funniduck">
-<meta property="twitter:domain" content="arimelody.space">
+<meta property="twitter:domain" content="arimelody.me">
-<meta property="twitter:url" content="https://arimelody.space/music/{{.ID}}">
+<meta property="twitter:url" content="https://arimelody.me/music/{{.ID}}">
-<meta name="twitter:title" content="{{.PrintArtists true true}} - {{.Title}}">
+<meta name="twitter.Title" content="{{.PrintArtists true true}} - {{.Title}}">
 <meta name="twitter:description" content="Stream &quot;{{.Title}}&quot; by {{.PrintArtists true true}} on all platforms!">
-<meta name="twitter:image" content="https://arimelody.space{{.GetArtwork}}">
+<meta name="twitter:image" content="https://arimelody.me{{.GetArtwork}}">
 <meta name="twitter:image:alt" content="Cover art for &quot;{{.Title}}&quot;">
 
 <link rel="stylesheet" href="/style/main.css">
@@ -34,7 +34,7 @@
 
     <div id="background" style="background-image: url({{.GetArtwork}})"></div>
 
-    <a href="/music" id="go-back" title="back to arimelody.space">&lt;</a>
+    <a href="/music" id="go-back" title="back to arimelody.me">&lt;</a>
     <br><br>
 
     <div id="music-container">

views/music.html

@@ -6,9 +6,9 @@
 
 <meta property="og:title" content="ari melody music">
 <meta property="og:type" content="website">
-<meta property="og:url" content="www.arimelody.space/music">
+<meta property="og:url" content="www.arimelody.me/music">
-<meta property="og:image" content="https://www.arimelody.space/img/favicon.png">
+<meta property="og:image" content="https://www.arimelody.me/img/favicon.png">
-<meta property="og:site_name" content="ari melody 💫">
+<meta property="og:site_name" content="ari melody">
 <meta property="og:description" content="music from your local SPACEGIRL 💫">
 
 <link rel="stylesheet" href="/style/main.css">
@@ -72,7 +72,7 @@
         </p>
         <blockquote>
             music used: ari melody - free2play<br>
-            <a href="/music/free2play">https://arimelody.space/music/free2play</a><br>
+            <a href="/music/free2play">https://arimelody.me/music/free2play</a><br>
             licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">CC BY-SA 4.0</a>.
         </blockquote>
         <p>
@@ -84,7 +84,7 @@
         if you do happen to use my work in something you're particularly proud of, feel free to send it my way!
         </p>
         <p>
-        &gt; <a href="mailto:ari@arimelody.space">ari@arimelody.space</a>
+        &gt; <a href="mailto:ari@arimelody.me">ari@arimelody.me</a>
         </p>
     </div>
 </main>