From 4c04dcdf189dc6b665bf4960317f93923f58cce5 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 12 Aug 2019 11:59:43 -0400 Subject: Added the foundations for the blog, changed index and refactoring some code --- .idea/fileTemplates/EJS - Alee Productions.ejs | 17 +++++ .../fileTemplates/JS - Alee Productions Routes.js | 27 ++++++++ app.js | 7 +- public/css/style.css | 5 +- routes/blog.js | 27 ++++++++ views/blog.ejs | 19 ++++++ views/index.ejs | 74 ++++++++++++++++++++-- views/projects.ejs | 1 + 8 files changed, 163 insertions(+), 14 deletions(-) create mode 100644 .idea/fileTemplates/EJS - Alee Productions.ejs create mode 100644 .idea/fileTemplates/JS - Alee Productions Routes.js create mode 100644 routes/blog.js create mode 100644 views/blog.ejs diff --git a/.idea/fileTemplates/EJS - Alee Productions.ejs b/.idea/fileTemplates/EJS - Alee Productions.ejs new file mode 100644 index 0000000..dd0d052 --- /dev/null +++ b/.idea/fileTemplates/EJS - Alee Productions.ejs @@ -0,0 +1,17 @@ + + + + + <% include ./includes/header %> + + + + <% include ./includes/navbar %> +

Title

Description.

+ <% include ./includes/footer %> + + + \ No newline at end of file diff --git a/.idea/fileTemplates/JS - Alee Productions Routes.js b/.idea/fileTemplates/JS - Alee Productions Routes.js new file mode 100644 index 0000000..f73f82d --- /dev/null +++ b/.idea/fileTemplates/JS - Alee Productions Routes.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('title', {title: 'title | Alee Productions'}); + }); + +module.exports = router; \ No newline at end of file diff --git a/app.js b/app.js index 86374e9..01e13ef 100644 --- a/app.js +++ b/app.js @@ -43,11 +43,11 @@ const rl = readline.createInterface({ }); function rlHelp() { - console.log("---------HELP-------"); + console.log("-----------HELP---------"); console.log("help - Displays help"); console.log("clear - Clears the console"); console.log("exit - Exits Application"); - console.log("--------------------"); + console.log("------------------------"); } rl.on("line", (input) => { @@ -72,7 +72,7 @@ rl.on("line", (input) => { } }); -console.log("[i] Starting up Website...") +console.log("[i] Starting up Website..."); app.set('view engine', 'ejs'); @@ -83,6 +83,7 @@ app.use(logger); app.use("/", require("./routes/index")); app.use("/projects", require("./routes/projects")); +app.use("/blog", require("./routes/blog")); app.use("/about", require("./routes/about")); app.use((req, res) => { diff --git a/public/css/style.css b/public/css/style.css index 19f7573..1067840 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -2,8 +2,5 @@ body { font-family: Play, sans-serif; background-color: #212121; color: #ffffff; -} - -.svg-white { - fill:#ffffff + margin-bottom: 100px; } \ No newline at end of file diff --git a/routes/blog.js b/routes/blog.js new file mode 100644 index 0000000..627403c --- /dev/null +++ b/routes/blog.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('blog', {title: 'Blog | Alee Productions'}); +}); + +module.exports = router; \ No newline at end of file diff --git a/views/blog.ejs b/views/blog.ejs new file mode 100644 index 0000000..ee21e43 --- /dev/null +++ b/views/blog.ejs @@ -0,0 +1,19 @@ + + + + + <% include ./includes/header %> + + + + <% include ./includes/navbar %> +

Blog

Where we post updates on products, this website and etc.

Notice: We are currently working on this page

+ +<% include ./includes/footer %> + + + \ No newline at end of file diff --git a/views/index.ejs b/views/index.ejs index 1864b81..d7a9afe 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -16,15 +16,75 @@ Learn more - -

+ +