diff --git a/public/js/main.js b/public/js/main.js index 6ad49f0..b4c9c80 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -1,13 +1,16 @@ $(document).ready(() => { switch(window.location.pathname.split(/\//)[1]) { - case "v": $("li:eq(1)").addClass("active"); break; - case "u": $("li:eq(3)").addClass("active"); break; + case "v": $("menu > li:eq(1)").addClass("active"); break; + case "u": + $("menu > li:eq(3)").addClass("active"); + $("menu > li:eq(3) > ul").removeClass("hidden"); + break; case "a": - $("li:eq(5)").addClass("active"); - $("li:eq(5) > ul").removeClass("hidden"); + $("menu > li:eq(5)").addClass("active"); + $("menu > li:eq(5) > ul").removeClass("hidden"); break; default: - $("li:eq(0)").addClass("active"); + $("menu > li:eq(0)").addClass("active"); break; } }); \ No newline at end of file diff --git a/src/routes/r/about.mjs b/src/routes/r/about.mjs index 3d9ef3a..ab0d61d 100644 --- a/src/routes/r/about.mjs +++ b/src/routes/r/about.mjs @@ -8,17 +8,17 @@ const queries = { export default express.Router() .get("/", (req, res) => { - res.render("about"); + res.render("about/about"); }) .get("/howto", (req, res) => { - res.render("howto"); + res.render("about/howto"); }) .get("/contact", (req, res) => { - res.render("contact"); + res.render("about/contact"); }) .get("/statistics", (req, res) => { db.exec(queries.statistic).then(rows => { const r = rows[0]; - res.render("statistics", { pastes: r.sum }); + res.render("about/statistics", { pastes: r.sum }); }).catch(err => console.log(err)); }); \ No newline at end of file diff --git a/src/routes/r/user.mjs b/src/routes/r/user.mjs index 4896385..738623f 100644 --- a/src/routes/r/user.mjs +++ b/src/routes/r/user.mjs @@ -4,11 +4,11 @@ import db from "../../lib/sql"; export default express.Router() .get("/", (req, res) => { - res.render("login"); + res.render("user/login"); }) .get("/register", (req, res) => { - res.send("WIP"); + res.render("user/register"); }) .get("/lost-password", (req, res) => { - res.send("WIP"); + res.render("user/lost-password"); }); \ No newline at end of file diff --git a/views/about.handlebars b/views/about/about.handlebars similarity index 100% rename from views/about.handlebars rename to views/about/about.handlebars diff --git a/views/contact.handlebars b/views/about/contact.handlebars similarity index 100% rename from views/contact.handlebars rename to views/about/contact.handlebars diff --git a/views/howto.handlebars b/views/about/howto.handlebars similarity index 100% rename from views/howto.handlebars rename to views/about/howto.handlebars diff --git a/views/statistics.handlebars b/views/about/statistics.handlebars similarity index 100% rename from views/statistics.handlebars rename to views/about/statistics.handlebars diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index e78a681..9fbe0bf 100644 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -20,7 +20,12 @@
  • New paste
  • View pastes

  • -
  • Login
  • +
  • Login + +

  • About