diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 9453385..083fadf 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -1,8 +1,77 @@ +header { + position: fixed; + top: 0; + left: 0; + padding: 30px; + width: 100%; + background-color: white; +} + +.header__logo-img { + width: 100px; + padding-top: 0px; + margin-top: 0px; + margin-left: 180px; + float: left; +} + body { - padding: 50px; - font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; + position: relative; + display: flex; + flex-direction: column; + text-align: center; + font: 14px "Galano Grotesque", "Poppins", sans-serif; + min-height: 100vh; + margin: 0; + padding: 0; +} + +.page-title { + padding-top: 8em; +} + +main { + padding-left: 5em; + padding-right: 5em; + padding-top: 5em; +} + +table { + margin: auto; +} + +nav { + padding-top: 0.5em; +} + +h1, .h1-article, h2, h3, h4, h5 { + letter-spacing: 0; } a { color: #00B7FF; } + +.footer-banner { + margin-top: auto; + background-color: #263057; + color: white; + font-weight: 300; + padding-top: 8em; + padding-left: 0; + padding-right: 0; + margin-left: 0; + margin-right: 0; + font: 14px "Galano Grotesque", "Poppins", sans-serif; +} + +footer { + display: flex; + min-width: 100%; + justify-content: flex-end; + margin-top: auto; +} + +address { + display: inline; +} \ No newline at end of file diff --git a/routes/index.js b/routes/index.js index ecca96a..60d707e 100644 --- a/routes/index.js +++ b/routes/index.js @@ -3,7 +3,7 @@ var router = express.Router(); /* GET home page. */ router.get('/', function(req, res, next) { - res.render('index', { title: 'Express' }); + res.render('index', { title: 'Kainos Employee Management' }); }); module.exports = router; diff --git a/views/addUser.ejs b/views/addUser.ejs index 3f556f6..1ffe9aa 100644 --- a/views/addUser.ejs +++ b/views/addUser.ejs @@ -5,11 +5,17 @@ Add New User - + +
logo
+ +

Add New User

+
+


@@ -21,6 +27,13 @@
-
+ +
+ + diff --git a/views/deleteUser.ejs b/views/deleteUser.ejs index 4da5af6..ec5cd61 100644 --- a/views/deleteUser.ejs +++ b/views/deleteUser.ejs @@ -5,17 +5,30 @@ Delete User - + +
logo
+ +

Delete User

+
+

Are you sure you want to delete <%= user.name %>?

-
+ +
+ + diff --git a/views/employee.ejs b/views/employee.ejs index 3686187..5022ee8 100644 --- a/views/employee.ejs +++ b/views/employee.ejs @@ -5,11 +5,17 @@ User Information - + +
logo
+ +

Employee Information

+
+
<% if (employee) { %> @@ -35,6 +41,12 @@

No Employee found.

<% } %> - + + + diff --git a/views/employees.ejs b/views/employees.ejs index 9bc5467..9e0eb74 100644 --- a/views/employees.ejs +++ b/views/employees.ejs @@ -5,11 +5,17 @@ employee List - + +
logo
+ +

Employees List

+
+
<% if (employees && employees.length > 0) { %>
@@ -40,6 +46,12 @@

No employees found.

<% } %> - + + + diff --git a/views/index.ejs b/views/index.ejs index 7b7a1d6..f41eaa2 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -1,11 +1,35 @@ - - <%= title %> - - - -

<%= title %>

+ + + + <%= title %> + + + + + + +
logo
+ +
+

+ <%= title %> +

+
+ +

Welcome to <%= title %>

- - + +
+ + + + \ No newline at end of file diff --git a/views/updateUser.ejs b/views/updateUser.ejs index 6132846..b236606 100644 --- a/views/updateUser.ejs +++ b/views/updateUser.ejs @@ -5,11 +5,18 @@ Update User - + +
logo
+ + +

Update User

+
+


@@ -21,6 +28,13 @@
- + +
+ + diff --git a/views/user.ejs b/views/user.ejs index 2a8df0d..4e85a7d 100644 --- a/views/user.ejs +++ b/views/user.ejs @@ -5,11 +5,17 @@ User Information - + +
logo
+ +

User Information

+
+
<% if (user) { %>
@@ -31,6 +37,12 @@

No user found.

<% } %> - + + + diff --git a/views/users.ejs b/views/users.ejs index f323c63..29e3599 100644 --- a/views/users.ejs +++ b/views/users.ejs @@ -5,11 +5,17 @@ User List - + +
logo
+ +

User List

+
+
<% if (users && users.length > 0) { %>
@@ -42,5 +48,12 @@ + + +