From 705f2121189afc01f5504f3db013d74ecf3b94f2 Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Tue, 22 May 2018 12:23:43 +0100
Subject: [PATCH] Adds ability to override CSS styles from a foreign repo.

---
 .../public}/css/custom-style.scss             |   1 +
 localhost.local/public/images/logo.png        | Bin 0 -> 1126 bytes
 nimforum.nimble                               |   2 +-
 public/css/nimforum.scss                      |   4 +-
 public/images/logo.png                        | Bin 1126 -> 70 bytes
 src/buildcss.nim                              |  35 ++++++++++++++++++
 src/forum.nim                                 |   8 +---
 src/frontend/buildcss.nim                     |   9 -----
 src/{forum.nim.cfg => nim.cfg}                |   0
 9 files changed, 41 insertions(+), 18 deletions(-)
 rename {public => localhost.local/public}/css/custom-style.scss (94%)
 create mode 100644 localhost.local/public/images/logo.png
 mode change 100644 => 120000 public/images/logo.png
 create mode 100644 src/buildcss.nim
 delete mode 100644 src/frontend/buildcss.nim
 rename src/{forum.nim.cfg => nim.cfg} (100%)

diff --git a/public/css/custom-style.scss b/localhost.local/public/css/custom-style.scss
similarity index 94%
rename from public/css/custom-style.scss
rename to localhost.local/public/css/custom-style.scss
index 5200f0b..f866829 100644
--- a/public/css/custom-style.scss
+++ b/localhost.local/public/css/custom-style.scss
@@ -6,6 +6,7 @@ $label-color: #7cd2ff;
 $secondary-btn-color: #f1f1f1;
 
 // Define nav bar colours.
+$body-bg: #ffffff;
 $navbar-color: $body-bg;
 $navbar-border-color-dark: $body-bg;
 $navbar-primary-color: #e80080;
\ No newline at end of file
diff --git a/localhost.local/public/images/logo.png b/localhost.local/public/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ac52b75b532615af1a1e73483c9abd7958ef700
GIT binary patch
literal 1126
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHiQ`7?-(L&ckXw1_tKOo-U3d6}R5r4$KHGWjOxvyjigM
z>|LfB%+pmQFW*SMQtTw)VYa&cg=Nj_jpiq}cPZ6qX|3MAXn96}K$8AR7x_y}YfW;#
zDI}$N7x`ZNy1{tk#wYU%5AOc_zxE;j?mN|GJNMuJ{^z~r^ZLB$*CP96Z}bWBB&)Ku
zSf5mlIjZ9Kh~b#w)ph1KI{wZ$mUC>A#N{75ZUs(1BeiGZqv>CFv~9l_z5S1_#Y6^a
zW4_1x!cNN{{n>JDhhb+f_vv?0A1aLb9^R9QHl4J&V#}?Aj^B0t*Bza%x&I>1<JGTz
z@O`=S>51GMAGh9g=CF|E-RAq5-W}KcqB>t`N7vdPsda1>!u_h#lU}U!<2}B6m3GbZ
z4OTlvj+&U2JYG2^US)5EkX^(h%cpugs>iL*2^=e^;<Vkz?VgoaBG!Cz?_-H0`KG()
zG;o`mOL<?DJzZ?N+lJrR)clqIIoZ>@X2trIht^+NsBKwpvh~*+zqnLkMkR+121TY8
z4uQePi0ERto|U)RY-6d;>#Tis%cO%%&8w6w%XMyN@2lhLOW1bohamIGU5_OWoCo^(
z#j)?E_g^H+9M=1y{@waqRL?^Vxm7#g7FH}=W;)mImaF`|><BaN<DWOMO;<ipUm=q&
z756Xx#p`4Df9M#$^eua=U}pNKxUNh4Gyk@b<;|++8UFrQ^04~vpBV?AwKDDr-N3N;
z$I1zx(m(!6QoPfe&n3Kod%a1<x9n7zHM`=bR2S?LU}XDH>3H<~qmZi~b1PZ)o5eKb
zS_DS?Oy98e>fU65c=M2k=^y<QpVn`jVmfE)jqaCi92eUAxwQXreY^9{dcUaI!^5d6
zhmv|8v^RClKUT-Hy-4Ja*6WRnqY9-~{`)CVW%Y*X_@VP(l<pn8%e!|$vF!e2A@xFr
z$FJ6ZD%0_v%UJcXZua+8cXtNtvSE=h-JWxI-KYNW)e90OIX(o<?hpT#Seg}K$FwCo
zW?i4WQzMhiYOxbQD&>@ZNQ3vYytQ1cTp#BC`hK~!jbj7<YN6svrkF#<o!fmF`5rgA
zM9*U|H+ni<`+)q7nHHx-5|o1LW-{G5kR35m;<WGsrFniesaypf+~tQ`o^ck)u1`Cq
zAKcLWEH9E9XsE84+Nw`1C#J+RJpZ@+kNwA-N11lrf3tpS$oZJ0Za8)4=$y|x65d_+
f+BxmM+CSFm&85o>K1|C2mIw@<u6{1-oD!M<)B@(L

literal 0
HcmV?d00001

diff --git a/nimforum.nimble b/nimforum.nimble
index 7bb36a0..a24424e 100644
--- a/nimforum.nimble
+++ b/nimforum.nimble
@@ -33,7 +33,7 @@ task runbackend, "Runs the forum backend":
   exec "./src/forum"
 
 task frontend, "Builds the necessary JS frontend (with CSS)":
-  exec "nimble c -r src/frontend/buildcss"
+  exec "nimble c -r src/buildcss"
   exec "nimble js -d:release src/frontend/forum.nim"
   mkDir "public/js"
   cpFile "src/frontend/nimcache/forum.js", "public/js/forum.js"
diff --git a/public/css/nimforum.scss b/public/css/nimforum.scss
index e77ea5f..45a345d 100644
--- a/public/css/nimforum.scss
+++ b/public/css/nimforum.scss
@@ -1,8 +1,8 @@
+@import "custom-style";
+
 // Import full Spectre source code
 @import "spectre/src/spectre";
 
-@import "custom-style";
-
 // Global styles.
 // - TODO: Make these non-global.
 .btn, .form-input {
diff --git a/public/images/logo.png b/public/images/logo.png
deleted file mode 100644
index 4ac52b75b532615af1a1e73483c9abd7958ef700..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1126
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHiQ`7?-(L&ckXw1_tKOo-U3d6}R5r4$KHGWjOxvyjigM
z>|LfB%+pmQFW*SMQtTw)VYa&cg=Nj_jpiq}cPZ6qX|3MAXn96}K$8AR7x_y}YfW;#
zDI}$N7x`ZNy1{tk#wYU%5AOc_zxE;j?mN|GJNMuJ{^z~r^ZLB$*CP96Z}bWBB&)Ku
zSf5mlIjZ9Kh~b#w)ph1KI{wZ$mUC>A#N{75ZUs(1BeiGZqv>CFv~9l_z5S1_#Y6^a
zW4_1x!cNN{{n>JDhhb+f_vv?0A1aLb9^R9QHl4J&V#}?Aj^B0t*Bza%x&I>1<JGTz
z@O`=S>51GMAGh9g=CF|E-RAq5-W}KcqB>t`N7vdPsda1>!u_h#lU}U!<2}B6m3GbZ
z4OTlvj+&U2JYG2^US)5EkX^(h%cpugs>iL*2^=e^;<Vkz?VgoaBG!Cz?_-H0`KG()
zG;o`mOL<?DJzZ?N+lJrR)clqIIoZ>@X2trIht^+NsBKwpvh~*+zqnLkMkR+121TY8
z4uQePi0ERto|U)RY-6d;>#Tis%cO%%&8w6w%XMyN@2lhLOW1bohamIGU5_OWoCo^(
z#j)?E_g^H+9M=1y{@waqRL?^Vxm7#g7FH}=W;)mImaF`|><BaN<DWOMO;<ipUm=q&
z756Xx#p`4Df9M#$^eua=U}pNKxUNh4Gyk@b<;|++8UFrQ^04~vpBV?AwKDDr-N3N;
z$I1zx(m(!6QoPfe&n3Kod%a1<x9n7zHM`=bR2S?LU}XDH>3H<~qmZi~b1PZ)o5eKb
zS_DS?Oy98e>fU65c=M2k=^y<QpVn`jVmfE)jqaCi92eUAxwQXreY^9{dcUaI!^5d6
zhmv|8v^RClKUT-Hy-4Ja*6WRnqY9-~{`)CVW%Y*X_@VP(l<pn8%e!|$vF!e2A@xFr
z$FJ6ZD%0_v%UJcXZua+8cXtNtvSE=h-JWxI-KYNW)e90OIX(o<?hpT#Seg}K$FwCo
zW?i4WQzMhiYOxbQD&>@ZNQ3vYytQ1cTp#BC`hK~!jbj7<YN6svrkF#<o!fmF`5rgA
zM9*U|H+ni<`+)q7nHHx-5|o1LW-{G5kR35m;<WGsrFniesaypf+~tQ`o^ck)u1`Cq
zAKcLWEH9E9XsE84+Nw`1C#J+RJpZ@+kNwA-N11lrf3tpS$oZJ0Za8)4=$y|x65d_+
f+BxmM+CSFm&85o>K1|C2mIw@<u6{1-oD!M<)B@(L

diff --git a/public/images/logo.png b/public/images/logo.png
new file mode 120000
index 0000000..b3d7ee4
--- /dev/null
+++ b/public/images/logo.png
@@ -0,0 +1 @@
+/Users/dom/projects/nimforum/forum.nim-lang.org/public/images/logo.png
\ No newline at end of file
diff --git a/src/buildcss.nim b/src/buildcss.nim
new file mode 100644
index 0000000..551956a
--- /dev/null
+++ b/src/buildcss.nim
@@ -0,0 +1,35 @@
+import os, strutils
+
+import sass
+
+import utils
+
+proc buildCSS*(config: Config) =
+  let publicLoc = "public"
+  var includePaths: seq[string] = @[]
+  # Check for a styles override.
+  var hostname = config.hostname
+  if not existsDir(hostname):
+    hostname = "localhost.local"
+
+  let dir = getCurrentDir() / hostname / "public"
+  includePaths.add(dir / "css")
+  createDir(publicLoc / "images")
+  let logo = publicLoc / "images" / "logo.png"
+  removeFile(logo)
+  createSymlink(
+    dir / "images" / "logo.png",
+    logo
+  )
+
+  let cssLoc = publicLoc / "css"
+  sass.compileFile(
+    cssLoc / "nimforum.scss",
+    cssLoc / "nimforum.css",
+    includePaths=includePaths
+  )
+
+when isMainModule:
+  let config = loadConfig()
+  buildCSS(config)
+  echo("CSS Built successfully")
\ No newline at end of file
diff --git a/src/forum.nim b/src/forum.nim
index b7b191f..50aa5e1 100644
--- a/src/forum.nim
+++ b/src/forum.nim
@@ -14,9 +14,7 @@ import
 import cgi except setCookie
 import options
 
-import sass
-
-import auth, email, utils
+import auth, email, utils, buildcss
 
 import frontend/threadlist except User
 import frontend/[
@@ -245,9 +243,7 @@ proc initialise() =
   isFTSAvailable = db.getAllRows(sql("SELECT name FROM sqlite_master WHERE " &
       "type='table' AND name='post_fts'")).len == 1
 
-  let cssLoc = "public" / "css"
-  if not existsFile(cssLoc / "nimforum.css"):
-    sass.compileFile(cssLoc / "nimforum.scss", cssLoc / "nimforum.css")
+  buildCSS(config)
 
   # Read karax.html and set its properties.
   karaxHtml = readFile("public/karax.html") %
diff --git a/src/frontend/buildcss.nim b/src/frontend/buildcss.nim
deleted file mode 100644
index bba4c7f..0000000
--- a/src/frontend/buildcss.nim
+++ /dev/null
@@ -1,9 +0,0 @@
-import sass, os
-
-when isMainModule:
-  compileFile(
-    getCurrentDir() / "public" / "css" / "nimforum.scss",
-    getCurrentDir() / "public" / "css" / "nimforum.css"
-  )
-
-  echo("Compiled CSS")
\ No newline at end of file
diff --git a/src/forum.nim.cfg b/src/nim.cfg
similarity index 100%
rename from src/forum.nim.cfg
rename to src/nim.cfg