style: reduced repetition in themes with common vars

fix: override theme in posthome
fix: imports removed by copilot
2024-12-06 19:16:43 +01:00 · 2024-07-25 10:45:49 -07:00 · 2024-07-25 10:14:06 -07:00 · 2024-07-25 10:09:32 -07:00 · 2024-07-25 10:03:55 -07:00 · 2024-07-25 10:00:09 -07:00
7 changed files with 44 additions and 9 deletions
@@ -1,9 +1,13 @@
 :root {
+    --code-bg: #36383d;
+    --code-fg: #ffffff;
+}
+
+:root,
+[data-theme="dark"] {
    --main-bg: #1b1f26;
    --text-color: #fff;
    --muted-text-color: #b3b3b3;
-    --code-bg: #36383d;
-    --code-fg: #ffffff;
    --input-bg: #2b303b;
    --input-bg-hover: #3b404b;
    --meta-bg: #525262;
@@ -12,12 +16,10 @@
 }

@media (prefers-color-scheme: light) {
-    :root {
+    :root:not([data-theme="dark"]) {
        --main-bg: #dbdbdb;
        --text-color: #000;
        --muted-text-color: #636363;
-        --code-bg: #36383d;
-        --code-fg: #ffffff;
        --input-bg: #bcbcbc;
        --input-bg-hover: #a8a8a8;
        --meta-bg: #aaa8a8;
@@ -26,6 +28,17 @@
    }
 }

+[data-theme="light"] {
+    --main-bg: #dbdbdb;
+    --text-color: #000;
+    --muted-text-color: #636363;
+    --input-bg: #bcbcbc;
+    --input-bg-hover: #a8a8a8;
+    --meta-bg: #aaa8a8;
+    --divider-color: #b5b5b5;
+    --link-color: #335ad0;
+}
+
 a {
    color: var(--link-color);
 }
@@ -2,6 +2,7 @@ package routes

 import (
 	"anonymousoverflow/config"
+	"anonymousoverflow/src/utils"
 	"fmt"
 	"regexp"
 	"strings"
@@ -10,8 +11,10 @@ import (
 )

 func GetHome(c *gin.Context) {
+	theme := utils.GetThemeFromEnv()
 	c.HTML(200, "home.html", gin.H{
 		"version": config.Version,
+		"theme":   theme,
 	})
 }

@@ -68,8 +71,10 @@ func PostHome(c *gin.Context) {
 	translated := translateUrl(body.URL)

 	if translated == "" {
+		theme := utils.GetThemeFromEnv()
 		c.HTML(400, "home.html", gin.H{
 			"errorMessage": "Invalid stack overflow/exchange URL",
+			"theme":        theme,
 		})
 		return
 	}
@@ -2,6 +2,7 @@ package routes

 import (
 	"anonymousoverflow/config"
+	"anonymousoverflow/src/utils"
 	"fmt"

 	"github.com/gin-gonic/gin"
@@ -17,9 +18,11 @@ func ChangeOptions(c *gin.Context) {
 			text = "enabled"
 		}
 		c.SetCookie("disable_images", fmt.Sprintf("%t", !c.MustGet("disable_images").(bool)), 60*60*24*365*10, "/", "", false, true)
+		theme := utils.GetThemeFromEnv()
 		c.HTML(200, "home.html", gin.H{
 			"successMessage": "Images are now " + text,
 			"version":        config.Version,
+			"theme":          theme,
 		})
 	default:
 		c.String(400, "400 Bad Request")
@@ -101,6 +101,8 @@ func ViewQuestion(c *gin.Context) {
 		imagePolicy = "'self'"
 	}

+	theme := utils.GetThemeFromEnv()
+
 	c.HTML(200, "question.html", gin.H{
 		"question":    newFilteredQuestion,
 		"answers":     answers,
@@ -108,6 +110,7 @@ func ViewQuestion(c *gin.Context) {
 		"currentUrl":  fmt.Sprintf("%s%s", os.Getenv("APP_URL"), c.Request.URL.Path),
 		"sortValue":   params.SoSortValue,
 		"domain":      domain,
+		"theme":       theme,
 	})

 }
@@ -0,0 +1,11 @@
+package utils
+
+import "os"
+
+func GetThemeFromEnv() string {
+	theme := os.Getenv("THEME")
+	if theme == "" {
+		theme = "auto"
+	}
+	return theme
+}
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html data-theme="{{ .theme }}">

 <head>
    <title>AnonymousOverflow - Private frontend for StackOverflow</title>
@@ -58,4 +58,4 @@
    </div>
 </body>

-</html>
+</html>
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html data-theme="{{ .theme }}">

 <head>
    <title>{{ .question.Title }} | AnonymousOverflow</title>
@@ -92,4 +92,4 @@
    {{ end }}
 </body>

-</html>
+</html>
Author	SHA1	Message	Date
httpjamesm	ef2f8afc4b	style: reduced repetition in themes with common vars	2024-07-25 10:45:49 -07:00
httpjamesm	ac69c3a59d	fix: override theme in posthome	2024-07-25 10:14:06 -07:00
httpjamesm	6b9afed2dd	fix: imports removed by copilot	2024-07-25 10:09:32 -07:00
httpjamesm	578e4b173e	Move all theme environment variable logic to a utils function Move theme environment variable logic to a utils function and update routes to use it. * Add `GetThemeFromEnv` function in `src/utils/theme.go` to derive the theme from environment variables and default to "auto" if not set. * Update `src/routes/home.go` to import and use `GetThemeFromEnv` in the `GetHome` function. * Update `src/routes/options.go` to import and use `GetThemeFromEnv` in the `ChangeOptions` function. * Update `src/routes/question.go` to import and use `GetThemeFromEnv` in the `ViewQuestion` function. --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/httpjamesm/AnonymousOverflow/pull/145?shareId=a0dab6f3-027c-4f6e-85fe-60e7675d0e70).	2024-07-25 10:03:55 -07:00
httpjamesm	31390edfc4	Propagate theme variable to template in options.go Propagate the `theme` variable from the environment to the template in `src/routes/options.go` * Retrieve the `theme` variable from the environment using `os.Getenv("THEME")` * Set the `theme` variable in the `gin.H` map when rendering the `home.html` template --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/httpjamesm/AnonymousOverflow/pull/145?shareId=6397c9b4-9450-425c-bbbe-019425965d2b).	2024-07-25 10:00:09 -07:00
httpjamesm	bd969567a4	Add theme support using environment variable	2024-07-25 09:57:47 -07:00