fix: mounting assets

Author: ItsNotGoodName

internal/procs/auth.go

@@ -7,7 +7,7 @@ import (
 	"github.com/ItsNotGoodName/smtpbridge/internal/core"
 )
 
-var ErrorLogin = fmt.Errorf("login error")
+var ErrorLogin = fmt.Errorf("login invalid")
 
 func AuthHTTPAnonymous(cc core.Context) bool {
 	return cc.Config.AuthHTTP.Username == "" && cc.Config.AuthHTTP.Password == ""

web/controllers/auth.go

@@ -62,7 +62,7 @@ func Logout(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 
 func UserRequire(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	if procs.AuthHTTPAnonymous(cc) {
-		return h.NotFound(c)
+		return NotFound(c)
 	}
 
 	return authRequire(c, cc, store)

web/controllers/controllers.go

@@ -117,3 +117,7 @@ func Trim(c *fiber.Ctx, cc core.Context) error {
 func SomethingWentWrong(c *fiber.Ctx) error {
 	return h.Render(c, "something-went-wrong", fiber.Map{"Error": ""})
 }
+
+func NotFound(c *fiber.Ctx) error {
+	return h.Render(c.Status(404), "404", fiber.Map{})
+}

web/helpers/http.go

@@ -29,20 +29,21 @@ func Error(c *fiber.Ctx, err error, codes ...int) error {
 	return Render(c, "something-went-wrong", fiber.Map{"Error": err})
 }
 
-func NotFound(c *fiber.Ctx) error {
-	return Render(c.Status(404), "404", nil)
-}
-
 type Meta struct {
 	Anonymous bool
 	CSRF      string
 }
 
 func Render(c *fiber.Ctx, name string, data fiber.Map, layouts ...string) error {
-	data["Meta"] = Meta{
-		Anonymous: c.Locals(AnonymousContextKey) != nil,
-		CSRF:      c.Locals(CSRFContextKey).(string),
+	meta := Meta{}
+	if c.Locals(AnonymousContextKey) != nil {
+		meta.Anonymous = true
 	}
+	if csrfRaw := c.Locals(CSRFContextKey); csrfRaw != "" {
+		meta.CSRF = csrfRaw.(string)
+	}
+
+	data["Meta"] = meta
 
 	return c.Render(name, data, layouts...)
 }

web/http/http.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/ItsNotGoodName/smtpbridge/internal/core"
 	"github.com/ItsNotGoodName/smtpbridge/web"
+	"github.com/ItsNotGoodName/smtpbridge/web/controllers"
 	h "github.com/ItsNotGoodName/smtpbridge/web/helpers"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/csrf"
@@ -48,14 +49,14 @@ func New(app core.App, shutdown context.CancelFunc, address string, bodyLimit in
 		ContextKey: h.CSRFContextKey,
 		Extractor:  csrfExtractor(),
 	}))
-	web.UseAssets(http)
 
 	route(app,
 		store,
 		http,
 	)
 
-	http.Use(h.NotFound)
+	web.UseAssets(http)
+	http.Use(controllers.NotFound)
 
 	return HTTP{
 		http:     http,

web/views/login.html

@@ -24,10 +24,10 @@ <h2>Login</h2>
         Log in
       </button>
       {{with .Flash}}
-      <h3>
+      <p class="text-red">
         {{.}}
-      </h3>
-      {{end}}
+        </pn>
+        {{end}}
     </form>
     {{end}}
   </article>