From ffa6b9a423a2f1a5c4bcc06663261a0808892273 Mon Sep 17 00:00:00 2001 From: vinchent Date: Wed, 21 Aug 2024 21:39:59 +0200 Subject: [PATCH] Improving FE and setting up an admin menu --- cmd/web/render.go | 6 +++++ cmd/web/templates/base.layout.gohtml | 37 +++++++++++++++++++++++++++- static/js/base.js | 34 ++++++++++++------------- 3 files changed, 59 insertions(+), 18 deletions(-) diff --git a/cmd/web/render.go b/cmd/web/render.go index 0f22e8d..c532f08 100644 --- a/cmd/web/render.go +++ b/cmd/web/render.go @@ -40,6 +40,12 @@ func (app *application) addDefaultData(td *templateData, r *http.Request) *templ td.API = app.config.api td.StripePubKey = app.config.stripe.key td.StripeSecretKey = app.config.stripe.secret + + if app.Session.Exists(r.Context(), "userID") { + td.IsAuthenticated = 1 + } else { + td.IsAuthenticated = 0 + } return td } diff --git a/cmd/web/templates/base.layout.gohtml b/cmd/web/templates/base.layout.gohtml index 59598a7..b43cd52 100644 --- a/cmd/web/templates/base.layout.gohtml +++ b/cmd/web/templates/base.layout.gohtml @@ -50,10 +50,45 @@ + {{ if eq .IsAuthenticated 1 }} + + {{ end }} diff --git a/static/js/base.js b/static/js/base.js index 4d04059..c5ef50f 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -1,19 +1,19 @@ -let loginLink = document.getElementById("login-link"); -let vtLink = document.getElementById("vt-link"); +// let loginLink = document.getElementById("login-link"); +// let vtLink = document.getElementById("vt-link"); +// +// document.addEventListener("DOMContentLoaded", function () { +// if (localStorage.getItem("token") !== null) { +// loginLink.innerHTML = 'Logout'; +// vtLink.classList.remove('d-none'); +// } else { +// loginLink.innerHTML = 'Login'; +// } +// loginLink.classList.remove('d-none') +// }); -document.addEventListener("DOMContentLoaded", function () { - if (localStorage.getItem("token") !== null) { - loginLink.innerHTML = 'Logout'; - vtLink.classList.remove('d-none'); - } else { - loginLink.innerHTML = 'Login'; - } - loginLink.classList.remove('d-none') -}); - -function logout() { - localStorage.removeItem("token"); - localStorage.removeItem("token_expiry"); - location.href = "/logout"; -} +// function logout() { +// localStorage.removeItem("token"); +// localStorage.removeItem("token_expiry"); +// location.href = "/logout"; +// }