Navbar template
This commit is contained in:
parent
d6de403880
commit
609ccfc0c4
|
|
@ -5,6 +5,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type RegisterProps struct {
|
type RegisterProps struct {
|
||||||
|
Navbar templates.NavCollapse
|
||||||
GeneralError string `json:",omitempty"`
|
GeneralError string `json:",omitempty"`
|
||||||
Username templates.InputProps
|
Username templates.InputProps
|
||||||
Password templates.InputProps
|
Password templates.InputProps
|
||||||
|
|
@ -36,6 +37,7 @@ func (p *RegisterProps) Validate() (valid bool) {
|
||||||
|
|
||||||
func NewRegisterProps(usernameVal, passwordVal, confirmPassVal string) *RegisterProps {
|
func NewRegisterProps(usernameVal, passwordVal, confirmPassVal string) *RegisterProps {
|
||||||
return &RegisterProps{
|
return &RegisterProps{
|
||||||
|
Navbar: templates.DefaultNavCollapse(),
|
||||||
GeneralError: "",
|
GeneralError: "",
|
||||||
Username: templates.InputProps{
|
Username: templates.InputProps{
|
||||||
Name: "username",
|
Name: "username",
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package response
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"lishwist/http/templates"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/Teajey/rsvp"
|
"github.com/Teajey/rsvp"
|
||||||
|
|
@ -11,9 +12,17 @@ func NotFound() rsvp.Response {
|
||||||
return Error(http.StatusNotFound, "Page not found")
|
return Error(http.StatusNotFound, "Page not found")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type errorProps struct {
|
||||||
|
Navbar templates.NavCollapse
|
||||||
|
Message string
|
||||||
|
}
|
||||||
|
|
||||||
func Error(status int, format string, a ...any) rsvp.Response {
|
func Error(status int, format string, a ...any) rsvp.Response {
|
||||||
return rsvp.Response{
|
return rsvp.Response{
|
||||||
Body: fmt.Sprintf(format, a...),
|
Body: errorProps{
|
||||||
|
Message: fmt.Sprintf(format, a...),
|
||||||
|
Navbar: templates.DefaultNavCollapse(),
|
||||||
|
},
|
||||||
Status: status,
|
Status: status,
|
||||||
TemplateName: "error_page.gotmpl",
|
TemplateName: "error_page.gotmpl",
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type AccountProps struct {
|
type AccountProps struct {
|
||||||
CurrentUsername string
|
Navbar templates.NavCollapse
|
||||||
GeneralError string `json:",omitempty"`
|
GeneralError string `json:",omitempty"`
|
||||||
PasswordFromAdmin bool `json:",omitempty"`
|
PasswordFromAdmin bool `json:",omitempty"`
|
||||||
Password templates.InputProps
|
Password templates.InputProps
|
||||||
|
|
@ -41,7 +41,7 @@ func (p *AccountProps) Validate() (valid bool) {
|
||||||
|
|
||||||
func NewAccountProps(username string, passwordFromAdmin bool, passwordVal, confirmPassVal string) *AccountProps {
|
func NewAccountProps(username string, passwordFromAdmin bool, passwordVal, confirmPassVal string) *AccountProps {
|
||||||
return &AccountProps{
|
return &AccountProps{
|
||||||
CurrentUsername: username,
|
Navbar: templates.UserNavCollapse(username, false),
|
||||||
PasswordFromAdmin: passwordFromAdmin,
|
PasswordFromAdmin: passwordFromAdmin,
|
||||||
Password: templates.InputProps{
|
Password: templates.InputProps{
|
||||||
Type: "password",
|
Type: "password",
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package routing
|
||||||
import (
|
import (
|
||||||
lishwist "lishwist/core"
|
lishwist "lishwist/core"
|
||||||
"lishwist/http/response"
|
"lishwist/http/response"
|
||||||
|
"lishwist/http/templates"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
|
|
@ -10,6 +11,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type foreignWishlistProps struct {
|
type foreignWishlistProps struct {
|
||||||
|
Navbar templates.NavCollapse
|
||||||
CurrentUserId string
|
CurrentUserId string
|
||||||
CurrentUserName string
|
CurrentUserName string
|
||||||
Username string
|
Username string
|
||||||
|
|
@ -35,11 +37,12 @@ func ForeignWishlist(app *lishwist.Session, session *response.Session, h http.He
|
||||||
log.Printf("%q couldn't get wishes of other user %q: %s\n", user.Name, otherUser.Name, err)
|
log.Printf("%q couldn't get wishes of other user %q: %s\n", user.Name, otherUser.Name, err)
|
||||||
return response.Error(http.StatusInternalServerError, "An error occurred while fetching this user :(")
|
return response.Error(http.StatusInternalServerError, "An error occurred while fetching this user :(")
|
||||||
}
|
}
|
||||||
p := foreignWishlistProps{CurrentUserId: user.Id, CurrentUserName: user.Name, Username: otherUser.Name, Gifts: wishes}
|
p := foreignWishlistProps{Navbar: templates.UserNavCollapse(user.Name, user.PasswordFromAdmin), CurrentUserId: user.Id, Username: otherUser.Name, Gifts: wishes}
|
||||||
return response.Data("foreign_wishlist.gotmpl", p)
|
return response.Data("foreign_wishlist.gotmpl", p)
|
||||||
}
|
}
|
||||||
|
|
||||||
type publicWishlistProps struct {
|
type publicWishlistProps struct {
|
||||||
|
Navbar templates.NavCollapse
|
||||||
Username string
|
Username string
|
||||||
GiftCount int
|
GiftCount int
|
||||||
}
|
}
|
||||||
|
|
@ -59,6 +62,6 @@ func PublicWishlist(s *response.Session, h http.Header, r *http.Request) rsvp.Re
|
||||||
log.Printf("Couldn't get wishes of user %q on public wishlist: %s\n", otherUser.Name, err)
|
log.Printf("Couldn't get wishes of user %q on public wishlist: %s\n", otherUser.Name, err)
|
||||||
return response.Error(http.StatusInternalServerError, "An error occurred while fetching this user :(")
|
return response.Error(http.StatusInternalServerError, "An error occurred while fetching this user :(")
|
||||||
}
|
}
|
||||||
p := publicWishlistProps{Username: otherUser.Name, GiftCount: giftCount}
|
p := publicWishlistProps{Navbar: templates.DefaultNavCollapse(), Username: otherUser.Name, GiftCount: giftCount}
|
||||||
return response.Data("public_foreign_wishlist.gotmpl", p)
|
return response.Data("public_foreign_wishlist.gotmpl", p)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,13 +7,14 @@ import (
|
||||||
|
|
||||||
lishwist "lishwist/core"
|
lishwist "lishwist/core"
|
||||||
"lishwist/http/response"
|
"lishwist/http/response"
|
||||||
|
"lishwist/http/templates"
|
||||||
|
|
||||||
"github.com/Teajey/rsvp"
|
"github.com/Teajey/rsvp"
|
||||||
)
|
)
|
||||||
|
|
||||||
type GroupProps struct {
|
type GroupProps struct {
|
||||||
Group *lishwist.Group
|
Navbar templates.NavCollapse
|
||||||
CurrentUsername string
|
Group *lishwist.Group
|
||||||
}
|
}
|
||||||
|
|
||||||
func AdminGroup(app *lishwist.Session, h http.Header, r *http.Request) rsvp.Response {
|
func AdminGroup(app *lishwist.Session, h http.Header, r *http.Request) rsvp.Response {
|
||||||
|
|
@ -31,8 +32,8 @@ func AdminGroup(app *lishwist.Session, h http.Header, r *http.Request) rsvp.Resp
|
||||||
group.Members = slices.Delete(group.Members, index, index+1)
|
group.Members = slices.Delete(group.Members, index, index+1)
|
||||||
}
|
}
|
||||||
p := GroupProps{
|
p := GroupProps{
|
||||||
Group: group,
|
Navbar: templates.UserNavCollapse(user.Name, user.PasswordFromAdmin),
|
||||||
CurrentUsername: user.Name,
|
Group: group,
|
||||||
}
|
}
|
||||||
return response.Data("group_page.gotmpl", p)
|
return response.Data("group_page.gotmpl", p)
|
||||||
}
|
}
|
||||||
|
|
@ -54,8 +55,8 @@ func Group(app *lishwist.Session, session *response.Session, h http.Header, r *h
|
||||||
index := group.MemberIndex(user.Id)
|
index := group.MemberIndex(user.Id)
|
||||||
group.Members = slices.Delete(group.Members, index, index+1)
|
group.Members = slices.Delete(group.Members, index, index+1)
|
||||||
p := GroupProps{
|
p := GroupProps{
|
||||||
Group: group,
|
Navbar: templates.UserNavCollapse(user.Name, user.PasswordFromAdmin),
|
||||||
CurrentUsername: user.Name,
|
Group: group,
|
||||||
}
|
}
|
||||||
return response.Data("group_page.gotmpl", p)
|
return response.Data("group_page.gotmpl", p)
|
||||||
}
|
}
|
||||||
|
|
@ -71,7 +72,8 @@ func PublicGroup(s *response.Session, h http.Header, r *http.Request) rsvp.Respo
|
||||||
return response.Error(http.StatusNotFound, "Group not found")
|
return response.Error(http.StatusNotFound, "Group not found")
|
||||||
}
|
}
|
||||||
p := GroupProps{
|
p := GroupProps{
|
||||||
Group: group,
|
Navbar: templates.DefaultNavCollapse(),
|
||||||
|
Group: group,
|
||||||
}
|
}
|
||||||
return response.Data("public_group_page.gotmpl", p)
|
return response.Data("public_group_page.gotmpl", p)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,18 +7,16 @@ import (
|
||||||
lishwist "lishwist/core"
|
lishwist "lishwist/core"
|
||||||
"lishwist/http/env"
|
"lishwist/http/env"
|
||||||
"lishwist/http/response"
|
"lishwist/http/response"
|
||||||
|
"lishwist/http/templates"
|
||||||
|
|
||||||
"github.com/Teajey/rsvp"
|
"github.com/Teajey/rsvp"
|
||||||
)
|
)
|
||||||
|
|
||||||
type HomeProps struct {
|
type HomeProps struct {
|
||||||
Username string
|
Navbar templates.NavCollapse
|
||||||
Gifts []lishwist.Wish
|
Gifts []lishwist.Wish
|
||||||
Todo []lishwist.Wish
|
Todo []lishwist.Wish
|
||||||
Reference string
|
Groups []lishwist.Group
|
||||||
HostUrl string
|
|
||||||
Groups []lishwist.Group
|
|
||||||
AccountAlert bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func Home(app *lishwist.Session, session *response.Session, h http.Header, r *http.Request) rsvp.Response {
|
func Home(app *lishwist.Session, session *response.Session, h http.Header, r *http.Request) rsvp.Response {
|
||||||
|
|
@ -38,7 +36,10 @@ func Home(app *lishwist.Session, session *response.Session, h http.Header, r *ht
|
||||||
log.Printf("Failed to get groups: %s\n", err)
|
log.Printf("Failed to get groups: %s\n", err)
|
||||||
return response.Error(http.StatusInternalServerError, "An error occurred while fetching your wishlist :(")
|
return response.Error(http.StatusInternalServerError, "An error occurred while fetching your wishlist :(")
|
||||||
}
|
}
|
||||||
p := HomeProps{Username: user.Name, Gifts: gifts, Todo: todo, Reference: user.Reference, HostUrl: env.Configuration.HostUrl, Groups: groups, AccountAlert: user.PasswordFromAdmin}
|
p := HomeProps{Navbar: templates.NavCollapse{
|
||||||
|
User: &templates.User{Name: user.Name, CopyList: &templates.CopyList{Domain: env.Configuration.HostUrl, Reference: user.Reference}},
|
||||||
|
AccountLink: &templates.AccountLink{Alert: user.PasswordFromAdmin},
|
||||||
|
}, Gifts: gifts, Todo: todo, Groups: groups}
|
||||||
return response.Data("home.gotmpl", p)
|
return response.Data("home.gotmpl", p)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,41 +7,7 @@
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div style="height: 100svh;" class="d-flex flex-column">
|
<div style="height: 100svh;" class="d-flex flex-column">
|
||||||
<div class="navbar navbar-expand-lg bg-body-tertiary">
|
{{template "navbar" .Navbar}}
|
||||||
<div class="container-fluid">
|
|
||||||
<div class="navbar-brand">Lishwist</div>
|
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle"
|
|
||||||
aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
<div class="collapse navbar-collapse" id="navbarToggle">
|
|
||||||
<nav>
|
|
||||||
<ul class="navbar-nav">
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="/">Home</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</nav>
|
|
||||||
<div class="flex-grow-1"></div>
|
|
||||||
<ul class="navbar-nav">
|
|
||||||
<li class="nav-item">
|
|
||||||
<div class="dropdown">
|
|
||||||
<button class="nav-link dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
|
||||||
Logged in as '{{.CurrentUsername}}'
|
|
||||||
</button>
|
|
||||||
<ul class="dropdown-menu">
|
|
||||||
<li>
|
|
||||||
<form class="d-contents" method="post" action="/logout">
|
|
||||||
<button class="dropdown-item" type="submit">Logout</button>
|
|
||||||
</form>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="overflow-y-scroll flex-grow-1">
|
<div class="overflow-y-scroll flex-grow-1">
|
||||||
<div class="container py-5">
|
<div class="container py-5">
|
||||||
{{with .GeneralError}}
|
{{with .GeneralError}}
|
||||||
|
|
@ -80,4 +46,4 @@
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -41,28 +41,62 @@
|
||||||
</script>
|
</script>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
{{define "boilerplate"}}
|
{{define "navbar"}}
|
||||||
<head>
|
<div class="navbar navbar-expand-lg bg-body-tertiary">
|
||||||
{{template "head" .}}
|
<div class="container-fluid">
|
||||||
</head>
|
<div class="navbar-brand">Lishwist</div>
|
||||||
|
{{with .}}
|
||||||
<body>
|
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle"
|
||||||
<div style="height: 100svh;" class="d-flex flex-column">
|
aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
<div class="navbar navbar-expand-lg bg-body-tertiary">
|
<span class="navbar-toggler-icon"></span>{{if and .AccountLink .AccountLink.Alert}} <span
|
||||||
<div class="container-fluid">
|
class="badge text-bg-danger">!</span>{{end}}
|
||||||
<div class="navbar-brand">Lishwist</div>
|
</button>
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle"
|
<div class="collapse navbar-collapse" id="navbarToggle">
|
||||||
aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
|
{{with .Links}}
|
||||||
<span class="navbar-toggler-icon"></span>
|
<nav>
|
||||||
</button>
|
<ul class="navbar-nav">
|
||||||
<div class="collapse navbar-collapse" id="navbarToggle">
|
{{range .}}
|
||||||
{{template "navbar" .}}
|
<li class="nav-item">
|
||||||
</div>
|
<a class="nav-link" href="{{.Href}}">{{.Name}}</a>
|
||||||
|
</li>
|
||||||
|
{{end}}
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
|
{{end}}
|
||||||
|
<div class="flex-grow-1"></div>
|
||||||
|
{{with .User}}
|
||||||
|
<ul class="navbar-nav">
|
||||||
|
{{with .CopyList}}
|
||||||
|
<li class="nav-item"><button class="btn btn-success"
|
||||||
|
onclick="navigator.clipboard.writeText('{{.Domain}}/lists/{{.Reference}}'); alert('The share link to your wishlist has been copied to your clipboard. Anyone with the link will be able to claim gifts for you. Share it with someone!');">Copy
|
||||||
|
share link</button></li>
|
||||||
|
{{end}}
|
||||||
|
<li class="nav-item">
|
||||||
|
<div class="dropdown">
|
||||||
|
<button class="nav-link dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
||||||
|
Logged in as '{{.Name}}'
|
||||||
|
</button>
|
||||||
|
<ul class="dropdown-menu">
|
||||||
|
{{with $.AccountLink}}
|
||||||
|
<li>
|
||||||
|
<a class="dropdown-item" href="/account">Account{{if .Alert}} <span
|
||||||
|
class="badge text-bg-danger">!</span>{{end}}</a>
|
||||||
|
</li>
|
||||||
|
{{end}}
|
||||||
|
<li>
|
||||||
|
<form class="d-contents" method="post" action="/logout">
|
||||||
|
<button class="dropdown-item" type="submit">Logout</button>
|
||||||
|
</form>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
{{template "body" .}}
|
|
||||||
</div>
|
</div>
|
||||||
</body>
|
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
{{define "login_prompt"}}
|
{{define "login_prompt"}}
|
||||||
|
|
|
||||||
|
|
@ -1,32 +1,15 @@
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
{{template "head" .}}
|
{{template "head"}}
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div style="height: 100svh;" class="d-flex flex-column">
|
<div style="height: 100svh;" class="d-flex flex-column">
|
||||||
<div class="navbar navbar-expand-lg bg-body-tertiary">
|
{{template "navbar" .Navbar}}
|
||||||
<div class="container-fluid">
|
|
||||||
<div class="navbar-brand">Lishwist</div>
|
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle"
|
|
||||||
aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
<div class="collapse navbar-collapse" id="navbarToggle">
|
|
||||||
<nav>
|
|
||||||
<ul class="navbar-nav">
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="/">Home</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="container d-flex flex-grow-1 justify-content-center align-items-center flex-column">
|
<div class="container d-flex flex-grow-1 justify-content-center align-items-center flex-column">
|
||||||
<div class="alert alert-danger" role="alert">
|
<div class="alert alert-danger" role="alert">
|
||||||
<p class="mb-0">{{.}}</p>
|
<p class="mb-0">{{.Message}}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,46 +1,12 @@
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
{{template "head" .}}
|
{{template "head"}}
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div style="height: 100svh;" class="d-flex flex-column">
|
<div style="height: 100svh;" class="d-flex flex-column">
|
||||||
<div class="navbar navbar-expand-lg bg-body-tertiary">
|
{{template "navbar" .Navbar}}
|
||||||
<div class="container-fluid">
|
|
||||||
<div class="navbar-brand">Lishwist</div>
|
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle"
|
|
||||||
aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
<div class="collapse navbar-collapse" id="navbarToggle">
|
|
||||||
<nav>
|
|
||||||
<ul class="navbar-nav">
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="/">Home</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</nav>
|
|
||||||
<div class="flex-grow-1"></div>
|
|
||||||
<ul class="navbar-nav">
|
|
||||||
<li class="nav-item">
|
|
||||||
<div class="dropdown">
|
|
||||||
<button class="nav-link dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
|
||||||
Logged in as '{{.CurrentUserName}}'
|
|
||||||
</button>
|
|
||||||
<ul class="dropdown-menu">
|
|
||||||
<li>
|
|
||||||
<form class="d-contents" method="post" action="/logout">
|
|
||||||
<button class="dropdown-item" type="submit">Logout</button>
|
|
||||||
</form>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="overflow-y-scroll flex-grow-1">
|
<div class="overflow-y-scroll flex-grow-1">
|
||||||
<div class="container py-5">
|
<div class="container py-5">
|
||||||
<section class="card">
|
<section class="card">
|
||||||
|
|
|
||||||
|
|
@ -1,46 +1,12 @@
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
{{template "head" .}}
|
{{template "head"}}
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div style="height: 100svh;" class="d-flex flex-column">
|
<div style="height: 100svh;" class="d-flex flex-column">
|
||||||
<div class="navbar navbar-expand-lg bg-body-tertiary">
|
{{template "navbar" .Navbar}}
|
||||||
<div class="container-fluid">
|
|
||||||
<div class="navbar-brand">Lishwist</div>
|
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle"
|
|
||||||
aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
<div class="collapse navbar-collapse" id="navbarToggle">
|
|
||||||
<nav>
|
|
||||||
<ul class="navbar-nav">
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="/">Home</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</nav>
|
|
||||||
<div class="flex-grow-1"></div>
|
|
||||||
<ul class="navbar-nav">
|
|
||||||
<li class="nav-item">
|
|
||||||
<div class="dropdown">
|
|
||||||
<button class="nav-link dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
|
||||||
Logged in as '{{.CurrentUsername}}'
|
|
||||||
</button>
|
|
||||||
<ul class="dropdown-menu">
|
|
||||||
<li>
|
|
||||||
<form class="d-contents" method="post" action="/logout">
|
|
||||||
<button class="dropdown-item" type="submit">Logout</button>
|
|
||||||
</form>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="overflow-y-scroll flex-grow-1">
|
<div class="overflow-y-scroll flex-grow-1">
|
||||||
<div class="container py-5">
|
<div class="container py-5">
|
||||||
<section class="card">
|
<section class="card">
|
||||||
|
|
|
||||||
|
|
@ -2,47 +2,12 @@
|
||||||
<html>
|
<html>
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
{{template "head" .}}
|
{{template "head"}}
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div style="height: 100svh;" class="d-flex flex-column">
|
<div style="height: 100svh;" class="d-flex flex-column">
|
||||||
<div class="navbar navbar-expand-lg bg-body-tertiary">
|
{{template "navbar" .Navbar}}
|
||||||
<div class="container-fluid">
|
|
||||||
<div class="navbar-brand">Lishwist</div>
|
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle"
|
|
||||||
aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
|
|
||||||
<span class="navbar-toggler-icon"></span>{{if .AccountAlert}} <span
|
|
||||||
class="badge text-bg-danger">!</span>{{end}}
|
|
||||||
</button>
|
|
||||||
<div class="collapse navbar-collapse" id="navbarToggle">
|
|
||||||
<div class="flex-grow-1"></div>
|
|
||||||
<ul class="navbar-nav">
|
|
||||||
<li class="nav-item"><button class="btn btn-success"
|
|
||||||
onclick="navigator.clipboard.writeText('{{.HostUrl}}/lists/{{.Reference}}'); alert('The share link to your wishlist has been copied to your clipboard. Anyone with the link will be able to claim gifts for you. Share it with someone!');">Copy
|
|
||||||
share link</button></li>
|
|
||||||
<li class="nav-item">
|
|
||||||
<div class="dropdown">
|
|
||||||
<button class="nav-link dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
|
||||||
Logged in as '{{.Username}}'{{if .AccountAlert}} <span class="badge text-bg-danger">!</span>{{end}}
|
|
||||||
</button>
|
|
||||||
<ul class="dropdown-menu">
|
|
||||||
<li>
|
|
||||||
<a class="dropdown-item" href="/account">Account{{if .AccountAlert}} <span
|
|
||||||
class="badge text-bg-danger">!</span>{{end}}</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<form class="d-contents" method="post" action="/logout">
|
|
||||||
<button class="dropdown-item" type="submit">Logout</button>
|
|
||||||
</form>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="overflow-y-scroll flex-grow-1">
|
<div class="overflow-y-scroll flex-grow-1">
|
||||||
<div class="container py-5">
|
<div class="container py-5">
|
||||||
<section class="card mb-4">
|
<section class="card mb-4">
|
||||||
|
|
@ -135,4 +100,4 @@
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,12 @@
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
{{template "head" .}}
|
{{template "head"}}
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div style="height: 100svh;" class="d-flex flex-column">
|
<div style="height: 100svh;" class="d-flex flex-column">
|
||||||
<div class="navbar navbar-expand-lg bg-body-tertiary">
|
{{template "navbar"}}
|
||||||
<div class="container-fluid">
|
|
||||||
<div class="navbar-brand">Lishwist</div>
|
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle"
|
|
||||||
aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
<div class="collapse navbar-collapse" id="navbarToggle">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="container d-flex flex-grow-1 justify-content-center align-items-center flex-column">
|
<div class="container d-flex flex-grow-1 justify-content-center align-items-center flex-column">
|
||||||
{{if .SuccessfulRegistration}}
|
{{if .SuccessfulRegistration}}
|
||||||
<div class="alert alert-success" role="alert">
|
<div class="alert alert-success" role="alert">
|
||||||
|
|
|
||||||
|
|
@ -1,29 +1,12 @@
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
{{template "head" .}}
|
{{template "head"}}
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div style="height: 100svh;" class="d-flex flex-column">
|
<div style="height: 100svh;" class="d-flex flex-column">
|
||||||
<div class="navbar navbar-expand-lg bg-body-tertiary">
|
{{template "navbar" .Navbar}}
|
||||||
<div class="container-fluid">
|
|
||||||
<div class="navbar-brand">Lishwist</div>
|
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle"
|
|
||||||
aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
<div class="collapse navbar-collapse" id="navbarToggle">
|
|
||||||
<nav>
|
|
||||||
<ul class="navbar-nav">
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="/">Home</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="overflow-y-scroll flex-grow-1">
|
<div class="overflow-y-scroll flex-grow-1">
|
||||||
<div class="container py-5">
|
<div class="container py-5">
|
||||||
<section class="card">
|
<section class="card">
|
||||||
|
|
|
||||||
|
|
@ -1,50 +1,33 @@
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
{{template "head" .}}
|
{{template "head"}}
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div style="height: 100svh;" class="d-flex flex-column">
|
<div style="height: 100svh;" class="d-flex flex-column">
|
||||||
<div class="navbar navbar-expand-lg bg-body-tertiary">
|
{{template "navbar" .Navbar}}
|
||||||
<div class="container-fluid">
|
<div class="overflow-y-scroll flex-grow-1">
|
||||||
<div class="navbar-brand">Lishwist</div>
|
<div class="container py-5">
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle"
|
<section class="card">
|
||||||
aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
|
<div class="card-body">
|
||||||
<span class="navbar-toggler-icon"></span>
|
<h2><em>{{.Group.Name}}</em> group members</h2>
|
||||||
</button>
|
<p>{{template "login_prompt"}} to see your groups</p>
|
||||||
<div class="collapse navbar-collapse" id="navbarToggle">
|
{{with .Group.Members}}
|
||||||
<nav>
|
<ul class="list-group">
|
||||||
<ul class="navbar-nav">
|
{{range .}}
|
||||||
<li class="nav-item">
|
<li class="list-group-item">
|
||||||
<a class="nav-link" href="/">Home</a>
|
{{.Name}}
|
||||||
</li>
|
</li>
|
||||||
|
{{end}}
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
{{else}}
|
||||||
</div>
|
<p>There's nobody else in this group.</p>
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="overflow-y-scroll flex-grow-1">
|
|
||||||
<div class="container py-5">
|
|
||||||
<section class="card">
|
|
||||||
<div class="card-body">
|
|
||||||
<h2><em>{{.Group.Name}}</em> group members</h2>
|
|
||||||
<p>{{template "login_prompt"}} to see your groups</p>
|
|
||||||
{{with .Group.Members}}
|
|
||||||
<ul class="list-group">
|
|
||||||
{{range .}}
|
|
||||||
<li class="list-group-item">
|
|
||||||
{{.Name}}
|
|
||||||
</li>
|
|
||||||
{{end}}
|
|
||||||
</ul>
|
|
||||||
{{else}}
|
|
||||||
<p>There's nobody else in this group.</p>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -1,29 +1,12 @@
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
{{template "head" .}}
|
{{template "head"}}
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div style="height: 100svh;" class="d-flex flex-column">
|
<div style="height: 100svh;" class="d-flex flex-column">
|
||||||
<div class="navbar navbar-expand-lg bg-body-tertiary">
|
{{template "navbar" .Navbar}}
|
||||||
<div class="container-fluid">
|
|
||||||
<div class="navbar-brand">Lishwist</div>
|
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle"
|
|
||||||
aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
<div class="collapse navbar-collapse" id="navbarToggle">
|
|
||||||
<nav>
|
|
||||||
<ul class="navbar-nav">
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="/">Home</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="container d-flex flex-grow-1 justify-content-center align-items-center flex-column">
|
<div class="container d-flex flex-grow-1 justify-content-center align-items-center flex-column">
|
||||||
<div class="alert alert-warning" role="alert">
|
<div class="alert alert-warning" role="alert">
|
||||||
<p>Your password will be stored in a safe, responsible manner; but don't trust my programming skills!</p>
|
<p>Your password will be stored in a safe, responsible manner; but don't trust my programming skills!</p>
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,43 @@ import (
|
||||||
"html/template"
|
"html/template"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type AccountLink struct {
|
||||||
|
Alert bool
|
||||||
|
}
|
||||||
|
|
||||||
|
type Link struct {
|
||||||
|
Href string
|
||||||
|
Name string
|
||||||
|
}
|
||||||
|
|
||||||
|
type CopyList struct {
|
||||||
|
Domain string
|
||||||
|
Reference string
|
||||||
|
}
|
||||||
|
|
||||||
|
type User struct {
|
||||||
|
Name string
|
||||||
|
CopyList *CopyList
|
||||||
|
}
|
||||||
|
|
||||||
|
type NavCollapse struct {
|
||||||
|
User *User
|
||||||
|
AccountLink *AccountLink
|
||||||
|
Links []Link
|
||||||
|
}
|
||||||
|
|
||||||
|
func DefaultNavCollapse() NavCollapse {
|
||||||
|
return NavCollapse{Links: []Link{{Href: "/", Name: "Home"}}}
|
||||||
|
}
|
||||||
|
|
||||||
|
func UserNavCollapse(username string, accountAlert bool) NavCollapse {
|
||||||
|
return NavCollapse{
|
||||||
|
Links: []Link{{Href: "/", Name: "Home"}},
|
||||||
|
User: &User{Name: username},
|
||||||
|
AccountLink: &AccountLink{Alert: accountAlert},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
type InputProps struct {
|
type InputProps struct {
|
||||||
Type string `json:",omitempty"`
|
Type string `json:",omitempty"`
|
||||||
Name string
|
Name string
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue