Incorporated issues

.air.toml

@@ -1,44 +0,0 @@
-root = "."
-testdata_dir = "testdata"
-tmp_dir = "tmp"
-
-[build]
-  args_bin = []
-  bin = "./tmp/main -domain localhost:8080 -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
-
-[color]
-  app = ""
-  build = "yellow"
-  main = "magenta"
-  runner = "green"
-  watcher = "cyan"
-
-[log]
-  main_only = false
-  time = false
-
-[misc]
-  clean_on_exit = false
-
-[screen]
-  clear_on_rebuild = false
-  keep_scroll = true

.gitignore

@@ -23,4 +23,3 @@ go.work
 
 # Custom stuff
 tmp/
-style.css

cmd/control/cli.go

@@ -1,62 +0,0 @@
-package control
-
-import (
-	"flag"
-	"fmt"
-	"path/filepath"
-)
-
-type CliArgs struct {
-	DBName  string
-	Domain  string
-	KeyFile string
-	LogFile string
-	Port    string
-	PicsDir string
-	RSSFile string
-	WebDir  string
-}
-
-func HandleCliArgs() (*CliArgs, error) {
-	var err error
-	cliArgs := new(CliArgs)
-
-	flag.StringVar(&cliArgs.DBName, "db", "cpolis", "DB name")
-	flag.StringVar(&cliArgs.Domain, "domain", "", "domain name")
-	keyFile := flag.String("key", "/var/www/cpolis/cpolis.key", "key file")
-	logFile := flag.String("log", "/var/log/cpolis.log", "log file")
-	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")
-	webDir := flag.String("web", "/var/www/cpolis/web", "web directory")
-	flag.Parse()
-
-	cliArgs.KeyFile, err = filepath.Abs(*keyFile)
-	if err != nil {
-		return nil, fmt.Errorf("error finding absolute path for KeyFile: %v", err)
-	}
-
-	cliArgs.LogFile, err = filepath.Abs(*logFile)
-	if err != nil {
-		return nil, fmt.Errorf("error finding absolute path for LogFile: %v", err)
-	}
-
-	_, err = filepath.Abs(cliArgs.PicsDir)
-	if err != nil {
-		return nil, fmt.Errorf("error finding absolute path for PicsDir: %v", err)
-	}
-
-	cliArgs.Port = fmt.Sprint(":", *port)
-
-	cliArgs.RSSFile, err = filepath.Abs(*rssFile)
-	if err != nil {
-		return nil, fmt.Errorf("error finding absolute path for RSSFile: %v", err)
-	}
-
-	cliArgs.WebDir, err = filepath.Abs(*webDir)
-	if err != nil {
-		return nil, fmt.Errorf("error finding absolute path for WebDir: %v", err)
-	}
-
-	return cliArgs, nil
-}

cmd/control/rss.go

@@ -2,8 +2,6 @@ package control
 
 import (
 	"fmt"
-	"io"
-	"os"
 	"time"
 
 	"git.streifling.com/jason/rss"
@@ -50,82 +48,3 @@ func GetChannel(db *model.DB, title, link, description string) (*rss.Channel, er
 
 	return channel, nil
 }
-
-func GenerateRSS(db *model.DB, title, link, desc string) (*string, error) {
-	channel := &rss.Channel{
-		Title:       title,
-		Link:        link,
-		Description: desc,
-		Items:       make([]*rss.Item, 0),
-	}
-
-	articles, err := db.GetCertainArticles(true, false)
-	if err != nil {
-		return nil, fmt.Errorf("error getting published articles for RSS feed: %v", err)
-	}
-
-	for _, article := range articles {
-		tags, err := db.GetArticleTags(article.ID)
-		if err != nil {
-			return nil, fmt.Errorf("error getting tags for articles for RSS feed: %v", err)
-		}
-		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 {
-			return nil, fmt.Errorf("error getting user user info for RSS feed: %v", err)
-		}
-
-		articleTitle, err := ConvertToPlain(article.Title)
-		if err != nil {
-			return nil, fmt.Errorf("error converting title to plain text for RSS feed: %v", err)
-		}
-
-		articleDescription, err := ConvertToPlain(article.Description)
-		if err != nil {
-			return nil, fmt.Errorf("error converting description to plain text for RSS feed: %v", err)
-		}
-
-		articleContent, err := ConvertToHTML(article.Content)
-		if err != nil {
-			return nil, fmt.Errorf("error converting content to HTML for RSS feed: %v", err)
-		}
-
-		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("UTF-8")
-	if err != nil {
-		return nil, fmt.Errorf("error converting RSS feed to XML: %v", err)
-	}
-
-	return &rss, nil
-}
-
-func SaveRSS(filename string, feed *string) error {
-	file, err := os.Create(filename)
-	if err != nil {
-		return fmt.Errorf("error creating file for RSS feed: %v", err)
-	}
-	defer file.Close()
-	file.Chmod(0644)
-
-	if _, err = io.WriteString(file, *feed); err != nil {
-		return fmt.Errorf("error writing to RSS file: %v", err)
-	}
-
-	return nil
-}

cmd/main.go

@@ -16,66 +16,62 @@ func init() {
 }
 
 func main() {
-	args, err := control.HandleCliArgs()
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	logFile, err := os.OpenFile(args.LogFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
+	logFile, err := os.OpenFile("tmp/cpolis.log",
+		os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
 	if err != nil {
 		log.Fatalln(err)
 	}
 	defer logFile.Close()
-	log.SetOutput(logFile)
+	// log.SetOutput(logFile)
 
-	db, err := model.OpenDB(args.DBName)
+	db, err := model.OpenDB("cpolis")
 	if err != nil {
 		log.Fatalln(err)
 	}
 	defer db.Close()
 
-	key, err := control.LoadKey(args.KeyFile)
+	key, err := control.LoadKey("tmp/key.gob")
 	if err != nil {
 		key, err = control.NewKey()
 		if err != nil {
 			log.Fatalln(err)
 		}
-		control.SaveKey(key, args.KeyFile)
+		control.SaveKey(key, "tmp/key.gob")
 	}
 	store := control.NewCookieStore(key)
 
 	mux := http.NewServeMux()
 	mux.Handle("/web/static/", http.StripPrefix("/web/static/",
-		http.FileServer(http.Dir(args.WebDir+"/static/"))))
-	mux.HandleFunc("/", view.HomePage(args, db, store))
+		http.FileServer(http.Dir("web/static/"))))
+	mux.HandleFunc("/", view.HomePage(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-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("GET /create-tag/", view.CreateTag)
+	mux.HandleFunc("GET /create-user/", view.CreateUser)
+	mux.HandleFunc("GET /edit-user/", view.EditUser(db, store))
+	mux.HandleFunc("GET /hub/", view.ShowHub(db, store))
+	mux.HandleFunc("GET /logout/", view.Logout(store))
+	mux.HandleFunc("GET /publish-issue/", view.PublishLatestIssue(db))
+	mux.HandleFunc("GET /rejected-articles/", view.ShowRejectedArticles(db, store))
+	mux.HandleFunc("GET /rss/", view.ShowRSS(
+		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(db))
+	mux.HandleFunc("GET /unpublished-articles/", view.ShowUnpublishedArticles(db))
+	mux.HandleFunc("GET /write-article/", view.WriteArticle(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 /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-tag/", view.AddTag(db, store))
+	mux.HandleFunc("POST /add-user/", view.AddUser(db, store))
+	mux.HandleFunc("POST /login/", view.Login(db, store))
+	mux.HandleFunc("POST /publish-article/", view.PublishArticle(db, store))
+	mux.HandleFunc("POST /reject-article/", view.RejectArticle(db, store))
+	mux.HandleFunc("POST /resubmit-article/", view.ResubmitArticle(db, store))
+	mux.HandleFunc("POST /review-rejected-article/", view.ReviewRejectedArticle(db, store))
+	mux.HandleFunc("POST /review-unpublished-article/", view.ReviewUnpublishedArticle(db, store))
+	mux.HandleFunc("POST /submit-article/", view.SubmitArticle(db, store))
+	mux.HandleFunc("POST /update-user/", view.UpdateUser(db, store))
 
-	log.Fatalln(http.ListenAndServe(args.Port, mux))
+	log.Fatalln(http.ListenAndServe(":8080", mux))
 }

cmd/model/articles.go

@@ -105,7 +105,7 @@ func (db *DB) GetArticle(id int64) (*Article, error) {
 
 func (db *DB) GetCertainArticles(published, rejected bool) ([]*Article, error) {
 	query := `
-    SELECT id, title, created, description, content, author_id, issue_id
+    SELECT id, title, created, description, content, author_id
     FROM articles
     WHERE published = ?
     AND rejected = ?
@@ -121,8 +121,7 @@ func (db *DB) GetCertainArticles(published, rejected bool) ([]*Article, error) {
 		var created []byte
 
 		if err = rows.Scan(&article.ID, &article.Title, &created,
-			&article.Description, &article.Content, &article.AuthorID,
-			&article.IssueID); err != nil {
+			&article.Description, &article.Content, &article.AuthorID); err != nil {
 			return nil, fmt.Errorf("error scanning article row: %v", err)
 		}
 

cmd/model/articles_tags.go

@@ -6,7 +6,10 @@ import (
 )
 
 func (db *DB) WriteArticleTags(articleID int64, tagIDs []int64) error {
-	query := "INSERT INTO articles_tags (article_id, tag_id) VALUES (?, ?)"
+	query := `
+    INSERT INTO articles_tags (article_id, tag_id)
+    VALUES (?, ?)
+    `
 
 	for i := 0; i < TxMaxRetries; i++ {
 		err := func() error {
@@ -65,8 +68,8 @@ func (db *DB) GetArticleTags(articleID int64) ([]*Tag, error) {
 }
 
 func (db *DB) UpdateArticleTags(articleID int64, tagIDs []int64) error {
-	deleteQuery := "DELETE FROM articles_tags WHERE article_id = ?"
-	insertQuery := "INSERT INTO articles_tags (article_id, tag_id) VALUES (?, ?)"
+	query := `
+    `
 
 	for i := 0; i < TxMaxRetries; i++ {
 		err := func() error {
@@ -75,22 +78,6 @@ func (db *DB) UpdateArticleTags(articleID int64, tagIDs []int64) error {
 				return fmt.Errorf("error starting transaction: %v", err)
 			}
 
-			if _, err := tx.Exec(deleteQuery, articleID); err != nil {
-				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
-				}
-				return fmt.Errorf("error deleting entries from articles_tags before inserting new ones: %v", err)
-			}
-
-			for _, tagID := range tagIDs {
-				if _, err := tx.Exec(insertQuery, articleID, tagID); err != nil {
-					if rollbackErr := tx.Rollback(); rollbackErr != nil {
-						log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
-					}
-					return fmt.Errorf("error inserting new entries into articles_tags: %v", err)
-				}
-			}
-
 			if err = tx.Commit(); err != nil {
 				return fmt.Errorf("error committing transaction: %v", err)
 			}

cmd/model/issues.go

@@ -23,6 +23,7 @@ func (db *DB) AddIssue() (int64, error) {
 }
 
 func (db *DB) PublishLatestIssue() error {
+	var id int64
 	txOptions := &sql.TxOptions{Isolation: sql.LevelSerializable}
 	updateQuery := "UPDATE issues SET published = true WHERE published = false"
 	insertQuery := "INSERT INTO issues (published) VALUES (?)"
@@ -34,7 +35,7 @@ func (db *DB) PublishLatestIssue() error {
 				return fmt.Errorf("error starting transaction: %v", err)
 			}
 
-			if _, err := tx.Exec(updateQuery); err != nil {
+			if _, err := tx.Exec(updateQuery, id); err != nil {
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
 					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}

cmd/model/users.go

@@ -1,8 +1,6 @@
 package model
 
 import (
-	"context"
-	"database/sql"
 	"fmt"
 	"log"
 
@@ -200,71 +198,3 @@ 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

@@ -1,13 +1,9 @@
 package view
 
 import (
-	"fmt"
 	"html/template"
-	"io"
 	"log"
 	"net/http"
-	"os"
-	"path/filepath"
 	"strconv"
 	"time"
 
@@ -15,21 +11,21 @@ import (
 	"streifling.com/jason/cpolis/cmd/model"
 )
 
-func ShowHub(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func ShowHub(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		session, err := s.Get(r, "cookie")
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
+			tmpl, err := template.ParseFiles("web/templates/login.html")
 			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
+		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", session.Values["role"].(int))
 	}
 }
 
-func WriteArticle(c *control.CliArgs, db *model.DB) http.HandlerFunc {
+func WriteArticle(db *model.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		tags, err := db.GetTagList()
 		if err != nil {
@@ -38,16 +34,16 @@ func WriteArticle(c *control.CliArgs, db *model.DB) http.HandlerFunc {
 			return
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/editor.html")
+		tmpl, err := template.ParseFiles("web/templates/editor.html")
 		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", tags)
 	}
 }
 
-func SubmitArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func SubmitArticle(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		session, err := s.Get(r, "cookie")
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
+			tmpl, err := template.ParseFiles("web/templates/login.html")
 			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
 		}
@@ -85,15 +81,15 @@ func SubmitArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) htt
 			return
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
+		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"])
 	}
 }
 
-func ResubmitArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func ResubmitArticle(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
+		id, err := strconv.ParseInt(r.PostFormValue("article-id"), 10, 64)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -104,7 +100,7 @@ func ResubmitArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) h
 		description := r.PostFormValue("article-description")
 		content := r.PostFormValue("article-content")
 
-		if err = db.UpdateAttributes(
+		if err := db.UpdateAttributes(
 			&model.Attribute{Table: "articles", ID: id, AttName: "title", Value: title},
 			&model.Attribute{Table: "articles", ID: id, AttName: "description", Value: description},
 			&model.Attribute{Table: "articles", ID: id, AttName: "content", Value: content},
@@ -115,37 +111,20 @@ func ResubmitArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) h
 			return
 		}
 
-		r.ParseForm()
-		tags := make([]int64, 0)
-		for _, tag := range r.Form["tags"] {
-			tagID, err := strconv.ParseInt(tag, 10, 64)
-			if err != nil {
-				log.Println(err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-			tags = append(tags, tagID)
-		}
-		if err = db.UpdateArticleTags(id, tags); err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
 		session, err := s.Get(r, "cookie")
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
+			tmpl, err := template.ParseFiles("web/templates/login.html")
 			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
+		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"])
 	}
 }
 
-func ShowUnpublishedArticles(c *control.CliArgs, db *model.DB) http.HandlerFunc {
+func ShowUnpublishedArticles(db *model.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		unpublishedArticles, err := db.GetCertainArticles(false, false)
 		if err != nil {
@@ -154,13 +133,13 @@ func ShowUnpublishedArticles(c *control.CliArgs, db *model.DB) http.HandlerFunc
 			return
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/unpublished-articles.html")
+		tmpl, err := template.ParseFiles("web/templates/unpublished-articles.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", unpublishedArticles)
 	}
 }
 
-func ShowRejectedArticles(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func ShowRejectedArticles(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		type htmlData struct {
 			MyIDs            map[int64]bool
@@ -189,75 +168,48 @@ func ShowRejectedArticles(c *control.CliArgs, db *model.DB, s *control.CookieSto
 			}
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/rejected-articles.html")
+		tmpl, err := template.ParseFiles("web/templates/rejected-articles.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", data)
 	}
 }
 
-func ReviewUnpublishedArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func ReviewUnpublishedArticle(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		type htmlData struct {
-			Title       string
-			Description string
-			Content     template.HTML
-			Tags        []*model.Tag
-			ID          int64
+			Article *model.Article
+			Tags    []*model.Tag
 		}
-
-		var err error
 		data := new(htmlData)
 
-		data.ID, err = strconv.ParseInt(r.PathValue("id"), 10, 64)
+		id, err := strconv.ParseInt(r.PostFormValue("id"), 10, 64)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
-		article, err := db.GetArticle(data.ID)
+		data.Article, err = db.GetArticle(id)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
-		data.Title, err = control.ConvertToPlain(article.Title)
+		data.Tags, err = db.GetArticleTags(id)
 		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)
-			return
-		}
-
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/to-be-published.html")
+		tmpl, err := template.ParseFiles("web/templates/to-be-published.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", data)
 	}
 }
 
-func ReviewRejectedArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func ReviewRejectedArticle(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		type htmlData struct {
 			Selected map[int64]bool
@@ -266,7 +218,7 @@ func ReviewRejectedArticle(c *control.CliArgs, db *model.DB, s *control.CookieSt
 		}
 		data := new(htmlData)
 
-		id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
+		id, err := strconv.ParseInt(r.PostFormValue("id"), 10, 64)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -298,15 +250,15 @@ func ReviewRejectedArticle(c *control.CliArgs, db *model.DB, s *control.CookieSt
 			data.Selected[tag.ID] = true
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/rework-article.html")
+		tmpl, err := template.ParseFiles("web/templates/rework-article.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", data)
 	}
 }
 
-func PublishArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func PublishArticle(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
+		id, err := strconv.ParseInt(r.PostFormValue("id"), 10, 64)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -315,7 +267,7 @@ func PublishArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) ht
 
 		session, err := s.Get(r, "cookie")
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
+			tmpl, err := template.ParseFiles("web/templates/login.html")
 			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
 		}
@@ -336,32 +288,15 @@ 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",
-		)
-		if err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		if err = control.SaveRSS(c.RSSFile, feed); err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
+		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"])
 	}
 }
 
-func RejectArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func RejectArticle(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
+		id, err := strconv.ParseInt(r.PostFormValue("id"), 10, 64)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -370,7 +305,7 @@ func RejectArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) htt
 
 		session, err := s.Get(r, "cookie")
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
+			tmpl, err := template.ParseFiles("web/templates/login.html")
 			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
 		}
@@ -383,13 +318,13 @@ func RejectArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) htt
 			return
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
+		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"])
 	}
 }
 
-func ShowCurrentArticles(c *control.CliArgs, db *model.DB) http.HandlerFunc {
+func ShowCurrentArticles(db *model.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		articles, err := db.GetCurrentIssueArticles()
 		if err != nil {
@@ -398,46 +333,20 @@ func ShowCurrentArticles(c *control.CliArgs, db *model.DB) http.HandlerFunc {
 			return
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/current-articles.html")
+		tmpl, err := template.ParseFiles("web/templates/current-articles.html")
 		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", articles)
 	}
 }
 
-func UploadImage(c *control.CliArgs) http.HandlerFunc {
+func PublishLatestIssue(db *model.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		file, header, err := r.FormFile("article-image")
-		if err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		defer file.Close()
-
-		filename := fmt.Sprint(time.Now().Format("2006-01-02_15:04:05"), "-",
-			header.Filename)
-		absFilepath, err := filepath.Abs(fmt.Sprint(c.PicsDir, "/", filename))
-		if err != nil {
+		if err := db.PublishLatestIssue(); 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)
-			return
-		}
-		defer img.Close()
-
-		if _, err = io.Copy(img, file); err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		imgMD := fmt.Sprint("![", header.Filename, "](", c.Domain, "/pics/", filename, ")")
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/editor.html")
-		template.Must(tmpl, err).ExecuteTemplate(w, "editor-images", imgMD)
+		tmpl, err := template.ParseFiles("web/templates/hub.html")
+		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
 	}
 }

cmd/view/editor.go

@@ -8,25 +8,23 @@ import (
 	"streifling.com/jason/cpolis/cmd/model"
 )
 
-func CreateTag(c *control.CliArgs) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-tag.html")
-		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
-	}
+func CreateTag(w http.ResponseWriter, r *http.Request) {
+	tmpl, err := template.ParseFiles("web/templates/add-tag.html")
+	template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
 }
 
-func AddTag(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func AddTag(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		db.AddTag(r.PostFormValue("tag"))
 
 		session, err := s.Get(r, "cookie")
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
+			tmpl, err := template.ParseFiles("web/templates/login.html")
 			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
+		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"])
 	}

cmd/view/images.go

@@ -1,22 +0,0 @@
-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/issues.go

@@ -1,31 +0,0 @@
-package view
-
-import (
-	"html/template"
-	"log"
-	"net/http"
-
-	"streifling.com/jason/cpolis/cmd/control"
-	"streifling.com/jason/cpolis/cmd/model"
-)
-
-func PublishLatestIssue(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		if err := db.PublishLatestIssue(); err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		session, err := s.Get(r, "cookie")
-		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
-		}
-
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
-		tmpl = template.Must(tmpl, err)
-		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"])
-	}
-}

cmd/view/rss.go

@@ -0,0 +1,95 @@
+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(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{"web/templates/index.html", "web/templates/feed.rss"}
+		tmpl, err := template.ParseFiles(files...)
+		template.Must(tmpl, err).Execute(w, rss)
+	}
+}

cmd/view/sessions.go

@@ -27,26 +27,26 @@ func saveSession(w http.ResponseWriter, r *http.Request, s *control.CookieStore,
 	return nil
 }
 
-func HomePage(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func HomePage(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		numRows, err := db.CountEntries("users")
 		if err != nil {
 			log.Fatalln(err)
 		}
 
-		files := []string{c.WebDir + "/templates/index.html"}
+		files := []string{"web/templates/index.html"}
 		if numRows == 0 {
-			files = append(files, c.WebDir+"/templates/first-user.html")
+			files = append(files, "web/templates/add-user.html")
 			tmpl, err := template.ParseFiles(files...)
 			template.Must(tmpl, err).Execute(w, nil)
 		} else {
 			session, _ := s.Get(r, "cookie")
 			if auth, ok := session.Values["authenticated"].(bool); auth && ok {
-				files = append(files, c.WebDir+"/templates/hub.html")
+				files = append(files, "web/templates/hub.html")
 				tmpl, err := template.ParseFiles(files...)
 				template.Must(tmpl, err).Execute(w, session.Values["role"])
 			} else {
-				files = append(files, c.WebDir+"/templates/login.html")
+				files = append(files, "web/templates/login.html")
 				tmpl, err := template.ParseFiles(files...)
 				template.Must(tmpl, err).Execute(w, nil)
 			}
@@ -54,7 +54,7 @@ func HomePage(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Han
 	}
 }
 
-func Login(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func Login(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		userName := r.PostFormValue("username")
 		password := r.PostFormValue("password")
@@ -84,16 +84,16 @@ func Login(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Handle
 			return
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
+		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", user.Role)
 	}
 }
 
-func Logout(c *control.CliArgs, s *control.CookieStore) http.HandlerFunc {
+func Logout(s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		session, err := s.Get(r, "cookie")
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
+			tmpl, err := template.ParseFiles("web/templates/login.html")
 			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
 		}
@@ -106,7 +106,7 @@ func Logout(c *control.CliArgs, s *control.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
+		tmpl, err := template.ParseFiles("web/templates/login.html")
 		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
 	}
 }

cmd/view/users.go

@@ -31,14 +31,12 @@ func checkUserStrings(user *model.User) (string, int, bool) {
 	}
 }
 
-func CreateUser(c *control.CliArgs) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-user.html")
-		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
-	}
+func CreateUser(w http.ResponseWriter, r *http.Request) {
+	tmpl, err := template.ParseFiles("web/templates/add-user.html")
+	template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
 }
 
-func AddUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func AddUser(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		role, err := strconv.Atoi(r.PostFormValue("role"))
 		if err != nil {
@@ -61,7 +59,7 @@ func AddUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Hand
 		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")
+			tmpl, err := template.ParseFiles("web/templates/add-user.html")
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", htmlData)
 			return
 		}
@@ -69,7 +67,7 @@ func AddUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Hand
 		if !ok {
 			htmlData.Msg = fmt.Sprint(userString, " ist zu lang. Maximal ",
 				stringLen, " Zeichen erlaubt.")
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-user.html")
+			tmpl, err := template.ParseFiles("web/templates/add-user.html")
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", htmlData)
 			return
 		}
@@ -77,34 +75,58 @@ func AddUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Hand
 		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")
+			tmpl, err := template.ParseFiles("web/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")
+			tmpl, err := template.ParseFiles("web/templates/add-user.html")
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", htmlData)
 			return
 		}
 
-		_, err = db.AddUser(htmlData.User, pass)
+		htmlData.ID, err = db.AddUser(htmlData.User, pass)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
+		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("web/templates/hub.html")
 		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", 0)
 	}
 }
 
-func EditUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func EditUser(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		session, err := s.Get(r, "cookie")
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
+			tmpl, err := template.ParseFiles("web/templates/login.html")
 			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
 		}
@@ -116,16 +138,16 @@ func EditUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Han
 			return
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/edit-user.html")
+		tmpl, err := template.ParseFiles("web/templates/edit-user.html")
 		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", user)
 	}
 }
 
-func UpdateUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc {
+func UpdateUser(db *model.DB, s *control.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		session, err := s.Get(r, "cookie")
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
+			tmpl, err := template.ParseFiles("web/templates/login.html")
 			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
 		}
@@ -145,7 +167,7 @@ func UpdateUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.H
 		if len(userData.UserName) == 0 || len(userData.FirstName) == 0 ||
 			len(userData.LastName) == 0 {
 			userData.Msg = "Alle Felder mit * müssen ausgefüllt sein."
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/edit-user.html")
+			tmpl, err := template.ParseFiles("web/templates/edit-user.html")
 			tmpl = template.Must(tmpl, err)
 			tmpl.ExecuteTemplate(w, "page-content", userData.Msg)
 			return
@@ -155,7 +177,7 @@ func UpdateUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.H
 		if !ok {
 			userData.Msg = fmt.Sprint(userString, " ist zu lang. Maximal ",
 				stringLen, " Zeichen erlaubt.")
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/edit-user.html")
+			tmpl, err := template.ParseFiles("web/templates/edit-user.html")
 			tmpl = template.Must(tmpl, err)
 			tmpl.ExecuteTemplate(w, "page-content", userData)
 			return
@@ -165,7 +187,7 @@ func UpdateUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.H
 			if id != userData.ID {
 				userData.Msg = "Benutzername bereits vergeben."
 				userData.UserName = ""
-				tmpl, err := template.ParseFiles(c.WebDir + "/templates/edit-user.html")
+				tmpl, err := template.ParseFiles("web/templates/edit-user.html")
 				tmpl = template.Must(tmpl, err)
 				tmpl.ExecuteTemplate(w, "page-content", userData)
 				return
@@ -181,87 +203,12 @@ func UpdateUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.H
 			newPass,
 			newPass2); err != nil {
 			userData.Msg = "Aktualisierung der Benutzerdaten fehlgeschlagen."
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/edit-user.html")
+			tmpl, err := template.ParseFiles("web/templates/edit-user.html")
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", userData)
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
+		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		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

@@ -1,50 +0,0 @@
-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.1.2
+	git.streifling.com/jason/rss v0.0.0-20240305164907-524bf9676188
 	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.1.2 h1:UB3UHJXMt5WDDh9y8n0Z6nS1XortbPXjEr7QZTdovY4=
-git.streifling.com/jason/rss v0.1.2/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
+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=
 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

@@ -1,10 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-    content: ["./web/templates/*.html"],
-    theme: {
-        extend: {}
-    },
-    plugins: [
-        require('@tailwindcss/typography')
-    ],
-}

web/static/css/input.css

@@ -1,41 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-body {
-    width: 800px;
-    @apply mx-auto text-slate-900;
-}
-
-h2 {
-    @apply font-bold mb-2 text-2xl;
-}
-
-form {
-    @apply flex flex-col gap-y-3;
-}
-
-input[type="file"] {
-    @apply border rounded-md w-full;
-}
-
-input[type="password"],
-input[type="text"] {
-    @apply border h-8 rounded-md;
-}
-
-textarea {
-    @apply border h-32 rounded-md;
-}
-
-.btn-area {
-    @apply flex gap-4 mt-4;
-}
-
-.btn {
-    @apply bg-slate-200 border my-2 px-3 py-2 rounded-md w-full hover:bg-slate-100;
-}
-
-.action-btn {
-    @apply bg-slate-800 border my-2 px-3 py-2 rounded-md text-slate-50 w-full hover:bg-slate-700;
-}

web/templates/add-tag.html

@@ -1,12 +1,8 @@
 {{define "page-content"}}
-<h2>Neuer Tag</h2>
-
+<h2>Neuer Benutzer</h2>
 <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>
-    </div>
+    <input required name="tag" placeholder="Tag" type="text" />
+    <input type="submit" value="Anlegen" hx-post="/add-tag/" hx-target="#page-content" />
 </form>
-
+<button hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
 {{end}}

web/templates/add-user.html

@@ -1,53 +1,25 @@
 {{define "page-content"}}
 <h2>Neuer Benutzer</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>
+    <input required name="username" placeholder="Benutzername" type="text" value="{{.UserName}}" />
+    <input required name="password" placeholder="Passwort" type="password" />
+    <input required name="password2" placeholder="Passwort wiederholen" type="password" />
 
-    <div class="flex gap-4">
-        <div>
-            <input required id="author" name="role" type="radio" value="3" {{if eq .Role 3 }}checked{{end}} />
-            <label for="author">Autor</label>
-        </div>
-        <div>
-            <input required id="editor" name="role" type="radio" value="2" {{if eq .Role 2 }}checked{{end}} />
-            <label for="editor">Redakteur</label>
-        </div>
-        <div>
-            <input required id="publisher" name="role" type="radio" value="1" {{if eq .Role 1 }}checked{{end}} />
-            <label for="publisher">Herausgeber</label>
-        </div>
-        <div>
-            <input required id="admin" name="role" type="radio" value="0" {{if eq .Role 0 }}checked{{end}} />
-            <label for="admin">Admin</label>
-        </div>
-    </div>
+    <input required name="first-name" placeholder="Vorname" type="text" value="{{.FirstName}}" />
+    <input required name="last-name" placeholder="Nachname" type="text" value="{{.LastName}}" />
 
-    <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>
-    </div>
+    <input required id="author" name="role" type="radio" value="3" {{if eq .Role 3 }}checked{{end}} />
+    <label for="author">Autor</label>
+    <input required id="editor" name="role" type="radio" value="2" {{if eq .Role 2 }}checked{{end}} />
+    <label for="editor">Redakteur</label>
+    <input required id="publisher" name="role" type="radio" value="1" {{if eq .Role 1 }}checked{{end}} />
+    <label for="publisher">Herausgeber</label>
+    <input required id="admin" name="role" type="radio" value="0" {{if eq .Role 0 }}checked{{end}} />
+    <label for="admin">Admin</label>
+
+    <input type="submit" value="Anlegen" hx-post="/add-user/" hx-target="#page-content" />
 </form>
+<button hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
 
 <script>
     var msg = "{{.Msg}}";

web/templates/current-articles.html

@@ -1,15 +1,10 @@
 {{define "page-content"}}
-<div class="flex flex-col gap-4">
-    {{range .}}
-    <div class="border px-2 py-1 rounded-md">
-        <h1 class="font-bold text-2xl">{{.Title}}</h1>
-        <p>{{.Description}}</p>
-    </div>
-    {{end}}
-</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>
+{{range .}}
+<div>
+    <h1>{{.Title}}</h1>
+    <p>{{.Description}}</p>
 </div>
 {{end}}
+<button hx-get="/publish-issue/" hx-target="#page-content">Ausgabe publizieren</button>
+<button hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
+{{end}}

web/templates/edit-user.html

@@ -1,36 +1,13 @@
 {{define "page-content"}}
 <form>
-    <div class="grid grid-cols-3 gap-4">
-        <div>
-            <label for="username">Benutzername</label>
-            <input class="w-full" name="username" type="text" value="{{.UserName}}" />
-        </div>
-        <div>
-            <label for="first-name">Vorname</label>
-            <input class="w-full" name="first-name" type="text" value="{{.FirstName}}" />
-        </div>
-        <div>
-            <label for="last-name">Nachname</label>
-            <input class="w-full" name="last-name" type="text" value="{{.LastName}}" />
-        </div>
-        <div>
-            <label for="old-password">Altes Passwort</label>
-            <input class="w-full" name="old-password" placeholder="***" type="password" />
-        </div>
-        <div>
-            <label for="password">Passwort</label>
-            <input class="w-full" name="password" placeholder="***" type="password" />
-        </div>
-        <div>
-            <label for="password2">Passwort wiederholen</label>
-            <input class="w-full" name="password2" placeholder="***" type="password" />
-        </div>
-    </div>
+    <input name="username" type="text" value="{{.UserName}}" />
+    <input name="first-name" type="text" value="{{.FirstName}}" />
+    <input name="last-name" type="text" value="{{.LastName}}" />
 
-    <div class="btn-area">
-        <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>
-    </div>
+    <input name="old-password" placeholder="Altes Passwort" type="password" />
+    <input name="password" placeholder="Neues Passwort" type="password" />
+    <input name="password2" placeholder="Wiederholen" type="password" />
+
+    <input type="submit" value="Aktualisieren" hx-post="/update-user/" hx-target="#page-content" />
 </form>
 {{end}}

web/templates/editor.html

@@ -1,69 +1,13 @@
 {{define "page-content"}}
 <h2>Editor</h2>
 <form>
-    <div class="flex flex-col gap-y-1">
-        <label for="article-title">Titel</label>
-        <input name="article-title" type="text" />
-    </div>
-    <div class="flex flex-col">
-        <label for="article-description">Beschreibung</label>
-        <textarea name="article-description"></textarea>
-    </div>
-    <div class="flex flex-col">
-        <label for="article-content">Artikel</label>
-        <textarea name="article-content"></textarea>
-    </div>
-
-    <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>
-    </div>
-
-    <div id="editor-images">
-        <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>
-    </div>
+    <input name="article-title" placeholder="Titel" type="text" />
+    <textarea name="article-description" placeholder="Beschreibung"></textarea>
+    <textarea name="article-content" placeholder="Artikel"></textarea>
+    {{range .}}
+    <input id="{{.Name}}" name="tags" type="checkbox" value="{{.ID}}" />
+    <label for="{{.Name}}">{{.Name}}</label>
+    {{end}}
+    <input type="submit" value="Senden" hx-post="/submit-article/" hx-target="#page-content" />
 </form>
-
-<script>
-    function copyToClipboard(text) {
-        event.preventDefault(); // Get-Request verhindern
-
-        var textarea = document.createElement("textarea");
-        textarea.textContent = text;
-        document.body.appendChild(textarea);
-
-        textarea.select();
-        try {
-            document.execCommand('copy');
-        } catch (err) {
-            console.warn('Fehler beim Kopieren', err);
-        }
-
-        document.body.removeChild(textarea);
-    }
-
-</script>
-{{end}}
-
-{{define "editor-images"}}
-{{if gt (len .) 0}}
-<div class="border px-2 py-1 rounded-md flex gap-4 justify-between">
-    <div class="self-center">{{.}}</div>
-    <button class="bg-slate-50 border my-2 px-3 py-2 rounded-md w-32 hover:bg-slate-100"
-        onclick="copyToClipboard('{{.}}')">Kopieren</button>
-</div>
-{{end}}
 {{end}}

web/templates/first-user.html

@@ -1,39 +0,0 @@
-{{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,45 +1,17 @@
 {{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>
-            <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">
-                Unveröffentlichte Artikel
-            </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>
-        </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>
-        </div>
-    </div>
-    {{end}}
-</div>
+<h2>Hub</h2>
+<button hx-get="/write-article/" hx-target="#page-content">Artikel schreiben</button>
+<button hx-get="/rejected-articles/" hx-target="#page-content">Abgelehnte Artikel</button>
+<button hx-get="/rss/" hx-target="#page-content">RSS Feed</button>
+<button hx-get="/edit-user/" hx-target="#page-content">Benutzer bearbeiten</button>
+{{if lt . 3}}
+<button hx-get="/unpublished-articles/" hx-target="#page-content">Unveröffentlichte Artikel</button>
+<button hx-get="/create-tag/" hx-target="#page-content">Neuer Tag</button>
+{{end}}
+{{if lt . 2}}
+<button hx-get="/this-issue/" hx-target="#page-content">Diese Ausgabe</button>
+{{end}}
+{{if eq . 0}}
+<button hx-get="/create-user/" hx-target="#page-content">Benutzer hinzufügen</button>
+{{end}}
 {{end}}

web/templates/index.html

@@ -5,27 +5,26 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Orient Editor</title>
-    <link href="/web/static/css/style.css" rel="stylesheet">
+    <link href="web/static/css/style.css" rel="stylesheet">
 </head>
 
-<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>
+<body>
+    <header>
+        <h1>Orient Editor</h1>
+        <button hx-get="logout" hx-target="#page-content">Abmelden</button>
     </header>
 
-    <main class="mx-4">
+    <main>
         <div id="page-content">
             {{template "page-content" .}}
         </div>
+
+        <script src="web/static/js/htmx.min.js"></script>
     </main>
 
-    <footer class="my-8">
-        <p class="text-center text-gray-500 dark:text-gray-400">
-            &copy; 2024 Jason Streifling. Alle Rechte vorbehalten.
-        </p>
+    <footer>
+        <p>&copy; 2024 Jason Streifling. Alle Rechte vorbehalten.</p>
     </footer>
-
-    <script src="/web/static/js/htmx.min.js"></script>
 </body>
 
 </html>

web/templates/login.html

@@ -1,11 +1,8 @@
 {{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 name="username" placeholder="Benutzername" type="text" />
+    <input name="password" placeholder="Passwort" type="password" />
+    <input type="submit" value="Anmelden" hx-post="/login/" hx-target="#page-content" />
 </form>
 {{end}}

web/templates/rejected-articles.html

@@ -1,14 +1,12 @@
 {{define "page-content"}}
-<div class="flex flex-col gap-4">
+<form>
     {{range .RejectedArticles}}
     {{if index $.MyIDs .ID}}
-    <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>
+    <input required id="{{.ID}}" name="id" type="radio" value="{{.ID}}" />
+    <label for="{{.ID}}">{{.Title}}</label>
     {{end}}
     {{end}}
-
-    <button class="action-btn" hx-get="/hub" hx-target="#page-content">Zurück</button>
-</div>
+    <input type="submit" value="Auswählen" hx-post="/review-rejected-article/" hx-target="#page-content" />
+</form>
+<button hx-get="/hub/" hx-target="#page-content">Zurück</button>
 {{end}}

web/templates/rework-article.html

@@ -1,71 +1,16 @@
 {{define "page-content"}}
 <h2>Editor</h2>
 <form>
-    <div class="flex flex-col gap-y-1">
-        <label for="article-title">Titel</label>
-        <input name="article-title" type="text" value="{{.Article.Title}}" />
-    </div>
-    <div class="flex flex-col">
-        <label for="article-description">Beschreibung</label>
-        <textarea name="article-description">{{.Article.Description}}</textarea>
-    </div>
-    <div class="flex flex-col">
-        <label for="article-content">Artikel</label>
-        <textarea name="article-content" placeholder="Artikel">{{.Article.Content}}</textarea>
-    </div>
+    <input name="article-title" placeholder="Titel" type="text" value="{{.Article.Title}}" />
+    <textarea name="article-description" placeholder="Beschreibung">{{.Article.Description}}</textarea>
+    <textarea name="article-content" placeholder="Artikel">{{.Article.Content}}</textarea>
+    <input name="article-id" type="hidden" value="{{.Article.ID}}" />
 
-    <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>
-    </div>
+    {{range .Tags}}
+    <input id="tag-{{.Name}}" name="tags" type="checkbox" value="{{.ID}}" {{if index $.Selected .ID}}checked{{end}} />
+    <label for="tag-{{.Name}}">{{.Name}}</label>
+    {{end}}
 
-    <div id="editor-images">
-        <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}}"
-            hx-target="#page-content" />
-        <button class="btn" hx-get="/hub" hx-target="#page-content">Zurück</button>
-    </div>
+    <input type="submit" value="Senden" hx-post="/resubmit-article/" hx-target="#page-content" />
 </form>
-
-<script>
-    function copyToClipboard(text) {
-        event.preventDefault(); // Get-Request verhindern
-
-        var textarea = document.createElement("textarea");
-        textarea.textContent = text;
-        document.body.appendChild(textarea);
-
-        textarea.select();
-        try {
-            document.execCommand('copy');
-        } catch (err) {
-            console.warn('Fehler beim Kopieren', err);
-        }
-
-        document.body.removeChild(textarea);
-    }
-
-</script>
-{{end}}
-
-{{define "editor-images"}}
-{{if gt (len .) 0}}
-<div class="border px-2 py-1 rounded-md flex gap-4 justify-between">
-    <div class="self-center">{{.}}</div>
-    <button class="bg-slate-50 border my-2 px-3 py-2 rounded-md w-32 hover:bg-slate-100"
-        onclick="copyToClipboard('{{.}}')">Kopieren</button>
-</div>
-{{end}}
 {{end}}

web/templates/to-be-published.html

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

web/templates/unpublished-articles.html

@@ -1,11 +1,10 @@
 {{define "page-content"}}
-<div class="flex flex-col gap-4">
+<form>
     {{range .}}
-    <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>
+    <input required id="{{.ID}}" name="id" type="radio" value="{{.ID}}" />
+    <label for="{{.ID}}">{{.Title}}</label>
     {{end}}
-    <button class="action-btn" hx-get="/hub" hx-target="#page-content">Zurück</button>
-</div>
+    <input type="submit" value="Auswählen" hx-post="/review-unpublished-article/" hx-target="#page-content" />
+</form>
+<button hx-get="/hub/" hx-target="#page-content">Zurück</button>
 {{end}}