From 0e659a8aa40f86df2a1d1abdccb876f3d24187fa Mon Sep 17 00:00:00 2001 From: Akif9748 Date: Fri, 26 Aug 2022 22:09:02 +0300 Subject: [PATCH] [WIP] Threads page is converting to new theme --- README.md | 34 +++--- public/css/{old_style.css => thread.css} | 0 public/js/thread.js | 23 ++--- views/create_thread.ejs | 5 +- views/extra/footer.ejs | 3 + views/extra/old_footer.ejs | 4 - views/extra/old_header.ejs | 10 -- views/extra/old_navbar.ejs | 41 -------- views/login.ejs | 3 +- views/register.ejs | 3 +- views/thread.ejs | 126 ++++++++++++++--------- 11 files changed, 109 insertions(+), 143 deletions(-) rename public/css/{old_style.css => thread.css} (100%) create mode 100644 views/extra/footer.ejs delete mode 100644 views/extra/old_footer.ejs delete mode 100644 views/extra/old_header.ejs delete mode 100644 views/extra/old_navbar.ejs diff --git a/README.md b/README.md index 7cbf0d9..7a6931f 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,9 @@ And, you can learn about API in `util/APIDOCS.md`. ## Roadmap ### TO-DO: - If thread deleted, not show its messages in API. -- If redirect => /register, return +- Thread.ejs fix with new theme +- Profile photos will store in database + ### Frontend ### User | To do | Is done? | Priority | @@ -56,7 +58,7 @@ And, you can learn about API in `util/APIDOCS.md`. | Send | 🟒 | HIGH | | Delete | 🟒 | HIGH | | Regex for scripts | πŸ”΄ | HIGH | -| Undelete | πŸ”΄ | MEDIUM | +| Undelete | 🟑 | MEDIUM | | React | 🟒 | MEDIUM | | Edit | πŸ”΄ | MEDIUM | @@ -66,7 +68,7 @@ And, you can learn about API in `util/APIDOCS.md`. | Ratelimit | 🟒 | HIGH | | Create | 🟒 | HIGH | | Delete | 🟒 | HIGH | -| Undelete | πŸ”΄ | MEDIUM | +| Undelete | 🟒 | MEDIUM | | Edit | πŸ”΄ | MEDIUM | ### API @@ -83,21 +85,15 @@ And, you can learn about API in `util/APIDOCS.md`. ### Other | To do | Is done? | Priority | | ----- | -------- | -------- | -| Footer | 🟒 | LOW | +| Footer | πŸ”΄ | LOW | | auto-scroll | 🟒 | LOW | -| Multi-theme support | 🟑 | LOW | -| Search | 🟑 | MEDIUM | -| Better view, page support, support message limit correct | πŸ”΄ | MEDIUM | -| Sending message etc. will use fetch API | 🟒 | HIGH | +| Multi-theme support, black theme | 🟑 | LOW | +| Search | πŸ”΄ | MEDIUM | +| Page support, support message limit correct | πŸ”΄ | MEDIUM | +| from form to AJAX | 🟒 | HIGH | -### New Theme -- [x] Login -- [x] Register -- [x] Main page -- [x] Error -- [x] Users -- [x] Threads -- [x] Create Thread -- [ ] Thread -- [ ] User -- [ ] Admin +## Major Version History +- V3: New Theme +- V2: Backend fix, mongoose is fixed. Really big fix. +- V1: Mongoose added. +- V0: Birth with quick.db \ No newline at end of file diff --git a/public/css/old_style.css b/public/css/thread.css similarity index 100% rename from public/css/old_style.css rename to public/css/thread.css diff --git a/public/js/thread.js b/public/js/thread.js index 20ae0ac..14bc41c 100644 --- a/public/js/thread.js +++ b/public/js/thread.js @@ -79,13 +79,20 @@ document.getElementById("send").addEventListener("submit", async e => { * Button Listener */ document.addEventListener("click", async e => { - let page = 1; // e.preventDefault(); if (e.target.id === "delete_thread") { const response = await request("/api/threads/" + e.target.value + "/delete"); if (response.deleted) { alert("Thread deleted"); - window.location.href = "/threads"; + location.reload(); + } + + } else if (e.target.id === "undelete_thread") { + const response = await request("/api/threads/" + e.target.value + "/undelete"); + if (!response.deleted) { + alert("Thread undeleted"); + location.reload(); + } } else if (e.target.id === "delete_message") { @@ -95,17 +102,7 @@ document.addEventListener("click", async e => { alert("Message deleted"); document.getElementById("message-delete-" + e.target.value).innerHTML = "

This message has been deleted

"; } - } else if (e.target.id === "left_page") { - e.preventDefault(); - - }else if (e.target.id === "right_page") { - e.preventDefault(); - const response = await request(`/api/messages/${e.target.value}/delete`); - if (response.deleted) { - alert("Message deleted"); - document.getElementById("message-delete-" + e.target.value).innerHTML = "

This message has been deleted

"; - } - }/*else if (e.target.id === "edit_thread") { + } /*else if (e.target.id === "edit_thread") { window.location.href = "/threads/<%= thread.id }/edit"; } */ diff --git a/views/create_thread.ejs b/views/create_thread.ejs index a5a056e..f53edb8 100644 --- a/views/create_thread.ejs +++ b/views/create_thread.ejs @@ -37,10 +37,9 @@ }); - if (response) { - alert("Thread opened"); + if (response) window.location.href = "/threads/" + response.id; - } + }); diff --git a/views/extra/footer.ejs b/views/extra/footer.ejs new file mode 100644 index 0000000..63da4ad --- /dev/null +++ b/views/extra/footer.ejs @@ -0,0 +1,3 @@ +
+ This website is powered by AKF-Forum +
\ No newline at end of file diff --git a/views/extra/old_footer.ejs b/views/extra/old_footer.ejs deleted file mode 100644 index c9e443a..0000000 --- a/views/extra/old_footer.ejs +++ /dev/null @@ -1,4 +0,0 @@ -




-
-

This website is powered by AKF-Forum

-
\ No newline at end of file diff --git a/views/extra/old_header.ejs b/views/extra/old_header.ejs deleted file mode 100644 index c91e962..0000000 --- a/views/extra/old_header.ejs +++ /dev/null @@ -1,10 +0,0 @@ - - - - - <%= title || "Akf-forum" %> - - - - - \ No newline at end of file diff --git a/views/extra/old_navbar.ejs b/views/extra/old_navbar.ejs deleted file mode 100644 index cd27f3c..0000000 --- a/views/extra/old_navbar.ejs +++ /dev/null @@ -1,41 +0,0 @@ - -<% if (user?.admin){ %> -
-

You are admin, and you can go your page!

 -
-
- -<% } %> - - - - -
diff --git a/views/login.ejs b/views/login.ejs index ea0517c..79afa11 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -4,9 +4,10 @@ <%- include("extra/meta", {title: "Log in!" }) %> - + + <%- include("extra/navbar") %>

Login

diff --git a/views/register.ejs b/views/register.ejs index 3111a6c..81158f9 100644 --- a/views/register.ejs +++ b/views/register.ejs @@ -3,9 +3,10 @@ <%- include("extra/meta", {title: "Register!" }) %> - + + <%- include("extra/navbar") %>

Register

diff --git a/views/thread.ejs b/views/thread.ejs index 1aada9c..10da760 100644 --- a/views/thread.ejs +++ b/views/thread.ejs @@ -1,69 +1,93 @@ -<%- include("extra/old_header", { title: thread.title }) %> - - - - <%- include("extra/old_navbar", {user}) %> +<%- include("extra/meta", {title: "Thread list!" }) %> -

- <%= thread.title %> -

+ + <%- include("extra/navbar") %> -

By > <%= thread.author.name %> - alt=<%= thread.author.name %>> -

- - <% if (user && !thread.deleted){ %> - - - - <% } else if (thread.deleted) { %> -

This thread has been deleted

- <% }; %> - -
+ + -
- <% if (!user){ %> -

Guests cant view messages!

- <% }%> -
+

+ <%= thread.title %> +

-
+

By > <%= thread.author.name %> + alt=<%= thread.author.name %>> +

+ + <% if (user && !thread.deleted){ %> + + + + <% } else if (thread.deleted) { %> +

This thread has been deleted

+ + + <% }; %> -
- - +
-
- <% if (user){ %> - - <%} else {%> - - <% }%> -
+
+ <% if (!user){ %> +

Guests cant view messages!

+ <% }%> - <% if (user){ %> - + +
+ +

26.08.2022 15:37:42

+ +

+ Akif9748 + Akif9748: +

+ +

Example message for development


+
+
+ +
+
+
+

0

+ + +
+
+ + +
+ +
+ + +
+ + + +
+ <% if (user){ %> + + <%} else {%> + <% }%> - - - - <%- include("extra/old_footer") %> - +
+ + <% if (user){ %> + + <% }%> + + + + \ No newline at end of file