Fixed small bug

.air.toml

@@ -3,42 +3,52 @@ testdata_dir = "testdata"
 tmp_dir = "tmp"
 
 [build]
-  args_bin = []
-  bin = "./tmp/main -key tmp/key.gob -log tmp/cpolis.log -pics tmp/pics -rss tmp/orientexpress_alle.rss -web web"
-  cmd = "go build -o ./tmp/main ./cmd/main.go"
-  delay = 0
-  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
-  exclude_file = []
-  exclude_regex = ["_test.go"]
-  exclude_unchanged = false
-  follow_symlink = false
-  full_bin = ""
-  include_dir = []
-  include_ext = ["go", "tpl", "tmpl", "html", "css"]
-  include_file = []
-  kill_delay = "0s"
-  log = "build-errors.log"
-  poll = false
-  poll_interval = 0
-  rerun = false
-  rerun_delay = 500
-  send_interrupt = false
-  stop_on_error = false
+args_bin = [
+    "-desc 'Freiheit, Gleichheit, Brüderlichkeit, Toleranz und Humanität'",
+    "-domain localhost:8080",
+    "-key tmp/key.gob",
+    "-link https://distrikt-ni-st.de",
+    "-log tmp/cpolis.log",
+    "-pics tmp/pics",
+    "-rss tmp/orientexpress_alle.rss",
+    "-title 'Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt'",
+    "-web web"
+]
+bin = "./tmp/main"
+cmd = "go build -o ./tmp/main ./cmd/main.go"
+delay = 0
+exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+exclude_file = []
+exclude_regex = ["_test.go"]
+exclude_unchanged = false
+follow_symlink = false
+full_bin = ""
+include_dir = []
+include_ext = ["go", "tpl", "tmpl", "html", "css"]
+include_file = []
+kill_delay = "0s"
+log = "build-errors.log"
+poll = false
+poll_interval = 0
+rerun = false
+rerun_delay = 500
+send_interrupt = false
+stop_on_error = false
 
 [color]
-  app = ""
-  build = "yellow"
-  main = "magenta"
-  runner = "green"
-  watcher = "cyan"
+app = ""
+build = "yellow"
+main = "magenta"
+runner = "green"
+watcher = "cyan"
 
 [log]
-  main_only = false
-  time = false
+main_only = false
+time = false
 
 [misc]
-  clean_on_exit = false
+clean_on_exit = false
 
 [screen]
-  clear_on_rebuild = false
-  keep_scroll = true
+clear_on_rebuild = false
+keep_scroll = true

cmd/control/cli.go

@@ -7,26 +7,34 @@ import (
 )
 
 type CliArgs struct {
-	DBName  string
-	KeyFile string
-	LogFile string
-	Port    string
-	PicsDir string
-	RSSFile string
-	WebDir  string
+	Description string
+	DBName      string
+	Domain      string
+	KeyFile     string
+	Link        string
+	LogFile     string
+	Port        string
+	PicsDir     string
+	RSSFile     string
+	Title       string
+	WebDir      string
 }
 
 func HandleCliArgs() (*CliArgs, error) {
 	var err error
 	cliArgs := new(CliArgs)
 
+	flag.StringVar(&cliArgs.DBName, "db", "cpolis", "DB name")
+	flag.StringVar(&cliArgs.Description, "desc", "Description", "Channel description")
+	flag.StringVar(&cliArgs.Domain, "domain", "", "domain name")
 	keyFile := flag.String("key", "/var/www/cpolis/cpolis.key", "key file")
+	flag.StringVar(&cliArgs.Link, "link", "Link", "Channel Link")
 	logFile := flag.String("log", "/var/log/cpolis.log", "log file")
-	picsDir := flag.String("pics", "/var/www/cpolis/pics", "pictures directory")
+	flag.StringVar(&cliArgs.PicsDir, "pics", "pics", "pictures directory")
 	port := flag.Int("port", 8080, "port")
 	rssFile := flag.String("rss", "/var/www/cpolis/cpolis.rss", "RSS file")
+	flag.StringVar(&cliArgs.Title, "title", "Title", "Channel title")
 	webDir := flag.String("web", "/var/www/cpolis/web", "web directory")
-	flag.StringVar(&cliArgs.DBName, "db", "cpolis", "DB name")
 	flag.Parse()
 
 	cliArgs.KeyFile, err = filepath.Abs(*keyFile)
@@ -39,7 +47,7 @@ func HandleCliArgs() (*CliArgs, error) {
 		return nil, fmt.Errorf("error finding absolute path for LogFile: %v", err)
 	}
 
-	cliArgs.PicsDir, err = filepath.Abs(*picsDir)
+	_, err = filepath.Abs(cliArgs.PicsDir)
 	if err != nil {
 		return nil, fmt.Errorf("error finding absolute path for PicsDir: %v", err)
 	}

cmd/control/rss.go

@@ -97,7 +97,7 @@ func GenerateRSS(db *model.DB, title, link, desc string) (*string, error) {
 
 		channel.Items = append(channel.Items, &rss.Item{
 			Title:       articleTitle,
-			Author:      user.FirstName + user.LastName,
+			Author:      user.FirstName + " " + user.LastName,
 			PubDate:     article.Created.Format(time.RFC1123Z),
 			Description: articleDescription,
 			Content:     &rss.Content{Value: articleContent},
@@ -107,7 +107,7 @@ func GenerateRSS(db *model.DB, title, link, desc string) (*string, error) {
 
 	feed := rss.NewFeed()
 	feed.Channels = append(feed.Channels, channel)
-	rss, err := feed.ToXML()
+	rss, err := feed.ToXML("UTF-8")
 	if err != nil {
 		return nil, fmt.Errorf("error converting RSS feed to XML: %v", err)
 	}

cmd/main.go

@@ -49,36 +49,33 @@ func main() {
 		http.FileServer(http.Dir(args.WebDir+"/static/"))))
 	mux.HandleFunc("/", view.HomePage(args, db, store))
 
-	mux.HandleFunc("GET /create-tag/", view.CreateTag(args))
-	mux.HandleFunc("GET /create-user/", view.CreateUser(args))
-	mux.HandleFunc("GET /edit-user/", view.EditUser(args, db, store))
-	mux.HandleFunc("GET /hub/", view.ShowHub(args, db, store))
-	mux.HandleFunc("GET /logout/", view.Logout(args, store))
-	mux.HandleFunc("GET /publish-issue/", view.PublishLatestIssue(args, db, store))
-	mux.HandleFunc("GET /rejected-articles/", view.ShowRejectedArticles(args, db, store))
-	mux.HandleFunc("GET /review-rejected-article/{id}/", view.ReviewRejectedArticle(args, db, store))
-	mux.HandleFunc("GET /review-unpublished-article/{id}/", view.ReviewUnpublishedArticle(args, db, store))
-	mux.HandleFunc("GET /rss/", view.ShowRSS(
-		args,
-		db,
-		"Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt",
-		"https://distrikt-ni-st.de",
-		"Freiheit, Gleichheit, Brüderlichkeit, Toleranz und Humanität",
-	))
-	mux.HandleFunc("GET /this-issue/", view.ShowCurrentArticles(args, db))
-	mux.HandleFunc("GET /unpublished-articles/", view.ShowUnpublishedArticles(args, db))
-	mux.HandleFunc("GET /write-article/", view.WriteArticle(args, db))
+	mux.HandleFunc("GET /create-tag", view.CreateTag(args))
+	mux.HandleFunc("GET /create-user", view.CreateUser(args))
+	mux.HandleFunc("GET /edit-user", view.EditUser(args, db, store))
+	mux.HandleFunc("GET /hub", view.ShowHub(args, db, store))
+	mux.HandleFunc("GET /logout", view.Logout(args, store))
+	mux.HandleFunc("GET /publish-article/{id}", view.PublishArticle(args, db, store))
+	mux.HandleFunc("GET /publish-issue", view.PublishLatestIssue(args, db, store))
+	mux.HandleFunc("GET /reject-article/{id}", view.RejectArticle(args, db, store))
+	mux.HandleFunc("GET /rejected-articles", view.ShowRejectedArticles(args, db, store))
+	mux.HandleFunc("GET /review-rejected-article/{id}", view.ReviewRejectedArticle(args, db, store))
+	mux.HandleFunc("GET /review-unpublished-article/{id}", view.ReviewUnpublishedArticle(args, db, store))
+	mux.HandleFunc("GET /rss", func(w http.ResponseWriter, r *http.Request) {
+		http.ServeFile(w, r, args.RSSFile)
+	})
+	mux.HandleFunc("GET /pics/{pic}", view.ServeImage(args, store))
+	mux.HandleFunc("GET /this-issue", view.ShowCurrentArticles(args, db))
+	mux.HandleFunc("GET /unpublished-articles", view.ShowUnpublishedArticles(args, db))
+	mux.HandleFunc("GET /write-article", view.WriteArticle(args, db))
 
-	mux.HandleFunc("POST /add-first-user/", view.AddFirstUser(args, db, store))
-	mux.HandleFunc("POST /add-tag/", view.AddTag(args, db, store))
-	mux.HandleFunc("POST /add-user/", view.AddUser(args, db, store))
-	mux.HandleFunc("POST /login/", view.Login(args, db, store))
-	mux.HandleFunc("POST /publish-article/{id}/", view.PublishArticle(args, db, store))
-	mux.HandleFunc("POST /reject-article/{id}/", view.RejectArticle(args, db, store))
-	mux.HandleFunc("POST /resubmit-article/{id}/", view.ResubmitArticle(args, db, store))
-	mux.HandleFunc("POST /submit-article/", view.SubmitArticle(args, db, store))
-	mux.HandleFunc("POST /update-user/", view.UpdateUser(args, db, store))
-	mux.HandleFunc("POST /upload-image/", view.UploadImage(args))
+	mux.HandleFunc("POST /add-first-user", view.AddFirstUser(args, db, store))
+	mux.HandleFunc("POST /add-tag", view.AddTag(args, db, store))
+	mux.HandleFunc("POST /add-user", view.AddUser(args, db, store))
+	mux.HandleFunc("POST /login", view.Login(args, db, store))
+	mux.HandleFunc("POST /resubmit-article/{id}", view.ResubmitArticle(args, db, store))
+	mux.HandleFunc("POST /submit-article", view.SubmitArticle(args, db, store))
+	mux.HandleFunc("POST /update-user", view.UpdateUser(args, db, store))
+	mux.HandleFunc("POST /upload-image", view.UploadImage(args))
 
 	log.Fatalln(http.ListenAndServe(args.Port, mux))
 }

cmd/view/articles.go

@@ -7,9 +7,12 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strconv"
+	"strings"
 	"time"
 
+	"github.com/google/uuid"
 	"streifling.com/jason/cpolis/cmd/control"
 	"streifling.com/jason/cpolis/cmd/model"
 )
@@ -197,26 +200,53 @@ func ShowRejectedArticles(c *control.CliArgs, db *model.DB, s *control.CookieSto
 func ReviewUnpublishedArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		type htmlData struct {
-			Article *model.Article
-			Tags    []*model.Tag
+			Title       string
+			Description string
+			Content     template.HTML
+			Tags        []*model.Tag
+			ID          int64
 		}
+
+		var err error
 		data := new(htmlData)
 
-		id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
+		data.ID, err = strconv.ParseInt(r.PathValue("id"), 10, 64)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
-		data.Article, err = db.GetArticle(id)
+		article, err := db.GetArticle(data.ID)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
-		data.Tags, err = db.GetArticleTags(id)
+		data.Title, err = control.ConvertToPlain(article.Title)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		data.Description, err = control.ConvertToPlain(article.Description)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		content, err := control.ConvertToHTML(article.Content)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+		data.Content = template.HTML(content)
+
+		data.Tags, err = db.GetArticleTags(data.ID)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -308,12 +338,7 @@ func PublishArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) ht
 			return
 		}
 
-		feed, err := control.GenerateRSS(
-			db,
-			"Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt",
-			"https://distrikt-ni-st.de",
-			"Freiheit, Gleichheit, Brüderlichkeit, Toleranz und Humanität",
-		)
+		feed, err := control.GenerateRSS(db, c.Title, c.Link, c.Description)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -385,8 +410,17 @@ func UploadImage(c *control.CliArgs) http.HandlerFunc {
 		}
 		defer file.Close()
 
-		filename := fmt.Sprint(c.PicsDir, time.Now().Format("2006-01-02_15:04:05"), "-", header.Filename)
-		img, err := os.Create(filename)
+		nameStrings := strings.Split(header.Filename, ".")
+		extension := "." + nameStrings[len(nameStrings)-1]
+		filename := fmt.Sprint(uuid.New(), extension)
+		absFilepath, err := filepath.Abs(fmt.Sprint(c.PicsDir, "/", filename))
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		img, err := os.Create(absFilepath)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -400,7 +434,9 @@ func UploadImage(c *control.CliArgs) http.HandlerFunc {
 			return
 		}
 
+		alt := strings.Join(nameStrings[0:len(nameStrings)-1], " ")
+		imgMD := fmt.Sprint("![", alt, "](", c.Domain, "/pics/", filename, ")")
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/editor.html")
-		template.Must(tmpl, err).ExecuteTemplate(w, "editor-images", fmt.Sprint("![", header.Filename, "](", filename, ")"))
+		template.Must(tmpl, err).ExecuteTemplate(w, "editor-images", imgMD)
 	}
 }

cmd/view/images.go

@@ -0,0 +1,22 @@
+package view
+
+import (
+	"log"
+	"net/http"
+	"path/filepath"
+
+	"streifling.com/jason/cpolis/cmd/control"
+)
+
+func ServeImage(c *control.CliArgs, s *control.CookieStore) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		absFilepath, err := filepath.Abs(c.PicsDir)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		http.ServeFile(w, r, absFilepath+"/"+r.PathValue("pic"))
+	}
+}

cmd/view/rss.go

@@ -1,95 +0,0 @@
-package view
-
-import (
-	"fmt"
-	"html/template"
-	"log"
-	"net/http"
-	"time"
-
-	"git.streifling.com/jason/rss"
-	"streifling.com/jason/cpolis/cmd/control"
-	"streifling.com/jason/cpolis/cmd/model"
-)
-
-func ShowRSS(c *control.CliArgs, db *model.DB, title, link, desc string) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		channel := &rss.Channel{
-			Title:       title,
-			Link:        link,
-			Description: desc,
-			Items:       make([]*rss.Item, 0),
-		}
-
-		articles, err := db.GetCertainArticles(true, false)
-		if err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		for _, article := range articles {
-			tags, err := db.GetArticleTags(article.ID)
-			if err != nil {
-				log.Println(err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-			tagNames := make([]string, 0)
-			for _, tag := range tags {
-				tagNames = append(tagNames, tag.Name)
-			}
-			tagNames = append(tagNames, fmt.Sprint("Orient Express ", article.IssueID))
-
-			user, err := db.GetUser(article.AuthorID)
-			if err != nil {
-				log.Println(err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-
-			articleTitle, err := control.ConvertToPlain(article.Title)
-			if err != nil {
-				log.Println(err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-
-			articleDescription, err := control.ConvertToPlain(article.Description)
-			if err != nil {
-				log.Println(err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-
-			articleContent, err := control.ConvertToHTML(article.Content)
-			if err != nil {
-				log.Println(err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-
-			channel.Items = append(channel.Items, &rss.Item{
-				Title:       articleTitle,
-				Author:      user.FirstName + user.LastName,
-				PubDate:     article.Created.Format(time.RFC1123Z),
-				Description: articleDescription,
-				Content:     &rss.Content{Value: articleContent},
-				Categories:  tagNames,
-			})
-		}
-
-		feed := rss.NewFeed()
-		feed.Channels = append(feed.Channels, channel)
-		rss, err := feed.ToXML()
-		if err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		files := []string{c.WebDir + "/templates/index.html", c.WebDir + "/templates/feed.rss"}
-		tmpl, err := template.ParseFiles(files...)
-		template.Must(tmpl, err).Execute(w, rss)
-	}
-}

create_db.sql

@@ -37,7 +37,7 @@ CREATE TABLE articles (
 
 CREATE TABLE tags (
     id      INT         AUTO_INCREMENT,
-    name    VARCHAR(15) NOT NULL UNIQUE,
+    name    VARCHAR(50) NOT NULL UNIQUE,
     PRIMARY KEY(id)
 );
 

go.mod

@@ -3,8 +3,9 @@ module streifling.com/jason/cpolis
 go 1.22.0
 
 require (
-	git.streifling.com/jason/rss v0.0.0-20240305164907-524bf9676188
+	git.streifling.com/jason/rss v0.1.2
 	github.com/go-sql-driver/mysql v1.7.1
+	github.com/google/uuid v1.6.0
 	github.com/gorilla/sessions v1.2.2
 	github.com/microcosm-cc/bluemonday v1.0.26
 	github.com/yuin/goldmark v1.7.0

go.sum

@@ -1,11 +1,13 @@
-git.streifling.com/jason/rss v0.0.0-20240305164907-524bf9676188 h1:C8M/j3f+cl5Y7YfGpU/ynb/SC/4tTYMDsyGFt3rswM8=
-git.streifling.com/jason/rss v0.0.0-20240305164907-524bf9676188/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
+git.streifling.com/jason/rss v0.1.2 h1:UB3UHJXMt5WDDh9y8n0Z6nS1XortbPXjEr7QZTdovY4=
+git.streifling.com/jason/rss v0.1.2/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
 github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=

tailwind.config.js

@@ -4,5 +4,7 @@ module.exports = {
     theme: {
         extend: {}
     },
-    plugins: [],
+    plugins: [
+        require('@tailwindcss/typography')
+    ],
 }

web/static/css/input.css

@@ -33,7 +33,7 @@ textarea {
 }
 
 .btn {
-    @apply bg-slate-50 border my-2 px-3 py-2 rounded-md w-full hover:bg-slate-100;
+    @apply bg-slate-200 border my-2 px-3 py-2 rounded-md w-full hover:bg-slate-100;
 }
 
 .action-btn {

web/templates/add-tag.html

@@ -4,8 +4,8 @@
 <form>
     <input required name="tag" placeholder="Tag eingeben" type="text" />
     <div class="btn-area">
-        <input class="action-btn" type="submit" value="Anlegen" hx-post="/add-tag/" hx-target="#page-content" />
-        <button class="btn" hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
+        <input class="action-btn" type="submit" value="Anlegen" hx-post="/add-tag" hx-target="#page-content" />
+        <button class="btn" hx-get="/hub" hx-target="#page-content">Abbrechen</button>
     </div>
 </form>
 

web/templates/add-user.html

@@ -1,5 +1,6 @@
 {{define "page-content"}}
 <h2>Neuer Benutzer</h2>
+
 <form>
     <div class="grid grid-cols-3 gap-4">
         <div>
@@ -44,8 +45,8 @@
     </div>
 
     <div class="btn-area">
-        <input class="action-btn" type="submit" value="Anlegen" hx-post="/add-user/" hx-target="#page-content" />
-        <button class="btn" hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
+        <input class="action-btn" type="submit" value="Anlegen" hx-post="/add-user" hx-target="#page-content" />
+        <button class="btn" hx-get="/hub" hx-target="#page-content">Abbrechen</button>
     </div>
 </form>
 

web/templates/current-articles.html

@@ -1,4 +1,6 @@
 {{define "page-content"}}
+<h2>Aktuelle Artikel</h2>
+
 <div class="flex flex-col gap-4">
     {{range .}}
     <div class="border px-2 py-1 rounded-md">
@@ -9,7 +11,7 @@
 </div>
 
 <div class="btn-area">
-    <button class="action-btn" hx-get="/publish-issue/" hx-target="#page-content">Ausgabe publizieren</button>
-    <button class="btn" hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
+    <button class="action-btn" hx-get="/publish-issue" hx-target="#page-content">Ausgabe publizieren</button>
+    <button class="btn" hx-get="/hub" hx-target="#page-content">Abbrechen</button>
 </div>
 {{end}}

web/templates/edit-user.html

@@ -1,4 +1,6 @@
 {{define "page-content"}}
+<h2>Benutzerdaten bearbeiten</h2>
+
 <form>
     <div class="grid grid-cols-3 gap-4">
         <div>
@@ -28,9 +30,9 @@
     </div>
 
     <div class="btn-area">
-        <input class="action-btn" type="submit" value="Aktualisieren" hx-post="/update-user/"
+        <input class="action-btn" type="submit" value="Aktualisieren" hx-post="/update-user"
             hx-target="#page-content" />
-        <button class="btn" hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
+        <button class="btn" hx-get="/hub" hx-target="#page-content">Abbrechen</button>
     </div>
 </form>
 {{end}}

web/templates/editor.html

@@ -1,5 +1,6 @@
 {{define "page-content"}}
 <h2>Editor</h2>
+
 <form>
     <div class="flex flex-col gap-y-1">
         <label for="article-title">Titel</label>
@@ -14,23 +15,26 @@
         <textarea name="article-content"></textarea>
     </div>
 
-    <div class="flex gap-4">
-        {{range .}}
-        <div>
-            <input id="{{.Name}}" name="tags" type="checkbox" value="{{.ID}}" />
-            <label for="{{.Name}}">{{.Name}}</label>
+    <div>
+        <span>Tags</span>
+        <div class="flex flex-wrap gap-x-4">
+            {{range .}}
+            <div>
+                <input id="{{.Name}}" name="tags" type="checkbox" value="{{.ID}}" />
+                <label for="{{.Name}}">{{.Name}}</label>
+            </div>
+            {{end}}
         </div>
-        {{end}}
     </div>
 
     <div id="editor-images">
-        <input class="mb-2" name="article-image" type="file" hx-encoding="multipart/form-data" hx-post="/upload-image/"
+        <input class="mb-2" name="article-image" type="file" hx-encoding="multipart/form-data" hx-post="/upload-image"
             hx-swap="beforeend" hx-target="#editor-images" />
     </div>
 
     <div class="btn-area">
-        <input class="action-btn" type="submit" value="Senden" hx-post="/submit-article/" hx-target="#page-content" />
-        <button class="btn" hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
+        <input class="action-btn" type="submit" value="Senden" hx-post="/submit-article" hx-target="#page-content" />
+        <button class="btn" hx-get="/hub" hx-target="#page-content">Abbrechen</button>
     </div>
 </form>
 

web/templates/feed.rss

@@ -1,3 +0,0 @@
-{{define "page-content"}}
-{{.}}
-{{end}}

web/templates/first-user.html

@@ -26,7 +26,7 @@
     </div>
 
     <div class="btn-area">
-        <input class="action-btn" type="submit" value="Anlegen" hx-post="/add-first-user/" hx-target="#page-content" />
+        <input class="action-btn" type="submit" value="Anlegen" hx-post="/add-first-user" hx-target="#page-content" />
     </div>
 </form>
 

web/templates/hub.html

@@ -1,14 +1,14 @@
 {{define "page-content"}}
 <div class="flex flex-col gap-4">
-    <button class="btn" hx-get="/logout/" hx-target="#page-content">Abmelden</button>
+    <button class="btn" hx-get="/logout" hx-target="#page-content">Abmelden</button>
 
     <div class="mb-3">
         <h2>Autor</h2>
         <div class="grid grid-cols-2 gap-x-4 gap-y-2">
-            <button class="btn" hx-get="/write-article/" hx-target="#page-content">Artikel schreiben</button>
-            <button class="btn" hx-get="/rejected-articles/" hx-target="#page-content">Abgelehnte Artikel</button>
-            <button class="btn" hx-get="/rss/" hx-target="#page-content">RSS Feed</button>
-            <button class="btn" hx-get="/edit-user/" hx-target="#page-content">Benutzer bearbeiten</button>
+            <button class="btn" hx-get="/write-article" hx-target="#page-content">Artikel schreiben</button>
+            <button class="btn" hx-get="/rejected-articles" hx-target="#page-content">Abgelehnte Artikel</button>
+            <a class="btn text-center" href="/rss">RSS Feed</a>
+            <button class="btn" hx-get="/edit-user" hx-target="#page-content">Benutzer bearbeiten</button>
         </div>
     </div>
 
@@ -16,10 +16,10 @@
     <div class="mb-3">
         <h2>Redakteur</h2>
         <div class="grid grid-cols-2 gap-4">
-            <button class="btn" hx-get="/unpublished-articles/" hx-target="#page-content">
+            <button class="btn" hx-get="/unpublished-articles" hx-target="#page-content">
                 Unveröffentlichte Artikel
             </button>
-            <button class="btn" hx-get="/create-tag/" hx-target="#page-content">Neuer Tag</button>
+            <button class="btn" hx-get="/create-tag" hx-target="#page-content">Neuer Tag</button>
         </div>
     </div>
     {{end}}
@@ -28,7 +28,7 @@
     <div class="mb-3">
         <h2>Herausgeber</h2>
         <div class="grid grid-cols-2 gap-4">
-            <button class="btn" hx-get="/this-issue/" hx-target="#page-content">Diese Ausgabe</button>
+            <button class="btn" hx-get="/this-issue" hx-target="#page-content">Diese Ausgabe</button>
         </div>
     </div>
     {{end}}
@@ -37,7 +37,7 @@
     <div class="mb-3">
         <h2>Administrator</h2>
         <div class="grid grid-cols-2 gap-4">
-            <button class="btn" hx-get="/create-user/" hx-target="#page-content">Benutzer hinzufügen</button>
+            <button class="btn" hx-get="/create-user" hx-target="#page-content">Benutzer hinzufügen</button>
         </div>
     </div>
     {{end}}

web/templates/index.html

@@ -8,7 +8,7 @@
     <link href="/web/static/css/style.css" rel="stylesheet">
 </head>
 
-<body class="flex flex-col justify-between min-h-[100dvh] bg-slate-50">
+<body class="flex flex-col justify-between min-h-screen bg-slate-50">
     <header class="my-8">
         <h1 class="font-bold text-4xl text-center">Orient Editor</h1>
     </header>

web/templates/login.html

@@ -1,11 +1,12 @@
 {{define "page-content"}}
 <h2>Anmeldung</h2>
+
 <form>
     <div class="btn-area">
         <input class="w-full" name="username" placeholder="Benutzername" type="text" />
         <input class="w-full" name="password" placeholder="Passwort" type="password" />
     </div>
 
-    <input class="action-btn" type="submit" value="Anmelden" hx-post="/login/" hx-target="#page-content" />
+    <input class="action-btn" type="submit" value="Anmelden" hx-post="/login" hx-target="#page-content" />
 </form>
 {{end}}

web/templates/rejected-articles.html

@@ -1,14 +1,16 @@
 {{define "page-content"}}
+<h2>Abgelehnte Artikel</h2>
+
 <div class="flex flex-col gap-4">
     {{range .RejectedArticles}}
     {{if index $.MyIDs .ID}}
-    <button class="btn" hx-get="/review-rejected-article/{{.ID}}/" hx-target="#page-content">
+    <button class="btn" hx-get="/review-rejected-article/{{.ID}}" hx-target="#page-content">
         <h1 class="font-bold text-2xl">{{.Title}}</h1>
         <p>{{.Description}}</p>
     </button>
     {{end}}
     {{end}}
 
-    <button class="action-btn" hx-get="/hub/" hx-target="#page-content">Zurück</button>
+    <button class="action-btn" hx-get="/hub" hx-target="#page-content">Zurück</button>
 </div>
 {{end}}

web/templates/rework-article.html

@@ -1,5 +1,6 @@
 {{define "page-content"}}
 <h2>Editor</h2>
+
 <form>
     <div class="flex flex-col gap-y-1">
         <label for="article-title">Titel</label>
@@ -14,25 +15,28 @@
         <textarea name="article-content" placeholder="Artikel">{{.Article.Content}}</textarea>
     </div>
 
-    <div class="flex gap-4">
-        {{range .Tags}}
-        <div>
-            <input id="tag-{{.Name}}" name="tags" type="checkbox" value="{{.ID}}" {{if index $.Selected
-                .ID}}checked{{end}} />
-            <label for="tag-{{.Name}}">{{.Name}}</label>
+    <div>
+        <span>Tags</span>
+        <div class="flex flex-wrap gap-x-4">
+            {{range .Tags}}
+            <div>
+                <input id="tag-{{.Name}}" name="tags" type="checkbox" value="{{.ID}}" {{if index $.Selected
+                    .ID}}checked{{end}} />
+                <label for="tag-{{.Name}}">{{.Name}}</label>
+            </div>
+            {{end}}
         </div>
-        {{end}}
     </div>
 
     <div id="editor-images">
-        <input class="mb-2" name="article-image" type="file" hx-encoding="multipart/form-data" hx-post="/upload-image/"
+        <input class="mb-2" name="article-image" type="file" hx-encoding="multipart/form-data" hx-post="/upload-image"
             hx-swap="beforeend" hx-target="#editor-images" />
     </div>
 
     <div class="btn-area">
-        <input class="action-btn" type="submit" value="Senden" hx-post="/resubmit-article/{{.Article.ID}}/"
+        <input class="action-btn" type="submit" value="Senden" hx-post="/resubmit-article/{{.Article.ID}}"
             hx-target="#page-content" />
-        <button class="btn" hx-get="/hub/" hx-target="#page-content">Zurück</button>
+        <button class="btn" hx-get="/hub" hx-target="#page-content">Zurück</button>
     </div>
 </form>
 

web/templates/to-be-published.html

@@ -1,21 +1,37 @@
 {{define "page-content"}}
-<form>
-    <h2>{{.Article.Title}}</h2>
-    <p>{{.Article.Description}}</p>
-    {{.Article.Content}}
+<h2>Artikel veröffentlichen</h2>
 
-    <p>
+<div>
+    <span>Titel</span>
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
+        {{.Title}}
+    </div>
+
+    <span>Beschreibung</span>
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
+        {{.Description}}
+    </div>
+
+    <span>Artikel</span>
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
+        <div class="prose">
+            {{.Content}}
+        </div>
+    </div>
+
+    <span>Tags</span>
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
         {{range .Tags}}
         {{.Name}}
+        <br>
         {{end}}
-    </p>
+    </div>
 
     <div class="btn-area">
-        <input class="action-btn" type="submit" value="Veröffentlichen" hx-post="/publish-article/{{.Article.ID}}/"
+        <input class="action-btn" type="submit" value="Veröffentlichen" hx-get="/publish-article/{{.ID}}"
             hx-target="#page-content" />
-        <input class="btn" type="submit" value="Ablehnen" hx-post="/reject-article/{{.Article.ID}}/"
-            hx-target="#page-content" />
-        <button class="btn" hx-get="/hub/" hx-target="#page-content">Zurück</button>
+        <input class="btn" type="submit" value="Ablehnen" hx-get="/reject-article/{{.ID}}" hx-target="#page-content" />
+        <button class="btn" hx-get="/hub" hx-target="#page-content">Zurück</button>
     </div>
-</form>
+</div>
 {{end}}

web/templates/unpublished-articles.html

@@ -1,11 +1,13 @@
 {{define "page-content"}}
+<h2>Unveröffentlichte Artikel</h2>
+
 <div class="flex flex-col gap-4">
     {{range .}}
-    <button class="btn" hx-get="/review-unpublished-article/{{.ID}}/" hx-target="#page-content">
+    <button class="btn" hx-get="/review-unpublished-article/{{.ID}}" hx-target="#page-content">
         <h1 class="font-bold text-2xl">{{.Title}}</h1>
         <p>{{.Description}}</p>
     </button>
     {{end}}
-    <button class="action-btn" hx-get="/hub/" hx-target="#page-content">Zurück</button>
+    <button class="action-btn" hx-get="/hub" hx-target="#page-content">Zurück</button>
 </div>
 {{end}}