From 552a9b533497977b4c2b48c6132ff6dc18595d09 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 16 Jan 2025 13:45:36 +0000 Subject: [PATCH 1/3] Added branding --- public/stylesheets/style.css | 60 ++++++++++++++++++++++++++++++++++-- routes/index.js | 2 +- views/addUser.ejs | 13 ++++++-- views/deleteUser.ejs | 13 ++++++-- views/employee.ejs | 12 ++++++-- views/employees.ejs | 12 ++++++-- views/index.ejs | 37 +++++++++++++++++----- views/updateUser.ejs | 12 ++++++-- views/user.ejs | 11 +++++-- views/users.ejs | 10 +++++- 10 files changed, 158 insertions(+), 24 deletions(-) diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 9453385..90b9145 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -1,8 +1,64 @@ +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; +} + +#page-title { + padding-top: 8em; +} + +main { + padding-left: 5em; + padding-right: 5em; + padding-top: 5em; +} + +nav { + padding-top: 1em; +} + +h1, .h1-article, h2, h3, h4, h5 { + letter-spacing: 0; } a { color: #00B7FF; } + +footer { + 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; +} + +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..449e450 100644 --- a/views/addUser.ejs +++ b/views/addUser.ejs @@ -5,11 +5,15 @@ Add New User - + +
logo
+

Add New User

+


@@ -21,6 +25,11 @@
-
+ +
+ + diff --git a/views/deleteUser.ejs b/views/deleteUser.ejs index 4da5af6..e9ab60c 100644 --- a/views/deleteUser.ejs +++ b/views/deleteUser.ejs @@ -5,17 +5,26 @@ 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..7c92270 100644 --- a/views/employee.ejs +++ b/views/employee.ejs @@ -5,11 +5,15 @@ User Information - + +
logo
+

Employee Information

+
<% if (employee) { %> @@ -35,6 +39,10 @@

No Employee found.

<% } %> - + + +
Copyright © 2024 Kainos. Contact: +
support@kainospeoplesupport.com
+
diff --git a/views/employees.ejs b/views/employees.ejs index 9bc5467..428e8ee 100644 --- a/views/employees.ejs +++ b/views/employees.ejs @@ -5,11 +5,15 @@ employee List - + +
logo
+

Employees List

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

No employees found.

<% } %> - + + +
Copyright © 2024 Kainos. Contact: +
support@kainospeoplesupport.com
+
diff --git a/views/index.ejs b/views/index.ejs index 7b7a1d6..c0b5cbb 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -1,11 +1,32 @@ - - <%= title %> - - - -

<%= title %>

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

+ <%= title %> +

+
+

Welcome to <%= title %>

- - + +
+ + +
Copyright © 2024 Kainos. Contact: +
support@kainospeoplesupport.com
+
+ \ No newline at end of file diff --git a/views/updateUser.ejs b/views/updateUser.ejs index 6132846..51f8137 100644 --- a/views/updateUser.ejs +++ b/views/updateUser.ejs @@ -5,11 +5,14 @@ Update User - + +
logo

Update User

+


@@ -21,6 +24,11 @@
- + +
+ +
Copyright © 2024 Kainos. Contact: +
support@kainospeoplesupport.com
+
diff --git a/views/user.ejs b/views/user.ejs index 2a8df0d..10b41c6 100644 --- a/views/user.ejs +++ b/views/user.ejs @@ -5,11 +5,14 @@ User Information - + +
logo

User Information

+
<% if (user) { %>
@@ -31,6 +34,10 @@

No user found.

<% } %> - + + +
Copyright © 2024 Kainos. Contact: +
support@kainospeoplesupport.com
+
diff --git a/views/users.ejs b/views/users.ejs index f323c63..1d21aa3 100644 --- a/views/users.ejs +++ b/views/users.ejs @@ -5,11 +5,14 @@ User List - + +
logo

User List

+
<% if (users && users.length > 0) { %>
@@ -42,5 +45,10 @@ + + +
Copyright © 2024 Kainos. Contact: +
support@kainospeoplesupport.com
+
From 8c98a6e103bbbb57300f018de3604f596792cb5e Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 16 Jan 2025 14:06:28 +0000 Subject: [PATCH 2/3] Fixed page footer --- public/stylesheets/style.css | 15 ++++++++++++--- views/addUser.ejs | 2 ++ views/deleteUser.ejs | 2 ++ views/employee.ejs | 2 ++ views/employees.ejs | 4 +++- views/index.ejs | 5 ++++- views/updateUser.ejs | 4 ++++ views/user.ejs | 3 +++ views/users.ejs | 3 +++ 9 files changed, 35 insertions(+), 5 deletions(-) diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 90b9145..b797de2 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -22,9 +22,11 @@ body { text-align: center; font: 14px "Galano Grotesque", "Poppins", sans-serif; min-height: 100vh; + margin: 0; + padding: 0; } -#page-title { +.page-title { padding-top: 8em; } @@ -35,7 +37,7 @@ main { } nav { - padding-top: 1em; + padding-top: 0.5em; } h1, .h1-article, h2, h3, h4, h5 { @@ -46,7 +48,7 @@ a { color: #00B7FF; } -footer { +.footer-banner { margin-top: auto; background-color: #263057; color: white; @@ -59,6 +61,13 @@ footer { 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/views/addUser.ejs b/views/addUser.ejs index 449e450..119dbf4 100644 --- a/views/addUser.ejs +++ b/views/addUser.ejs @@ -11,7 +11,9 @@
logo
+

Add New User

+
diff --git a/views/deleteUser.ejs b/views/deleteUser.ejs index e9ab60c..9710b59 100644 --- a/views/deleteUser.ejs +++ b/views/deleteUser.ejs @@ -11,7 +11,9 @@
logo
+

Delete User

+
diff --git a/views/employee.ejs b/views/employee.ejs index 7c92270..bed0498 100644 --- a/views/employee.ejs +++ b/views/employee.ejs @@ -11,7 +11,9 @@
logo
+

Employee Information

+
<% if (employee) { %> diff --git a/views/employees.ejs b/views/employees.ejs index 428e8ee..da08228 100644 --- a/views/employees.ejs +++ b/views/employees.ejs @@ -10,8 +10,10 @@
logo
- + +

Employees List

+
<% if (employees && employees.length > 0) { %> diff --git a/views/index.ejs b/views/index.ejs index c0b5cbb..f41eaa2 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -13,11 +13,12 @@
logo
-
+

<%= title %>

+

Welcome to <%= title %>

+
Copyright © 2024 Kainos. Contact:
support@kainospeoplesupport.com
+
\ No newline at end of file diff --git a/views/updateUser.ejs b/views/updateUser.ejs index 51f8137..dd6e810 100644 --- a/views/updateUser.ejs +++ b/views/updateUser.ejs @@ -10,7 +10,11 @@
logo
+ + +

Update User

+
diff --git a/views/user.ejs b/views/user.ejs index 10b41c6..5660514 100644 --- a/views/user.ejs +++ b/views/user.ejs @@ -10,7 +10,10 @@
logo
+ +

User Information

+
<% if (user) { %> diff --git a/views/users.ejs b/views/users.ejs index 1d21aa3..abc5938 100644 --- a/views/users.ejs +++ b/views/users.ejs @@ -10,7 +10,10 @@
logo
+ +

User List

+
<% if (users && users.length > 0) { %> From 7db2be4cbb158c6ba89929cf89fc2accb5c412e9 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 16 Jan 2025 14:20:21 +0000 Subject: [PATCH 3/3] Fixed footer and centred tables. --- public/stylesheets/style.css | 4 ++++ views/addUser.ejs | 2 ++ views/deleteUser.ejs | 2 ++ views/employee.ejs | 2 ++ views/employees.ejs | 2 ++ views/updateUser.ejs | 2 ++ views/user.ejs | 2 ++ views/users.ejs | 2 ++ 8 files changed, 18 insertions(+) diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index b797de2..083fadf 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -36,6 +36,10 @@ main { padding-top: 5em; } +table { + margin: auto; +} + nav { padding-top: 0.5em; } diff --git a/views/addUser.ejs b/views/addUser.ejs index 119dbf4..1ffe9aa 100644 --- a/views/addUser.ejs +++ b/views/addUser.ejs @@ -31,7 +31,9 @@
+
Copyright © 2024 Kainos. Contact:
support@kainospeoplesupport.com
+
diff --git a/views/deleteUser.ejs b/views/deleteUser.ejs index 9710b59..ec5cd61 100644 --- a/views/deleteUser.ejs +++ b/views/deleteUser.ejs @@ -26,7 +26,9 @@
+
Copyright © 2024 Kainos. Contact:
support@kainospeoplesupport.com
+
diff --git a/views/employee.ejs b/views/employee.ejs index bed0498..5022ee8 100644 --- a/views/employee.ejs +++ b/views/employee.ejs @@ -44,7 +44,9 @@
+
Copyright © 2024 Kainos. Contact:
support@kainospeoplesupport.com
+
diff --git a/views/employees.ejs b/views/employees.ejs index da08228..9e0eb74 100644 --- a/views/employees.ejs +++ b/views/employees.ejs @@ -49,7 +49,9 @@
+
Copyright © 2024 Kainos. Contact:
support@kainospeoplesupport.com
+
diff --git a/views/updateUser.ejs b/views/updateUser.ejs index dd6e810..b236606 100644 --- a/views/updateUser.ejs +++ b/views/updateUser.ejs @@ -32,7 +32,9 @@
+
Copyright © 2024 Kainos. Contact:
support@kainospeoplesupport.com
+
diff --git a/views/user.ejs b/views/user.ejs index 5660514..4e85a7d 100644 --- a/views/user.ejs +++ b/views/user.ejs @@ -40,7 +40,9 @@
+
Copyright © 2024 Kainos. Contact:
support@kainospeoplesupport.com
+
diff --git a/views/users.ejs b/views/users.ejs index abc5938..29e3599 100644 --- a/views/users.ejs +++ b/views/users.ejs @@ -51,7 +51,9 @@
+
Copyright © 2024 Kainos. Contact:
support@kainospeoplesupport.com
+