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

Compare commits

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

No commits in common. "fe4293b02f3881eaa2167490a4f2142520a73158" and "6cfc53901eb920a819e45e31697d671b359e5630" have entirely different histories.
fe4293b02f ... 6cfc53901e

10 changed files with 29 additions and 35 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, auth.LoginPost()) return Render(c, http.StatusOK, home.Home())
} }
func (h *Handlers) AuthShowCookies(c echo.Context) error { func (h *Handlers) AuthShowCookies(c echo.Context) error {

17
handlers/handler.go
View File

@ -1,7 +1,6 @@
package handlers package handlers
import ( import (
"context"
"errors" "errors"
"templ-test/client" "templ-test/client"
"templ-test/domain" "templ-test/domain"
@ -44,16 +43,7 @@ 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 {
@ -111,10 +101,5 @@ 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,3 +36,7 @@ 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,7 +4,6 @@ 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,11 +6,8 @@ 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
View File

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

8
views/home/settingsUpdated.templ
View File

@ -1,5 +1,9 @@
package home package home
import "templ-test/views/layout"
templ SettingsUpdated() { templ SettingsUpdated() {
<p>You are now free to move about the cabin. Thank you for saving with us!</p> @layout.WithLayout("Settings Updated") {
} <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,8 +1,20 @@
package layout package layout
templ WithLayout(pageName string) { templ WithLayout(pageName string) {
<!doctype html> <html>
<html lang="en" data-bs-theme={ useLightOrDarkTheme(ctx) }> @getHtmlHead()
<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"> <nav class="navbar navbar-expand-lg bg-body-tertiary" data-bs-theme={ useLightOrDarkTheme(ctx)}>
<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 {
value := ctx.Value(domain.CookieSettingsDarkMode) cookie := ctx.Value(domain.CookieSettingsDarkMode)
if value == "on" { if cookie == "on" {
return "dark" return "dark"
} else { } else {
return "light" return "light"