Compare commits
7 Commits
bd82bfeca0
...
6cfc53901e
Author | SHA1 | Date | |
---|---|---|---|
6cfc53901e | |||
f9c7032e92 | |||
22940d952c | |||
a4d5b7ade3 | |||
68c44812d8 | |||
9d88d649d1 | |||
03d151f75a |
15
.vscode/launch.json
vendored
Normal file
15
.vscode/launch.json
vendored
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
// Use IntelliSense to learn about possible attributes.
|
||||||
|
// Hover to view descriptions of existing attributes.
|
||||||
|
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
|
"version": "0.2.0",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "Launch file",
|
||||||
|
"type": "go",
|
||||||
|
"request": "launch",
|
||||||
|
"mode": "debug",
|
||||||
|
"program": "cmd/main.go"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
7
.vscode/settings.json
vendored
7
.vscode/settings.json
vendored
@ -1,6 +1,13 @@
|
|||||||
{
|
{
|
||||||
|
"editor.formatOnSave": true,
|
||||||
|
"[templ]": {
|
||||||
|
"editor.defaultFormatter": "a-h.templ"
|
||||||
|
},
|
||||||
"files.exclude": {
|
"files.exclude": {
|
||||||
"**/*_templ.go": true,
|
"**/*_templ.go": true,
|
||||||
"**/*_templ.txt": true
|
"**/*_templ.txt": true
|
||||||
|
},
|
||||||
|
"emmet.includeLanguages": {
|
||||||
|
"templ": "html"
|
||||||
}
|
}
|
||||||
}
|
}
|
9
domain/consts.go
Normal file
9
domain/consts.go
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
package domain
|
||||||
|
|
||||||
|
const (
|
||||||
|
CookieToken = "token"
|
||||||
|
CookieRefreshToken = "refresh"
|
||||||
|
CookieUser = "user"
|
||||||
|
|
||||||
|
CookieSettingsDarkMode = "darkmode"
|
||||||
|
)
|
@ -3,6 +3,7 @@ package handlers
|
|||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"templ-test/domain"
|
||||||
"templ-test/views/auth"
|
"templ-test/views/auth"
|
||||||
"templ-test/views/home"
|
"templ-test/views/home"
|
||||||
|
|
||||||
@ -25,17 +26,17 @@ func (h *Handlers) AuthLoginPost(c echo.Context) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cookie := new(http.Cookie)
|
cookie := new(http.Cookie)
|
||||||
cookie.Name = CookieToken
|
cookie.Name = domain.CookieToken
|
||||||
cookie.Value = resp.Token
|
cookie.Value = resp.Token
|
||||||
c.SetCookie(cookie)
|
c.SetCookie(cookie)
|
||||||
|
|
||||||
cookie = new(http.Cookie)
|
cookie = new(http.Cookie)
|
||||||
cookie.Name = CookieRefreshToken
|
cookie.Name = domain.CookieRefreshToken
|
||||||
cookie.Value = resp.RefreshToken
|
cookie.Value = resp.RefreshToken
|
||||||
c.SetCookie(cookie)
|
c.SetCookie(cookie)
|
||||||
|
|
||||||
cookie = new(http.Cookie)
|
cookie = new(http.Cookie)
|
||||||
cookie.Name = CookieUser
|
cookie.Name = domain.CookieUser
|
||||||
cookie.Value = user
|
cookie.Value = user
|
||||||
c.SetCookie(cookie)
|
c.SetCookie(cookie)
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@ package handlers
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"templ-test/client"
|
"templ-test/client"
|
||||||
|
"templ-test/domain"
|
||||||
"templ-test/models"
|
"templ-test/models"
|
||||||
"templ-test/services"
|
"templ-test/services"
|
||||||
"time"
|
"time"
|
||||||
@ -13,12 +14,6 @@ import (
|
|||||||
"github.com/labstack/echo/v4"
|
"github.com/labstack/echo/v4"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
|
||||||
CookieToken = "token"
|
|
||||||
CookieRefreshToken = "refresh"
|
|
||||||
CookieUser = "user"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Handlers struct {
|
type Handlers struct {
|
||||||
api client.ApiClient
|
api client.ApiClient
|
||||||
cfg services.EnvConfig
|
cfg services.EnvConfig
|
||||||
@ -76,7 +71,7 @@ func ValidateJwt(ctx echo.Context, sharedSecret, issuer string) (jwtToken, error
|
|||||||
if !token.Valid {
|
if !token.Valid {
|
||||||
return jwtToken{}, errors.New("invalid jwt token")
|
return jwtToken{}, errors.New("invalid jwt token")
|
||||||
}
|
}
|
||||||
|
|
||||||
claims := token.Claims.(*jwtToken)
|
claims := token.Claims.(*jwtToken)
|
||||||
if !claims.Exp.After(time.Now()) {
|
if !claims.Exp.After(time.Now()) {
|
||||||
return jwtToken{}, errors.New("the jwt token has expired")
|
return jwtToken{}, errors.New("the jwt token has expired")
|
||||||
@ -91,17 +86,17 @@ func ValidateJwt(ctx echo.Context, sharedSecret, issuer string) (jwtToken, error
|
|||||||
func GetCookieValues(ctx echo.Context) models.AllCookies {
|
func GetCookieValues(ctx echo.Context) models.AllCookies {
|
||||||
m := models.AllCookies{}
|
m := models.AllCookies{}
|
||||||
|
|
||||||
token, err := ctx.Cookie(CookieToken)
|
token, err := ctx.Cookie(domain.CookieToken)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
m.Token = token.Value
|
m.Token = token.Value
|
||||||
}
|
}
|
||||||
|
|
||||||
user, err := ctx.Cookie(CookieUser)
|
user, err := ctx.Cookie(domain.CookieUser)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
m.Username = user.Value
|
m.Username = user.Value
|
||||||
}
|
}
|
||||||
|
|
||||||
refresh, err := ctx.Cookie(CookieRefreshToken)
|
refresh, err := ctx.Cookie(domain.CookieRefreshToken)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
m.RefreshToken = refresh.Value
|
m.RefreshToken = refresh.Value
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,8 @@ package handlers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"templ-test/domain"
|
||||||
|
"templ-test/models"
|
||||||
"templ-test/views/home"
|
"templ-test/views/home"
|
||||||
|
|
||||||
"github.com/labstack/echo/v4"
|
"github.com/labstack/echo/v4"
|
||||||
@ -12,13 +14,27 @@ func (h *Handlers) HomeHandler(c echo.Context) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) Settings(c echo.Context) error {
|
func (h *Handlers) Settings(c echo.Context) error {
|
||||||
return Render(c, http.StatusOK, home.UserSettings())
|
m := models.SettingsViewModel{}
|
||||||
|
darkMode, err := c.Cookie(domain.CookieSettingsDarkMode)
|
||||||
|
if err == nil {
|
||||||
|
m.DarkMode = darkMode.Value
|
||||||
|
}
|
||||||
|
|
||||||
|
return Render(c, http.StatusOK, home.UserSettings(m))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) SettingsPost(c echo.Context) error {
|
func (h *Handlers) SettingsPost(c echo.Context) error {
|
||||||
// take in the updated values from he user and write the cookies... tbd
|
// take in the updated values from he user and write the cookies... tbd
|
||||||
|
useDarkMode := c.FormValue(domain.CookieSettingsDarkMode)
|
||||||
|
if useDarkMode != "" {
|
||||||
|
darkModeCookie := new(http.Cookie)
|
||||||
|
darkModeCookie.Name = domain.CookieSettingsDarkMode
|
||||||
|
darkModeCookie.Value = useDarkMode
|
||||||
|
|
||||||
return Render(c, http.StatusOK, home.UserSettings())
|
c.SetCookie(darkModeCookie)
|
||||||
|
}
|
||||||
|
|
||||||
|
return Render(c, http.StatusOK, home.SettingsUpdated())
|
||||||
}
|
}
|
||||||
|
|
||||||
//func (h *Handlers) ListHandler(c echo.Context) error {
|
//func (h *Handlers) ListHandler(c echo.Context) error {
|
||||||
|
5
models/home.go
Normal file
5
models/home.go
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
type SettingsViewModel struct {
|
||||||
|
DarkMode string
|
||||||
|
}
|
@ -4,7 +4,7 @@ import "templ-test/models"
|
|||||||
import "templ-test/views/layout"
|
import "templ-test/views/layout"
|
||||||
|
|
||||||
templ ShowCookie(m models.AllCookies) {
|
templ ShowCookie(m models.AllCookies) {
|
||||||
@layout.Testing("Cookie Explorer") {
|
@layout.WithLayout("Cookie Explorer") {
|
||||||
<h2>These are stored as cookies</h2>
|
<h2>These are stored as cookies</h2>
|
||||||
<p>Username: { m.Username }</p>
|
<p>Username: { m.Username }</p>
|
||||||
<p>JWT Token: { m.Token }</p>
|
<p>JWT Token: { m.Token }</p>
|
||||||
|
@ -3,7 +3,7 @@ package auth
|
|||||||
import "templ-test/views/layout"
|
import "templ-test/views/layout"
|
||||||
|
|
||||||
templ AuthLogin() {
|
templ AuthLogin() {
|
||||||
@layout.WithLayout("Login", true) {
|
@layout.WithLayout("Login") {
|
||||||
<form hx-post="/auth/login">
|
<form hx-post="/auth/login">
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label for="username" class="form-label">Username</label>
|
<label for="username" class="form-label">Username</label>
|
||||||
|
@ -17,7 +17,3 @@ templ BootstrapAlert(message, variant string) {
|
|||||||
{ message }
|
{ message }
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
templ BootstrapButton(message, variant string) {
|
|
||||||
<button type="button" class={ getButtonVariant(variant) }>{ message }</button>
|
|
||||||
}
|
|
10
views/components/bootstrap/button.templ
Normal file
10
views/components/bootstrap/button.templ
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
package bootstrap
|
||||||
|
|
||||||
|
const (
|
||||||
|
ButtonTypeSubmit = "submit"
|
||||||
|
ButtonTypeDefault = "button"
|
||||||
|
)
|
||||||
|
|
||||||
|
templ BootstrapButton(message, variant, buttonType string) {
|
||||||
|
<button type={ buttonType } class={ getButtonVariant(variant) }>{ message }</button>
|
||||||
|
}
|
5
views/components/bootstrap/label.templ
Normal file
5
views/components/bootstrap/label.templ
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
package bootstrap
|
||||||
|
|
||||||
|
templ Label(cssClass, name, cssForId, message string) {
|
||||||
|
<label class={ cssClass } name={ name } for={ cssForId }>{ message }</label>
|
||||||
|
}
|
13
views/components/bootstrap/switch.templ
Normal file
13
views/components/bootstrap/switch.templ
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
package bootstrap
|
||||||
|
|
||||||
|
const (
|
||||||
|
SwitchTypeCheckbox = "checkbox"
|
||||||
|
)
|
||||||
|
|
||||||
|
templ Switch(name, switchType, cssId string, enabled bool) {
|
||||||
|
if enabled == true {
|
||||||
|
<input class="form-check-input" name={ name } type={ switchType } role="switch" id={ cssId } checked/>
|
||||||
|
} else {
|
||||||
|
<input class="form-check-input" name={ name } type={ switchType } role="switch" id={ cssId }/>
|
||||||
|
}
|
||||||
|
}
|
@ -3,7 +3,7 @@ package home
|
|||||||
import "templ-test/views/layout"
|
import "templ-test/views/layout"
|
||||||
|
|
||||||
templ Error(message error) {
|
templ Error(message error) {
|
||||||
@layout.Testing("Error") {
|
@layout.WithLayout("Error") {
|
||||||
<h1>Oops... :(</h1>
|
<h1>Oops... :(</h1>
|
||||||
<h3>{ message.Error() } </h3>
|
<h3>{ message.Error() } </h3>
|
||||||
}
|
}
|
||||||
|
@ -4,14 +4,14 @@ import "templ-test/views/components/bootstrap"
|
|||||||
import "templ-test/views/layout"
|
import "templ-test/views/layout"
|
||||||
|
|
||||||
templ Home() {
|
templ Home() {
|
||||||
@layout.WithLayout("Home", true) {
|
@layout.WithLayout("Home") {
|
||||||
<p>
|
<p>
|
||||||
this should be above the alert
|
this should be above the alert
|
||||||
</p>
|
</p>
|
||||||
@bootstrap.BootstrapAlert("Testing!", bootstrap.VariantDark)
|
@bootstrap.BootstrapAlert("Testing!", bootstrap.VariantDark)
|
||||||
<p>you should now see this under the Alert </p>
|
<p>you should now see this under the Alert </p>
|
||||||
@bootstrap.BootstrapButton("I am in danger", bootstrap.VariantDanger)
|
@bootstrap.BootstrapButton("I am in danger", bootstrap.VariantDanger, bootstrap.ButtonTypeDefault)
|
||||||
@bootstrap.BootstrapButton("I am the darkness", bootstrap.VariantDark)
|
@bootstrap.BootstrapButton("I am the darkness", bootstrap.VariantDark, bootstrap.ButtonTypeDefault)
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,33 @@
|
|||||||
package home
|
package home
|
||||||
|
|
||||||
import "templ-test/views/layout"
|
import "templ-test/views/layout"
|
||||||
|
import "templ-test/views/components/bootstrap"
|
||||||
|
import "templ-test/models"
|
||||||
|
import "templ-test/domain"
|
||||||
|
|
||||||
templ UserSettings() {
|
const (
|
||||||
@layout.Testing("Settings") {
|
test = "t"
|
||||||
<h2>This is not ready yet</h2>
|
)
|
||||||
|
|
||||||
|
templ UserSettings(model models.SettingsViewModel) {
|
||||||
|
@layout.WithLayout("Settings") {
|
||||||
|
<form hx-post="/settings">
|
||||||
|
<div class="mb-3">
|
||||||
|
if useDarkMode(model.DarkMode) {
|
||||||
|
@bootstrap.Switch("darkmode", bootstrap.SwitchTypeCheckbox, test, true)
|
||||||
|
} else {
|
||||||
|
@bootstrap.Switch("darkmode", bootstrap.SwitchTypeCheckbox, "flexSwitchCheckDefault", true)
|
||||||
|
}
|
||||||
|
@bootstrap.Label("form-check-label", domain.CookieSettingsDarkMode, "flexSwitchCheckDefault", "Use Dark Mode")
|
||||||
|
</div>
|
||||||
|
@bootstrap.BootstrapButton("Submit", bootstrap.VariantInfo, bootstrap.ButtonTypeSubmit)
|
||||||
|
</form>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func useDarkMode(value string) bool {
|
||||||
|
if value == "on" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
9
views/home/settingsUpdated.templ
Normal file
9
views/home/settingsUpdated.templ
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
package home
|
||||||
|
|
||||||
|
import "templ-test/views/layout"
|
||||||
|
|
||||||
|
templ SettingsUpdated() {
|
||||||
|
@layout.WithLayout("Settings Updated") {
|
||||||
|
<p>You are now free to move about the cabin. Thank you for saving with us!</p>
|
||||||
|
}
|
||||||
|
}
|
@ -1,6 +1,6 @@
|
|||||||
package layout
|
package layout
|
||||||
|
|
||||||
templ WithLayout(pageName string, useDarkMode bool) {
|
templ WithLayout(pageName string) {
|
||||||
<html>
|
<html>
|
||||||
@getHtmlHead()
|
@getHtmlHead()
|
||||||
<body>
|
<body>
|
||||||
|
@ -2,8 +2,14 @@ package layout
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"templ-test/domain"
|
||||||
)
|
)
|
||||||
|
|
||||||
func useLightOrDarkTheme(ctx context.Context) string {
|
func useLightOrDarkTheme(ctx context.Context) string {
|
||||||
return "dark"
|
cookie := ctx.Value(domain.CookieSettingsDarkMode)
|
||||||
|
if cookie == "on" {
|
||||||
|
return "dark"
|
||||||
|
} else {
|
||||||
|
return "light"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user