From 05caf693301e8a38657659858bb20f5d462e9a06 Mon Sep 17 00:00:00 2001 From: Immanuel Onyeka Date: Tue, 21 May 2024 22:28:17 -0400 Subject: [PATCH] Fix style errors caused by Grav move --- components/sidebar.vue | 9 +++------ main.css | 17 +++++++++++++---- skouter.go | 20 ++++++++------------ 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/components/sidebar.vue b/components/sidebar.vue index 026b6d4..0d9425e 100644 --- a/components/sidebar.vue +++ b/components/sidebar.vue @@ -13,12 +13,9 @@ fill-rule="evenodd" d="M2 12.5a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 +width="16" height="16" fill="currentColor" class="bi bi-x close" viewBox="0 0 16 16"> + + diff --git a/main.css b/main.css index b61e692..369e58b 100644 --- a/main.css +++ b/main.css @@ -62,15 +62,19 @@ section.form label { margin: 10px 0 10px 30px; } +#app { + width: 100%; + height: 100%; +} + .app-panel { - height: 100%; - width: 100%; - position: absolute; + width: 100%; + position: relative; display: flex; + justify-content: space-between; } menu.sidebar { - height: calc(100% - 70px); position: relative; margin: 0; padding: 35px 0px; @@ -276,6 +280,11 @@ svg.close { color: var(--text); } +.sidebar svg.close { + width: 34px; + height: 34px; +} + .close-btn { width: 30px; height: 30px; diff --git a/skouter.go b/skouter.go index b332e3e..4d57b3c 100644 --- a/skouter.go +++ b/skouter.go @@ -3187,8 +3187,7 @@ func subscribe(w http.ResponseWriter, db *sql.DB, r *http.Request) { // easier testing of the endpoint. err = user.Sub.insertSub(db) if err != nil { - // http.Error(w, err.Error(), 500) - json.NewEncoder(w).Encode(s) + http.Error(w, err.Error(), 500) return } } else { @@ -3539,16 +3538,16 @@ func (user *User) sendVerificationEmail() { AddTo(user.Email). SetSubject("Email Verification") - message := `To: %s - Subject: Email Verification - - Welcome %s, - Click the link below to verify your email address - https://skouter.net?verification_token=%s` + message := `Welcome %s, +Click the link below to verify your email address +https://%s?verification_token=%s` t, err := verificationToken(user.Id) - message = fmt.Sprintf(message, user.Email, user.FirstName, t) + message = fmt.Sprintf(message, + user.FirstName, + os.Getenv("SKOUTER_DOMAIN"), + t) email.SetBody(mailer.TextPlain, message) @@ -4080,9 +4079,6 @@ func dev(args []string) { } func check(args []string) { - os.Setenv("DB_NAME", "skouter_dev") - os.Setenv("DB_USER", "tester") - os.Setenv("DB_PASSWORD", "test123") files := http.FileServer(http.Dir("")) http.Handle("/assets/", files)