jtom38/go-cook-portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jtom38:6cfc53901eb920a819e45e31697d671b359e5630
Branches Tags
jtom38:main
...
compare: jtom38:fe4293b02f3881eaa2167490a4f2142520a73158
Branches Tags
jtom38:main

5 Commits
6cfc53901e ... fe4293b02f

Author SHA1 Message Date
James Tombleson
fe4293b02f minor changes 2024-04-14 19:38:45 -07:00
James Tombleson
a110f2de73 the base layout now pulls the cookie for darkmode and loads it into the context 2024-04-14 19:38:15 -07:00
James Tombleson
9dbd8e0e00 Same thing here, once they post a new value just return something basic for now 2024-04-14 19:37:06 -07:00
James Tombleson
2086ff3547 simple loginPost to avoid double layouts 2024-04-14 19:36:45 -07:00
James Tombleson
cda43e8ae2 updated the cookie view to show darkmode settings 2024-04-14 19:36:30 -07:00
10 changed files with 35 additions and 29 deletions
Show Stats Expand all files Collapse all files

2
handlers/auth.go
View File

@ -41,7 +41,7 @@ func (h *Handlers) AuthLoginPost(c echo.Context) error {
c.SetCookie(cookie) c.SetCookie(cookie)
// render // render
return Render(c, http.StatusOK, home.Home()) return Render(c, http.StatusOK, auth.LoginPost())
} }
func (h *Handlers) AuthShowCookies(c echo.Context) error { func (h *Handlers) AuthShowCookies(c echo.Context) error {

17
handlers/handler.go
View File

@ -1,6 +1,7 @@
package handlers package handlers
import ( import (
"context"
"errors" "errors"
"templ-test/client" "templ-test/client"
"templ-test/domain" "templ-test/domain"
@ -43,7 +44,16 @@ func (h *Handlers) Register(group echo.Group) {
func Render(ctx echo.Context, statusCode int, t templ.Component) error { func Render(ctx echo.Context, statusCode int, t templ.Component) error {
ctx.Response().Writer.WriteHeader(statusCode) ctx.Response().Writer.WriteHeader(statusCode)
ctx.Response().Header().Set(echo.HeaderContentType, echo.MIMETextHTML) ctx.Response().Header().Set(echo.HeaderContentType, echo.MIMETextHTML)
return t.Render(ctx.Request().Context(), ctx.Response().Writer)
// take the request context and make it a var
request := ctx.Request().Context()
//Check to see if we the echo context has the cookie we are looking for, if so, create a new context based on what we had and add the value
darkMode, err := ctx.Cookie(domain.CookieSettingsDarkMode)
if err == nil {
request = context.WithValue(request, domain.CookieSettingsDarkMode, darkMode.Value)
}
return t.Render(request, ctx.Response().Writer)
} }
type jwtToken struct { type jwtToken struct {
@ -101,5 +111,10 @@ func GetCookieValues(ctx echo.Context) models.AllCookies {
m.RefreshToken = refresh.Value m.RefreshToken = refresh.Value
} }
darkMode, err := ctx.Cookie(domain.CookieSettingsDarkMode)
if err == nil {
m.DarkMode = darkMode.Value
}
return m return m
} }

4
handlers/home.go
View File

@ -36,7 +36,3 @@ func (h *Handlers) SettingsPost(c echo.Context) error {
return Render(c, http.StatusOK, home.SettingsUpdated()) return Render(c, http.StatusOK, home.SettingsUpdated())
} }
//func (h *Handlers) ListHandler(c echo.Context) error {
// return Render(c, http.StatusOK, views.List())
//}

1
models/auth.go
View File

@ -4,6 +4,7 @@ type AllCookies struct {
Username string Username string
Token string Token string
RefreshToken string RefreshToken string
DarkMode string
} }
type ShowCookie struct { type ShowCookie struct {

3
views/auth/cookie.templ
View File

@ -6,8 +6,11 @@ import "templ-test/views/layout"
templ ShowCookie(m models.AllCookies) { templ ShowCookie(m models.AllCookies) {
@layout.WithLayout("Cookie Explorer") { @layout.WithLayout("Cookie Explorer") {
<h2>These are stored as cookies</h2> <h2>These are stored as cookies</h2>
<h3>JWT Values</h3>
<p>Username: { m.Username }</p> <p>Username: { m.Username }</p>
<p>JWT Token: { m.Token }</p> <p>JWT Token: { m.Token }</p>
<p>RefreshToken: { m.RefreshToken }</p> <p>RefreshToken: { m.RefreshToken }</p>
<h3>User Settings</h3>
<p>DarkMode: { m.DarkMode }</p>
} }
} }

7
views/auth/loginPost.templ Normal file
View File

@ -0,0 +1,7 @@
package auth
import "templ-test/views/components/bootstrap"
templ LoginPost() {
@bootstrap.BootstrapAlert("Login successful!", bootstrap.VariantSuccess)
}

4
views/home/settingsUpdated.templ
View File

@ -1,9 +1,5 @@
package home package home
import "templ-test/views/layout"
templ SettingsUpdated() { templ SettingsUpdated() {
@layout.WithLayout("Settings Updated") {
<p>You are now free to move about the cabin. Thank you for saving with us!</p> <p>You are now free to move about the cabin. Thank you for saving with us!</p>
} }
}

16
views/layout/body.templ
View File

@ -1,20 +1,8 @@
package layout package layout
templ WithLayout(pageName string) { templ WithLayout(pageName string) {
<html> <!doctype html>
@getHtmlHead() <html lang="en" data-bs-theme={ useLightOrDarkTheme(ctx) }>
<body>
@bootstrapNavBar()
@getBodyHeader(pageName)
<div class="container-fluid">
{ children... }
</div>
</body>
</html>
}
templ Testing(pageName string) {
<html>
@getHtmlHead() @getHtmlHead()
<body> <body>
@bootstrapNavBar() @bootstrapNavBar()

2
views/layout/navbar.templ
View File

@ -1,7 +1,7 @@
package layout package layout
templ bootstrapNavBar() { templ bootstrapNavBar() {
<nav class="navbar navbar-expand-lg bg-body-tertiary" data-bs-theme={ useLightOrDarkTheme(ctx)}> <nav class="navbar navbar-expand-lg bg-body-tertiary">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="#">Navbar</a> <a class="navbar-brand" href="#">Navbar</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">

4
views/layout/util.go
View File

@ -6,8 +6,8 @@ import (
) )
func useLightOrDarkTheme(ctx context.Context) string { func useLightOrDarkTheme(ctx context.Context) string {
cookie := ctx.Value(domain.CookieSettingsDarkMode) value := ctx.Value(domain.CookieSettingsDarkMode)
if cookie == "on" { if value == "on" {
return "dark" return "dark"
} else { } else {
return "light" return "light"