aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorAndrew Lee <alee14498@gmail.com>2019-08-02 15:35:14 -0400
committerAndrew Lee <alee14498@gmail.com>2019-08-02 15:35:14 -0400
commitcc2c3863b0a3ec26e6610163c00b5f8f6aedc716 (patch)
tree372b990c1e9e40475be08a554768acece5fd5430 /views
parentf7c360592b6c2ef24b033280aa977a894349476a (diff)
downloadalp-website-cc2c3863b0a3ec26e6610163c00b5f8f6aedc716.tar.gz
alp-website-cc2c3863b0a3ec26e6610163c00b5f8f6aedc716.tar.bz2
alp-website-cc2c3863b0a3ec26e6610163c00b5f8f6aedc716.zip
About page, updated 404 and changed style
Diffstat (limited to 'views')
-rw-r--r--views/404.ejs9
-rw-r--r--views/about.ejs25
-rw-r--r--views/includes/footer.ejs9
-rw-r--r--views/includes/header.ejs10
-rw-r--r--views/includes/navbar.ejs31
-rw-r--r--views/index.ejs13
6 files changed, 79 insertions, 18 deletions
diff --git a/views/404.ejs b/views/404.ejs
index 2bcc58e..4bdc4a1 100644
--- a/views/404.ejs
+++ b/views/404.ejs
@@ -1,10 +1,15 @@
<!DOCTYPE html>
-<html lang="en">
+<html>
<head>
<% include ./includes/header %>
<title><%= title %></title>
</head>
<body>
- <h1>404 - Not Found</h1>
+ <center>
+ <h1>404 - Not Found</h1>
+ <h2>Oops, seems like that page isn't found!</h2>
+ <h3>Return to <a href="/">homepage</a>?</h3>
+ </center>
+ <% include ./includes/footer %>
</body>
</html> \ No newline at end of file
diff --git a/views/about.ejs b/views/about.ejs
new file mode 100644
index 0000000..87485be
--- /dev/null
+++ b/views/about.ejs
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+ <% include ./includes/header %>
+ <title><%= title %></title>
+</head>
+
+<body>
+ <% include ./includes/navbar %>
+ <div class="jumbotron special-color">
+ <h2 class="display-4">About Alee Productions</h2>
+ <p class="lead">Alee Productions is a productions company by Andrew Lee that focuses on making videos and games.
+ </p>
+ </div>
+ <div class="container">
+ <h1>History</h1>
+ <p>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.</p>
+
+ </div>
+ <% include ./includes/footer %>
+</body>
+
+</html> \ No newline at end of file
diff --git a/views/includes/footer.ejs b/views/includes/footer.ejs
index 8a666f5..56a654c 100644
--- a/views/includes/footer.ejs
+++ b/views/includes/footer.ejs
@@ -1 +1,8 @@
-<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script> \ No newline at end of file
+<!-- JQuery -->
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/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>
+<!-- Bootstrap core JavaScript -->
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/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
diff --git a/views/includes/header.ejs b/views/includes/header.ejs
index 268e2d4..9f47fb4 100644
--- a/views/includes/header.ejs
+++ b/views/includes/header.ejs
@@ -1,3 +1,7 @@
-<link href="https://fonts.googleapis.com/css?family=Play:400,700&display=swap" rel="stylesheet">
-<link rel="stylesheet" href="/css/style.css">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css"> \ No newline at end of file
+<!-- Font Awesome -->
+<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css">
+<!-- Bootstrap core CSS -->
+<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/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 rel="stylesheet" href="/css/style.css"> \ No newline at end of file
diff --git a/views/includes/navbar.ejs b/views/includes/navbar.ejs
index 634ee5a..ed2e826 100644
--- a/views/includes/navbar.ejs
+++ b/views/includes/navbar.ejs
@@ -1,12 +1,23 @@
-<div class="navbar-fixed">
-<nav>
- <div class="nav-wrapper black">
- <a href="/" class="brand-logo">Alee Productions</a>
- <ul id="nav-mobile" class="right hide-on-med-and-down">
- <li><a href="/projects">Projects</a></li>
- <li><a href="/blog">Blog</a></li>
- <li><a href="/about">About</a></li>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+ <a class="navbar-brand" href="/">Alee Productions</a>
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav"
+ aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+ <div class="collapse navbar-collapse" id="navbarNav">
+ <ul class="navbar-nav">
+ <li class="nav-item">
+ <a class="nav-link" href="/">Home</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="/projects">Projects</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="/blog">Blog</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="/about">About</a>
+ </li>
</ul>
</div>
-</nav>
-</div> \ No newline at end of file
+</nav> \ No newline at end of file
diff --git a/views/index.ejs b/views/index.ejs
index 80605ce..55bfaed 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -1,12 +1,21 @@
<!DOCTYPE html>
-<html lang="en">
+<html>
+
<head>
<% include ./includes/header %>
<title><%= title %></title>
</head>
+
<body>
<% include ./includes/navbar %>
- <h1>This page is under construction</h1>
+ <div class="jumbotron special-color">
+ <h2 class="display-4">Hello! Welcome to Alee Productions.</h2>
+ <p class="lead">We are a very small produtions company.</p>
+ <hr class="my-4">
+ <p>If you want to know more about us click the button down below.</p>
+ <a class="btn btn-green btn-lg" href="/about" role="button">Learn more</a>
+ </div>
<% include ./includes/footer %>
</body>
+
</html> \ No newline at end of file