diff options
| author | Andrew Lee <alee14498@gmail.com> | 2019-08-12 11:59:43 -0400 |
|---|---|---|
| committer | Andrew Lee <alee14498@gmail.com> | 2019-08-12 11:59:43 -0400 |
| commit | 4c04dcdf189dc6b665bf4960317f93923f58cce5 (patch) | |
| tree | 93389374a53f0adc333d9a02aec60c67a58caac5 | |
| parent | 557e496d3c8e41cc7c98bee5d425315922984056 (diff) | |
| download | alp-website-4c04dcdf189dc6b665bf4960317f93923f58cce5.tar.gz alp-website-4c04dcdf189dc6b665bf4960317f93923f58cce5.tar.bz2 alp-website-4c04dcdf189dc6b665bf4960317f93923f58cce5.zip | |
Added the foundations for the blog, changed index and refactoring some code
| -rw-r--r-- | .idea/fileTemplates/EJS - Alee Productions.ejs | 17 | ||||
| -rw-r--r-- | .idea/fileTemplates/JS - Alee Productions Routes.js | 27 | ||||
| -rw-r--r-- | app.js | 7 | ||||
| -rw-r--r-- | public/css/style.css | 5 | ||||
| -rw-r--r-- | routes/blog.js | 27 | ||||
| -rw-r--r-- | views/blog.ejs | 19 | ||||
| -rw-r--r-- | views/index.ejs | 74 | ||||
| -rw-r--r-- | views/projects.ejs | 1 |
8 files changed, 163 insertions, 14 deletions
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 @@ +<!DOCTYPE html> +<html> + +<head> + <% include ./includes/header %> +</head> + +<body> + <% include ./includes/navbar %> + <div class="jumbotron special-color"> + <h2 class="display-4">Title</h2> + <p class="lead">Description.</p> + </div> + <% include ./includes/footer %> +</body> + +</html>
\ 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 <https://www.gnu.org/licenses/>. + +**************************************/ +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 @@ -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 <https://www.gnu.org/licenses/>. + +**************************************/ +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 @@ +<!DOCTYPE html> +<html> + +<head> + <% include ./includes/header %> +</head> + +<body> + <% include ./includes/navbar %> + <div class="jumbotron special-color"> + <h2 class="display-4">Blog</h2> + <p class="lead">Where we post updates on products, this website and etc.</p> + </div> + <center><h1>Notice: We are currently working on this page</h1></center> + +<% include ./includes/footer %> +</body> + +</html>
\ 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 @@ <a class="btn btn-green btn-lg" href="/about" role="button">Learn more</a> </div> - <!--Community, Video and Software--> - <div class="container"> + <!--Carousel Wrapper--> + <div id="carousel-example-2" class="carousel slide carousel-fade" data-ride="carousel"> + <!--Indicators--> + <ol class="carousel-indicators"> + <li data-target="#carousel-example-2" data-slide-to="0" class="active"></li> + <li data-target="#carousel-example-2" data-slide-to="1"></li> + <li data-target="#carousel-example-2" data-slide-to="2"></li> + </ol> + <!--/.Indicators--> + <!--Slides--> + <div class="carousel-inner" role="listbox"> + <div class="carousel-item active"> + <div class="view"> + <img class="d-block w-100" src="https://mdbootstrap.com/img/Photos/Slides/img%20(68).jpg" + alt="First slide"> + <div class="mask rgba-black-light"></div> + </div> + <div class="carousel-caption"> + <h3 class="h3-responsive">Light mask</h3> + <p>First text</p> + </div> + </div> + <div class="carousel-item"> + <!--Mask color--> + <div class="view"> + <img class="d-block w-100" src="https://mdbootstrap.com/img/Photos/Slides/img%20(6).jpg" + alt="Second slide"> + <div class="mask rgba-black-strong"></div> + </div> + <div class="carousel-caption"> + <h3 class="h3-responsive">Strong mask</h3> + <p>Secondary text</p> + </div> + </div> + <div class="carousel-item"> + <!--Mask color--> + <div class="view"> + <img class="d-block w-100" src="https://mdbootstrap.com/img/Photos/Slides/img%20(9).jpg" + alt="Third slide"> + <div class="mask rgba-black-slight"></div> + </div> + <div class="carousel-caption"> + <h3 class="h3-responsive">Slight mask</h3> + <p>Third text</p> + </div> + </div> + </div> + <!--/.Slides--> + <!--Controls--> + <a class="carousel-control-prev" href="#carousel-example-2" role="button" data-slide="prev"> + <span class="carousel-control-prev-icon" aria-hidden="true"></span> + <span class="sr-only">Previous</span> + </a> + <a class="carousel-control-next" href="#carousel-example-2" role="button" data-slide="next"> + <span class="carousel-control-next-icon" aria-hidden="true"></span> + <span class="sr-only">Next</span> + </a> + <!--/.Controls--> + </div> + <!--/.Carousel Wrapper--> + <br> + <!--Community, Video and Software--> <div class="row"> <div class="col-sm"> <center> <div class="view overlay"> <a href="https://discord.gg/EFhRDqG"> - <img src="/img/users-solid.svg" class="svg-white" height=220px> + <img src="/img/users-solid.svg" height=220px> <div class="mask flex-center rgba-green-strong"> <p class="white-text">Community</p> </div> @@ -38,7 +98,7 @@ <center> <div class="view overlay"> <a href="https://www.youtube.com/channel/UC9CIwdleH3m_PV35QqULWzA"> - <img src="/img/video-solid.svg" class="svg-white" height=220px> + <img src="/img/video-solid.svg" height=220px> <div class="mask flex-center rgba-green-strong"> <p class="white-text">Video</p> </div> @@ -52,7 +112,7 @@ <center> <div class="view overlay"> <a href="https://github.com/aleeproductions"> - <img src="/img/file-code-solid.svg" class="svg-white" height=220px> + <img src="/img/file-code-solid.svg" height=220px> <div class="mask flex-center rgba-green-strong"> <p class="white-text">Software</p> </div> @@ -65,8 +125,8 @@ </div> </div> <script> - console.log("Welcome to Alee Productions :)") - alert("Please note that this website is under active development and bugs may occur.\nIf there's any report it to the GitHub repo.") + console.log("Welcome to Alee Productions :)"); + alert("Please note that this website is under active development and bugs may occur.\nIf there's any report it to the GitHub repo."); </script> <% include ./includes/footer %> diff --git a/views/projects.ejs b/views/projects.ejs index 1fc2d32..d48282b 100644 --- a/views/projects.ejs +++ b/views/projects.ejs @@ -11,6 +11,7 @@ <h2 class="display-4">Projects</h2> <p class="lead">This is the projects that we are currently working on.</p> </div> + <center><h1>Notice: We are currently working on this page</h1></center> <% include ./includes/footer %> </body> |