Merge branch 'devel'

cmd/backend/articles.go

@@ -13,6 +13,7 @@ type Article struct {
 	Title         string
 	BannerLink    string
 	Summary       string
+	ContentLink   string
 	ID            int64
 	AuthorID      int64
 	IssueID       int64
@@ -29,8 +30,8 @@ func (db *DB) AddArticle(a *Article) (int64, error) {
 	selectQuery := "SELECT id FROM issues WHERE published = false"
 	insertQuery := `
     INSERT INTO articles
-        (title, banner_link, summary, published, rejected, author_id, issue_id, edited_id, is_in_issue, auto_generated)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        (title, banner_link, summary, content_link, published, rejected, author_id, issue_id, edited_id, is_in_issue, auto_generated)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `
 
 	for i := 0; i < TxMaxRetries; i++ {
@@ -47,7 +48,7 @@ func (db *DB) AddArticle(a *Article) (int64, error) {
 				return 0, fmt.Errorf("error getting issue ID when adding article to DB: %v", err)
 			}
 
-			result, err := tx.Exec(insertQuery, a.Title, a.BannerLink, a.Summary, a.Published, a.Rejected, a.AuthorID, id, a.EditedID, a.IsInIssue, a.AutoGenerated)
+			result, err := tx.Exec(insertQuery, a.Title, a.BannerLink, a.Summary, a.ContentLink, a.Published, a.Rejected, a.AuthorID, id, a.EditedID, a.IsInIssue, a.AutoGenerated)
 			if err != nil {
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
 					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
@@ -81,7 +82,7 @@ func (db *DB) AddArticle(a *Article) (int64, error) {
 
 func (db *DB) GetArticle(id int64) (*Article, error) {
 	query := `
-    SELECT title, created, banner_link, summary, published, author_id, issue_id, edited_id, is_in_issue, auto_generated
+    SELECT title, created, banner_link, summary, content_link, published, author_id, issue_id, edited_id, is_in_issue, auto_generated
     FROM articles
     WHERE id = ?
     `
@@ -91,7 +92,7 @@ func (db *DB) GetArticle(id int64) (*Article, error) {
 	var created []byte
 	var err error
 
-	if err := row.Scan(&article.Title, &created, &article.BannerLink, &article.Summary, &article.Published, &article.AuthorID, &article.IssueID, &article.EditedID, &article.IsInIssue, &article.AutoGenerated); err != nil {
+	if err := row.Scan(&article.Title, &created, &article.BannerLink, &article.Summary, &article.ContentLink, &article.Published, &article.AuthorID, &article.IssueID, &article.EditedID, &article.IsInIssue, &article.AutoGenerated); err != nil {
 		return nil, fmt.Errorf("error scanning article row: %v", err)
 	}
 
@@ -106,7 +107,7 @@ func (db *DB) GetArticle(id int64) (*Article, error) {
 
 func (db *DB) GetCertainArticles(attribute string, value bool) ([]*Article, error) {
 	query := fmt.Sprintf(`
-    SELECT id, title, created, banner_link, summary, author_id, issue_id, published, rejected, is_in_issue, auto_generated
+    SELECT id, title, created, banner_link, summary, content_link, author_id, issue_id, published, rejected, is_in_issue, auto_generated
     FROM articles
     WHERE %s = ?
     `, attribute)
@@ -120,7 +121,7 @@ func (db *DB) GetCertainArticles(attribute string, value bool) ([]*Article, erro
 		article := new(Article)
 		var created []byte
 
-		if err = rows.Scan(&article.ID, &article.Title, &created, &article.BannerLink, &article.Summary, &article.AuthorID, &article.IssueID, &article.Published, &article.Rejected, &article.IsInIssue, &article.AutoGenerated); err != nil {
+		if err = rows.Scan(&article.ID, &article.Title, &created, &article.BannerLink, &article.Summary, &article.ContentLink, &article.AuthorID, &article.IssueID, &article.Published, &article.Rejected, &article.IsInIssue, &article.AutoGenerated); err != nil {
 			return nil, fmt.Errorf("error scanning article row: %v", err)
 		}
 
@@ -140,7 +141,7 @@ func (db *DB) GetCurrentIssueArticles() ([]*Article, error) {
 	txOptions := &sql.TxOptions{Isolation: sql.LevelSerializable}
 	issueQuery := "SELECT id FROM issues WHERE published = false"
 	articlesQuery := `
-    SELECT id, title, created, banner_link, summary, author_id, auto_generated
+    SELECT id, title, created, banner_link, summary, content_link, author_id, auto_generated
     FROM articles
     WHERE issue_id = ? AND published = true AND is_in_issue = true
     `
@@ -173,7 +174,7 @@ func (db *DB) GetCurrentIssueArticles() ([]*Article, error) {
 				article := new(Article)
 				var created []byte
 
-				if err = rows.Scan(&article.ID, &article.Title, &created, &article.BannerLink, &article.Summary, &article.AuthorID, &article.AutoGenerated); err != nil {
+				if err = rows.Scan(&article.ID, &article.Title, &created, &article.BannerLink, &article.Summary, &article.ContentLink, &article.AuthorID, &article.AutoGenerated); err != nil {
 					if rollbackErr := tx.Rollback(); rollbackErr != nil {
 						log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 					}

cmd/backend/atom.go

@@ -8,13 +8,13 @@ import (
 	"git.streifling.com/jason/atom"
 )
 
+type Feed struct{ *atom.Feed }
+
 func GenerateAtomFeed(c *Config, db *DB) (*string, error) {
 	feed := atom.NewFeed(c.Title)
 	feed.ID = atom.NewID("urn:feed:1")
 	feed.Subtitle = atom.NewText("text", c.Description)
-
-	linkID := feed.AddLink(atom.NewLink(c.Link))
-	feed.Links[linkID].Rel = "self"
+	feed.AddLink(atom.NewLink(c.Link))
 
 	feed.Generator = atom.NewGenerator("cpolis")
 	feed.Generator.URI = "https://git.streifling.com/jason/cpolis"
@@ -32,31 +32,27 @@ func GenerateAtomFeed(c *Config, db *DB) (*string, error) {
 		}
 		entry := atom.NewEntry(articleTitle)
 		entry.ID = atom.NewID(fmt.Sprint("urn:entry:", article.ID))
+		entry.Content = atom.NewContent(atom.OutOfLine, "text/hmtl", article.ContentLink)
 		entry.Published = atom.NewDate(article.Created)
-		entry.Content = atom.NewContent(atom.OutOfLine, "text/hmtl", fmt.Sprint(c.Domain, "/article/serve/", article.ID))
 
-		if article.AutoGenerated {
-			entry.Summary = atom.NewText("text", "automatically generated")
-		} else {
-			articleSummary, err := ConvertToPlain(article.Summary)
-			if err != nil {
-				return nil, fmt.Errorf("error converting description to plain text for Atom feed: %v", err)
-			}
-			entry.Summary = atom.NewText("text", articleSummary)
-		}
-
-		if len(article.BannerLink) > 0 {
-			linkID := entry.AddLink(atom.NewLink(c.Domain + "/image/serve/" + article.BannerLink))
-			entry.Links[linkID].Rel = "enclosure"
-			entry.Links[linkID].Type = "image/webp"
-		}
+		linkID := entry.AddLink(atom.NewLink(article.BannerLink))
+		entry.Links[linkID].Rel = "enclosure"
+		entry.Links[linkID].Type = "image/webp"
 
 		user, err := db.GetUser(c, article.AuthorID)
 		if err != nil {
 			return nil, fmt.Errorf("error getting user user info for Atom feed: %v", err)
 		}
-		authorID := entry.AddAuthor(atom.NewPerson(user.FirstName + " " + user.LastName))
-		entry.Authors[authorID].URI = c.Domain + "/image/serve/" + user.ProfilePicLink
+		entry.AddAuthor(atom.NewPerson(user.FirstName + " " + user.LastName))
+
+		articleSummary, err := ConvertToPlain(article.Summary)
+		if err != nil {
+			return nil, fmt.Errorf("error converting description to plain text for Atom feed: %v", err)
+		}
+		if article.AutoGenerated {
+			articleSummary = "auto generated"
+		}
+		entry.Summary = atom.NewText("text", articleSummary)
 
 		tags, err := db.GetArticleTags(article.ID)
 		if err != nil {

cmd/backend/config.go

@@ -52,7 +52,7 @@ func newConfig() *Config {
 		PDFDir:          "/var/www/cpolis/pdfs",
 		PicsDir:         "/var/www/cpolis/pics",
 		Port:            ":8080",
-		Version:         "v0.14.0",
+		Version:         "v0.13.2",
 		WebDir:          "/var/www/cpolis/web",
 	}
 }

cmd/backend/images.go

@@ -1,6 +1,7 @@
 package backend
 
 import (
+	"encoding/base64"
 	"fmt"
 	"image"
 	"io"
@@ -42,3 +43,20 @@ func SaveImage(src io.Reader, maxHeight, maxWidth int, path string) (string, err
 
 	return filename, nil
 }
+
+func ServeBase64Image(c *Config, filename string) (string, error) {
+	file := c.PicsDir + "/" + filename
+
+	img, err := os.Open(file)
+	if err != nil {
+		return "", fmt.Errorf("error opening file %v: %v", file, err)
+	}
+	defer img.Close()
+
+	imgBytes, err := io.ReadAll(img)
+	if err != nil {
+		return "", fmt.Errorf("error turning %v into bytes: %v", file, err)
+	}
+
+	return base64.StdEncoding.EncodeToString(imgBytes), nil
+}

cmd/backend/users.go

@@ -149,11 +149,11 @@ func (db *DB) AddUser(c *Config, u *User, pass string) (int64, error) {
 	}
 
 	query := `
-    INSERT INTO users (username, password, first_name, last_name, email, profile_pic_link, role)
-    VALUES (?, ?, ?, ?, ?, ?, ?)
+    INSERT INTO users (username, password, first_name, last_name, email, role)
+    VALUES (?, ?, ?, ?, ?, ?)
     `
 
-	result, err := db.Exec(query, u.UserName, string(hashedPass), aesFirstName, aesLastName, aesEmail, u.ProfilePicLink, u.Role)
+	result, err := db.Exec(query, u.UserName, string(hashedPass), aesFirstName, aesLastName, aesEmail, u.Role)
 	if err != nil {
 		return 0, fmt.Errorf("error inserting new user %v into DB: %v", u.UserName, err)
 	}
@@ -253,13 +253,13 @@ func (db *DB) GetUser(c *Config, id int64) (*User, error) {
 
 	user := new(User)
 	query := `
-    SELECT id, username, first_name, last_name, email, profile_pic_link, role
+    SELECT id, username, first_name, last_name, email, role
     FROM users
     WHERE id = ?
     `
 
 	row := db.QueryRow(query, id)
-	if err := row.Scan(&user.ID, &user.UserName, &aesFirstName, &aesLastName, &aesEmail, &user.ProfilePicLink, &user.Role); err != nil {
+	if err := row.Scan(&user.ID, &user.UserName, &aesFirstName, &aesLastName, &aesEmail, &user.Role); err != nil {
 		return nil, fmt.Errorf("error reading user information: %v", err)
 	}
 
@@ -281,10 +281,10 @@ func (db *DB) GetUser(c *Config, id int64) (*User, error) {
 	return user, nil
 }
 
-func (db *DB) UpdateOwnUserAttributes(c *Config, id int64, userName, firstName, lastName, email, profilePicLink, oldPass, newPass string) error {
+func (db *DB) UpdateOwnUserAttributes(c *Config, id int64, userName, firstName, lastName, email, oldPass, newPass string) error {
 	var err error
 	tx := new(Tx)
-	passwordEmpty := len(newPass) == 0
+	passwordEmpty := len(newPass) > 0
 
 	for i := 0; i < TxMaxRetries; i++ {
 		err := func() error {
@@ -331,7 +331,6 @@ func (db *DB) UpdateOwnUserAttributes(c *Config, id int64, userName, firstName,
 				&Attribute{Table: "users", ID: id, AttName: "first_name", Value: aesFirstName},
 				&Attribute{Table: "users", ID: id, AttName: "last_name", Value: aesLastName},
 				&Attribute{Table: "users", ID: id, AttName: "email", Value: aesEmail},
-				&Attribute{Table: "users", ID: id, AttName: "profile_pic_link", Value: profilePicLink},
 			); err != nil {
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
 					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
@@ -361,8 +360,8 @@ func (db *DB) AddFirstUser(c *Config, u *User, pass string) (int64, error) {
 	txOptions := &sql.TxOptions{Isolation: sql.LevelSerializable}
 	selectQuery := "SELECT COUNT(*) FROM users"
 	insertQuery := `
-    INSERT INTO users (username, password, first_name, last_name, email, profile_pic_link, role)
-    VALUES (?, ?, ?, ?, ?, ?, ?)
+    INSERT INTO users (username, password, first_name, last_name, email, role)
+    VALUES (?, ?, ?, ?, ?, ?)
     `
 
 	for i := 0; i < TxMaxRetries; i++ {
@@ -417,7 +416,7 @@ func (db *DB) AddFirstUser(c *Config, u *User, pass string) (int64, error) {
 				return 0, fmt.Errorf("error encrypting email: %v", err)
 			}
 
-			result, err := tx.Exec(insertQuery, u.UserName, string(hashedPass), aesFirstName, aesLastName, aesEmail, u.ProfilePicLink, u.Role)
+			result, err := tx.Exec(insertQuery, u.UserName, string(hashedPass), aesFirstName, aesLastName, aesEmail, u.Role)
 			if err != nil {
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
 					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
@@ -452,7 +451,7 @@ func (db *DB) GetAllUsers(c *Config) (map[int64]*User, error) {
 	var aesFirstName, aesLastName, aesEmail string
 	var err error
 
-	query := "SELECT id, username, first_name, last_name, email, profile_pic_link, role FROM users"
+	query := "SELECT id, username, first_name, last_name, email, role FROM users"
 
 	rows, err := db.Query(query)
 	if err != nil {
@@ -462,7 +461,7 @@ func (db *DB) GetAllUsers(c *Config) (map[int64]*User, error) {
 	users := make(map[int64]*User, 0)
 	for rows.Next() {
 		user := new(User)
-		if err = rows.Scan(&user.ID, &user.UserName, &aesFirstName, &aesLastName, &aesEmail, &user.ProfilePicLink, &user.Role); err != nil {
+		if err = rows.Scan(&user.ID, &user.UserName, &aesFirstName, &aesLastName, &aesEmail, &user.Role); err != nil {
 			return nil, fmt.Errorf("error getting user info: %v", err)
 		}
 
@@ -507,10 +506,10 @@ func (tx *Tx) SetPassword(id int64, newPass string) error {
 	return nil
 }
 
-func (db *DB) UpdateUserAttributes(c *Config, id int64, userName, firstName, lastName, email, profilePicLink, newPass string, role int) error {
+func (db *DB) UpdateUserAttributes(c *Config, id int64, userName, firstName, lastName, email, newPass string, role int) error {
 	var err error
 	tx := new(Tx)
-	passwordEmpty := len(newPass) == 0
+	passwordEmpty := len(newPass) > 0
 
 	for i := 0; i < TxMaxRetries; i++ {
 		err := func() error {
@@ -557,7 +556,6 @@ func (db *DB) UpdateUserAttributes(c *Config, id int64, userName, firstName, las
 				&Attribute{Table: "users", ID: id, AttName: "first_name", Value: aesFirstName},
 				&Attribute{Table: "users", ID: id, AttName: "last_name", Value: aesLastName},
 				&Attribute{Table: "users", ID: id, AttName: "email", Value: aesEmail},
-				&Attribute{Table: "users", ID: id, AttName: "profile_pic_link", Value: profilePicLink},
 				&Attribute{Table: "users", ID: id, AttName: "role", Value: role},
 			); err != nil {
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {

cmd/calls/images.go

@@ -6,15 +6,12 @@ import (
 	"path/filepath"
 
 	b "streifling.com/jason/cpolis/cmd/backend"
-	f "streifling.com/jason/cpolis/cmd/frontend"
 )
 
-func ServeImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
+func ServeImage(c *b.Config) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := f.GetSession(w, r, c, s); err != nil {
-			if !tokenIsVerified(w, r, c) {
-				return
-			}
+		if !tokenIsVerified(w, r, c) {
+			return
 		}
 
 		absFilepath, err := filepath.Abs(c.PicsDir)

cmd/frontend/articles.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"os"
 	"strconv"
+	"strings"
 	"time"
 
 	b "streifling.com/jason/cpolis/cmd/backend"
@@ -23,7 +24,7 @@ type EditorHTMLData struct {
 	Action       string
 	ActionTitle  string
 	ActionButton string
-	Image        string
+	BannerImage  string
 	HTMLContent  template.HTML
 	Article      *b.Article
 	Tags         []*b.Tag
@@ -31,7 +32,7 @@ type EditorHTMLData struct {
 
 func WriteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -63,7 +64,7 @@ func WriteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -92,6 +93,10 @@ func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			http.Error(w, "Bitte den Titel eingeben.", http.StatusBadRequest)
 			return
 		}
+		if len(article.BannerLink) == 0 {
+			http.Error(w, "Bitte ein Titelbild einfügen.", http.StatusBadRequest)
+			return
+		}
 		if len(article.Summary) == 0 {
 			http.Error(w, "Bitte die Beschreibung eingeben.", http.StatusBadRequest)
 			return
@@ -117,6 +122,13 @@ func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
+		article.ContentLink = fmt.Sprint(c.Domain, "/article/serve/", article.ID)
+		if err = db.UpdateAttributes(&b.Attribute{Table: "articles", ID: article.ID, AttName: "content_link", Value: article.ContentLink}); err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
 		r.ParseForm()
 		tags := make([]int64, 0)
 		for _, tag := range r.Form["tags"] {
@@ -149,7 +161,7 @@ func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -190,7 +202,6 @@ func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 		if err = db.UpdateAttributes(
 			&b.Attribute{Table: "articles", ID: id, AttName: "title", Value: title},
-			&b.Attribute{Table: "articles", ID: id, AttName: "banner_link", Value: r.PostFormValue("article-banner-url")},
 			&b.Attribute{Table: "articles", ID: id, AttName: "summary", Value: summary},
 			&b.Attribute{Table: "articles", ID: id, AttName: "rejected", Value: false},
 			&b.Attribute{Table: "articles", ID: id, AttName: "is_in_issue", Value: r.PostFormValue("issue") == "on"},
@@ -232,7 +243,7 @@ func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func ShowUnpublishedUnrejectedAndPublishedRejectedArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := GetSession(w, r, c, s); err != nil {
+		if _, err := getSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -276,7 +287,7 @@ func ShowUnpublishedUnrejectedAndPublishedRejectedArticles(c *b.Config, db *b.DB
 
 func ShowRejectedArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -314,7 +325,7 @@ func ShowRejectedArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerF
 
 func ReviewRejectedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := GetSession(w, r, c, s); err != nil {
+		if _, err := getSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -335,7 +346,14 @@ func ReviewRejectedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.Handler
 			return
 		}
 
-		data.Image = data.Article.BannerLink
+		imgURL := strings.Split(data.Article.BannerLink, "/")
+		imgFileName := imgURL[len(imgURL)-1]
+		data.BannerImage, err = b.ServeBase64Image(c, imgFileName)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
 
 		articleAbsName := fmt.Sprint(c.ArticleDir, "/", data.Article.ID, ".md")
 		content, err := os.ReadFile(articleAbsName)
@@ -378,7 +396,7 @@ func ReviewRejectedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.Handler
 
 func PublishArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -472,7 +490,7 @@ func PublishArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func RejectArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -507,7 +525,7 @@ func RejectArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func ShowCurrentIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := GetSession(w, r, c, s); err != nil {
+		if _, err := getSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -531,7 +549,7 @@ func ShowCurrentIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc
 
 func ShowPublishedArticles(c *b.Config, db *b.DB, s *b.CookieStore, action string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := GetSession(w, r, c, s); err != nil {
+		if _, err := getSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -568,7 +586,7 @@ func ShowPublishedArticles(c *b.Config, db *b.DB, s *b.CookieStore, action strin
 
 func ReviewArticle(c *b.Config, db *b.DB, s *b.CookieStore, action, title, button string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := GetSession(w, r, c, s); err != nil {
+		if _, err := getSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -605,7 +623,14 @@ func ReviewArticle(c *b.Config, db *b.DB, s *b.CookieStore, action, title, butto
 			return
 		}
 
-		data.Image = article.BannerLink
+		imgURL := strings.Split(article.BannerLink, "/")
+		imgFileName := imgURL[len(imgURL)-1]
+		data.BannerImage, err = b.ServeBase64Image(c, imgFileName)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
 
 		data.Article.Summary, err = b.ConvertToPlain(article.Summary)
 		if err != nil {
@@ -647,7 +672,7 @@ func ReviewArticle(c *b.Config, db *b.DB, s *b.CookieStore, action, title, butto
 
 func DeleteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -700,7 +725,7 @@ func DeleteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func AllowEditArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -759,7 +784,7 @@ func AllowEditArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc
 
 func EditArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := GetSession(w, r, c, s); err != nil {
+		if _, err := getSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -781,7 +806,14 @@ func EditArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		data.Image = data.Article.BannerLink
+		imgURL := strings.Split(data.Article.BannerLink, "/")
+		imgFileName := imgURL[len(imgURL)-1]
+		data.BannerImage, err = b.ServeBase64Image(c, imgFileName)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
 
 		content, err := os.ReadFile(fmt.Sprint(c.ArticleDir, "/", data.Article.ID, ".md"))
 		if err != nil {

cmd/frontend/images.go

@@ -9,9 +9,9 @@ import (
 	b "streifling.com/jason/cpolis/cmd/backend"
 )
 
-func UploadEasyMDEImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
+func UploadImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := GetSession(w, r, c, s); err != nil {
+		if _, err := getSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -42,9 +42,9 @@ func UploadEasyMDEImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	}
 }
 
-func UploadImage(c *b.Config, s *b.CookieStore, fileKey, htmlFile, htmlTemplate string) http.HandlerFunc {
+func UploadBanner(c *b.Config, s *b.CookieStore, fileKey, htmlFile, htmlTemplate string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := GetSession(w, r, c, s); err != nil {
+		if _, err := getSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -69,8 +69,20 @@ func UploadImage(c *b.Config, s *b.CookieStore, fileKey, htmlFile, htmlTemplate
 			return
 		}
 
-		data := new(struct{ Image string })
-		data.Image = filename
+		base64Img, err := b.ServeBase64Image(c, filename)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		data := new(struct {
+			BannerImage string
+			URL         string
+		})
+
+		data.BannerImage = base64Img
+		data.URL = c.Domain + "/image/serve/" + filename
 
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/" + htmlFile)
 		if err = template.Must(tmpl, err).ExecuteTemplate(w, htmlTemplate, data); err != nil {

cmd/frontend/issues.go

@@ -13,7 +13,7 @@ import (
 
 func PublishLatestIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -41,6 +41,10 @@ func PublishLatestIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFun
 			http.Error(w, "Bitte den Titel eingeben.", http.StatusBadRequest)
 			return
 		}
+		if len(article.BannerLink) == 0 {
+			http.Error(w, "Bitte ein Titelbild einfügen.", http.StatusBadRequest)
+			return
+		}
 
 		article.ID, err = db.AddArticle(article)
 		if err != nil {
@@ -62,6 +66,19 @@ func PublishLatestIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFun
 			return
 		}
 
+		article.ContentLink = fmt.Sprint(c.Domain, "/article/serve/", article.ID)
+		if err = db.UpdateAttributes(&b.Attribute{Table: "articles", ID: article.ID, AttName: "content_link", Value: article.ContentLink}); err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		if err = db.UpdateAttributes(&b.Attribute{Table: "articles", ID: article.ID, AttName: "content_link", Value: article.ContentLink}); err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
 		if err = db.AddArticleToCurrentIssue(article.ID); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

cmd/frontend/pdf.go

@@ -12,7 +12,7 @@ import (
 
 func UploadPDF(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := GetSession(w, r, c, s); err != nil {
+		if _, err := getSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

cmd/frontend/sessions.go

@@ -26,8 +26,8 @@ func saveSession(w http.ResponseWriter, r *http.Request, s *b.CookieStore, u *b.
 	return nil
 }
 
-// GetSession is used for verifying that the user is logged in and returns their session and an error.
-func GetSession(w http.ResponseWriter, r *http.Request, c *b.Config, s *b.CookieStore) (*b.Session, error) {
+// getSession is used for verifying that the user is logged in and returns their session and an error.
+func getSession(w http.ResponseWriter, r *http.Request, c *b.Config, s *b.CookieStore) (*b.Session, error) {
 	msg := "Keine gültige Session. Bitte erneut anmelden."
 	tmpl, tmplErr := template.ParseFiles(c.WebDir+"/templates/index.html", c.WebDir+"/templates/login.html")
 
@@ -57,21 +57,15 @@ func HomePage(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 		}
 
 		data := new(struct {
-			*UserHTMLData
 			Version string
+			Role    int
 		})
-		data.UserHTMLData = &UserHTMLData{User: new(b.User)}
 		data.Version = c.Version
 
 		files := make([]string, 2)
 		files[0] = c.WebDir + "/templates/index.html"
 		if numRows == 0 {
-			data.Role = b.NonExistent
-			data.Title = "Erster Benutzer (Administrator)"
-			data.ButtonText = "Anlegen"
-			data.URL = "/user/add-first"
-
-			files[1] = c.WebDir + "/templates/edit-user.html"
+			files[1] = c.WebDir + "/templates/first-user.html"
 			tmpl, err := template.ParseFiles(files...)
 			if err = template.Must(tmpl, err).Execute(w, data); err != nil {
 				log.Println(err)
@@ -85,7 +79,6 @@ func HomePage(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
-
 			if auth, ok := session.Values["authenticated"].(bool); auth && ok {
 				data.Role = session.Values["role"].(int)
 				files[1] = c.WebDir + "/templates/hub.html"
@@ -96,7 +89,6 @@ func HomePage(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 					return
 				}
 			} else {
-				data.Role = b.Author
 				files[1] = c.WebDir + "/templates/login.html"
 				tmpl, err := template.ParseFiles(files...)
 				if err = template.Must(tmpl, err).Execute(w, data); err != nil {
@@ -150,7 +142,7 @@ func Login(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func Logout(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -175,7 +167,7 @@ func Logout(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 
 func ShowHub(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

cmd/frontend/tags.go

@@ -10,7 +10,7 @@ import (
 
 func CreateTag(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := GetSession(w, r, c, s); err != nil {
+		if _, err := getSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -27,7 +27,7 @@ func CreateTag(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 
 func AddTag(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

cmd/frontend/users.go

@@ -10,14 +10,6 @@ import (
 	b "streifling.com/jason/cpolis/cmd/backend"
 )
 
-type UserHTMLData struct {
-	*b.User
-	Title      string
-	ButtonText string
-	URL        string
-	Image      string
-}
-
 func checkUserStrings(user *b.User) (string, int, bool) {
 	userLen := 63 // max value for utf-8 at 255 bytes
 	nameLen := 56 // max value when aes encrypting utf-8 at up to 255 bytes
@@ -35,21 +27,14 @@ func checkUserStrings(user *b.User) (string, int, bool) {
 
 func CreateUser(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := GetSession(w, r, c, s); err != nil {
+		if _, err := getSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
-		data := &UserHTMLData{
-			User:       &b.User{Role: b.Author},
-			Title:      "Neuer Benutzer",
-			ButtonText: "Anlegen",
-			URL:        "/user/add",
-		}
-
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/edit-user.html")
-		if err = template.Must(tmpl, err).ExecuteTemplate(w, "page-content", data); err != nil {
+		tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-user.html")
+		if err = template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -59,7 +44,7 @@ func CreateUser(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 
 func AddUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -67,11 +52,10 @@ func AddUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 		}
 
 		user := &b.User{
-			UserName:       r.PostFormValue("username"),
-			FirstName:      r.PostFormValue("first-name"),
-			LastName:       r.PostFormValue("last-name"),
-			Email:          r.PostFormValue("email"),
-			ProfilePicLink: r.PostFormValue("profile-pic-url"),
+			UserName:  r.PostFormValue("username"),
+			FirstName: r.PostFormValue("first-name"),
+			LastName:  r.PostFormValue("last-name"),
+			Email:     r.PostFormValue("email"),
 		}
 		pass := r.PostFormValue("password")
 		pass2 := r.PostFormValue("password2")
@@ -138,7 +122,7 @@ func AddUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func EditSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -152,16 +136,8 @@ func EditSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		data := &UserHTMLData{
-			User:       user,
-			Title:      "Mein Profil bearbeiten",
-			ButtonText: "Übernehmen",
-			URL:        "/user/update/self",
-			Image:      user.ProfilePicLink,
-		}
-
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/edit-user.html")
-		if err = template.Must(tmpl, err).ExecuteTemplate(w, "page-content", data); err != nil {
+		tmpl, err := template.ParseFiles(c.WebDir + "/templates/edit-self.html")
+		if err = template.Must(tmpl, err).ExecuteTemplate(w, "page-content", user); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -171,7 +147,7 @@ func EditSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func UpdateSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -179,12 +155,11 @@ func UpdateSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 		}
 
 		user := &b.User{
-			ID:             session.Values["id"].(int64),
-			UserName:       r.PostFormValue("username"),
-			FirstName:      r.PostFormValue("first-name"),
-			LastName:       r.PostFormValue("last-name"),
-			Email:          r.PostFormValue("email"),
-			ProfilePicLink: r.PostFormValue("profile-pic-url"),
+			ID:        session.Values["id"].(int64),
+			UserName:  r.PostFormValue("username"),
+			FirstName: r.PostFormValue("first-name"),
+			LastName:  r.PostFormValue("last-name"),
+			Email:     r.PostFormValue("email"),
 		}
 
 		oldPass := r.PostFormValue("old-password")
@@ -227,7 +202,7 @@ func UpdateSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		if err = db.UpdateOwnUserAttributes(c, user.ID, user.UserName, user.FirstName, user.LastName, user.Email, user.ProfilePicLink, oldPass, newPass); err != nil {
+		if err = db.UpdateOwnUserAttributes(c, user.ID, user.UserName, user.FirstName, user.LastName, user.Email, oldPass, newPass); err != nil {
 			log.Println("error: user:", user.ID, err)
 			http.Error(w, "Benutzerdaten konnten nicht aktualisiert werden.", http.StatusInternalServerError)
 			return
@@ -250,12 +225,11 @@ func AddFirstUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var err error
 		user := &b.User{
-			UserName:       r.PostFormValue("username"),
-			FirstName:      r.PostFormValue("first-name"),
-			LastName:       r.PostFormValue("last-name"),
-			Email:          r.PostFormValue("email"),
-			ProfilePicLink: r.PostFormValue("profile-pic-url"),
-			Role:           b.Admin,
+			UserName:  r.PostFormValue("username"),
+			FirstName: r.PostFormValue("first-name"),
+			LastName:  r.PostFormValue("last-name"),
+			Email:     r.PostFormValue("email"),
+			Role:      b.Admin,
 		}
 		pass := r.PostFormValue("password")
 		pass2 := r.PostFormValue("password2")
@@ -319,7 +293,7 @@ func AddFirstUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func ShowAllUsers(c *b.Config, db *b.DB, s *b.CookieStore, action string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -351,7 +325,7 @@ func ShowAllUsers(c *b.Config, db *b.DB, s *b.CookieStore, action string) http.H
 
 func EditUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := GetSession(w, r, c, s); err != nil {
+		if _, err := getSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -371,16 +345,8 @@ func EditUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		data := &UserHTMLData{
-			User:       user,
-			Title:      "Profil von " + user.FirstName + " " + user.LastName + " bearbeiten",
-			ButtonText: "Übernehmen",
-			URL:        fmt.Sprint("/user/update/", user.ID),
-			Image:      user.ProfilePicLink,
-		}
-
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/edit-user.html")
-		if err = template.Must(tmpl, err).ExecuteTemplate(w, "page-content", data); err != nil {
+		if err = template.Must(tmpl, err).ExecuteTemplate(w, "page-content", user); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -390,7 +356,7 @@ func EditUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func UpdateUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -436,8 +402,6 @@ func UpdateUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		user.ProfilePicLink = r.PostFormValue("profile-pic-url")
-
 		newPass := r.PostFormValue("password")
 		newPass2 := r.PostFormValue("password2")
 		if newPass != newPass2 {
@@ -456,7 +420,7 @@ func UpdateUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		if err = db.UpdateUserAttributes(c, user.ID, user.UserName, user.FirstName, user.LastName, user.Email, user.ProfilePicLink, newPass, user.Role); err != nil {
+		if err = db.UpdateUserAttributes(c, user.ID, user.UserName, user.FirstName, user.LastName, user.Email, newPass, user.Role); err != nil {
 			log.Println("error: user:", user.ID, err)
 			http.Error(w, "Benutzerdaten konnten nicht aktualisiert werden.", http.StatusInternalServerError)
 			return
@@ -476,7 +440,7 @@ func UpdateUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func DeleteUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := GetSession(w, r, c, s)
+		session, err := getSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

cmd/main.go

@@ -68,7 +68,7 @@ func main() {
 	mux.HandleFunc("GET /article/write", f.WriteArticle(config, db, store))
 	mux.HandleFunc("GET /atom/serve", c.ServeAtomFeed(config))
 	mux.HandleFunc("GET /hub", f.ShowHub(config, db, store))
-	mux.HandleFunc("GET /image/serve/{pic}", c.ServeImage(config, store))
+	mux.HandleFunc("GET /image/serve/{pic}", c.ServeImage(config))
 	mux.HandleFunc("GET /issue/this", f.ShowCurrentIssue(config, db, store))
 	mux.HandleFunc("GET /logout", f.Logout(config, store))
 	mux.HandleFunc("GET /pdf/get-list", c.ServePDFList(config))
@@ -83,10 +83,10 @@ func main() {
 
 	mux.HandleFunc("POST /article/resubmit/{id}", f.ResubmitArticle(config, db, store))
 	mux.HandleFunc("POST /article/submit", f.SubmitArticle(config, db, store))
-	mux.HandleFunc("POST /article/upload-banner", f.UploadImage(config, store, "article-banner", "editor.html", "article-banner-template"))
-	mux.HandleFunc("POST /article/upload-image", f.UploadEasyMDEImage(config, store))
+	mux.HandleFunc("POST /article/upload-banner", f.UploadBanner(config, store, "article-banner", "editor.html", "article-banner-template"))
+	mux.HandleFunc("POST /article/upload-image", f.UploadImage(config, store))
 	mux.HandleFunc("POST /issue/publish", f.PublishLatestIssue(config, db, store))
-	mux.HandleFunc("POST /issue/upload-banner", f.UploadImage(config, store, "issue-banner", "current-issue.html", "issue-banner-template"))
+	mux.HandleFunc("POST /issue/upload-banner", f.UploadBanner(config, store, "issue-banner", "current-issue.html", "issue-banner-template"))
 	mux.HandleFunc("POST /login", f.Login(config, db, store))
 	mux.HandleFunc("POST /pdf/upload", f.UploadPDF(config, store))
 	mux.HandleFunc("POST /tag/add", f.AddTag(config, db, store))
@@ -94,7 +94,6 @@ func main() {
 	mux.HandleFunc("POST /user/add-first", f.AddFirstUser(config, db, store))
 	mux.HandleFunc("POST /user/update/{id}", f.UpdateUser(config, db, store))
 	mux.HandleFunc("POST /user/update/self", f.UpdateSelf(config, db, store))
-	mux.HandleFunc("POST /user/upload-profile-pic", f.UploadImage(config, store, "upload-profile-pic", "edit-user.html", "profile-pic-template"))
 
 	log.Fatalln(http.ListenAndServe(config.Port, mux))
 }

create_db.sql

@@ -11,7 +11,7 @@ CREATE TABLE users (
     first_name          VARCHAR(255)    NOT NULL,
     last_name           VARCHAR(255)    NOT NULL,
     email               VARCHAR(255)    NOT NULL,
-    profile_pic_link    VARCHAR(255),
+    -- profile_pic_link    VARCHAR(255)    NOT NULL,
     role                INT             NOT NULL,
     PRIMARY KEY (id)
 );
@@ -26,8 +26,9 @@ CREATE TABLE articles (
     id              INT             AUTO_INCREMENT,
     title           VARCHAR(255)    NOT NULL,
     created         TIMESTAMP       DEFAULT CURRENT_TIMESTAMP,
-    banner_link     VARCHAR(255),
+    banner_link     VARCHAR(255)    NOT NULL,
     summary         TEXT            NOT NULL,
+    content_link    VARCHAR(255)    NOT NULL,
     published       BOOL            NOT NULL,
     rejected        BOOL            NOT NULL,
     author_id       INT             NOT NULL,

web/static/css/input.css

@@ -24,7 +24,7 @@ textarea {
 }
 
 .btn-area {
-    @apply grid grid-cols-1 md:grid-cols-2 gap-x-4 gap-y-1;
+    @apply grid grid-cols-1 md:grid-cols-2 gap-x-4 gap-y-1 mt-4;
 }
 
 .btn-area-3 {
@@ -40,33 +40,33 @@ textarea {
 }
 
 .EasyMDEContainer .CodeMirror {
-    @apply bg-slate-50 dark:bg-slate-950 border-slate-200 dark:border-slate-800 text-slate-900 dark:text-slate-100;
+    @apply bg-slate-50 dark:bg-slate-950 border-slate-200 dark:border-slate-800 text-slate-900 dark:text-slate-100
 }
 
 .EasyMDEContainer .cm-s-easymde .CodeMirror-cursor {
-    @apply border-slate-900 dark:border-slate-100;
+    @apply border-slate-900 dark:border-slate-100
 }
 
 .EasyMDEContainer .editor-toolbar > * {
-    @apply text-slate-900 dark:text-slate-100;
+    @apply text-slate-900 dark:text-slate-100
 }
 
 .EasyMDEContainer .editor-toolbar > .active, .editor-toolbar > button:hover, .editor-preview pre, .cm-s-easymde .cm-comment {
-    @apply bg-slate-100 dark:bg-slate-900;
+    @apply bg-slate-100 dark:bg-slate-900
 }
 
 .EasyMDEContainer .CodeMirror-fullscreen {
-    @apply bg-slate-50 dark:bg-slate-950;
+    @apply bg-slate-50 dark:bg-slate-950
 }
 
 .editor-toolbar {
-    @apply border border-slate-200 dark:border-slate-800;
+    @apply border border-slate-200 dark:border-slate-800
 }
 
 .editor-toolbar.fullscreen {
-    @apply bg-slate-50 dark:bg-slate-950;
+    @apply bg-slate-50 dark:bg-slate-950
 }
 
 .editor-preview {
-    @apply bg-slate-50 dark:bg-slate-950;
+    @apply bg-slate-50 dark:bg-slate-950
 }

web/templates/add-user.html

@@ -0,0 +1,66 @@
+{{define "page-content"}}
+<h2>Neuer Benutzer</h2>
+
+<form>
+    <div class="grid grid-cols-1 sm:grid-cols-2 md: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>
+            <label for="email">Emailadresse</label>
+            <input class="w-full" required name="email" type="text" value="{{.Email}}" />
+        </div>
+
+        <div>
+            <label for="email2">Emailadresse wiederholen</label>
+            <input class="w-full" required name="email2" type="text" value="{{.Email}}" />
+        </div>
+    </div>
+
+    <div class="flex flex-wrap 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">Administrator</label>
+        </div>
+    </div>
+
+    <div class="btn-area">
+        <input class="action-btn" type="submit" value="Anlegen" hx-post="/user/add" hx-target="#page-content" />
+        <button class="btn" hx-get="/hub" hx-target="#page-content">Abbrechen</button>
+    </div>
+</form>
+{{end}}

web/templates/current-issue.html

@@ -79,8 +79,8 @@
 {{end}}
 
 {{define "issue-banner-template"}}
-<div id="issue-banner-container">
-    <img src="/image/serve/{{.Image}}" alt="" />
-    <input id="issue-banner-url" name="issue-banner-url" type="hidden" value="{{.Image}}" />
+<div class="w-full" id="issue-banner-container">
+    <img src="data:image/webp;base64,{{.BannerImage}}" alt="Banner Image">
+    <input id="issue-banner-url" name="issue-banner-url" type="hidden" value="{{.URL}}" />
 </div>
 {{end}}

web/templates/edit-self.html

@@ -0,0 +1,53 @@
+{{define "page-content"}}
+<h2>Profil bearbeiten</h2>
+
+<form>
+    <div class="grid grid-cols-1 sm:grid-cols-2 md: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>
+            <label for="email">Emailadresse</label>
+            <input class="w-full" required name="email" type="text" value="{{.Email}}" />
+        </div>
+
+        <div>
+            <label for="email2">Emailadresse wiederholen</label>
+            <input class="w-full" required name="email2" type="text" value="{{.Email}}" />
+        </div>
+    </div>
+
+    <div class="btn-area">
+        <input class="action-btn" type="submit" value="Aktualisieren" hx-post="/user/update/self"
+            hx-target="#page-content" />
+        <button class="btn" hx-get="/hub" hx-target="#page-content">Abbrechen</button>
+    </div>
+</form>
+{{end}}

web/templates/edit-user.html

@@ -1,90 +1,67 @@
 {{define "page-content"}}
-<h2>{{.Title}}</h2>
-
-<form class="flex flex-col gap-4" hx-encoding="multipart/form-data">
-    <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-        {{template "profile-pic-template" .}}
+<h2>Profil von {{.FirstName}} {{.LastName}} bearbeiten</h2>
 
+<form>
+    <div class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4">
         <div>
             <label for="username">Benutzername</label>
-            <input class="w-full" required name="username" type="text" {{if lt .Role 4}}value="{{.UserName}}" {{end}} />
-        </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" />
+            <input class="w-full" name="username" type="text" value="{{.UserName}}" />
         </div>
 
         <div>
             <label for="first-name">Vorname</label>
-            <input class="w-full" required name="first-name" type="text" {{if lt .Role 4}}value="{{.FirstName}}"
-                {{end}} />
+            <input class="w-full" 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" {{if lt .Role 4}}value="{{.LastName}}"
-                {{end}} />
+            <input class="w-full" name="last-name" type="text" value="{{.LastName}}" />
+        </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>
             <label for="email">Emailadresse</label>
-            <input class="w-full" required name="email" type="text" {{if lt .Role 4}}value="{{.Email}}" {{end}} />
+            <input class="w-full" required name="email" type="text" value="{{.Email}}" />
         </div>
 
         <div>
             <label for="email2">Emailadresse wiederholen</label>
-            <input class="w-full" required name="email2" type="text" {{if lt .Role 4}}value="{{.Email}}" {{end}} />
+            <input class="w-full" required name="email2" type="text" value="{{.Email}}" />
         </div>
     </div>
 
-    {{if lt .Role 4}}
     <div class="flex flex-wrap gap-4">
         <div>
-            <input required id="author" name="role" type="radio" value="3" {{if eq .Role 3}}checked{{end}} />
+            <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}} />
+            <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}} />
+            <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}} />
+            <input required id="admin" name="role" type="radio" value="0" {{if eq .Role 0 }}checked{{end}} />
             <label for="admin">Administrator</label>
         </div>
     </div>
-    {{end}}
 
     <div class="btn-area">
-        <input class="action-btn" type="submit" value="{{.ButtonText}}" hx-post="{{.URL}}" hx-target="#page-content" />
+        <input class="action-btn" type="submit" value="Aktualisieren" hx-post="/user/update/{{.ID}}"
+            hx-target="#page-content" />
         <button class="btn" hx-get="/hub" hx-target="#page-content">Abbrechen</button>
     </div>
 </form>
 {{end}}
-
-{{define "profile-pic-template"}}
-<div class="flex items-center justify-center row-span-3 self-center" id="profile-pic-container">
-    <label
-        class="bg-slate-200 dark:bg-slate-800 hover:bg-slate-100 dark:hover:bg-slate-900 border border-slate-200 dark:border-slate-800 cursor-pointer flex flex-col h-48 items-center justify-center overflow-hidden rounded-full w-48"
-        for="upload-profile-pic">
-        {{if gt (len .Image) 0}}
-        <img src="/image/serve/{{.Image}}" alt="" />
-        {{else}}
-        <span class="text-2xl">+</span>
-        <span>Profilbild</span>
-        {{end}}
-    </label>
-    <input class="hidden" id="upload-profile-pic" name="upload-profile-pic" type="file"
-        hx-post="/user/upload-profile-pic" hx-swap="outerHTML" hx-target="#profile-pic-container" />
-    <input id="profile-pic-url" name="profile-pic-url" type="hidden" value="{{.Image}}" />
-</div>
-{{end}}

web/templates/editor.html

@@ -1,9 +1,12 @@
 {{define "page-content"}}
 <h2>Editor</h2>
 
-<form class="flex flex-col gap-4" id="edit-area" hx-encoding="multipart/form-data">
+<form id="edit-area" hx-encoding="multipart/form-data">
     <div class="flex flex-col gap-y-1">
-        {{template "article-banner-template" .}}
+        <div class="w-full" id="article-banner-container">
+            <img src="data:image/webp;base64,{{.BannerImage}}" alt="Banner Image">
+            <input id="article-banner-url" name="article-banner-url" type="hidden" value="{{.Article.BannerLink}}" />
+        </div>
 
         <div class="grid grid-cols-2 gap-4 items-center">
             <div class="flex flex-col">
@@ -11,22 +14,28 @@
                 <input name="article-title" type="text" value="{{.Article.Title}}" />
             </div>
 
-            <div class="flex">
+            <div class="grid grid-cols-1 items-center">
                 <label class="btn text-center" for="article-banner">Titelbild</label>
                 <input class="hidden" id="article-banner" name="article-banner" type="file" required
-                    hx-post="/article/upload-banner" hx-swap="outerHTML" hx-target="#article-banner-container" />
+                    hx-post="/article/upload-banner" hx-target="#article-banner-container" />
             </div>
         </div>
     </div>
 
-    <div class="flex flex-col gap-1">
+    <div class="flex flex-col gap-y-1">
         <label for="article-summary">Beschreibung</label>
         <textarea name="article-summary">{{.Article.Summary}}</textarea>
     </div>
 
+    <div class="flex flex-col gap-y-1">
+        <label for="easyMDE">Artikel</label>
+        <textarea id="easyMDE">{{.Content}}</textarea>
+        <input id="article-content" name="article-content" type="hidden" value="{{.Content}}" />
+    </div>
+
     <div>
         <span>Tags</span>
-        <div class="flex flex-wrap gap-4">
+        <div class="flex flex-wrap gap-x-4">
             <div>
                 <input id="issue" name="issue" type="checkbox" {{if .Article.IsInIssue}}checked{{end}} />
                 <label for="issue">Orient Express</label>
@@ -42,12 +51,6 @@
         </div>
     </div>
 
-    <div class="flex flex-col gap-1">
-        <label for="easyMDE">Artikel</label>
-        <textarea id="easyMDE">{{.Content}}</textarea>
-        <input id="article-content" name="article-content" type="hidden" value="{{.Content}}" />
-    </div>
-
     <div class="btn-area">
         <input class="action-btn" type="submit" value="Senden" hx-post="/article/{{.Action}}"
             hx-target="#page-content" />
@@ -89,8 +92,8 @@
 {{end}}
 
 {{define "article-banner-template"}}
-<div id="article-banner-container">
-    <img src="/image/serve/{{.Image}}" alt="" />
-    <input id="article-banner-url" name="article-banner-url" type="hidden" value="{{.Image}}" />
+<div class="w-full" id="article-banner-container">
+    <img src="data:image/webp;base64,{{.BannerImage}}" alt="Banner Image">
+    <input id="article-banner-url" name="article-banner-url" type="hidden" value="{{.URL}}" />
 </div>
 {{end}}

web/templates/first-user.html

@@ -0,0 +1,46 @@
+{{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" />
+        </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" />
+        </div>
+
+        <div>
+            <label for="last-name">Nachname</label>
+            <input class="w-full" required name="last-name" type="text" />
+        </div>
+
+        <div>
+            <label for="email">Emailadresse</label>
+            <input class="w-full" required name="email" type="text" />
+        </div>
+
+        <div>
+            <label for="email2">Emailadresse wiederholen</label>
+            <input class="w-full" required name="email2" type="text" />
+        </div>
+    </div>
+
+    <div class="btn-area-1">
+        <input class="action-btn" type="submit" value="Anlegen" hx-post="/user/add-first" hx-target="#page-content" />
+    </div>
+</form>
+{{end}}

web/templates/review-article.html

@@ -3,7 +3,7 @@
 
 <div>
     <div class="w-full" id="article-banner-container">
-        <img src="/image/serve/{{.Image}}" alt="Banner Image">
+        <img src="data:image/webp;base64,{{.BannerImage}}" alt="Banner Image">
     </div>
 
     <span>Titel</span>