Add profile pic and correct usage of banner link

Delete content link from everywhere since it is only a combination of already saved info
Changed version
2024-11-01 16:31:47 +01:00 · 2024-11-01 16:26:37 +01:00 · 2024-11-01 16:22:50 +01:00 · 2024-11-01 16:22:31 +01:00 · 2024-10-30 03:25:05 +01:00 · 2024-10-30 03:24:29 +01:00
25 changed files with 256 additions and 438 deletions
--- a/cmd/backend/articles.go
+++ b/cmd/backend/articles.go
@ -13,7 +13,6 @@ type Article struct {
 	Title         string
 	BannerLink    string
 	Summary       string
-	ContentLink   string
 	ID            int64
 	AuthorID      int64
 	IssueID       int64
@ -30,8 +29,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, content_link, published, rejected, author_id, issue_id, edited_id, is_in_issue, auto_generated)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        (title, banner_link, summary, published, rejected, author_id, issue_id, edited_id, is_in_issue, auto_generated)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
    `

 	for i := 0; i < TxMaxRetries; i++ {
@ -48,7 +47,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.ContentLink, 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.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)
@ -82,7 +81,7 @@ func (db *DB) AddArticle(a *Article) (int64, error) {

 func (db *DB) GetArticle(id int64) (*Article, error) {
 	query := `
-    SELECT title, created, banner_link, summary, content_link, published, author_id, issue_id, edited_id, is_in_issue, auto_generated
+    SELECT title, created, banner_link, summary, published, author_id, issue_id, edited_id, is_in_issue, auto_generated
    FROM articles
    WHERE id = ?
    `
@ -92,7 +91,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.ContentLink, &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.Published, &article.AuthorID, &article.IssueID, &article.EditedID, &article.IsInIssue, &article.AutoGenerated); err != nil {
 		return nil, fmt.Errorf("error scanning article row: %v", err)
 	}

@ -107,7 +106,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, content_link, author_id, issue_id, published, rejected, is_in_issue, auto_generated
+    SELECT id, title, created, banner_link, summary, author_id, issue_id, published, rejected, is_in_issue, auto_generated
    FROM articles
    WHERE %s = ?
    `, attribute)
@ -121,7 +120,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.ContentLink, &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.AuthorID, &article.IssueID, &article.Published, &article.Rejected, &article.IsInIssue, &article.AutoGenerated); err != nil {
 			return nil, fmt.Errorf("error scanning article row: %v", err)
 		}

@ -141,7 +140,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, content_link, author_id, auto_generated
+    SELECT id, title, created, banner_link, summary, author_id, auto_generated
    FROM articles
    WHERE issue_id = ? AND published = true AND is_in_issue = true
    `
@ -174,7 +173,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.ContentLink, &article.AuthorID, &article.AutoGenerated); err != nil {
+				if err = rows.Scan(&article.ID, &article.Title, &created, &article.BannerLink, &article.Summary, &article.AuthorID, &article.AutoGenerated); err != nil {
 					if rollbackErr := tx.Rollback(); rollbackErr != nil {
 						log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 					}
--- a/cmd/backend/atom.go
+++ b/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)
-	feed.AddLink(atom.NewLink(c.Link))
+
+	linkID := feed.AddLink(atom.NewLink(c.Link))
+	feed.Links[linkID].Rel = "self"

 	feed.Generator = atom.NewGenerator("cpolis")
 	feed.Generator.URI = "https://git.streifling.com/jason/cpolis"
@ -32,27 +32,31 @@ 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))

-		linkID := entry.AddLink(atom.NewLink(article.BannerLink))
-		entry.Links[linkID].Rel = "enclosure"
-		entry.Links[linkID].Type = "image/webp"
+		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"
+		}

 		user, err := db.GetUser(c, article.AuthorID)
 		if err != nil {
 			return nil, fmt.Errorf("error getting user user info for Atom feed: %v", err)
 		}
-		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)
+		authorID := entry.AddAuthor(atom.NewPerson(user.FirstName + " " + user.LastName))
+		entry.Authors[authorID].URI = c.Domain + "/image/serve/" + user.ProfilePicLink

 		tags, err := db.GetArticleTags(article.ID)
 		if err != nil {
--- a/cmd/backend/config.go
+++ b/cmd/backend/config.go
@ -18,7 +18,7 @@ type Config struct {
 	DBName          string
 	Description     string
 	Domain          string
-	AtomFeed        string
+	AtomFile        string
 	FirebaseKey     string
 	GOBKeyFile      string
 	Link            string
@ -39,7 +39,7 @@ func newConfig() *Config {
 	return &Config{
 		AESKeyFile:      "/var/www/cpolis/aes.key",
 		ArticleDir:      "/var/www/cpolis/articles",
-		AtomFeed:        "/var/www/cpolis/cpolis.atom",
+		AtomFile:        "/var/www/cpolis/cpolis.atom",
 		ConfigFile:      "/etc/cpolis/config.toml",
 		DBName:          "cpolis",
 		FirebaseKey:     "/var/www/cpolis/serviceAccountKey.json",
@ -52,7 +52,7 @@ func newConfig() *Config {
 		PDFDir:          "/var/www/cpolis/pdfs",
 		PicsDir:         "/var/www/cpolis/pics",
 		Port:            ":8080",
-		Version:         "v0.13.1",
+		Version:         "v0.14.0",
 		WebDir:          "/var/www/cpolis/web",
 	}
 }
@ -110,7 +110,7 @@ func (c *Config) handleCliArgs() error {

 	flag.StringVar(&c.AESKeyFile, "aes", c.AESKeyFile, "aes key file")
 	flag.StringVar(&c.ArticleDir, "articles", c.ArticleDir, "articles directory")
-	flag.StringVar(&c.AtomFeed, "feed", c.AtomFeed, "atom feed file")
+	flag.StringVar(&c.AtomFile, "feed", c.AtomFile, "atom feed file")
 	flag.StringVar(&c.ConfigFile, "config", c.ConfigFile, "config file")
 	flag.StringVar(&c.DBName, "db", c.DBName, "DB name")
 	flag.StringVar(&c.Description, "desc", c.Description, "channel description")
@ -187,10 +187,10 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 		c.Domain = "https://" + c.Domain
 	}

-	if cliConfig.AtomFeed != defaultConfig.AtomFeed {
-		c.AtomFeed = cliConfig.AtomFeed
+	if cliConfig.AtomFile != defaultConfig.AtomFile {
+		c.AtomFile = cliConfig.AtomFile
 	}
-	c.AtomFeed, err = mkFile(c.AtomFeed, 0644, 0744)
+	c.AtomFile, err = mkFile(c.AtomFile, 0644, 0744)
 	if err != nil {
 		return fmt.Errorf("error setting up file: %v", err)
 	}
--- a/cmd/backend/images.go
+++ b/cmd/backend/images.go
@ -1,7 +1,6 @@
 package backend

 import (
-	"encoding/base64"
 	"fmt"
 	"image"
 	"io"
@ -43,20 +42,3 @@ 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
-}
--- a/cmd/backend/users.go
+++ b/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, role)
-    VALUES (?, ?, ?, ?, ?, ?)
+    INSERT INTO users (username, password, first_name, last_name, email, profile_pic_link, role)
+    VALUES (?, ?, ?, ?, ?, ?, ?)
    `

-	result, err := db.Exec(query, u.UserName, string(hashedPass), aesFirstName, aesLastName, aesEmail, u.Role)
+	result, err := db.Exec(query, u.UserName, string(hashedPass), aesFirstName, aesLastName, aesEmail, u.ProfilePicLink, 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, role
+    SELECT id, username, first_name, last_name, email, profile_pic_link, role
    FROM users
    WHERE id = ?
    `

 	row := db.QueryRow(query, id)
-	if err := row.Scan(&user.ID, &user.UserName, &aesFirstName, &aesLastName, &aesEmail, &user.Role); err != nil {
+	if err := row.Scan(&user.ID, &user.UserName, &aesFirstName, &aesLastName, &aesEmail, &user.ProfilePicLink, &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, oldPass, newPass string) error {
+func (db *DB) UpdateOwnUserAttributes(c *Config, id int64, userName, firstName, lastName, email, profilePicLink, 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 {
@ -293,6 +293,7 @@ func (db *DB) UpdateOwnUserAttributes(c *Config, id int64, userName, firstName,
 				return fmt.Errorf("error starting transaction: %v", err)
 			}

+			fmt.Println(len(newPass), passwordEmpty)
 			if !passwordEmpty {
 				if err = tx.ChangePassword(id, oldPass, newPass); err != nil {
 					if rollbackErr := tx.Rollback(); rollbackErr != nil {
@ -326,11 +327,13 @@ func (db *DB) UpdateOwnUserAttributes(c *Config, id int64, userName, firstName,
 				return fmt.Errorf("error encrypting email: %v", err)
 			}

+			fmt.Println("profilePicLink:", profilePicLink)
 			if err = tx.UpdateAttributes(
 				&Attribute{Table: "users", ID: id, AttName: "username", Value: userName},
 				&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)
@ -360,8 +363,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, role)
-    VALUES (?, ?, ?, ?, ?, ?)
+    INSERT INTO users (username, password, first_name, last_name, email, profile_pic_link, role)
+    VALUES (?, ?, ?, ?, ?, ?, ?)
    `

 	for i := 0; i < TxMaxRetries; i++ {
@ -416,7 +419,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.Role)
+			result, err := tx.Exec(insertQuery, u.UserName, string(hashedPass), aesFirstName, aesLastName, aesEmail, u.ProfilePicLink, u.Role)
 			if err != nil {
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
 					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
@ -451,7 +454,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, role FROM users"
+	query := "SELECT id, username, first_name, last_name, email, profile_pic_link, role FROM users"

 	rows, err := db.Query(query)
 	if err != nil {
@ -461,7 +464,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.Role); err != nil {
+		if err = rows.Scan(&user.ID, &user.UserName, &aesFirstName, &aesLastName, &aesEmail, &user.ProfilePicLink, &user.Role); err != nil {
 			return nil, fmt.Errorf("error getting user info: %v", err)
 		}

@ -506,10 +509,10 @@ func (tx *Tx) SetPassword(id int64, newPass string) error {
 	return nil
 }

-func (db *DB) UpdateUserAttributes(c *Config, id int64, userName, firstName, lastName, email, newPass string, role int) error {
+func (db *DB) UpdateUserAttributes(c *Config, id int64, userName, firstName, lastName, email, profilePicLink, 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 {
@ -556,6 +559,7 @@ 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 {
--- a/cmd/calls/atom.go
+++ b/cmd/calls/atom.go
@ -14,7 +14,7 @@ func ServeAtomFeed(c *b.Config) http.HandlerFunc {
 			return
 		}

-		absFilepath, err := filepath.Abs(c.AtomFeed)
+		absFilepath, err := filepath.Abs(c.AtomFile)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
--- a/cmd/calls/images.go
+++ b/cmd/calls/images.go
@ -6,12 +6,15 @@ import (
 	"path/filepath"

 	b "streifling.com/jason/cpolis/cmd/backend"
+	f "streifling.com/jason/cpolis/cmd/frontend"
 )

-func ServeImage(c *b.Config) http.HandlerFunc {
+func ServeImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if !tokenIsVerified(w, r, c) {
-			return
+		if _, err := f.GetSession(w, r, c, s); err != nil {
+			if !tokenIsVerified(w, r, c) {
+				return
+			}
 		}

 		absFilepath, err := filepath.Abs(c.PicsDir)
--- a/cmd/frontend/articles.go
+++ b/cmd/frontend/articles.go
@ -7,7 +7,6 @@ import (
 	"net/http"
 	"os"
 	"strconv"
-	"strings"
 	"time"

 	b "streifling.com/jason/cpolis/cmd/backend"
@ -24,7 +23,7 @@ type EditorHTMLData struct {
 	Action       string
 	ActionTitle  string
 	ActionButton string
-	BannerImage  string
+	Image        string
 	HTMLContent  template.HTML
 	Article      *b.Article
 	Tags         []*b.Tag
@ -32,7 +31,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)
@ -64,7 +63,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)
@ -93,10 +92,6 @@ 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
@ -122,13 +117,6 @@ 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"] {
@ -161,7 +149,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)
@ -202,6 +190,7 @@ 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"},
@ -243,7 +232,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
@ -287,7 +276,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)
@ -325,7 +314,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
@ -346,14 +335,7 @@ func ReviewRejectedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.Handler
 			return
 		}

-		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
-		}
+		data.Image = data.Article.BannerLink

 		articleAbsName := fmt.Sprint(c.ArticleDir, "/", data.Article.ID, ".md")
 		content, err := os.ReadFile(articleAbsName)
@ -396,7 +378,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)
@ -469,7 +451,7 @@ func PublishArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		if err = b.SaveAtomFeed(c.AtomFeed, feed); err != nil {
+		if err = b.SaveAtomFeed(c.AtomFile, feed); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@ -490,7 +472,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)
@ -525,7 +507,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
@ -549,7 +531,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
@ -586,7 +568,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
@ -623,14 +605,7 @@ func ReviewArticle(c *b.Config, db *b.DB, s *b.CookieStore, action, title, butto
 			return
 		}

-		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.Image = article.BannerLink

 		data.Article.Summary, err = b.ConvertToPlain(article.Summary)
 		if err != nil {
@ -672,7 +647,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)
@ -704,7 +679,7 @@ func DeleteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		if err = b.SaveAtomFeed(c.AtomFeed, feed); err != nil {
+		if err = b.SaveAtomFeed(c.AtomFile, feed); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@ -725,7 +700,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)
@ -784,7 +759,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
@ -806,14 +781,7 @@ func EditArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}

-		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
-		}
+		data.Image = data.Article.BannerLink

 		content, err := os.ReadFile(fmt.Sprint(c.ArticleDir, "/", data.Article.ID, ".md"))
 		if err != nil {
--- a/cmd/frontend/images.go
+++ b/cmd/frontend/images.go
@ -9,20 +9,14 @@ import (
 	b "streifling.com/jason/cpolis/cmd/backend"
 )

-func UploadImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
+func UploadEasyMDEImage(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
 		}

-		if err := r.ParseMultipartForm(10 << 20); err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-
 		file, _, err := r.FormFile("article-image")
 		if err != nil {
 			log.Println(err)
@ -48,9 +42,9 @@ func UploadImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	}
 }

-func UploadBanner(c *b.Config, s *b.CookieStore, fileKey, htmlFile, htmlTemplate string) http.HandlerFunc {
+func UploadImage(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
@ -75,20 +69,8 @@ func UploadBanner(c *b.Config, s *b.CookieStore, fileKey, htmlFile, htmlTemplate
 			return
 		}

-		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
+		data := new(struct{ Image string })
+		data.Image = filename

 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/" + htmlFile)
 		if err = template.Must(tmpl, err).ExecuteTemplate(w, htmlTemplate, data); err != nil {
--- a/cmd/frontend/issues.go
+++ b/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,10 +41,6 @@ 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 {
@ -66,19 +62,6 @@ 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)
@ -97,7 +80,7 @@ func PublishLatestIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFun
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		if err = b.SaveAtomFeed(c.AtomFeed, feed); err != nil {
+		if err = b.SaveAtomFeed(c.AtomFile, feed); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
--- a/cmd/frontend/pdf.go
+++ b/cmd/frontend/pdf.go
@ -12,18 +12,12 @@ 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
 		}

-		if err := r.ParseMultipartForm(10 << 20); err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-
 		file, _, err := r.FormFile("pdf-upload")
 		if err != nil {
 			log.Println(err)
--- a/cmd/frontend/sessions.go
+++ b/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,15 +57,21 @@ 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 {
-			files[1] = c.WebDir + "/templates/first-user.html"
+			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"
 			tmpl, err := template.ParseFiles(files...)
 			if err = template.Must(tmpl, err).Execute(w, data); err != nil {
 				log.Println(err)
@ -79,6 +85,7 @@ 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"
@ -89,6 +96,7 @@ 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 {
@ -142,7 +150,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)
@ -167,7 +175,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)
--- a/cmd/frontend/tags.go
+++ b/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)
--- a/cmd/frontend/users.go
+++ b/cmd/frontend/users.go
@ -10,6 +10,14 @@ 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
@ -27,14 +35,21 @@ 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
 		}

-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-user.html")
-		if err = template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil); err != nil {
+		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 {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@ -44,7 +59,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)
@ -52,10 +67,11 @@ 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"),
+			UserName:       r.PostFormValue("username"),
+			FirstName:      r.PostFormValue("first-name"),
+			LastName:       r.PostFormValue("last-name"),
+			Email:          r.PostFormValue("email"),
+			ProfilePicLink: r.PostFormValue("profile-pic-url"),
 		}
 		pass := r.PostFormValue("password")
 		pass2 := r.PostFormValue("password2")
@ -122,7 +138,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)
@ -136,8 +152,16 @@ func EditSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}

-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/edit-self.html")
-		if err = template.Must(tmpl, err).ExecuteTemplate(w, "page-content", user); err != nil {
+		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 {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@ -147,7 +171,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)
@ -155,11 +179,12 @@ 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"),
+			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"),
 		}

 		oldPass := r.PostFormValue("old-password")
@ -202,7 +227,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, oldPass, newPass); err != nil {
+		if err = db.UpdateOwnUserAttributes(c, user.ID, user.UserName, user.FirstName, user.LastName, user.Email, user.ProfilePicLink, oldPass, newPass); err != nil {
 			log.Println("error: user:", user.ID, err)
 			http.Error(w, "Benutzerdaten konnten nicht aktualisiert werden.", http.StatusInternalServerError)
 			return
@ -225,11 +250,12 @@ 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"),
-			Role:      b.Admin,
+			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,
 		}
 		pass := r.PostFormValue("password")
 		pass2 := r.PostFormValue("password2")
@ -293,7 +319,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)
@ -325,7 +351,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
@ -345,8 +371,16 @@ 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", user); err != nil {
+		if err = template.Must(tmpl, err).ExecuteTemplate(w, "page-content", data); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@ -356,7 +390,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)
@ -402,6 +436,8 @@ 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 {
@ -420,7 +456,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, newPass, user.Role); err != nil {
+		if err = db.UpdateUserAttributes(c, user.ID, user.UserName, user.FirstName, user.LastName, user.Email, user.ProfilePicLink, newPass, user.Role); err != nil {
 			log.Println("error: user:", user.ID, err)
 			http.Error(w, "Benutzerdaten konnten nicht aktualisiert werden.", http.StatusInternalServerError)
 			return
@ -440,7 +476,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)
--- a/cmd/main.go
+++ b/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))
+	mux.HandleFunc("GET /image/serve/{pic}", c.ServeImage(config, store))
 	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.UploadBanner(config, store, "article-banner", "editor.html", "article-banner-template"))
-	mux.HandleFunc("POST /article/upload-image", f.UploadImage(config, 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 /issue/publish", f.PublishLatestIssue(config, db, store))
-	mux.HandleFunc("POST /issue/upload-banner", f.UploadBanner(config, store, "issue-banner", "current-issue.html", "issue-banner-template"))
+	mux.HandleFunc("POST /issue/upload-banner", f.UploadImage(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,6 +94,7 @@ 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))
 }
--- a/create_db.sql
+++ b/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)    NOT NULL,
+    profile_pic_link    VARCHAR(255),
    role                INT             NOT NULL,
    PRIMARY KEY (id)
 );
@ -26,9 +26,8 @@ CREATE TABLE articles (
    id              INT             AUTO_INCREMENT,
    title           VARCHAR(255)    NOT NULL,
    created         TIMESTAMP       DEFAULT CURRENT_TIMESTAMP,
-    banner_link     VARCHAR(255)    NOT NULL,
+    banner_link     VARCHAR(255),
    summary         TEXT            NOT NULL,
-    content_link    VARCHAR(255)    NOT NULL,
    published       BOOL            NOT NULL,
    rejected        BOOL            NOT NULL,
    author_id       INT             NOT NULL,
--- a/web/static/css/input.css
+++ b/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 mt-4;
+    @apply grid grid-cols-1 md:grid-cols-2 gap-x-4 gap-y-1;
 }

 .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;
 }
--- a/web/templates/add-user.html
+++ b/web/templates/add-user.html
@ -1,66 +0,0 @@
-{{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}}
--- a/web/templates/current-issue.html
+++ b/web/templates/current-issue.html
@ -79,8 +79,8 @@
 {{end}}

 {{define "issue-banner-template"}}
-<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 id="issue-banner-container">
+    <img src="/image/serve/{{.Image}}" alt="" />
+    <input id="issue-banner-url" name="issue-banner-url" type="hidden" value="{{.Image}}" />
 </div>
 {{end}}
--- a/web/templates/edit-self.html
+++ b/web/templates/edit-self.html
@ -1,53 +0,0 @@
-{{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}}
--- a/web/templates/edit-user.html
+++ b/web/templates/edit-user.html
@ -1,67 +1,90 @@
 {{define "page-content"}}
-<h2>Profil von {{.FirstName}} {{.LastName}} bearbeiten</h2>
+<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" .}}

-<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}}" />
+            <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" name="password" placeholder="***" type="password" />
+            <input class="w-full" required name="password" placeholder="***" type="password" />
        </div>

        <div>
            <label for="password2">Passwort wiederholen</label>
-            <input class="w-full" name="password2" placeholder="***" type="password" />
+            <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" {{if lt .Role 4}}value="{{.FirstName}}"
+                {{end}} />
+        </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}} />
        </div>

        <div>
            <label for="email">Emailadresse</label>
-            <input class="w-full" required name="email" type="text" value="{{.Email}}" />
+            <input class="w-full" required name="email" type="text" {{if lt .Role 4}}value="{{.Email}}" {{end}} />
        </div>

        <div>
            <label for="email2">Emailadresse wiederholen</label>
-            <input class="w-full" required name="email2" type="text" value="{{.Email}}" />
+            <input class="w-full" required name="email2" type="text" {{if lt .Role 4}}value="{{.Email}}" {{end}} />
        </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="Aktualisieren" hx-post="/user/update/{{.ID}}"
-            hx-target="#page-content" />
+        <input class="action-btn" type="submit" value="{{.ButtonText}}" hx-post="{{.URL}}" 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}}
--- a/web/templates/editor.html
+++ b/web/templates/editor.html
@ -1,12 +1,9 @@
 {{define "page-content"}}
 <h2>Editor</h2>

-<form id="edit-area" hx-encoding="multipart/form-data">
+<form class="flex flex-col gap-4" id="edit-area" hx-encoding="multipart/form-data">
    <div class="flex flex-col gap-y-1">
-        <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>
+        {{template "article-banner-template" .}}

        <div class="grid grid-cols-2 gap-4 items-center">
            <div class="flex flex-col">
@ -14,28 +11,22 @@
                <input name="article-title" type="text" value="{{.Article.Title}}" />
            </div>

-            <div class="grid grid-cols-1 items-center">
+            <div class="flex">
                <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-target="#article-banner-container" />
+                    hx-post="/article/upload-banner" hx-swap="outerHTML" hx-target="#article-banner-container" />
            </div>
        </div>
    </div>

-    <div class="flex flex-col gap-y-1">
+    <div class="flex flex-col gap-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-x-4">
+        <div class="flex flex-wrap gap-4">
            <div>
                <input id="issue" name="issue" type="checkbox" {{if .Article.IsInIssue}}checked{{end}} />
                <label for="issue">Orient Express</label>
@ -51,6 +42,12 @@
        </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" />
@ -92,8 +89,8 @@
 {{end}}

 {{define "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="{{.URL}}" />
+<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>
 {{end}}
--- a/web/templates/first-user.html
+++ b/web/templates/first-user.html
@ -1,46 +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" />
-        </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}}
--- a/web/templates/index.html
+++ b/web/templates/index.html
@ -42,7 +42,7 @@
        <p>{{.Version}} - <strong>Alpha: Drastische Änderungen und Fehler vorbehalten.</strong></p>
    </footer>

-    <script src="https://unpkg.com/htmx.org@2.0.2"></script>
+    <script src="https://unpkg.com/htmx.org@2.0.3"></script>
    <script src="https://unpkg.com/easymde/dist/easymde.min.js"></script>
    <script>
        document.addEventListener('DOMContentLoaded', () => {
--- a/web/templates/review-article.html
+++ b/web/templates/review-article.html
@ -3,7 +3,7 @@

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

    <span>Titel</span>
Author	SHA1	Message	Date
Jason Streifling	b2a8578c72	Add profile pic and correct usage of banner link	2024-11-01 16:31:47 +01:00
Jason Streifling	dbddff6e55	Delete content link from everywhere since it is only a combination of already saved info	2024-11-01 16:26:37 +01:00
Jason Streifling	f663592019	Changed version	2024-11-01 16:22:50 +01:00
Jason Streifling	c59029cf3d	Add rel="self" to Atom feed	2024-11-01 16:22:31 +01:00
Jason Streifling	ac740cf4b8	Update version number	2024-10-30 03:25:05 +01:00
Jason Streifling	b7d82f15e9	Serve images from only one route enabling image previews in articles	2024-10-30 03:24:29 +01:00
Jason Streifling	b4003c8216	Fix bug that made the issue content unavailable	2024-10-30 03:23:59 +01:00
Jason Streifling	81c046c1b0	Add summary checks back	2024-10-30 02:22:19 +01:00
Jason Streifling	1e9fdd2ab9	Update version number	2024-10-30 02:13:40 +01:00
Jason Streifling	1fbc0ddcf6	Make banner link and summary optional	2024-10-30 02:12:53 +01:00
Jason Streifling	0dd2101a08	Cleanup	2024-10-29 17:00:51 +01:00
Jason Streifling	e95871ee70	Fix bug that allowed empty banner images	2024-10-29 16:43:42 +01:00
Jason Streifling	083718711d	Use empty alt tag for banner image	2024-10-29 16:37:41 +01:00
Jason Streifling	20a12c6299	Implement banner images in a more standard way	2024-10-29 16:36:40 +01:00
Jason Streifling	be829e662b	Change version number	2024-10-28 18:28:22 +01:00
Jason Streifling	0036b42d82	Update htmx version	2024-10-28 18:27:24 +01:00
Jason Streifling	59deb69e2f	Lift size constraints from image and pdf uploads	2024-10-28 17:59:53 +01:00
Jason Streifling	3aef27585a	Rename AtomFeed to AtomFile everywhere else	2024-10-28 17:57:51 +01:00
Jason Streifling	3aa8796537	Rename AtomFeed to AtomFile in config	2024-10-27 15:50:45 +01:00