From be5c14ffa4b10e1586b68f94669093146df9d452 Mon Sep 17 00:00:00 2001
From: Andrew Lee <alee14498@gmail.com>
Date: Fri, 16 Aug 2019 00:44:47 -0400
Subject: Added transitions, community rules, git projects and etc

---
 views/includes/footer.ejs  |  8 +++++++-
 views/includes/header.ejs  | 14 +++++++++-----
 views/includes/navbar.ejs  | 25 ++++++++++++++++++++-----
 views/includes/scripts.ejs | 12 +++++++-----
 4 files changed, 43 insertions(+), 16 deletions(-)

(limited to 'views/includes')

diff --git a/views/includes/footer.ejs b/views/includes/footer.ejs
index 1e2ad39..4cc1d7d 100644
--- a/views/includes/footer.ejs
+++ b/views/includes/footer.ejs
@@ -1,3 +1,9 @@
 <footer class="page-footer mt-5 font-small green">
         <div class="footer-copyright text-center py-3">© Copyright 2016-2019, Alee Productions. Licensed with GPL-3.0</div>
-</footer>
\ No newline at end of file
+</footer>
+<div class="alert alert-warning fixed-bottom m-0 alert-dismissible fade show" role="alert">
+        Please note that this website is under active development and bugs may occur.<br>If there's any, report it to the <a href="https://github.com/aleeproductions/website">GitHub</a> repo.
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+        </button>
+</div>
\ No newline at end of file
diff --git a/views/includes/header.ejs b/views/includes/header.ejs
index f9ab843..9511128 100644
--- a/views/includes/header.ejs
+++ b/views/includes/header.ejs
@@ -2,7 +2,7 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="X-UA-Compatible" content="ie=edge">
-<meta name="description" content="We make games, video and software.">
+<meta name="description" content="We make games, videos and software.">
 
 <!-- Favicons -->
 <link rel="apple-touch-icon" sizes="180x180" href="/ico/apple-touch-icon.png">
@@ -16,12 +16,16 @@
 <meta name="theme-color" content="#ffffff">
 
 <!-- Font Awesome -->
-<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css">
+<script src="https://kit.fontawesome.com/4c90505fb4.js"></script>
 <!-- Bootstrap core CSS -->
-<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/css/bootstrap.min.css" rel="stylesheet">
 <!-- Material Design Bootstrap -->
-<link href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.8.7/css/mdb.min.css" rel="stylesheet">
-<link href="https://fonts.googleapis.com/css?family=Play:400,700&display=swap" rel="stylesheet"> 
+<link href="/css/mdb.min.css" rel="stylesheet">
+<!-- Play -->
+<link href="https://fonts.googleapis.com/css?family=Play:400,700&display=swap" rel="stylesheet">
+<!-- animsition.css -->
+<link rel="stylesheet" href="/css/animsition.min.css">
+
 <link rel="stylesheet" href="/css/style.css">
 
 <title><%= title %></title>
diff --git a/views/includes/navbar.ejs b/views/includes/navbar.ejs
index b8d3ed5..90405c8 100644
--- a/views/includes/navbar.ejs
+++ b/views/includes/navbar.ejs
@@ -1,5 +1,5 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-    <a class="navbar-brand" href="/">
+    <a class="navbar-brand animsition-link" href="/">
         <img src="/img/ALP.png" height="30" class="d-inline-block align-top" alt="Alee Prod Logo">
         Alee Productions</a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav"
@@ -9,16 +9,31 @@
     <div class="collapse navbar-collapse" id="navbarNav">
         <ul class="navbar-nav mr-auto">
             <li class="nav-item">
-                <a class="nav-link" href="/">Home</a>
+                <a class="nav-link animsition-link" href="/">Home</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" href="/projects">Projects</a>
+                <a class="nav-link animsition-link" href="/projects">Projects</a>
+            </li>
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" id="navbarDropdownMenuLink" data-toggle="dropdown"
+                   aria-haspopup="true" aria-expanded="false">Community</a>
+                <div class="dropdown-menu dropdown-primary" aria-labelledby="navbarDropdownMenuLink">
+                    <a class="dropdown-item animsition-link" href="/community/rules">Rules</a>
+                </div>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link animsition-link" href="/blog">Blog</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" href="/blog">Blog</a>
+                <a class="nav-link animsition-link" href="/about">About</a>
             </li>
+        </ul>
+        <ul class="navbar-nav">
+            <!--<li class="nav-item">
+                <a class="nav-link" onclick="toggle-theme">Dark</a>
+            </li>-->
             <li class="nav-item">
-                <a class="nav-link" href="/about">About</a>
+                <span class="navbar-text white-text">BETA</span>
             </li>
         </ul>
     </div>
diff --git a/views/includes/scripts.ejs b/views/includes/scripts.ejs
index 30fe254..d5ccc40 100644
--- a/views/includes/scripts.ejs
+++ b/views/includes/scripts.ejs
@@ -1,9 +1,11 @@
 <!-- JQuery -->
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+<script type="text/javascript" src="/js/jquery.min.js"></script>
 <!-- Bootstrap tooltips -->
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.4/umd/popper.min.js"></script>
+<script type="text/javascript" src="/js/popper.min.js"></script>
 <!-- Bootstrap core JavaScript -->
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/js/bootstrap.min.js">
-</script>
+<script type="text/javascript" src="/js/bootstrap.min.js"></script>
 <!-- MDB core JavaScript -->
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.8.7/js/mdb.min.js"></script>
\ No newline at end of file
+<script type="text/javascript" src="/js/mdb.min.js"></script>
+<!-- animsition.js -->
+<script type="text/javascript" src="/js/animsition.min.js"></script>
+<script type="text/javascript" src="/js/transition.js"></script>
\ No newline at end of file
-- 
cgit v1.2.3