Fix Media Articlrd

kontor-gin/.goreleaser.yaml

@@ -22,11 +22,8 @@ builds:
     goos:
       - linux
       - windows
-      - darwin
     goarch:
-      - arm64
       - amd64
-      - "386"
 
 archives:
   - formats: [tar.gz]

kontor-gin/cmd/kontor/main.go

@@ -15,7 +15,6 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/spf13/viper"
 )
 
 func main() {
@@ -40,7 +39,7 @@ func main() {
 	}
 
 	r := router.New(
-		handlers.NewAdminHandler(db, []byte(viper.GetString("api_secret"))),
+		handlers.NewAdminHandler(db, config.ServerConfig.ApiSecret),
 		handlers.NewBookshelfHandler(db),
 		handlers.NewComicsHandler(db),
 		handlers.NewMediaHandler(db),

kontor-gin/internal/config/config.go

@@ -11,6 +11,7 @@ import (
 )
 
 var (
+	ApiSecret    []byte
 	CfgFile      string
 	Verbose      int
 	Overwrite    bool
@@ -79,7 +80,8 @@ type CliConfig struct {
 }
 
 type ServerConfiguration struct {
-	Server struct {
+	ApiSecret []byte `mapstructure:"api_secret" validate:"required"`
+	Server    struct {
 		Port int    `mapstructure:"port" validate:"required"`
 		Host string `mapstructure:"host"`
 	} `mapstructure:"server"`

kontor-gin/internal/handlers/media.go

@@ -5,6 +5,7 @@ import (
 )
 
 type MediaHandler struct {
+	MediaArticleHandler   *MediaArticleHandler
 	MediaActorHandler     *MediaActorHandler
 	MediaFileHandler      *MediaFileHandler
 	MediaLoFiHandler      *MediaLoFiHandler
@@ -15,6 +16,7 @@ type MediaHandler struct {
 
 func NewMediaHandler(db *gorm.DB) *MediaHandler {
 	mediaHandler := &MediaHandler{
+		MediaArticleHandler:   NewMediaArticleHandler(db),
 		MediaActorHandler:     NewMediaActorHandler(db),
 		MediaFileHandler:      NewMediaFileHandler(db),
 		MediaLoFiHandler:      NewMediaLoFiHandler(db),

kontor-gin/internal/handlers/media_actor.go

@@ -79,7 +79,7 @@ func (handler *MediaActorHandler) ListPage(c *gin.Context) {
 	}
 	data := globals.GetDefaultValues(user, "MediaActors...")
 	data["actors"] = actors
-	c.HTML(http.StatusOK, "mediaactors", data)
+	c.HTML(http.StatusOK, "media_actors", data)
 }
 
 func (handler *MediaActorHandler) EditPage(c *gin.Context) {
@@ -120,7 +120,7 @@ func (handler *MediaActorHandler) UpdatePage(c *gin.Context) {
 	}
 	logger.Info("MediaActorHandler#UpdatePage", "actor", actor)
 	//handler.Service.Update(c.Request.Context(), form.ConvertFormToMediaLofiDTO())
-	c.Redirect(http.StatusFound, "web/actors")
+	c.Redirect(http.StatusFound, globals.MediaActorLink)
 }
 
 func (handler *MediaActorHandler) DeletePage(c *gin.Context) {
@@ -135,5 +135,5 @@ func (handler *MediaActorHandler) DeletePage(c *gin.Context) {
 	// 	return
 	// }
 	logger.Info("MediaActorHandler#DeletePage", "actor", id)
-	c.Redirect(http.StatusFound, "web/actors")
+	c.Redirect(http.StatusFound, globals.MediaActorLink)
 }

kontor-gin/internal/handlers/media_article.go

@@ -0,0 +1,134 @@
+package handlers
+
+import (
+	"kontor-api-gin/internal/globals"
+	"kontor-api-gin/internal/models"
+	"kontor-api-gin/internal/repository"
+	"kontor-api-gin/internal/service"
+	"net/http"
+
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-contrib/slog"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type MediaArticleHandler struct {
+	Service *service.MediaArticleService
+}
+
+func NewMediaArticleHandler(db *gorm.DB) *MediaArticleHandler {
+	mediaFileHandler := &MediaArticleHandler{
+		Service: service.NewMediaArticleService(repository.NewMediaArticleRepository(db)),
+	}
+	return mediaFileHandler
+}
+
+func (handler *MediaArticleHandler) List(c *gin.Context) {
+	logger := slog.Get(c)
+	logger.Info("MediaArticleHandler#List")
+	articles, err := handler.Service.List(c.Request.Context())
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+	dtos := models.ConvertMediaArticlesToDtos(articles)
+	c.JSON(http.StatusOK, dtos)
+}
+
+func (handler *MediaArticleHandler) Add(c *gin.Context) {
+	var input models.MediaFileAdd
+
+	if err := c.ShouldBindJSON(&input); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+	lofi, err := handler.Service.Add(c.Request.Context(), input.Url)
+	if err != nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "lofi not added"})
+		return
+	}
+	c.JSON(http.StatusOK, lofi)
+}
+
+func (handler *MediaArticleHandler) Delete(c *gin.Context) {
+	id := c.Param("id")
+	err := handler.Service.Delete(c.Request.Context(), id)
+	if err != nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "lofi not found"})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"ok": "true"})
+}
+
+func (handler *MediaArticleHandler) ListPage(c *gin.Context) {
+	session := sessions.Default(c)
+	user := session.Get(globals.UserKey)
+	files, err := handler.Service.List(c.Request.Context())
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+	data := globals.GetDefaultValues(user, "MediaArticles...")
+	data["title"] = "Kontor MediaArticles"
+	data["media_links"] = files
+	data["MediaLinksUrl"] = globals.MediaArticleLink
+	c.HTML(http.StatusOK, "media_links", data)
+}
+
+func (handler *MediaArticleHandler) EditPage(c *gin.Context) {
+	session := sessions.Default(c)
+	user := session.Get(globals.UserKey)
+	id := c.Param("id")
+	logger := slog.Get(c)
+	media_file, err := handler.Service.Get(c.Request.Context(), id)
+	if err != nil {
+		logger.Info("MediaArticleHandler#EditPage", "error", err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+	logger.Info("MediaArticleHandler#EditPage", "media_file", media_file)
+	data := globals.GetDefaultValues(user, "MediaArticle Details...")
+	data["lofi"] = media_file
+	c.HTML(http.StatusOK, "lofi_detail", data)
+}
+
+func (handler *MediaArticleHandler) UpdatePage(c *gin.Context) {
+	session := sessions.Default(c)
+	user := session.Get(globals.UserKey)
+	id := c.Param("id")
+	logger := slog.Get(c)
+	media_article, err := handler.Service.Get(c.Request.Context(), id)
+	if err != nil {
+		logger.Info("MediaArticleHandler#UpdatePage", "error", err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+	var form models.MediaArticleForm
+	if err := c.ShouldBind(&form); err != nil {
+		logger.Info("MediaArticleHandler#UpdatePage", "error", err.Error())
+		data := globals.GetDefaultValues(user, "MediaArticle Details...")
+		data["Form"] = form
+		data["Errors"] = err.Error()
+		c.HTML(http.StatusBadRequest, "lofi_detail", data)
+		return
+	}
+	logger.Info("MediaArticleHandler#UpdatePage", "media_article", media_article)
+	//handler.Service.Update(c.Request.Context(), form.ConvertFormToMediaFileDTO())
+	c.Redirect(http.StatusFound, globals.MediaArticleLink)
+}
+
+func (handler *MediaArticleHandler) DeletePage(c *gin.Context) {
+	//session := sessions.Default(c)
+	//user := session.Get(globals.UserKey)
+	id := c.Param("id")
+	logger := slog.Get(c)
+	err := handler.Service.Delete(c.Request.Context(), id)
+	if err != nil {
+		logger.Info("MediaArticleHandler#DeletePage", "error", err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+	logger.Info("MediaArticleHandler#DeletePage", "lofi", id)
+	c.Redirect(http.StatusFound, globals.MediaArticleLink)
+}

kontor-gin/internal/models/media_article.go

@@ -34,6 +34,16 @@ func (media_article *MediaArticle) TableName() string {
 	return "media_article"
 }
 
+type MediaArticleForm struct {
+	Title string `form:"title" binding:"required"`
+	Url   string `form:"url" binding:"required"`
+}
+
+func (form *MediaArticleForm) ConvertFormToMediaArticleDTO() MediaArticleDTO {
+	dto := MediaArticleDTO{}
+	return dto
+}
+
 type MediaArticleDTO struct {
 	ID        string             `json:"id"                  binding:"required"`
 	CreatedAt helpers.KontorTime `json:"created_date"`

kontor-gin/internal/router/router.go

@@ -21,6 +21,9 @@ import (
 func New(admin *handlers.AdminHandler, bookshelf *handlers.BookshelfHandler, comics *handlers.ComicsHandler, media *handlers.MediaHandler, tysc *handlers.TyscHandler) *gin.Engine {
 	router := gin.New()
 	router.Use(gin.Recovery())
+	// router.Use(gin.LoggerWithConfig(gin.LoggerConfig{
+	// 	SkipPaths: []string{"/health", "/public/style/main.css"},
+	// }))
 	router.Use(gin_slog.SetLogger(
 		gin_slog.WithSkipPath([]string{"/health", "/public/style/main.css"}),
 		gin_slog.WithDefaultLevel(slog.LevelInfo),
@@ -60,7 +63,7 @@ func New(admin *handlers.AdminHandler, bookshelf *handlers.BookshelfHandler, com
 	m.GET("/actors", media.MediaActorHandler.ListPage)
 	m.GET("/actors/:id", media.MediaActorHandler.EditPage)
 	m.POST("/actors/:id", media.MediaActorHandler.UpdatePage)
-	m.GET("/articles", media.MediaFileHandler.ListPage)
+	m.GET("/articles", media.MediaArticleHandler.ListPage)
 	m.GET("/files", media.MediaFileHandler.ListPage)
 	m.GET("/files/edit/:id", media.MediaFileHandler.EditPage)
 	m.POST("/files/edit/:id", media.MediaFileHandler.UpdatePage)

kontor-gin/internal/service/media-article.go

@@ -0,0 +1,37 @@
+package service
+
+import (
+	"context"
+	"kontor-api-gin/internal/models"
+	"kontor-api-gin/internal/repository"
+	"log/slog"
+)
+
+type MediaArticleService struct {
+	repository *repository.MediaArticleRepository
+}
+
+func NewMediaArticleService(repo *repository.MediaArticleRepository) *MediaArticleService {
+	service := &MediaArticleService{repository: repo}
+	return service
+}
+
+func (service *MediaArticleService) List(context context.Context) ([]models.MediaArticle, error) {
+	slog.Info("MediaArticleService#List")
+	return service.repository.FindAll(context)
+}
+
+func (service *MediaArticleService) Get(context context.Context, id string) (*models.MediaArticle, error) {
+	slog.Info("MediaArticleService#Get")
+	return service.repository.GetById(context, id)
+}
+
+func (service *MediaArticleService) Add(context context.Context, url string) (*models.MediaArticle, error) {
+	slog.Info("MediaArticleService#Add")
+	return service.repository.Add(context, url)
+}
+
+func (service *MediaArticleService) Delete(context context.Context, id string) error {
+	slog.Info("MediaArticleService#Delete")
+	return service.repository.Delete(context, id)
+}

kontor-gin/templates/pages/media_actors.html

@@ -1,4 +1,4 @@
-{{ define "mediaactors" }}
+{{ define "media_actors" }}
 <!doctype html>
 <html lang="de">
     {{ template "head" . }}
@@ -19,10 +19,10 @@
                 </div>
             </div>
             <div class="row">
-                <form class="form-inline" action="/web/actors">
+                <form class="form-inline" action="{{ .MediaLinksUrl }}">
                     <input type="text" placeholder="Search" name="query">
                     <button type="submit">Search</button>
-                    <div class="pill-nav"><a href="/web/actors/add">Add Lofi</a></div>
+                    <div class="pill-nav"><a href="{{ .MediaLinksUrl }}/edit">Add Lofi</a></div>
                 </form>
             </div>
             <div class="row">
@@ -30,7 +30,7 @@
                     <div class="card shadow p-3 mb-2 bg-body rounded" style="width: 18rem;">
                         <div class="card-body">
                             <h5 class="card-title">{{.Name}}</h5>
-                            <a href="/web/actors/{{.ID}}" class="btn btn-primary">Read more</a>
+                            <a href="{{ $.media_actor_link }}/{{.ID}}" class="btn btn-primary">Read more</a>
                         </div>
                     </div>
                 {{ end }}