-
+
+
+{{ template "script" . }}
-{{ template "script" . }}
{{ end }}
--
cgit v1.2.3
From 9552ec24b1631032acbf1efbe21479ff44b29a63 Mon Sep 17 00:00:00 2001
From: KushBlazingJudah <59340248+KushBlazingJudah@users.noreply.github.com>
Date: Mon, 16 Aug 2021 18:56:59 -0300
Subject: = -> ==
---
static/js/themes.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/static/js/themes.js b/static/js/themes.js
index 70a1b7f..0d9772f 100644
--- a/static/js/themes.js
+++ b/static/js/themes.js
@@ -11,8 +11,8 @@ function getCookie(key) {
function setTheme(name) {
for (let i = 0, tags = document.getElementsByTagName("link"); i < tags.length; i++) {
- if (tags[i].type = "text/css" && tags[i].title) {
- tags[i].disabled = !(tags[i].title == name);
+ if (tags[i].type === "text/css" && tags[i].title) {
+ tags[i].disabled = !(tags[i].title === name);
}
}
--
cgit v1.2.3
From 9e782ba01620997becc3118433e3d1961a88b2c3 Mon Sep 17 00:00:00 2001
From: KushBlazingJudah <59340248+KushBlazingJudah@users.noreply.github.com>
Date: Wed, 18 Aug 2021 00:26:02 -0300
Subject: rudimentary theme switching
---
client.go | 7 ++++
main.go | 19 ++++++++++
static/css/gruvbox.css | 63 --------------------------------
static/css/style.css | 85 -------------------------------------------
static/css/themes/default.css | 85 +++++++++++++++++++++++++++++++++++++++++++
static/css/themes/gruvbox.css | 63 ++++++++++++++++++++++++++++++++
static/js/themes.js | 6 +++
static/main.html | 13 ++++++-
8 files changed, 191 insertions(+), 150 deletions(-)
delete mode 100644 static/css/gruvbox.css
delete mode 100644 static/css/style.css
create mode 100644 static/css/themes/default.css
create mode 100644 static/css/themes/gruvbox.css
diff --git a/client.go b/client.go
index 1be926a..bef5c77 100644
--- a/client.go
+++ b/client.go
@@ -53,6 +53,7 @@ type PageData struct {
ReturnTo string
NewsItems []NewsItem
BoardRemainer []int
+ Themes *[]string
}
type AdminPage struct {
@@ -271,6 +272,8 @@ func OutboxGet(w http.ResponseWriter, r *http.Request, db *sql.DB, collection Co
returnData.Pages = pages
returnData.TotalPage = len(returnData.Pages) - 1
+ returnData.Themes = &Themes
+
t.ExecuteTemplate(w, "layout", returnData)
}
@@ -374,6 +377,8 @@ func ArchiveGet(w http.ResponseWriter, r *http.Request, db *sql.DB, collection C
returnData.Posts = collection.OrderedItems
+ returnData.Themes = &Themes
+
t.ExecuteTemplate(w, "layout", returnData)
}
@@ -467,6 +472,8 @@ func PostGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
returnData.PostId = shortURL(returnData.Board.To, returnData.Posts[0].Id)
}
+ returnData.Themes = &Themes
+
t.ExecuteTemplate(w, "layout", returnData)
}
diff --git a/main.go b/main.go
index 6502cda..dd73510 100644
--- a/main.go
+++ b/main.go
@@ -19,6 +19,7 @@ import (
"net/url"
"os"
"os/exec"
+ "path"
"regexp"
"strconv"
"strings"
@@ -51,6 +52,8 @@ var MediaHashs = make(map[string]string)
var ActorCache = make(map[string]Actor)
+var Themes []string
+
func main() {
CreatedNeededDirectories()
@@ -84,6 +87,22 @@ func main() {
}
}
+ // get list of themes
+ themes, err := ioutil.ReadDir("./static/css/themes")
+ if err != nil {
+ panic(err)
+ }
+
+ for _, f := range themes {
+ if f.Name() == "default" {
+ continue
+ }
+
+ if e := path.Ext(f.Name()); e == ".css" {
+ Themes = append(Themes, strings.TrimSuffix(f.Name(), e))
+ }
+ }
+
// Allow access to public media folder
fileServer := http.FileServer(http.Dir("./public"))
http.Handle("/public/", http.StripPrefix("/public", neuter(fileServer)))
diff --git a/static/css/gruvbox.css b/static/css/gruvbox.css
deleted file mode 100644
index fb39ea4..0000000
--- a/static/css/gruvbox.css
+++ /dev/null
@@ -1,63 +0,0 @@
-a, a:link, a:visited, a:active {
- color: #b16286;
- text-decoration: none
-}
-
-a.reply {
- color: #cc241d;
-}
-
-a:hover.reply {
- color: #fb4934;
-}
-
-body {
- background: #282828;
- color: #ebdbb2;
-
- font-family: Iosevka, monospace, sans-serif;
- font-size: 0.9em;
-}
-
-.popup-box {
- border: 4px solid #928374;
- background-color: #3c3836;
-}
-
-.box, .box-alt {
- background-color: #3c3836;
-}
-
-.quote {
- color: #98971a;
-}
-
-.post {
- background-color: #1d2021;
-}
-
-:target > div > .post {
- background-color: #504945;
-}
-
-.subject {
- color: #458588;
-}
-
-.name {
- color: #b8bb26;
-}
-
-.tripcode {
- color: #689d6a;
-}
-
-h1,h2,h3,h4,h5,h6 {
- color: #fb4934;
- margin-bottom: 0.1em;
-}
-
-.replyLink {
- color: #83a598;
- font-size: 0.8em;
-}
diff --git a/static/css/style.css b/static/css/style.css
deleted file mode 100644
index fa76b50..0000000
--- a/static/css/style.css
+++ /dev/null
@@ -1,85 +0,0 @@
-a, a:link, a:visited, a:hover, a:active {
- text-decoration: none
-}
-
-a:link, a:visited, a:active {
- color: black;
-}
-
-a:hover {
- color: #de0808;
-}
-
-body {
- background-color: #eef2fe;
- color: black;
-}
-
-body.nsfw {
- background-color: #ffffee;
- color: #820404
-}
-
-.popup-box {
- border: 4px solid #d3caf0;
- background-color: #eff5ff;
-}
-
-.nsfw .popup-box {
- border: 4px solid #f0e2d9;
- background-color: #f9f9e0;
-}
-
-.box {
- background-color: #eff5ff;
-}
-
-.nsfw .box {
- background-color: #f9f9e0;
-}
-
-.box-alt {
- background-color: #d3caf0;
-}
-
-.nsfw .box-alt {
- background-color: #f0e2d9;
-}
-
-
-.quote {
- color: #789922;
-}
-
-.post {
- background-color: #d5daf0;
-}
-
-.nsfw .post {
- background-color: #f0e0d6;
-}
-
-:target > div > .post {
- background-color: #d6bad0;
-}
-
-.nsfw :target > div > .post {
- background-color: #f0c0b0;
-}
-
-.title {
- color: #0f0c5d;
-}
-
-.name, .tripcode {
- color: #117743;
-}
-
-a.reply {
- color: #af0a0f;
-}
-
-.replyLink {
- color: #000080;
- font-size: 0.8em;
-}
diff --git a/static/css/themes/default.css b/static/css/themes/default.css
new file mode 100644
index 0000000..fa76b50
--- /dev/null
+++ b/static/css/themes/default.css
@@ -0,0 +1,85 @@
+a, a:link, a:visited, a:hover, a:active {
+ text-decoration: none
+}
+
+a:link, a:visited, a:active {
+ color: black;
+}
+
+a:hover {
+ color: #de0808;
+}
+
+body {
+ background-color: #eef2fe;
+ color: black;
+}
+
+body.nsfw {
+ background-color: #ffffee;
+ color: #820404
+}
+
+.popup-box {
+ border: 4px solid #d3caf0;
+ background-color: #eff5ff;
+}
+
+.nsfw .popup-box {
+ border: 4px solid #f0e2d9;
+ background-color: #f9f9e0;
+}
+
+.box {
+ background-color: #eff5ff;
+}
+
+.nsfw .box {
+ background-color: #f9f9e0;
+}
+
+.box-alt {
+ background-color: #d3caf0;
+}
+
+.nsfw .box-alt {
+ background-color: #f0e2d9;
+}
+
+
+.quote {
+ color: #789922;
+}
+
+.post {
+ background-color: #d5daf0;
+}
+
+.nsfw .post {
+ background-color: #f0e0d6;
+}
+
+:target > div > .post {
+ background-color: #d6bad0;
+}
+
+.nsfw :target > div > .post {
+ background-color: #f0c0b0;
+}
+
+.title {
+ color: #0f0c5d;
+}
+
+.name, .tripcode {
+ color: #117743;
+}
+
+a.reply {
+ color: #af0a0f;
+}
+
+.replyLink {
+ color: #000080;
+ font-size: 0.8em;
+}
diff --git a/static/css/themes/gruvbox.css b/static/css/themes/gruvbox.css
new file mode 100644
index 0000000..fb39ea4
--- /dev/null
+++ b/static/css/themes/gruvbox.css
@@ -0,0 +1,63 @@
+a, a:link, a:visited, a:active {
+ color: #b16286;
+ text-decoration: none
+}
+
+a.reply {
+ color: #cc241d;
+}
+
+a:hover.reply {
+ color: #fb4934;
+}
+
+body {
+ background: #282828;
+ color: #ebdbb2;
+
+ font-family: Iosevka, monospace, sans-serif;
+ font-size: 0.9em;
+}
+
+.popup-box {
+ border: 4px solid #928374;
+ background-color: #3c3836;
+}
+
+.box, .box-alt {
+ background-color: #3c3836;
+}
+
+.quote {
+ color: #98971a;
+}
+
+.post {
+ background-color: #1d2021;
+}
+
+:target > div > .post {
+ background-color: #504945;
+}
+
+.subject {
+ color: #458588;
+}
+
+.name {
+ color: #b8bb26;
+}
+
+.tripcode {
+ color: #689d6a;
+}
+
+h1,h2,h3,h4,h5,h6 {
+ color: #fb4934;
+ margin-bottom: 0.1em;
+}
+
+.replyLink {
+ color: #83a598;
+ font-size: 0.8em;
+}
diff --git a/static/js/themes.js b/static/js/themes.js
index 0d9772f..19bdbb4 100644
--- a/static/js/themes.js
+++ b/static/js/themes.js
@@ -20,5 +20,11 @@ function setTheme(name) {
}
function applyTheme() {
+ // HACK: disable all of the themes first. this for some reason makes things work.
+ for (let i = 0, tags = document.getElementsByTagName("link"); i < tags.length; i++) {
+ if (tags[i].type === "text/css" && tags[i].title) {
+ tags[i].disabled = true;
+ }
+ }
setTheme(getCookie("theme") || "default");
}
diff --git a/static/main.html b/static/main.html
index 3fa1b66..9a88afc 100644
--- a/static/main.html
+++ b/static/main.html
@@ -8,8 +8,10 @@
-
-
+
+ {{ range .Themes }}
+
+ {{ end }}
{{ template "header" . }}
@@ -38,6 +40,13 @@
{{ template "content" . }}
{{ template "bottom" . }}
+
+
+
/{{ .Board.Name }}/ - {{ .Board.PrefName }}
+/{{ .Board.Name }}/ - {{ .Board.PrefName }}
{{ .Board.Summary }}
{{ $len := len .Posts }} {{ if eq $len 0 }} -- cgit v1.2.3 From c455494cd617d66bc28a30afb1fbd4377e0ecb01 Mon Sep 17 00:00:00 2001 From: KushBlazingJudah <59340248+KushBlazingJudah@users.noreply.github.com> Date: Mon, 16 Aug 2021 16:35:19 -0300 Subject: extremely basic themes support --- static/js/themes.js | 24 ++++++++++++++++++++++++ static/main.html | 9 ++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 static/js/themes.js diff --git a/static/js/themes.js b/static/js/themes.js new file mode 100644 index 0000000..70a1b7f --- /dev/null +++ b/static/js/themes.js @@ -0,0 +1,24 @@ +function setCookie(key, value, age) { + document.cookie = key + "=" + encodeURIComponent(value) + ";sameSite=strict;max-age=" + 60 * 60 * 24 * age + ";path=/"; +} + +function getCookie(key) { + if (document.cookie.length != 0) { + return document.cookie.split('; ').find(row => row.startsWith(key)).split('=')[1]; + } + return ""; +} + +function setTheme(name) { + for (let i = 0, tags = document.getElementsByTagName("link"); i < tags.length; i++) { + if (tags[i].type = "text/css" && tags[i].title) { + tags[i].disabled = !(tags[i].title == name); + } + } + + setCookie("theme", name, 3650); +} + +function applyTheme() { + setTheme(getCookie("theme") || "default"); +} diff --git a/static/main.html b/static/main.html index 3f819dd..3fa1b66 100644 --- a/static/main.html +++ b/static/main.html @@ -8,10 +8,11 @@ - + + {{ template "header" . }} - +
[Home][Rules][FAQ]
All trademarks and copyrights on this page are owned by their respective parties.
-- cgit v1.2.3 From d460fa6316d3db4e68e6b4d4c7ee2d02d6505304 Mon Sep 17 00:00:00 2001 From: KushBlazingJudah <59340248+KushBlazingJudah@users.noreply.github.com> Date: Wed, 18 Aug 2021 00:50:13 -0300 Subject: it works --- client.go | 8 ++++++++ static/js/themes.js | 12 +++++++++++- static/main.html | 13 ++++++++----- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/client.go b/client.go index bef5c77..31e11f2 100644 --- a/client.go +++ b/client.go @@ -123,6 +123,8 @@ func IndexGet(w http.ResponseWriter, r *http.Request, db *sql.DB) { data.InstanceIndex = GetCollectionFromReq("https://fchan.xyz/followers").Items data.NewsItems = getNewsFromDB(db, 3) + data.Themes = &Themes + t.ExecuteTemplate(w, "layout", data) } @@ -156,6 +158,8 @@ func NewsGet(w http.ResponseWriter, r *http.Request, db *sql.DB, timestamp int) data.Title = actor.PreferredUsername + ": " + data.NewsItems[0].Title + data.Themes = &Themes + t.ExecuteTemplate(w, "layout", data) } @@ -180,6 +184,8 @@ func AllNewsGet(w http.ResponseWriter, r *http.Request, db *sql.DB) { data.Board.Restricted = actor.Restricted data.NewsItems = getNewsFromDB(db, 0) + data.Themes = &Themes + t.ExecuteTemplate(w, "layout", data) } @@ -329,6 +335,8 @@ func CatalogGet(w http.ResponseWriter, r *http.Request, db *sql.DB, collection C returnData.Posts = collection.OrderedItems + returnData.Themes = &Themes + t.ExecuteTemplate(w, "layout", returnData) } diff --git a/static/js/themes.js b/static/js/themes.js index 19bdbb4..3f1b906 100644 --- a/static/js/themes.js +++ b/static/js/themes.js @@ -26,5 +26,15 @@ function applyTheme() { tags[i].disabled = true; } } - setTheme(getCookie("theme") || "default"); + let theme = getCookie("theme") || "default"; + setTheme(theme); + + // reflect this in the switcher + let switcher = document.getElementById("themeSwitcher"); + for(var i = 0; i < switcher.options.length; i++) { + if (switcher.options[i].value === theme) { + switcher.selectedIndex = i; + break; + } + } } diff --git a/static/main.html b/static/main.html index 9a88afc..794a602 100644 --- a/static/main.html +++ b/static/main.html @@ -41,11 +41,14 @@ {{ template "bottom" . }} - +
+ Theme:
+
+
[Home][Rules][FAQ]
--
cgit v1.2.3
From 7027fdd87011962b2b177342a462d54737e03501 Mon Sep 17 00:00:00 2001
From: KushBlazingJudah <59340248+KushBlazingJudah@users.noreply.github.com>
Date: Wed, 18 Aug 2021 12:57:26 -0300
Subject: theme newpost at top of page
---
static/css/themes/default.css | 28 +++++++++
static/css/themes/gruvbox.css | 35 ++++++++++++
static/js/posts.js | 21 ++-----
static/nposts.html | 30 +++++-----
static/top.html | 128 +++++++++++++++++++++++++++---------------
5 files changed, 167 insertions(+), 75 deletions(-)
diff --git a/static/css/themes/default.css b/static/css/themes/default.css
index fa76b50..2df2921 100644
--- a/static/css/themes/default.css
+++ b/static/css/themes/default.css
@@ -83,3 +83,31 @@ a.reply {
color: #000080;
font-size: 0.8em;
}
+
+#newpostbtn {
+ text-align: center;
+ margin-top: 80px;
+}
+
+#postForm {
+ margin: auto;
+}
+
+#postForm tr > td:first-child {
+ background-color: #98e;
+ border: 1px black;
+ padding-left: 0.5em;
+ padding-right: 0.5em;
+}
+
+#postForm input[type="text"],
+#postForm textarea {
+ box-sizing: border-box;
+ -webkit-box-sizing:border-box;
+ -moz-box-sizing: border-box;
+}
+
+#postForm #captcha {
+ display: block;
+ width: 100%;
+}
diff --git a/static/css/themes/gruvbox.css b/static/css/themes/gruvbox.css
index fb39ea4..a23d7f4 100644
--- a/static/css/themes/gruvbox.css
+++ b/static/css/themes/gruvbox.css
@@ -61,3 +61,38 @@ h1,h2,h3,h4,h5,h6 {
color: #83a598;
font-size: 0.8em;
}
+
+#newpostbtn {
+ text-align: center;
+ margin-top: 80px;
+}
+
+input[type="text"] {
+ -webkit-appearance: none;
+ -webkit-border-radius: 0;
+
+}
+
+#postForm {
+ border: 4px solid #928374;
+ background-color: #3c3836;
+ margin: auto;
+}
+
+#postForm tr > td:first-child {
+ background-color: #504945;
+ padding-left: 0.5em;
+ padding-right: 0.5em;
+}
+
+#postForm input[type="text"],
+#postForm textarea {
+ box-sizing: border-box;
+ -webkit-box-sizing:border-box;
+ -moz-box-sizing: border-box;
+}
+
+#postForm #captcha {
+ display: block;
+ width: 100%;
+}
diff --git a/static/js/posts.js b/static/js/posts.js
index 455e7ea..75244fa 100644
--- a/static/js/posts.js
+++ b/static/js/posts.js
@@ -2,29 +2,16 @@ function startNewPost(){
var el = document.getElementById("newpostbtn");
el.style="display:none;";
el.setAttribute("state", "1");
- document.getElementById("newpost").style = "display: block;";
+ document.getElementById("newpost").style = "";
+ sessionStorage.setItem("newpostState", true);
}
function stopNewPost(){
var el = document.getElementById("newpostbtn");
el.style="display:block;";
el.setAttribute("state", "0");
- document.getElementById("newpost").style = "display: hidden;";
-}
-
-function newpost()
-{
- var state = document.getElementById("newpostbtn").getAttribute("state");
- if(state === "0")
- {
- startNewPost();
- sessionStorage.setItem("newpostState", true);
- }
- else
- {
- stopNewPost();
- sessionStorage.setItem("newpostState", false);
- }
+ document.getElementById("newpost").style = "display: none;";
+ sessionStorage.setItem("newpostState", false);
}
function shortURL(actorName, url)
diff --git a/static/nposts.html b/static/nposts.html
index 6def8b2..46d8bb1 100644
--- a/static/nposts.html
+++ b/static/nposts.html
@@ -15,33 +15,35 @@
{{ define "content" }}
{{ $board := .Board }}
-
{{ else }}
-
-
-
- [Catalog] + {{ template "posts" . }}
- [Catalog] + + +
- [ < ] +
- [ < ] {{ end }} {{ range $i, $e := .Pages }} {{ if eq $i $page}} @@ -51,7 +53,7 @@ {{ end }} {{ end }} {{ if lt .CurrentPage .TotalPage }} -
- [ > ] +
- [ > ] {{ end }}
-
-
-
{{ if gt .TotalPage 0 }} {{ $totalPage := .TotalPage }}
-
{{ $page := .CurrentPage }}
{{ if gt $page 0 }}
-
[Post a Reply]
+[Post a Reply]
{{ else }} -[Start a New Thread]
+[Start a New Thread]
{{ end }}
-
@@ -41,37 +61,57 @@
{{ if eq (index .Posts 0).Type "Note" }}
{{ if .Board.InReplyTo }}
- [Post a Reply]
+[Post a Reply]
{{ else }} -[Start a New Thread]
+[Start a New Thread]
{{ end }} {{ $len := len .Posts }}
-
+
+
+