diff --git a/README.md b/README.md index 4e5f148..6fb6b42 100644 --- a/README.md +++ b/README.md @@ -30,9 +30,6 @@ https://www.dropbox.com/sh/62o9vtykx57vlge/AABwtHlL5VeTuGXVegT_d3iXa?dl=0 -### Gantt Chart - -https://app.teamweek.com/#pg/xHNPnwNcWA8nuJm5--z6gqOOQ6nH1IIo ## Features @@ -122,13 +119,13 @@ If you are installing this software, please read the entire readme, and not just 10) That's it! You should be all set up and able to log in to the admin portion of the site. -## Using the Site +## Using the Site (Desktop View) -1) The index / landing page +1) Home Page: * This page should look like below. This page gives an overview of all the roles, themes and elements that are present in the database. * This page is really useful if you already know what roles, themes or elements you want to see are. * To see the roles, themes or elements, just press the blue **Show / Hide** button. - * We can see that a search bar is circled. This lets you search for anything in the database. This includes alternative names for the roles. + * We can see that a search bar on the top right. This lets you search for anything in the database. This includes alternative names for the roles. ![index](readme-img/index.jpg) @@ -140,7 +137,7 @@ If you are installing this software, please read the entire readme, and not just ![index3](readme-img/index-3.jpg) -2) The 'Find a Career' page +2) Finding a Career: * This page is intended for penultimate and final year students. We developed this page taking into account feedback from current students. * The idea is that you choose three themes that you feel that you are particularly proficient at. @@ -159,14 +156,18 @@ If you are installing this software, please read the entire readme, and not just * You can see even more information by clicking the **See More** button. -![student5](readme-img/student-5.jpg) - * You're then given a detailed page - the key thing here is that themes and elements may be highlighted in green or red. * Green themes and elements are those that you have selected in the process of getting to this page. * Red themes and elements are those that you have not selected, and may wish to consider if you are interested in this career in the future. -* It is also possible to download a form of this page in a PDF format. -3) The admin pages +![student5](readme-img/student-5.jpg) + +* Or you can view a poster by pressing **View Poster** + +![student6](readme-img/student-6.jpg) + + +3) Admin Functionality: * These pages are intended for the admin of the site to easily be able to add, update or delete role, themes and elements. ![admin](readme-img/admin-login.jpg) @@ -178,37 +179,77 @@ If you are installing this software, please read the entire readme, and not just * Below is what you will see if you were to add something to the database: ![admin3](readme-img/admin-add.jpg) -![admin4](readme-img/admin-add2.jpg) +![admin4](readme-img/admin-add-2.jpg) +![admin5](readme-img/admin-add-3.jpg) * Below is what you will see if you were to update something in the database: -![admin4](readme-img/admin-update.jpg) -![admin4](readme-img/admin-update2.jpg) +![admin6](readme-img/admin-update.jpg) +![admin7](readme-img/admin-update-2.jpg) +![admin7](readme-img/admin-update-3.jpg) * Below is what you will see if you were to delete something in the database. * Please note the danger of deleting something in the database. ⚠️ * You **cannot** undo this action, and you will have to add the items back into the database manually, or by using the tools shown above. -![admin5](readme-img/admin-delete.jpg) +![admin8](readme-img/admin-remove.jpg) * You can also add new users to the database, also making them admins. * Please note that any user you add will also be able to add, update and remove elements, along with adding new admins. ⚠️ -![admin6](readme-img/admin-new-user.jpg) +![admin9](readme-img/admin-new-user.jpg) -* Forgotten Password +* Forgotten Password Functionality: * It is also possible to recover your account in the case of a forgotten password. * Please keep in mind that anyone with direct access to the SQL database will be able to recover your account as well, therefore it is a good idea to secure this database. ⚠️ ![admin7](readme-img/admin-fp-1.jpg) ![admin8](readme-img/admin-fp-2.jpg) -4) Search Results +4) Searching * Present on every page is the navbar and the search bar. * This search bar allows you to search for roles, themes and elements. ![search](readme-img/search.jpg) -![search2](readme-img/search2.jpg) +![search2](readme-img/search-2.jpg) + + +## Using the Site (Mobile View) +This toolkit was designed to be responsive, and so it is as equally usable on mobile as it is on a laptop. + +1) Home Page: + +- Just like on the desktop, this page gives an overview of the roles, themes and elements that are present in the database. + +![mobile](readme-img/m-h-1.jpg) + +- To see the roles, themes or elements, just press the blue **Show / Hide** button. + +![mobile](readme-img/m-h-2.jpg) + + +2) Finding a Career: + +![mobile](readme-img/m-s-1.jpg) + +![mobile](readme-img/m-s-2.jpg) + +![mobile](readme-img/m-s-3.jpg) + + +3) Admin Functionality: + +![mobile](readme-img/m-a-1.jpg) + +![mobile](readme-img/m-a-u.jpg) + +* Forgotten password functionality also still exists: + +![mobile](readme-img/m-p.jpg) + +4) Searching: + +* By pressing on the hamburger menu (top right of the screen), we can open up the navbar, revealing a search bar. This functions just as well as the search bar on the desktop version of the site. -Thanks for reading the readme file. +![mobile](readme-img/m-se.jpg) diff --git a/readme-img/admin-add-2.jpg b/readme-img/admin-add-2.jpg new file mode 100644 index 0000000..60dc9b1 Binary files /dev/null and b/readme-img/admin-add-2.jpg differ diff --git a/readme-img/admin-add-3.jpg b/readme-img/admin-add-3.jpg new file mode 100644 index 0000000..f452111 Binary files /dev/null and b/readme-img/admin-add-3.jpg differ diff --git a/readme-img/admin-add.jpg b/readme-img/admin-add.jpg index fd7fca5..9a552a1 100644 Binary files a/readme-img/admin-add.jpg and b/readme-img/admin-add.jpg differ diff --git a/readme-img/admin-add2.jpg b/readme-img/admin-add2.jpg deleted file mode 100644 index 4fbe639..0000000 Binary files a/readme-img/admin-add2.jpg and /dev/null differ diff --git a/readme-img/admin-delete.jpg b/readme-img/admin-delete.jpg deleted file mode 100644 index fea816b..0000000 Binary files a/readme-img/admin-delete.jpg and /dev/null differ diff --git a/readme-img/admin-fp-1.jpg b/readme-img/admin-fp-1.jpg index 9abde31..1b3033d 100644 Binary files a/readme-img/admin-fp-1.jpg and b/readme-img/admin-fp-1.jpg differ diff --git a/readme-img/admin-fp-2.jpg b/readme-img/admin-fp-2.jpg index 3f6f8cb..4cf1c59 100644 Binary files a/readme-img/admin-fp-2.jpg and b/readme-img/admin-fp-2.jpg differ diff --git a/readme-img/admin-index.jpg b/readme-img/admin-index.jpg index 70ffce4..45c347f 100644 Binary files a/readme-img/admin-index.jpg and b/readme-img/admin-index.jpg differ diff --git a/readme-img/admin-login.jpg b/readme-img/admin-login.jpg index e24b76e..a272f22 100644 Binary files a/readme-img/admin-login.jpg and b/readme-img/admin-login.jpg differ diff --git a/readme-img/admin-new-user.jpg b/readme-img/admin-new-user.jpg index 89175fb..d8712e5 100644 Binary files a/readme-img/admin-new-user.jpg and b/readme-img/admin-new-user.jpg differ diff --git a/readme-img/admin-remove.jpg b/readme-img/admin-remove.jpg new file mode 100644 index 0000000..74a48d4 Binary files /dev/null and b/readme-img/admin-remove.jpg differ diff --git a/readme-img/admin-update-2.jpg b/readme-img/admin-update-2.jpg new file mode 100644 index 0000000..40ced5b Binary files /dev/null and b/readme-img/admin-update-2.jpg differ diff --git a/readme-img/admin-update-3.jpg b/readme-img/admin-update-3.jpg new file mode 100644 index 0000000..6196b4b Binary files /dev/null and b/readme-img/admin-update-3.jpg differ diff --git a/readme-img/admin-update.jpg b/readme-img/admin-update.jpg index 293b928..31c9087 100644 Binary files a/readme-img/admin-update.jpg and b/readme-img/admin-update.jpg differ diff --git a/readme-img/admin-update2.jpg b/readme-img/admin-update2.jpg deleted file mode 100644 index 3edc077..0000000 Binary files a/readme-img/admin-update2.jpg and /dev/null differ diff --git a/readme-img/index-2.jpg b/readme-img/index-2.jpg index 6ef0be5..672e5c7 100644 Binary files a/readme-img/index-2.jpg and b/readme-img/index-2.jpg differ diff --git a/readme-img/index-3.jpg b/readme-img/index-3.jpg index c09a029..b7b1fd6 100644 Binary files a/readme-img/index-3.jpg and b/readme-img/index-3.jpg differ diff --git a/readme-img/index.jpg b/readme-img/index.jpg index a73b956..6e0e12c 100644 Binary files a/readme-img/index.jpg and b/readme-img/index.jpg differ diff --git a/readme-img/m-a-1.jpg b/readme-img/m-a-1.jpg new file mode 100644 index 0000000..e6e2a76 Binary files /dev/null and b/readme-img/m-a-1.jpg differ diff --git a/readme-img/m-a-u.jpg b/readme-img/m-a-u.jpg new file mode 100644 index 0000000..0e4be24 Binary files /dev/null and b/readme-img/m-a-u.jpg differ diff --git a/readme-img/m-h-1.jpg b/readme-img/m-h-1.jpg new file mode 100644 index 0000000..f12a331 Binary files /dev/null and b/readme-img/m-h-1.jpg differ diff --git a/readme-img/m-h-2.jpg b/readme-img/m-h-2.jpg new file mode 100644 index 0000000..f7a1c97 Binary files /dev/null and b/readme-img/m-h-2.jpg differ diff --git a/readme-img/m-p.jpg b/readme-img/m-p.jpg new file mode 100644 index 0000000..44727ff Binary files /dev/null and b/readme-img/m-p.jpg differ diff --git a/readme-img/m-s-1.jpg b/readme-img/m-s-1.jpg new file mode 100644 index 0000000..11e429a Binary files /dev/null and b/readme-img/m-s-1.jpg differ diff --git a/readme-img/m-s-2.jpg b/readme-img/m-s-2.jpg new file mode 100644 index 0000000..24a2af2 Binary files /dev/null and b/readme-img/m-s-2.jpg differ diff --git a/readme-img/m-s-3.jpg b/readme-img/m-s-3.jpg new file mode 100644 index 0000000..340cd2f Binary files /dev/null and b/readme-img/m-s-3.jpg differ diff --git a/readme-img/m-se.jpg b/readme-img/m-se.jpg new file mode 100644 index 0000000..1abe497 Binary files /dev/null and b/readme-img/m-se.jpg differ diff --git a/readme-img/search-2.jpg b/readme-img/search-2.jpg new file mode 100644 index 0000000..99918b9 Binary files /dev/null and b/readme-img/search-2.jpg differ diff --git a/readme-img/search.jpg b/readme-img/search.jpg index 514a404..3aa8fc2 100644 Binary files a/readme-img/search.jpg and b/readme-img/search.jpg differ diff --git a/readme-img/search2.jpg b/readme-img/search2.jpg deleted file mode 100644 index 3a9a52f..0000000 Binary files a/readme-img/search2.jpg and /dev/null differ diff --git a/readme-img/student-2.jpg b/readme-img/student-2.jpg index 9d1f334..bc543eb 100644 Binary files a/readme-img/student-2.jpg and b/readme-img/student-2.jpg differ diff --git a/readme-img/student-3.jpg b/readme-img/student-3.jpg index 83dd8e0..198b790 100644 Binary files a/readme-img/student-3.jpg and b/readme-img/student-3.jpg differ diff --git a/readme-img/student-4.jpg b/readme-img/student-4.jpg index 8962533..8cdc02b 100644 Binary files a/readme-img/student-4.jpg and b/readme-img/student-4.jpg differ diff --git a/readme-img/student-5.jpg b/readme-img/student-5.jpg index 1b96abe..3097a84 100644 Binary files a/readme-img/student-5.jpg and b/readme-img/student-5.jpg differ diff --git a/readme-img/student-6.jpg b/readme-img/student-6.jpg new file mode 100644 index 0000000..63d3e7f Binary files /dev/null and b/readme-img/student-6.jpg differ diff --git a/readme-img/student.jpg b/readme-img/student.jpg index ae5643f..ab2a8aa 100644 Binary files a/readme-img/student.jpg and b/readme-img/student.jpg differ diff --git a/src/header.php b/src/header.php index 61b1c4c..d2bdd37 100644 --- a/src/header.php +++ b/src/header.php @@ -4,5 +4,7 @@ + + diff --git a/src/img/favicon.ico b/src/img/favicon.ico new file mode 100644 index 0000000..a7a1314 Binary files /dev/null and b/src/img/favicon.ico differ diff --git a/src/navbar.php b/src/navbar.php index 2761f0d..30da2de 100644 --- a/src/navbar.php +++ b/src/navbar.php @@ -25,7 +25,7 @@ } .navbar-brand { /* line-height: 80px; */ - /* padding-top: 14pt; */ + padding-top: 14pt; /* padding-bottom: 2pt; */ padding-left: 20pt; color: #1c2c67; @@ -84,6 +84,12 @@ .uon-image { display: none; } + .navbar-brand { + /* line-height: 80px; */ + /* padding-top: 14pt; */ + padding-bottom: 2pt; + padding-left: 20pt; + } } @media (min-width: 350px) and (max-width: 449px) {