diff --git a/forum.nim b/forum.nim index b270d0e..965456c 100644 --- a/forum.nim +++ b/forum.nim @@ -13,8 +13,8 @@ import import cgi except setCookie import options -import redesign/threadlist except User -import redesign/[ +import frontend/threadlist except User +import frontend/[ category, postlist, error, header, post, profile, user, karaxutils ] @@ -346,8 +346,7 @@ proc getBanErrorMsg(banValue: string; rank: Rank): string = if banValue.len > 0: return "You have been banned: " & banValue case rank - of Spammer: return "You are a spammer." - of Troll: return "You have been banned." + of Spammer, Troll, Banned: return "You have been banned." of EmailUnconfirmed: return "You need to confirm your email first." of Moderated, Rank.User, Moderator, Admin: @@ -1202,11 +1201,11 @@ routes: resp data get "/karax/nimforum.css": - resp readFile("redesign/nimforum.css"), "text/css" + resp readFile("frontend/nimforum.css"), "text/css" get "/karax/nimcache/forum.js": - resp readFile("redesign/nimcache/forum.js"), "application/javascript" + resp readFile("frontend/nimcache/forum.js"), "application/javascript" get "/karax/images/crown.png": - resp readFile("redesign/images/crown.png"), "image/png" + resp readFile("frontend/images/crown.png"), "image/png" get "/karax/threads.json": @@ -1563,7 +1562,7 @@ routes: resp Http400, $(%exc.data), "application/json" get re"/karax/(.+)?": - resp readFile("redesign/karax.html") + resp readFile("frontend/karax.html") get "/threadActivity.xml": createTFD() diff --git a/redesign/builder.nim b/frontend/builder.nim similarity index 100% rename from redesign/builder.nim rename to frontend/builder.nim diff --git a/redesign/category.nim b/frontend/category.nim similarity index 100% rename from redesign/category.nim rename to frontend/category.nim diff --git a/redesign/editbox.nim b/frontend/editbox.nim similarity index 100% rename from redesign/editbox.nim rename to frontend/editbox.nim diff --git a/redesign/error.nim b/frontend/error.nim similarity index 100% rename from redesign/error.nim rename to frontend/error.nim diff --git a/redesign/forum.nim b/frontend/forum.nim similarity index 100% rename from redesign/forum.nim rename to frontend/forum.nim diff --git a/redesign/forum.nim.cfg b/frontend/forum.nim.cfg similarity index 100% rename from redesign/forum.nim.cfg rename to frontend/forum.nim.cfg diff --git a/redesign/header.nim b/frontend/header.nim similarity index 100% rename from redesign/header.nim rename to frontend/header.nim diff --git a/redesign/index.html b/frontend/index.html similarity index 100% rename from redesign/index.html rename to frontend/index.html diff --git a/redesign/karax.html b/frontend/karax.html similarity index 100% rename from redesign/karax.html rename to frontend/karax.html diff --git a/redesign/karaxutils.nim b/frontend/karaxutils.nim similarity index 100% rename from redesign/karaxutils.nim rename to frontend/karaxutils.nim diff --git a/redesign/login.nim b/frontend/login.nim similarity index 100% rename from redesign/login.nim rename to frontend/login.nim diff --git a/redesign/newthread.nim b/frontend/newthread.nim similarity index 100% rename from redesign/newthread.nim rename to frontend/newthread.nim diff --git a/redesign/nimforum.scss b/frontend/nimforum.scss similarity index 100% rename from redesign/nimforum.scss rename to frontend/nimforum.scss diff --git a/redesign/post.nim b/frontend/post.nim similarity index 100% rename from redesign/post.nim rename to frontend/post.nim diff --git a/redesign/postbutton.nim b/frontend/postbutton.nim similarity index 100% rename from redesign/postbutton.nim rename to frontend/postbutton.nim diff --git a/redesign/postlist.nim b/frontend/postlist.nim similarity index 100% rename from redesign/postlist.nim rename to frontend/postlist.nim diff --git a/redesign/profile.nim b/frontend/profile.nim similarity index 100% rename from redesign/profile.nim rename to frontend/profile.nim diff --git a/redesign/replybox.nim b/frontend/replybox.nim similarity index 100% rename from redesign/replybox.nim rename to frontend/replybox.nim diff --git a/redesign/signup.nim b/frontend/signup.nim similarity index 100% rename from redesign/signup.nim rename to frontend/signup.nim diff --git a/redesign/syntax.scss b/frontend/syntax.scss similarity index 100% rename from redesign/syntax.scss rename to frontend/syntax.scss diff --git a/redesign/thread.html b/frontend/thread.html similarity index 100% rename from redesign/thread.html rename to frontend/thread.html diff --git a/redesign/threadlist.nim b/frontend/threadlist.nim similarity index 100% rename from redesign/threadlist.nim rename to frontend/threadlist.nim diff --git a/redesign/user.nim b/frontend/user.nim similarity index 100% rename from redesign/user.nim rename to frontend/user.nim diff --git a/redesign/usermenu.nim b/frontend/usermenu.nim similarity index 100% rename from redesign/usermenu.nim rename to frontend/usermenu.nim diff --git a/redesign/spectre b/redesign/spectre deleted file mode 160000 index 7a6af53..0000000 --- a/redesign/spectre +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7a6af53bca72b549b2cbf1948763348bd5b30dcd diff --git a/utils.nim b/utils.nim index 2d6e97e..028c42e 100644 --- a/utils.nim +++ b/utils.nim @@ -7,7 +7,7 @@ from times import getTime, getGMTime, format let UsernameIdent* = IdentChars # TODO: Double check that everyone follows this. -import redesign/karaxutils +import frontend/karaxutils export parseInt proc `%`*[T](opt: Option[T]): JsonNode =