Compare commits
No commits in common. "4e0bce37a2370ff654aed5c180a80624b1b9ec2e" and "21fd3403b27a2d23337a4d2e63efcd5e50db8ff9" have entirely different histories.
4e0bce37a2
...
21fd3403b2
@ -1,4 +1,4 @@
|
||||
package backend
|
||||
package control
|
||||
|
||||
import (
|
||||
"flag"
|
||||
@ -1,4 +1,4 @@
|
||||
package backend
|
||||
package control
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
@ -1,4 +1,4 @@
|
||||
package backend
|
||||
package control
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -7,9 +7,10 @@ import (
|
||||
"time"
|
||||
|
||||
"git.streifling.com/jason/rss"
|
||||
"streifling.com/jason/cpolis/cmd/model"
|
||||
)
|
||||
|
||||
func GetChannel(db *DB, title, link, description string) (*rss.Channel, error) {
|
||||
func GetChannel(db *model.DB, title, link, description string) (*rss.Channel, error) {
|
||||
channel := &rss.Channel{
|
||||
Title: title,
|
||||
Link: link,
|
||||
@ -50,7 +51,7 @@ func GetChannel(db *DB, title, link, description string) (*rss.Channel, error) {
|
||||
return channel, nil
|
||||
}
|
||||
|
||||
func GenerateRSS(db *DB, title, link, desc string) (*string, error) {
|
||||
func GenerateRSS(db *model.DB, title, link, desc string) (*string, error) {
|
||||
channel := &rss.Channel{
|
||||
Title: title,
|
||||
Link: link,
|
||||
@ -1,4 +1,4 @@
|
||||
package backend
|
||||
package control
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
83
cmd/main.go
83
cmd/main.go
@ -6,17 +6,17 @@ import (
|
||||
"net/http"
|
||||
"os"
|
||||
|
||||
b "streifling.com/jason/cpolis/cmd/backend"
|
||||
f "streifling.com/jason/cpolis/cmd/frontend"
|
||||
"streifling.com/jason/cpolis/cmd/control"
|
||||
"streifling.com/jason/cpolis/cmd/model"
|
||||
"streifling.com/jason/cpolis/cmd/view"
|
||||
)
|
||||
|
||||
func init() {
|
||||
gob.Register(b.User{})
|
||||
gob.Register(f.ArticlePreviewHtmlData{})
|
||||
gob.Register(model.User{})
|
||||
}
|
||||
|
||||
func main() {
|
||||
config, err := b.HandleConfig()
|
||||
config, err := control.HandleConfig()
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
@ -28,58 +28,59 @@ func main() {
|
||||
defer logFile.Close()
|
||||
log.SetOutput(logFile)
|
||||
|
||||
db, err := b.OpenDB(config.DBName)
|
||||
db, err := model.OpenDB(config.DBName)
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
key, err := b.LoadKey(config.KeyFile)
|
||||
key, err := control.LoadKey(config.KeyFile)
|
||||
if err != nil {
|
||||
key, err = b.NewKey()
|
||||
key, err = control.NewKey()
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
b.SaveKey(key, config.KeyFile)
|
||||
control.SaveKey(key, config.KeyFile)
|
||||
}
|
||||
store := b.NewCookieStore(key)
|
||||
store := control.NewCookieStore(key)
|
||||
|
||||
mux := http.NewServeMux()
|
||||
mux.Handle("/web/static/", http.StripPrefix("/web/static/",
|
||||
http.FileServer(http.Dir(config.WebDir+"/static/"))))
|
||||
mux.HandleFunc("/", f.HomePage(config, db, store))
|
||||
mux.HandleFunc("/", view.HomePage(config, db, store))
|
||||
|
||||
mux.HandleFunc("GET /create-tag", f.CreateTag(config))
|
||||
mux.HandleFunc("GET /create-user", f.CreateUser(config))
|
||||
mux.HandleFunc("GET /edit-self", f.EditSelf(config, db, store))
|
||||
mux.HandleFunc("GET /edit-user/{id}", f.EditUser(config, db))
|
||||
mux.HandleFunc("GET /delete-user/{id}", f.DeleteUser(config, db, store))
|
||||
mux.HandleFunc("GET /hub", f.ShowHub(config, db, store))
|
||||
mux.HandleFunc("GET /logout", f.Logout(config, store))
|
||||
mux.HandleFunc("GET /pics/{pic}", f.ServeImage(config, store))
|
||||
mux.HandleFunc("GET /publish-article/{id}", f.PublishArticle(config, db, store))
|
||||
mux.HandleFunc("GET /publish-issue", f.PublishLatestIssue(config, db, store))
|
||||
mux.HandleFunc("GET /reject-article/{id}", f.RejectArticle(config, db, store))
|
||||
mux.HandleFunc("GET /rejected-articles", f.ShowRejectedArticles(config, db, store))
|
||||
mux.HandleFunc("GET /review-rejected-article/{id}", f.ReviewRejectedArticle(config, db, store))
|
||||
mux.HandleFunc("GET /review-unpublished-article/{id}", f.ReviewUnpublishedArticle(config, db, store))
|
||||
mux.HandleFunc("GET /rss", func(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, config.RSSFile) })
|
||||
mux.HandleFunc("GET /show-all-users-edit", f.ShowAllUsers(config, db, store, "edit-user"))
|
||||
mux.HandleFunc("GET /show-all-users-delete", f.ShowAllUsers(config, db, store, "delete-user"))
|
||||
mux.HandleFunc("GET /this-issue", f.ShowCurrentArticles(config, db))
|
||||
mux.HandleFunc("GET /unpublished-articles", f.ShowUnpublishedArticles(config, db))
|
||||
mux.HandleFunc("GET /write-article", f.WriteArticle(config, db))
|
||||
mux.HandleFunc("GET /create-tag", view.CreateTag(config))
|
||||
mux.HandleFunc("GET /create-user", view.CreateUser(config))
|
||||
mux.HandleFunc("GET /edit-self", view.EditSelf(config, db, store))
|
||||
mux.HandleFunc("GET /edit-user/{id}", view.EditUser(config, db))
|
||||
mux.HandleFunc("GET /delete-user/{id}", view.DeleteUser(config, db, store))
|
||||
mux.HandleFunc("GET /hub", view.ShowHub(config, db, store))
|
||||
mux.HandleFunc("GET /logout", view.Logout(config, store))
|
||||
mux.HandleFunc("GET /pics/{pic}", view.ServeImage(config, store))
|
||||
mux.HandleFunc("GET /publish-article/{id}", view.PublishArticle(config, db, store))
|
||||
mux.HandleFunc("GET /publish-issue", view.PublishLatestIssue(config, db, store))
|
||||
mux.HandleFunc("GET /reject-article/{id}", view.RejectArticle(config, db, store))
|
||||
mux.HandleFunc("GET /rejected-articles", view.ShowRejectedArticles(config, db, store))
|
||||
mux.HandleFunc("GET /review-rejected-article/{id}", view.ReviewRejectedArticle(config, db, store))
|
||||
mux.HandleFunc("GET /review-unpublished-article/{id}", view.ReviewUnpublishedArticle(config, db, store))
|
||||
mux.HandleFunc("GET /rss", func(w http.ResponseWriter, r *http.Request) {
|
||||
http.ServeFile(w, r, config.RSSFile)
|
||||
})
|
||||
mux.HandleFunc("GET /show-all-users-edit", view.ShowAllUsers(config, db, store, "edit-user"))
|
||||
mux.HandleFunc("GET /show-all-users-delete", view.ShowAllUsers(config, db, store, "delete-user"))
|
||||
mux.HandleFunc("GET /this-issue", view.ShowCurrentArticles(config, db))
|
||||
mux.HandleFunc("GET /unpublished-articles", view.ShowUnpublishedArticles(config, db))
|
||||
mux.HandleFunc("GET /write-article", view.WriteArticle(config, db))
|
||||
|
||||
mux.HandleFunc("POST /add-first-user", f.AddFirstUser(config, db, store))
|
||||
mux.HandleFunc("POST /add-tag", f.AddTag(config, db, store))
|
||||
mux.HandleFunc("POST /add-user", f.AddUser(config, db, store))
|
||||
mux.HandleFunc("POST /login", f.Login(config, db, store))
|
||||
mux.HandleFunc("POST /preview-article", f.PreviewArticle(config, store))
|
||||
mux.HandleFunc("POST /resubmit-article/{id}", f.ResubmitArticle(config, db, store))
|
||||
mux.HandleFunc("POST /submit-article", f.SubmitArticle(config, db, store))
|
||||
mux.HandleFunc("POST /update-self", f.UpdateSelf(config, db, store))
|
||||
mux.HandleFunc("POST /update-user/{id}", f.UpdateUser(config, db, store))
|
||||
mux.HandleFunc("POST /upload-image", f.UploadImage(config))
|
||||
mux.HandleFunc("POST /add-first-user", view.AddFirstUser(config, db, store))
|
||||
mux.HandleFunc("POST /add-tag", view.AddTag(config, db, store))
|
||||
mux.HandleFunc("POST /add-user", view.AddUser(config, db, store))
|
||||
mux.HandleFunc("POST /login", view.Login(config, db, store))
|
||||
mux.HandleFunc("POST /resubmit-article/{id}", view.ResubmitArticle(config, db, store))
|
||||
mux.HandleFunc("POST /submit-article", view.SubmitArticle(config, db, store))
|
||||
mux.HandleFunc("POST /update-self", view.UpdateSelf(config, db, store))
|
||||
mux.HandleFunc("POST /update-user/{id}", view.UpdateUser(config, db, store))
|
||||
mux.HandleFunc("POST /upload-image", view.UploadImage(config))
|
||||
|
||||
log.Fatalln(http.ListenAndServe(config.Port, mux))
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package backend
|
||||
package model
|
||||
|
||||
import (
|
||||
"context"
|
||||
@ -1,4 +1,4 @@
|
||||
package backend
|
||||
package model
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -1,4 +1,4 @@
|
||||
package backend
|
||||
package model
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
@ -1,4 +1,4 @@
|
||||
package backend
|
||||
package model
|
||||
|
||||
import (
|
||||
"context"
|
||||
@ -1,4 +1,4 @@
|
||||
package backend
|
||||
package model
|
||||
|
||||
import "fmt"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package backend
|
||||
package model
|
||||
|
||||
import (
|
||||
"context"
|
||||
@ -1,4 +1,4 @@
|
||||
package frontend
|
||||
package view
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -13,16 +13,11 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
b "streifling.com/jason/cpolis/cmd/backend"
|
||||
"streifling.com/jason/cpolis/cmd/control"
|
||||
"streifling.com/jason/cpolis/cmd/model"
|
||||
)
|
||||
|
||||
type ArticlePreviewHtmlData struct {
|
||||
Title string
|
||||
Description string
|
||||
Content template.HTML
|
||||
}
|
||||
|
||||
func ShowHub(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
func ShowHub(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
session, err := s.Get(r, "cookie")
|
||||
if err != nil {
|
||||
@ -36,7 +31,7 @@ func ShowHub(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
func WriteArticle(c *b.Config, db *b.DB) http.HandlerFunc {
|
||||
func WriteArticle(c *control.Config, db *model.DB) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
tags, err := db.GetTagList()
|
||||
if err != nil {
|
||||
@ -50,7 +45,7 @@ func WriteArticle(c *b.Config, db *b.DB) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
func SubmitArticle(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
session, err := s.Get(r, "cookie")
|
||||
if err != nil {
|
||||
@ -59,7 +54,7 @@ func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
|
||||
}
|
||||
|
||||
article := &b.Article{
|
||||
article := &model.Article{
|
||||
Title: r.PostFormValue("article-title"),
|
||||
Description: r.PostFormValue("article-description"),
|
||||
Content: r.PostFormValue("article-content"),
|
||||
@ -98,7 +93,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 {
|
||||
func ResubmitArticle(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
|
||||
if err != nil {
|
||||
@ -112,10 +107,10 @@ func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
content := r.PostFormValue("article-content")
|
||||
|
||||
if err = db.UpdateAttributes(
|
||||
&b.Attribute{Table: "articles", ID: id, AttName: "title", Value: title},
|
||||
&b.Attribute{Table: "articles", ID: id, AttName: "description", Value: description},
|
||||
&b.Attribute{Table: "articles", ID: id, AttName: "content", Value: content},
|
||||
&b.Attribute{Table: "articles", ID: id, AttName: "rejected", Value: false},
|
||||
&model.Attribute{Table: "articles", ID: id, AttName: "title", Value: title},
|
||||
&model.Attribute{Table: "articles", ID: id, AttName: "description", Value: description},
|
||||
&model.Attribute{Table: "articles", ID: id, AttName: "content", Value: content},
|
||||
&model.Attribute{Table: "articles", ID: id, AttName: "rejected", Value: false},
|
||||
); err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
@ -152,7 +147,7 @@ func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
func ShowUnpublishedArticles(c *b.Config, db *b.DB) http.HandlerFunc {
|
||||
func ShowUnpublishedArticles(c *control.Config, db *model.DB) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
unpublishedArticles, err := db.GetCertainArticles(false, false)
|
||||
if err != nil {
|
||||
@ -167,11 +162,11 @@ func ShowUnpublishedArticles(c *b.Config, db *b.DB) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
func ShowRejectedArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
func ShowRejectedArticles(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
type htmlData struct {
|
||||
MyIDs map[int64]bool
|
||||
RejectedArticles []*b.Article
|
||||
RejectedArticles []*model.Article
|
||||
}
|
||||
data := new(htmlData)
|
||||
|
||||
@ -202,13 +197,13 @@ func ShowRejectedArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerF
|
||||
}
|
||||
}
|
||||
|
||||
func ReviewUnpublishedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
func ReviewUnpublishedArticle(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
type htmlData struct {
|
||||
Title string
|
||||
Description string
|
||||
Content template.HTML
|
||||
Tags []*b.Tag
|
||||
Tags []*model.Tag
|
||||
ID int64
|
||||
}
|
||||
|
||||
@ -229,21 +224,21 @@ func ReviewUnpublishedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.Hand
|
||||
return
|
||||
}
|
||||
|
||||
data.Title, err = b.ConvertToPlain(article.Title)
|
||||
data.Title, err = control.ConvertToPlain(article.Title)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
data.Description, err = b.ConvertToPlain(article.Description)
|
||||
data.Description, err = control.ConvertToPlain(article.Description)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
content, err := b.ConvertToHTML(article.Content)
|
||||
content, err := control.ConvertToHTML(article.Content)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
@ -264,12 +259,12 @@ func ReviewUnpublishedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.Hand
|
||||
}
|
||||
}
|
||||
|
||||
func ReviewRejectedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
func ReviewRejectedArticle(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
type htmlData struct {
|
||||
Selected map[int64]bool
|
||||
Article *b.Article
|
||||
Tags []*b.Tag
|
||||
Article *model.Article
|
||||
Tags []*model.Tag
|
||||
}
|
||||
data := new(htmlData)
|
||||
|
||||
@ -311,7 +306,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 {
|
||||
func PublishArticle(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
|
||||
if err != nil {
|
||||
@ -334,22 +329,22 @@ func PublishArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
}
|
||||
|
||||
if err = db.UpdateAttributes(
|
||||
&b.Attribute{Table: "articles", ID: id, AttName: "published", Value: true},
|
||||
&b.Attribute{Table: "articles", ID: id, AttName: "rejected", Value: false},
|
||||
&b.Attribute{Table: "articles", ID: id, AttName: "created", Value: time.Now().Format("2006-01-02 15:04:05")},
|
||||
&model.Attribute{Table: "articles", ID: id, AttName: "published", Value: true},
|
||||
&model.Attribute{Table: "articles", ID: id, AttName: "rejected", Value: false},
|
||||
&model.Attribute{Table: "articles", ID: id, AttName: "created", Value: time.Now().Format("2006-01-02 15:04:05")},
|
||||
); err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
feed, err := b.GenerateRSS(db, c.Title, c.Link, c.Description)
|
||||
feed, err := control.GenerateRSS(db, c.Title, c.Link, c.Description)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
if err = b.SaveRSS(c.RSSFile, feed); err != nil {
|
||||
if err = control.SaveRSS(c.RSSFile, feed); err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@ -361,7 +356,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 {
|
||||
func RejectArticle(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
|
||||
if err != nil {
|
||||
@ -378,7 +373,7 @@ func RejectArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
}
|
||||
|
||||
if err = db.UpdateAttributes(
|
||||
&b.Attribute{Table: "articles", ID: id, AttName: "rejected", Value: true},
|
||||
&model.Attribute{Table: "articles", ID: id, AttName: "rejected", Value: true},
|
||||
); err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
@ -391,7 +386,7 @@ func RejectArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
func ShowCurrentArticles(c *b.Config, db *b.DB) http.HandlerFunc {
|
||||
func ShowCurrentArticles(c *control.Config, db *model.DB) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
articles, err := db.GetCurrentIssueArticles()
|
||||
if err != nil {
|
||||
@ -405,7 +400,7 @@ func ShowCurrentArticles(c *b.Config, db *b.DB) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
func UploadImage(c *b.Config) http.HandlerFunc {
|
||||
func UploadImage(c *control.Config) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
file, header, err := r.FormFile("article-image")
|
||||
if err != nil {
|
||||
@ -445,50 +440,3 @@ func UploadImage(c *b.Config) http.HandlerFunc {
|
||||
template.Must(tmpl, err).ExecuteTemplate(w, "editor-images", imgMD)
|
||||
}
|
||||
}
|
||||
|
||||
func PreviewArticle(c *b.Config, s *b.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var err error
|
||||
data := new(ArticlePreviewHtmlData)
|
||||
|
||||
data.Title, err = b.ConvertToPlain(r.PostFormValue("article-title"))
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
data.Description, err = b.ConvertToPlain(r.PostFormValue("article-description"))
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
content, err := b.ConvertToHTML(r.PostFormValue("article-content"))
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
data.Content = template.HTML(content)
|
||||
|
||||
session, err := s.Get(r, "cookie")
|
||||
if err != nil {
|
||||
tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
|
||||
msg := "Session nicht mehr gültig. Bitte erneut anmelden."
|
||||
template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
|
||||
}
|
||||
|
||||
session.Values["article"] = data
|
||||
if err = session.Save(r, w); err != nil {
|
||||
log.Println(err)
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
tmpl, err := template.ParseFiles(c.WebDir + "/templates/editor.html")
|
||||
tmpl = template.Must(tmpl, err)
|
||||
tmpl.ExecuteTemplate(w, "preview", data)
|
||||
}
|
||||
}
|
||||
@ -1,20 +1,21 @@
|
||||
package frontend
|
||||
package view
|
||||
|
||||
import (
|
||||
"html/template"
|
||||
"net/http"
|
||||
|
||||
b "streifling.com/jason/cpolis/cmd/backend"
|
||||
"streifling.com/jason/cpolis/cmd/control"
|
||||
"streifling.com/jason/cpolis/cmd/model"
|
||||
)
|
||||
|
||||
func CreateTag(c *b.Config) http.HandlerFunc {
|
||||
func CreateTag(c *control.Config) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-tag.html")
|
||||
template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
|
||||
}
|
||||
}
|
||||
|
||||
func AddTag(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
func AddTag(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
db.AddTag(r.PostFormValue("tag"))
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
package frontend
|
||||
package view
|
||||
|
||||
import (
|
||||
"log"
|
||||
"net/http"
|
||||
"path/filepath"
|
||||
|
||||
b "streifling.com/jason/cpolis/cmd/backend"
|
||||
"streifling.com/jason/cpolis/cmd/control"
|
||||
)
|
||||
|
||||
func ServeImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
|
||||
func ServeImage(c *control.Config, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
absFilepath, err := filepath.Abs(c.PicsDir)
|
||||
if err != nil {
|
||||
@ -1,14 +1,15 @@
|
||||
package frontend
|
||||
package view
|
||||
|
||||
import (
|
||||
"html/template"
|
||||
"log"
|
||||
"net/http"
|
||||
|
||||
b "streifling.com/jason/cpolis/cmd/backend"
|
||||
"streifling.com/jason/cpolis/cmd/control"
|
||||
"streifling.com/jason/cpolis/cmd/model"
|
||||
)
|
||||
|
||||
func PublishLatestIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
func PublishLatestIssue(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if err := db.PublishLatestIssue(); err != nil {
|
||||
log.Println(err)
|
||||
@ -1,4 +1,4 @@
|
||||
package frontend
|
||||
package view
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -6,10 +6,11 @@ import (
|
||||
"log"
|
||||
"net/http"
|
||||
|
||||
b "streifling.com/jason/cpolis/cmd/backend"
|
||||
"streifling.com/jason/cpolis/cmd/control"
|
||||
"streifling.com/jason/cpolis/cmd/model"
|
||||
)
|
||||
|
||||
func saveSession(w http.ResponseWriter, r *http.Request, s *b.CookieStore, u *b.User) error {
|
||||
func saveSession(w http.ResponseWriter, r *http.Request, s *control.CookieStore, u *model.User) error {
|
||||
session, err := s.Get(r, "cookie")
|
||||
if err != nil {
|
||||
return fmt.Errorf("error getting session: %v", err)
|
||||
@ -26,7 +27,7 @@ func saveSession(w http.ResponseWriter, r *http.Request, s *b.CookieStore, u *b.
|
||||
return nil
|
||||
}
|
||||
|
||||
func HomePage(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
func HomePage(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
numRows, err := db.CountEntries("users")
|
||||
if err != nil {
|
||||
@ -53,7 +54,7 @@ func HomePage(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
func Login(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
func Login(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
userName := r.PostFormValue("username")
|
||||
password := r.PostFormValue("password")
|
||||
@ -88,7 +89,7 @@ func Login(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
func Logout(c *b.Config, s *b.CookieStore) http.HandlerFunc {
|
||||
func Logout(c *control.Config, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
session, err := s.Get(r, "cookie")
|
||||
if err != nil {
|
||||
@ -1,4 +1,4 @@
|
||||
package frontend
|
||||
package view
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -7,15 +7,16 @@ import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
b "streifling.com/jason/cpolis/cmd/backend"
|
||||
"streifling.com/jason/cpolis/cmd/control"
|
||||
"streifling.com/jason/cpolis/cmd/model"
|
||||
)
|
||||
|
||||
type UserData struct {
|
||||
*b.User
|
||||
*model.User
|
||||
Msg string
|
||||
}
|
||||
|
||||
func checkUserStrings(user *b.User) (string, int, bool) {
|
||||
func checkUserStrings(user *model.User) (string, int, bool) {
|
||||
userLen := 15
|
||||
nameLen := 50
|
||||
|
||||
@ -30,14 +31,14 @@ func checkUserStrings(user *b.User) (string, int, bool) {
|
||||
}
|
||||
}
|
||||
|
||||
func CreateUser(c *b.Config) http.HandlerFunc {
|
||||
func CreateUser(c *control.Config) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-user.html")
|
||||
template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
|
||||
}
|
||||
}
|
||||
|
||||
func AddUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
func AddUser(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
role, err := strconv.Atoi(r.PostFormValue("role"))
|
||||
if err != nil {
|
||||
@ -47,7 +48,7 @@ func AddUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
}
|
||||
|
||||
htmlData := UserData{
|
||||
User: &b.User{
|
||||
User: &model.User{
|
||||
UserName: r.PostFormValue("username"),
|
||||
FirstName: r.PostFormValue("first-name"),
|
||||
LastName: r.PostFormValue("last-name"),
|
||||
@ -107,7 +108,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 {
|
||||
func EditSelf(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
session, err := s.Get(r, "cookie")
|
||||
if err != nil {
|
||||
@ -128,7 +129,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 {
|
||||
func UpdateSelf(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
session, err := s.Get(r, "cookie")
|
||||
if err != nil {
|
||||
@ -138,7 +139,7 @@ func UpdateSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
}
|
||||
|
||||
userData := UserData{
|
||||
User: &b.User{
|
||||
User: &model.User{
|
||||
ID: session.Values["id"].(int64),
|
||||
UserName: r.PostFormValue("username"),
|
||||
FirstName: r.PostFormValue("first-name"),
|
||||
@ -198,16 +199,16 @@ func UpdateSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
func AddFirstUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
func AddFirstUser(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var err error
|
||||
|
||||
htmlData := UserData{
|
||||
User: &b.User{
|
||||
User: &model.User{
|
||||
UserName: r.PostFormValue("username"),
|
||||
FirstName: r.PostFormValue("first-name"),
|
||||
LastName: r.PostFormValue("last-name"),
|
||||
Role: b.Admin,
|
||||
Role: model.Admin,
|
||||
},
|
||||
}
|
||||
pass := r.PostFormValue("password")
|
||||
@ -273,11 +274,11 @@ 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 {
|
||||
func ShowAllUsers(c *control.Config, db *model.DB, s *control.CookieStore, action string) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var err error
|
||||
type htmlData struct {
|
||||
Users map[int64]*b.User
|
||||
Users map[int64]*model.User
|
||||
Action string
|
||||
}
|
||||
|
||||
@ -302,7 +303,7 @@ func ShowAllUsers(c *b.Config, db *b.DB, s *b.CookieStore, action string) http.H
|
||||
}
|
||||
}
|
||||
|
||||
func EditUser(c *b.Config, db *b.DB) http.HandlerFunc {
|
||||
func EditUser(c *control.Config, db *model.DB) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
|
||||
if err != nil {
|
||||
@ -323,7 +324,7 @@ func EditUser(c *b.Config, db *b.DB) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
func UpdateUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
func UpdateUser(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
|
||||
if err != nil {
|
||||
@ -340,7 +341,7 @@ func UpdateUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
|
||||
}
|
||||
|
||||
userData := UserData{
|
||||
User: &b.User{
|
||||
User: &model.User{
|
||||
ID: id,
|
||||
UserName: r.PostFormValue("username"),
|
||||
FirstName: r.PostFormValue("first-name"),
|
||||
@ -407,7 +408,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 {
|
||||
func DeleteUser(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
|
||||
if err != nil {
|
||||
@ -1,12 +1,7 @@
|
||||
{{define "page-content"}}
|
||||
<h2>Editor</h2>
|
||||
|
||||
<form id="edit-area">
|
||||
<div class="btn-area">
|
||||
<button class="btn" disabled hx-get="/hub" hx-target="#edit-area">Schreiben</button>
|
||||
<button class="btn" hx-post="/preview-article" hx-target="#edit-area">Vorschau</button>
|
||||
</div>
|
||||
|
||||
<form>
|
||||
<div class="flex flex-col gap-y-1">
|
||||
<label for="article-title">Titel</label>
|
||||
<input name="article-title" type="text" />
|
||||
@ -60,6 +55,7 @@
|
||||
|
||||
document.body.removeChild(textarea);
|
||||
}
|
||||
|
||||
</script>
|
||||
{{end}}
|
||||
|
||||
@ -72,23 +68,3 @@
|
||||
</div>
|
||||
{{end}}
|
||||
{{end}}
|
||||
|
||||
|
||||
{{define "preview"}}
|
||||
<span>Titel</span>
|
||||
<div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
|
||||
{{.Title}}
|
||||
</div>
|
||||
|
||||
<span>Beschreibung</span>
|
||||
<div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
|
||||
{{.Description}}
|
||||
</div>
|
||||
|
||||
<span>Artikel</span>
|
||||
<div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
|
||||
<div class="prose">
|
||||
{{.Content}}
|
||||
</div>
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user