From b0b971aba04a848c7ffa155cb281ea8fd9b2292e Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Fri, 2 Aug 2019 20:54:44 -0400 Subject: Added teams in about and some beautifying --- app.js | 55 +++++++++++++++++++++++++---------------------- routes/about.js | 19 ++++++++++++++++ routes/index.js | 19 ++++++++++++++++ routes/projects.js | 27 +++++++++++++++++++++++ views/404.ejs | 1 + views/about.ejs | 25 +++++++++++++++++---- views/includes/footer.ejs | 6 +++++- views/index.ejs | 4 ++-- views/projects.ejs | 18 ++++++++++++++++ 9 files changed, 141 insertions(+), 33 deletions(-) create mode 100644 routes/projects.js create mode 100644 views/projects.ejs diff --git a/app.js b/app.js index 0b1149d..cb63d37 100644 --- a/app.js +++ b/app.js @@ -29,37 +29,37 @@ const Hook = new webhook.Webhook(config.durl); const port = 4000; const logger = (req, res, next) => { - console.log( - `${req.protocol}://${req.get('host')}${ + console.log( + `${req.protocol}://${req.get('host')}${ req.originalUrl }: ${moment().format()}` - ); - next(); - }; + ); + next(); +}; - const rl = readline.createInterface({ - input: process.stdin, - output: process.stdout - }); +const rl = readline.createInterface({ + input: process.stdin, + output: process.stdout +}); - rl.on("line", (input) => { - switch (input) { - case "clear": - console.clear(); +rl.on("line", (input) => { + switch (input) { + case "clear": + console.clear(); break; - case "exit": - async function exitWebsite() { + case "exit": + async function exitWebsite() { console.log("[i] Closing website..."); - await Hook.info("Alee Productions Website","Website is shutting down..."); + await Hook.info("Alee Productions Website", "Website is shutting down..."); process.exit(0); - } - exitWebsite(); + } + exitWebsite(); break; - default: - console.log("[X] Error: Command not found. Use clear or exit."); - break; - } - }); + default: + console.log("[X] Error: Command not found. Use clear or exit."); + break; + } +}); console.log("[i] Starting up Website...") @@ -71,13 +71,16 @@ app.use(express.static(path.join(__dirname, "public"))); app.use(logger) app.use("/", require("./routes/index")); +app.use("/projects", require("./routes/projects")); app.use("/about", require("./routes/about")); app.use((req, res) => { - res.status(404).render("404", {title: "404 | Alee Productions"}); + res.status(404).render("404", { + title: "404 | Alee Productions" + }); }); app.listen(port, () => { -//Hook.success("Alee Productions Website","Website has been loaded!") -console.log(`[>] Website listening on port ${port}!`) + //Hook.success("Alee Productions Website","Website has been loaded!") + console.log(`[>] Website listening on port ${port}!`) }); \ No newline at end of file diff --git a/routes/about.js b/routes/about.js index a46108c..9222133 100644 --- a/routes/about.js +++ b/routes/about.js @@ -1,3 +1,22 @@ +/********************************* + + Alee Productions Website: Website for Alee Productions + Copyright (C) 2019 Alee + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +**************************************/ const express = require("express"); const router = express.Router(); diff --git a/routes/index.js b/routes/index.js index b12714e..24859b6 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,3 +1,22 @@ +/********************************* + + Alee Productions Website: Website for Alee Productions + Copyright (C) 2019 Alee + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +**************************************/ const express = require("express"); const router = express.Router(); diff --git a/routes/projects.js b/routes/projects.js new file mode 100644 index 0000000..6e45ce0 --- /dev/null +++ b/routes/projects.js @@ -0,0 +1,27 @@ +/********************************* + + Alee Productions Website: Website for Alee Productions + Copyright (C) 2019 Alee + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +**************************************/ +const express = require("express"); +const router = express.Router(); + +router.get('/', (req, res) => { + res.render('projects', {title: 'Projects | Alee Productions'}); + }); + +module.exports = router; \ No newline at end of file diff --git a/views/404.ejs b/views/404.ejs index 4bdc4a1..720bd87 100644 --- a/views/404.ejs +++ b/views/404.ejs @@ -5,6 +5,7 @@ <%= title %> + <% include ./includes/navbar %>

404 - Not Found

Oops, seems like that page isn't found!

diff --git a/views/about.ejs b/views/about.ejs index 87485be..452cd82 100644 --- a/views/about.ejs +++ b/views/about.ejs @@ -15,10 +15,27 @@

History

-

Alee Productions started in 2016. It used to be called "AleeCorp" and used to make just software but over time it started branching to other things like making games and videos. - In late 2018, AleeCorp merged with Universe and some project merged but due to a community conflict during October in that year, Universe and AleeCorp splited. In 2019 however, AleeCorp renamed to Alee Productions just to make the company more professional.

- -
+

Alee Productions started in 2016. It used to be called "AleeCorp" and used to make just software but over + time it started branching to other things like making games and videos. + In late 2018, AleeCorp merged with Universe and some project merged but due to a community conflict during + October in that year, Universe and AleeCorp splited. In 2019 however, AleeCorp renamed to Alee Productions + just to make the company more professional.

+

Team

+
+
+
Community Team
+

+

    +
  • Travis#1777 (Admin)
    • +
  • Inkydink#9098 (Admin)
    • +
  • The Pixel Polygon#2069 (Admin)
    • +
  • Sylv#7596 (Moderator)
    • +
  • jtsshieh#6424 (Moderator)
    • + +
+

+
+
<% include ./includes/footer %> diff --git a/views/includes/footer.ejs b/views/includes/footer.ejs index 56a654c..50e53ec 100644 --- a/views/includes/footer.ejs +++ b/views/includes/footer.ejs @@ -1,8 +1,12 @@ +
+
© Copyright 2019, Alee Productions. Powered by ExpressJS and EJS.
+
- + \ No newline at end of file diff --git a/views/index.ejs b/views/index.ejs index 55bfaed..e62eff6 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -8,9 +8,9 @@ <% include ./includes/navbar %> -
+

Hello! Welcome to Alee Productions.

-

We are a very small produtions company.

+

We are a very small productions company.

If you want to know more about us click the button down below.

Learn more diff --git a/views/projects.ejs b/views/projects.ejs new file mode 100644 index 0000000..02c98ff --- /dev/null +++ b/views/projects.ejs @@ -0,0 +1,18 @@ + + + + + <% include ./includes/header %> + <%= title %> + + + + <% include ./includes/navbar %> +
+

Projects

+

This is the projects that we are currently working on.

+
+ <% include ./includes/footer %> + + + \ No newline at end of file -- cgit v1.2.3