Changed rss package to tagged version

cmd/control/rss.go

@@ -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,42 +49,30 @@ 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 /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-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/model/users.go

@@ -1,6 +1,8 @@
 package model
 
 import (
+	"context"
+	"database/sql"
 	"fmt"
 	"log"
 
@@ -198,3 +200,71 @@ func (db *DB) UpdateUserAttributes(id int64, user, first, last, oldPass, newPass
 
 	return fmt.Errorf("error: %v unsuccessful retries for DB operation, aborting", TxMaxRetries)
 }
+
+func (db *DB) AddFirstUser(u *User, pass string) (int64, error) {
+	var numUsers int64
+	txOptions := &sql.TxOptions{Isolation: sql.LevelSerializable}
+	selectQuery := "SELECT COUNT(*) FROM users"
+	insertQuery := `
+    INSERT INTO users (username, password, first_name, last_name, role)
+    VALUES (?, ?, ?, ?, ?)
+    `
+
+	for i := 0; i < TxMaxRetries; i++ {
+		id, err := func() (int64, error) {
+			tx, err := db.BeginTx(context.Background(), txOptions)
+			if err != nil {
+				return 0, fmt.Errorf("error starting transaction: %v", err)
+			}
+
+			if err := tx.QueryRow(selectQuery).Scan(&numUsers); err != nil {
+				if rollbackErr := tx.Rollback(); rollbackErr != nil {
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
+				}
+				return 0, fmt.Errorf("error getting ID of %v: %v", u.UserName, err)
+			}
+			if numUsers != 0 {
+				if err = tx.Commit(); err != nil {
+					return 0, fmt.Errorf("error committing transaction: %v", err)
+				}
+				return 2, nil
+			}
+
+			hashedPass, err := bcrypt.GenerateFromPassword([]byte(pass), bcrypt.DefaultCost)
+			if err != nil {
+				if rollbackErr := tx.Rollback(); rollbackErr != nil {
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
+				}
+				return 0, fmt.Errorf("error creating password hash: %v", err)
+			}
+
+			result, err := tx.Exec(insertQuery, u.UserName, string(hashedPass), u.FirstName, u.LastName, u.Role)
+			if err != nil {
+				if rollbackErr := tx.Rollback(); rollbackErr != nil {
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
+				}
+				return 0, fmt.Errorf("error inserting new user %v into DB: %v", u.UserName, err)
+			}
+
+			id, err := result.LastInsertId()
+			if err != nil {
+				if rollbackErr := tx.Rollback(); rollbackErr != nil {
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
+				}
+				return 0, fmt.Errorf("error inserting user into DB: %v", err)
+			}
+
+			if err = tx.Commit(); err != nil {
+				return 0, fmt.Errorf("error committing transaction: %v", err)
+			}
+			return id, nil
+		}()
+		if err == nil {
+			return id, nil
+		}
+
+		log.Println(err)
+		wait(i)
+	}
+	return 0, fmt.Errorf("error: %v unsuccessful retries for DB operation, aborting", TxMaxRetries)
+}

cmd/view/articles.go

@@ -197,26 +197,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)

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)
-	}
-}

cmd/view/sessions.go

@@ -36,7 +36,7 @@ func HomePage(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Han
 
 		files := []string{c.WebDir + "/templates/index.html"}
 		if numRows == 0 {
-			files = append(files, c.WebDir+"/templates/add-user.html")
+			files = append(files, c.WebDir+"/templates/first-user.html")
 			tmpl, err := template.ParseFiles(files...)
 			template.Must(tmpl, err).Execute(w, nil)
 		} else {

cmd/view/users.go

@@ -88,37 +88,13 @@ func AddUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Hand
 			return
 		}
 
-		htmlData.ID, err = db.AddUser(htmlData.User, pass)
+		_, err = db.AddUser(htmlData.User, pass)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
-		if htmlData.ID == 1 {
-			htmlData.Role = model.Admin
-
-			if err = db.UpdateAttributes(
-				&model.Attribute{Table: "users", ID: id, AttName: "role", Value: htmlData.Role},
-			); err != nil {
-				log.Println(err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-
-			if err := saveSession(w, r, s, htmlData.User); err != nil {
-				log.Println(err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-
-			if _, err := db.AddIssue(); err != nil {
-				log.Println(err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-		}
-
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
 		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", 0)
 	}
@@ -214,3 +190,78 @@ func UpdateUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.H
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"].(int))
 	}
 }
+
+func AddFirstUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var err error
+
+		htmlData := UserData{
+			User: &model.User{
+				UserName:  r.PostFormValue("username"),
+				FirstName: r.PostFormValue("first-name"),
+				LastName:  r.PostFormValue("last-name"),
+				Role:      model.Admin,
+			},
+		}
+		pass := r.PostFormValue("password")
+		pass2 := r.PostFormValue("password2")
+
+		if len(htmlData.UserName) == 0 || len(htmlData.FirstName) == 0 ||
+			len(htmlData.LastName) == 0 || len(pass) == 0 || len(pass2) == 0 {
+			htmlData.Msg = "Alle Felder müssen ausgefüllt werden."
+			tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-user.html")
+			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", htmlData)
+			return
+		}
+		userString, stringLen, ok := checkUserStrings(htmlData.User)
+		if !ok {
+			htmlData.Msg = fmt.Sprint(userString, " ist zu lang. Maximal ",
+				stringLen, " Zeichen erlaubt.")
+			tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-user.html")
+			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", htmlData)
+			return
+		}
+		id, _ := db.GetID(htmlData.UserName)
+		if id != 0 {
+			htmlData.Msg = fmt.Sprint(htmlData.UserName,
+				" ist bereits vergeben. Bitte anderen Benutzernamen wählen.")
+			tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-user.html")
+			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", htmlData)
+			return
+		}
+		if pass != pass2 {
+			htmlData.Msg = "Die Passwörter stimmen nicht überein."
+			tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-user.html")
+			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", htmlData)
+			return
+		}
+
+		htmlData.ID, err = db.AddFirstUser(htmlData.User, pass)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+		if htmlData.ID > 1 {
+			errString := "error: there is already a first user"
+			log.Println(errString)
+			http.Error(w, errString, http.StatusInternalServerError)
+			return
+		}
+
+		if err := saveSession(w, r, s, htmlData.User); err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		if _, err := db.AddIssue(); err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
+		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", 0)
+	}
+}

create_db.sql

@@ -0,0 +1,50 @@
+DROP TABLE IF EXISTS articles_tags;
+DROP TABLE IF EXISTS tags;
+DROP TABLE IF EXISTS articles;
+DROP TABLE IF EXISTS issues;
+DROP TABLE IF EXISTS users;
+
+CREATE TABLE users (
+    id          INT         AUTO_INCREMENT,
+    username    VARCHAR(15) NOT NULL UNIQUE,
+    password    VARCHAR(60) NOT NULL,
+    first_name  VARCHAR(50) NOT NULL,
+    last_name   VARCHAR(50) NOT NULL,
+    role        INT         NOT NULL,
+    PRIMARY KEY(id)
+);
+
+CREATE TABLE issues (
+    id          INT     AUTO_INCREMENT,
+    published   BOOL    NOT NULL,
+    PRIMARY KEY(id)
+);
+
+CREATE TABLE articles (
+    id          INT             AUTO_INCREMENT,
+    title       VARCHAR(255)    NOT NULL,
+    created     TIMESTAMP       DEFAULT CURRENT_TIMESTAMP,
+    description TEXT            NOT NULL,
+    content     TEXT            NOT NULL,
+    published   BOOL            NOT NULL,
+    rejected    BOOL            NOT NULL,
+    author_id   INT             NOT NULL,
+    issue_id    INT             NOT NULL,
+    PRIMARY KEY(id),
+    FOREIGN KEY(author_id) REFERENCES users(id),
+    FOREIGN KEY(issue_id) REFERENCES issues(id)
+);
+
+CREATE TABLE tags (
+    id      INT         AUTO_INCREMENT,
+    name    VARCHAR(50) NOT NULL UNIQUE,
+    PRIMARY KEY(id)
+);
+
+CREATE TABLE articles_tags (
+    article_id  INT,
+    tag_id      INT,
+    PRIMARY KEY(article_id, tag_id),
+    FOREIGN KEY(article_id) REFERENCES articles(id),
+    FOREIGN KEY(tag_id) REFERENCES tags(id)
+);

go.mod

@@ -3,7 +3,7 @@ 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/gorilla/sessions v1.2.2
 	github.com/microcosm-cc/bluemonday v1.0.26

go.sum

@@ -1,5 +1,5 @@
-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=

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

@@ -44,8 +44,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

@@ -9,7 +9,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

@@ -28,9 +28,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

@@ -14,23 +14,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/first-user.html

@@ -0,0 +1,39 @@
+{{define "page-content"}}
+<h2>Erster Benutzer (Administrator)</h2>
+
+<form>
+    <div class="grid grid-cols-3 gap-4">
+        <div>
+            <label for="username">Benutzername</label>
+            <input class="w-full" required name="username" type="text" value="{{.UserName}}" />
+        </div>
+        <div>
+            <label for="password">Passwort</label>
+            <input class="w-full" required name="password" placeholder="***" type="password" />
+        </div>
+        <div>
+            <label for="password2">Passwort wiederholen</label>
+            <input class="w-full" required name="password2" placeholder="***" type="password" />
+        </div>
+        <div>
+            <label for="first-name">Vorname</label>
+            <input class="w-full" required name="first-name" type="text" value="{{.FirstName}}" />
+        </div>
+        <div>
+            <label for="last-name">Nachname</label>
+            <input class="w-full" required name="last-name" type="text" value="{{.LastName}}" />
+        </div>
+    </div>
+
+    <div class="btn-area">
+        <input class="action-btn" type="submit" value="Anlegen" hx-post="/add-first-user" hx-target="#page-content" />
+    </div>
+</form>
+
+<script>
+    var msg = "{{.Msg}}";
+    if (msg != "") {
+        alert(msg);
+    }
+</script>
+{{end}}

web/templates/hub.html

@@ -1,38 +1,43 @@
 {{define "page-content"}}
 <div class="flex flex-col gap-4">
+    <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>
+
     {{if lt . 3}}
     <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}}
+
     {{if lt . 2}}
     <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}}
+
     {{if eq . 0}}
     <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,18 +8,15 @@
     <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>
-        <button class="btn" hx-get="logout" hx-target="#page-content">Abmelden</button>
     </header>
 
-    <main>
+    <main class="mx-4">
         <div id="page-content">
             {{template "page-content" .}}
         </div>
-
-        <script src="/web/static/js/htmx.min.js"></script>
     </main>
 
     <footer class="my-8">
@@ -27,6 +24,8 @@
             &copy; 2024 Jason Streifling. Alle Rechte vorbehalten.
         </p>
     </footer>
+
+    <script src="/web/static/js/htmx.min.js"></script>
 </body>
 
 </html>

web/templates/login.html

@@ -6,6 +6,6 @@
         <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

@@ -2,13 +2,13 @@
 <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

@@ -14,25 +14,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,35 @@
 {{define "page-content"}}
-<form>
-    <h2>{{.Article.Title}}</h2>
-    <p>{{.Article.Description}}</p>
-    {{.Article.Content}}
+<div>
+    <span>Titel</span>
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
+        {{.Title}}
+    </div>
 
-    <p>
+    <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,11 @@
 {{define "page-content"}}
 <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="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}}