From 9b7de43534c450792248fa7ede263e145d9d131d Mon Sep 17 00:00:00 2001 From: Leo <95978312+yaefdb@users.noreply.github.com> Date: Sun, 21 Jan 2024 04:33:06 +0800 Subject: [PATCH 1/4] update --- consumerWebsite/public/css/api.css | 2 +- consumerWebsite/public/css/contact.css | 2 +- consumerWebsite/public/images/404.png | Bin 7590 -> 14321 bytes consumerWebsite/public/images/4044.png | Bin 14321 -> 0 bytes consumerWebsite/routes/render.js | 10 ++++++ consumerWebsite/views/api.ejs | 1 + consumerWebsite/views/bot.ejs | 3 ++ consumerWebsite/views/forgotPassword.ejs | 17 +++++++++ consumerWebsite/views/index.ejs | 6 ++-- consumerWebsite/views/learnmore.ejs | 43 +++++++++++++++++++++++ consumerWebsite/views/logintop.ejs | 2 +- consumerWebsite/views/signuplogin.ejs | 2 +- consumerWebsite/views/top.ejs | 4 +-- 13 files changed, 82 insertions(+), 10 deletions(-) delete mode 100644 consumerWebsite/public/images/4044.png create mode 100644 consumerWebsite/views/forgotPassword.ejs create mode 100644 consumerWebsite/views/learnmore.ejs diff --git a/consumerWebsite/public/css/api.css b/consumerWebsite/public/css/api.css index d3d44b1..4489fca 100644 --- a/consumerWebsite/public/css/api.css +++ b/consumerWebsite/public/css/api.css @@ -17,7 +17,7 @@ figure, figcaption, footer, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { margin: 0; - padding: 0; + padding: ; border: 0; font-size:100%; font: inherit; diff --git a/consumerWebsite/public/css/contact.css b/consumerWebsite/public/css/contact.css index 2137c19..524a5e4 100644 --- a/consumerWebsite/public/css/contact.css +++ b/consumerWebsite/public/css/contact.css @@ -4,7 +4,7 @@ form { background-color: #fff; - padding: 20px; + padding: 25px; border-radius: 8px; box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); width: 66%; diff --git a/consumerWebsite/public/images/404.png b/consumerWebsite/public/images/404.png index bcf59366cf354c33f39d296bf0e2f17753b240fe..6b34292086053a2968d5bee707d9951910de6d77 100644 GIT binary patch literal 14321 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 uky``{1m`~oa5cFoFPGO`LP2< <%- include('top') %> +
diff --git a/consumerWebsite/views/bot.ejs b/consumerWebsite/views/bot.ejs index af81d8c..6716b71 100644 --- a/consumerWebsite/views/bot.ejs +++ b/consumerWebsite/views/bot.ejs @@ -86,4 +86,7 @@ + + + diff --git a/consumerWebsite/views/forgotPassword.ejs b/consumerWebsite/views/forgotPassword.ejs new file mode 100644 index 0000000..71f8933 --- /dev/null +++ b/consumerWebsite/views/forgotPassword.ejs @@ -0,0 +1,17 @@ +<%- include('logintop') %> + + +
+
+
Reset Password
+
+ + + + +
+
+ Dont have an account? Sign Up +
+
+ \ No newline at end of file diff --git a/consumerWebsite/views/index.ejs b/consumerWebsite/views/index.ejs index d1ff853..84a2e60 100644 --- a/consumerWebsite/views/index.ejs +++ b/consumerWebsite/views/index.ejs @@ -57,7 +57,7 @@

70% - 75%

- Learn More + Learn More
@@ -68,7 +68,7 @@

15 - 18 PSI

- Learn More + Learn More
@@ -79,7 +79,7 @@

30° - 37°

- Learn More + Learn More
diff --git a/consumerWebsite/views/learnmore.ejs b/consumerWebsite/views/learnmore.ejs new file mode 100644 index 0000000..5b3062f --- /dev/null +++ b/consumerWebsite/views/learnmore.ejs @@ -0,0 +1,43 @@ +<%- include('top') %> + + +
+
+ +
+ Singapore Map + + +
+

North

+

Air Quality Index: 15

+
+ +
+

South

+

Air Quality Index: 16

+
+ +
+

East

+

Air Quality Index: 16

+
+ +
+

West

+

Air Quality Index: 18

+
+ +
+

Central

+

Air Quality Index: 17

+
+ +
+
+ +
+
+ + +<%- include('bot') %> diff --git a/consumerWebsite/views/logintop.ejs b/consumerWebsite/views/logintop.ejs index 3924f4f..7d6b367 100644 --- a/consumerWebsite/views/logintop.ejs +++ b/consumerWebsite/views/logintop.ejs @@ -67,7 +67,7 @@ diff --git a/consumerWebsite/views/top.ejs b/consumerWebsite/views/top.ejs index 2c3b9c2..b6564b1 100644 --- a/consumerWebsite/views/top.ejs +++ b/consumerWebsite/views/top.ejs @@ -21,8 +21,6 @@ - - @@ -82,7 +80,7 @@ - - - -
-
-
-
-
Find us
-

Blk 645 Jalan Tenaga

-

+65 90064959

-

Leongdingxuan@gmail.com

-
-
-
Follow us
- - - -
-
-
Quick links
- - - -
-
-
Recent posts
- -
    -
  • -
    - -
    -
    -

    Singapore's air quality ...

    - 7 oct 2023 -
    -
-
    -
  • -
    - -
    -
    -

    Singapore Government ...

    - 29 Sep 2023 -
    -
-
    -
  • -
    - -
    -
    -

    High risk of severe ...

    - 22 Jun 2023 -
    -
-
-
-
-
-
-

All Rights Reserved. © 2023 EcoSaver -

-
-
- - - - - - - - - - - \ No newline at end of file diff --git a/consumerWebsite/public/css/api.css b/consumerWebsite/public/css/api.css index 4489fca..d3d44b1 100644 --- a/consumerWebsite/public/css/api.css +++ b/consumerWebsite/public/css/api.css @@ -17,7 +17,7 @@ figure, figcaption, footer, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { margin: 0; - padding: ; + padding: 0; border: 0; font-size:100%; font: inherit; diff --git a/consumerWebsite/public/forgotpassword.html b/consumerWebsite/public/forgotpassword.html deleted file mode 100644 index 6de9045..0000000 --- a/consumerWebsite/public/forgotpassword.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - -
-
-
Reset Password
-
- - - - -
-
- Dont have an account? Sign Up -
-
- - - \ No newline at end of file diff --git a/consumerWebsite/public/learnmore.html b/consumerWebsite/public/learnmore.html deleted file mode 100644 index a8cc7ba..0000000 --- a/consumerWebsite/public/learnmore.html +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - EcoSaver - - - - - - - - - - - - - -
-
- -
- Singapore Map - - -
-

North

-

Air Quality Index: 15

-
- -
-

South

-

Air Quality Index: 16

-
- -
-

East

-

Air Quality Index: 16

-
- -
-

West

-

Air Quality Index: 18

-
- -
-

Central

-

Air Quality Index: 17

-
- -
-
- -
-
- - -
-
-
-
-
Find us
- -

Blk 645 Jalan Tenaga

-

+65 90064959

-

Leongdingxuan@gmail.com

-
-
-
Follow us
- - - -
-
-
Quick links
- - - -
-
-
News
- -
    -
  • -
    - -
    -
    -

    Singapore's air quality ...

    - 7 oct 2023 -
    -
-
    -
  • -
    - -
    -
    -

    Singapore Government ...

    - 29 Sep 2023 -
    -
-
    -
  • -
    - -
    -
    -

    High risk of severe ...

    - 22 Jun 2023 -
    -
-
-
-
-
-
-

All Rights Reserved. © 2023 EcoSaver -

-
-
- - - - - - - - \ No newline at end of file diff --git a/consumerWebsite/routes/render.js b/consumerWebsite/routes/render.js index b47643a..352cf11 100644 --- a/consumerWebsite/routes/render.js +++ b/consumerWebsite/routes/render.js @@ -71,9 +71,15 @@ router.get('/forgotPassword', function(req, res, next) { res.render('forgotPassword'); }); +//resetted password page +router.get('/resetpassword', function(req, res, next) { + res.render('resetpassword'); +}); + + //learn more page -router.get('/forgotPassword', function(req, res, next) { - res.render('forgotPassword'); +router.get('/learnmore', function(req, res, next) { + res.render('learnmore'); }); //profile page diff --git a/consumerWebsite/views/forgotPassword.ejs b/consumerWebsite/views/forgotPassword.ejs index 71f8933..3220de0 100644 --- a/consumerWebsite/views/forgotPassword.ejs +++ b/consumerWebsite/views/forgotPassword.ejs @@ -4,14 +4,14 @@
Reset Password
-
+

- Dont have an account? Sign Up + Dont have an account? Sign Up
\ No newline at end of file diff --git a/consumerWebsite/public/resetpassword.html b/consumerWebsite/views/resetpassword.ejs similarity index 100% rename from consumerWebsite/public/resetpassword.html rename to consumerWebsite/views/resetpassword.ejs From dd345e14e54db4665d4db36e60a38a29814bfffb Mon Sep 17 00:00:00 2001 From: Leo <95978312+yaefdb@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:35:24 +0800 Subject: [PATCH 3/4] update --- consumerWebsite/public/css/profile.css | 100 +++++++++++++++ consumerWebsite/routes/render.js | 1 + consumerWebsite/views/profile.ejs | 167 ++++++++++++++++--------- 3 files changed, 210 insertions(+), 58 deletions(-) create mode 100644 consumerWebsite/public/css/profile.css diff --git a/consumerWebsite/public/css/profile.css b/consumerWebsite/public/css/profile.css new file mode 100644 index 0000000..18eaded --- /dev/null +++ b/consumerWebsite/public/css/profile.css @@ -0,0 +1,100 @@ +.btn-delete { + background-color: red; + color: white; +} + +.ui-w-80 { + width: 80px !important; + height: auto; +} + +.btn-default { + border-color: rgba(24,28,33,0.1); + background: rgba(0,0,0,0); + color: #4E5155; +} + +label.btn { + margin-bottom: 0; +} + +.btn-outline-primary { + border-color: #26B4FF; + background: transparent; + color: #26B4FF; +} + +.btn { + cursor: pointer; +} + +.text-light { + color: #babbbc !important; +} + +.btn-facebook { + border-color: rgba(0,0,0,0); + background: #3B5998; + color: #fff; +} + +.btn-instagram { + border-color: rgba(0,0,0,0); + background: #000; + color: #fff; +} + +.card { + background-clip: padding-box; + box-shadow: 0 1px 4px rgba(24,28,33,0.012); +} + +.row-bordered { + overflow: hidden; +} + +.account-settings-fileinput { + position: absolute; + visibility: hidden; + width: 1px; + height: 1px; + opacity: 0; +} +.account-settings-links .list-group-item.active { + font-weight: bold !important; +} +html:not(.dark-style) .account-settings-links .list-group-item.active { + background: transparent !important; +} +.account-settings-multiselect ~ .select2-container { + width: 100% !important; +} +.light-style .account-settings-links .list-group-item { + padding: 0.85rem 1.5rem; + border-color: rgba(24, 28, 33, 0.03) !important; +} +.light-style .account-settings-links .list-group-item.active { + color: #4e5155 !important; +} +.material-style .account-settings-links .list-group-item { + padding: 0.85rem 1.5rem; + border-color: rgba(24, 28, 33, 0.03) !important; +} +.material-style .account-settings-links .list-group-item.active { + color: #4e5155 !important; +} +.dark-style .account-settings-links .list-group-item { + padding: 0.85rem 1.5rem; + border-color: rgba(255, 255, 255, 0.03) !important; +} +.dark-style .account-settings-links .list-group-item.active { + color: #fff !important; +} +.light-style .account-settings-links .list-group-item.active { + color: #4E5155 !important; +} +.light-style .account-settings-links .list-group-item { + padding: 0.85rem 1.5rem; + border-color: rgba(24,28,33,0.03) !important; +} + diff --git a/consumerWebsite/routes/render.js b/consumerWebsite/routes/render.js index 53c5cc2..109ff51 100644 --- a/consumerWebsite/routes/render.js +++ b/consumerWebsite/routes/render.js @@ -66,6 +66,7 @@ router.get("/profile", function (req, res, next) { res.render("profile"); }); + //forgot password page router.get("/forgotPassword", function (req, res, next) { res.render("forgotPassword"); diff --git a/consumerWebsite/views/profile.ejs b/consumerWebsite/views/profile.ejs index 03f9351..c779825 100644 --- a/consumerWebsite/views/profile.ejs +++ b/consumerWebsite/views/profile.ejs @@ -1,64 +1,115 @@ <%- include('top') %> - + + -
-
-

Profile -

-
-
+
+
+

Profile +

+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-

Profile Settings

-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-<%- include('bot') %> - +
+
+
+ +
+
+
+
+ +
+ +
+
+   +
Allowed JPG, GIF or PNG. Max size of 800K
+
+
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ Your email is not confirmed. Please check your inbox.
+ Resend confirmation +
+
+
+ + +
+
+ + +
+
+ +
+
+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+
+
+
+
+ +
+   + + +
+ +
+ +
+ <%- include('bot') %> \ No newline at end of file From 409e647646fb1782a4e9ea9ce3ddb48c69b794bd Mon Sep 17 00:00:00 2001 From: Leo <95978312+yaefdb@users.noreply.github.com> Date: Mon, 22 Jan 2024 16:35:06 +0800 Subject: [PATCH 4/4] update --- consumerWebsite/public/css/api.css | 25 +++++- consumerWebsite/public/js/learnmore.js | 74 +++++++++++----- consumerWebsite/views/api.ejs | 114 ++++++++++++++++--------- consumerWebsite/views/contact.ejs | 1 + consumerWebsite/views/learnmore.ejs | 2 +- consumerWebsite/views/profile.ejs | 5 +- consumerWebsite/views/top.ejs | 3 - 7 files changed, 152 insertions(+), 72 deletions(-) diff --git a/consumerWebsite/public/css/api.css b/consumerWebsite/public/css/api.css index d3d44b1..f5d527e 100644 --- a/consumerWebsite/public/css/api.css +++ b/consumerWebsite/public/css/api.css @@ -523,4 +523,27 @@ body.one-content-column-version .content thead { .cf:before, .cf:after { content: ""; display: block; } .cf:after { clear: both; } -.ie6 .cf { zoom: 1 } \ No newline at end of file +.ie6 .cf { zoom: 1 } + + + +.generate-key-button { + float: right; /* Align the button to the right */ + margin-right: 85%; + margin-top: -40px; /* Adjust the margin-top value based on your layout */ + /* Add any additional styling you want for the button */ +} + +#content-get-api .generate-key-button { + background-color: #4caf50; /* Green background color */ + color: white; /* White text color */ + padding: 5px 11px; /* Padding for the button */ + border: none; /* Remove button border */ + border-radius: 5px; /* Add border-radius for rounded corners */ + cursor: pointer; /* Add pointer cursor on hover */ + font-size: 14px; /* Font size */ +} + +#content-get-api .generate-key-button:hover { + background-color: #45a049; /* Darker green on hover */ +} \ No newline at end of file diff --git a/consumerWebsite/public/js/learnmore.js b/consumerWebsite/public/js/learnmore.js index c965824..2e4a440 100644 --- a/consumerWebsite/public/js/learnmore.js +++ b/consumerWebsite/public/js/learnmore.js @@ -1,28 +1,60 @@ document.addEventListener("DOMContentLoaded", function () { function updateAdditionalInfo(region) { const infoContainer = document.getElementById("additional-info"); - // Replace the following with actual data retrieval based on the region - const aqi = "15"; - const temperature = "25°C"; - const humidity = "60%"; +// Replace the following with actual data retrieval based on the region +const aqi = "15"; +const temperature = "25°C"; +const humidity = "60%"; +const pm25 = "10"; +const pm10 = "20"; +const so2 = "5"; +const o3 = "35"; +const co = "0.5"; +const no2 = "15"; + +infoContainer.innerHTML = ` +
+

Additional Information - ${region}

+ +
+ Air Quality Index: + ${aqi} +
+
+ Temperature: + ${temperature} +
+
+ Humidity: + ${humidity} +
+
+ PM2.5: + ${pm25} +
+
+ PM10: + ${pm10} +
+
+ SO2: + ${so2} +
+
+ O3: + ${o3} +
+
+ CO: + ${co} +
+
+ NO2: + ${no2} +
+
+`; - infoContainer.innerHTML = ` -
-

Additional Information - ${region}

-
- Air Quality Index: - ${aqi} -
-
- Temperature: - ${temperature} -
-
- Humidity: - ${humidity} -
-
- `; // Remove the 'active' class from all info-box elements const infoBoxes = document.querySelectorAll('.info-box'); diff --git a/consumerWebsite/views/api.ejs b/consumerWebsite/views/api.ejs index aa5ade5..fd19cb7 100644 --- a/consumerWebsite/views/api.ejs +++ b/consumerWebsite/views/api.ejs @@ -5,8 +5,8 @@ https://github.com/ticlekiwi/API-Documentation-HTML-Template !--> - <%- include('top') %> - +<%- include('top') %> +
@@ -39,8 +39,8 @@
  • GET STARTED
    • -
  • - Get Data From API +
  • + Generate API
  • Errors @@ -87,7 +87,8 @@ Authorization JSON Your API key. - (Required) Example: curl https://api.teeseng.uk/api/v0/location -H "Authorization: {provide your + (Required) Example: curl https://api.teeseng.uk/api/v0/location -H "Authorization: + {provide your API key here}" @@ -119,7 +120,8 @@ Authorization JSON (Required) Your API key. - Example: curl https://api.teeseng.uk/api/v0/location -H "Authorization: {provide your + Example: curl https://api.teeseng.uk/api/v0/location -H "Authorization: {provide + your API key here}" @@ -130,11 +132,12 @@

    Add Location (Only for system or admin API key)

    To add an Location you need to make a POST call to the following url :
    - https://api.teeseng.uk/api/v0/location/new + https://api.teeseng.uk/api/v0/location/new

    Example :
    - curl https://api.teeseng.uk/api/v0/location/new -H "Content-Type: application/json" -X POST -d '{"name": "SAMPLE", "added_by": "system" , "description": "test"}' + curl https://api.teeseng.uk/api/v0/location/new -H "Content-Type: application/json" -X POST -d '{"name": "SAMPLE", "added_by": "system" , "description": "test"}'

    Return Response :
    @@ -155,7 +158,8 @@ Authorization JSON Your API key. - (Required) Example: curl https://api.teeseng.uk/api/v0/location/new -H "Authorization: {provide your + (Required) Example: curl https://api.teeseng.uk/api/v0/location/new -H + "Authorization: {provide your API key here}" @@ -163,7 +167,8 @@ Location name JSON Location name. - (Required) Location name. Example: curl https://api.teeseng.uk/api/v0/location/new -H "Authorization: provide + (Required) Location name. Example: curl https://api.teeseng.uk/api/v0/location/new + -H "Authorization: provide your API key here" -d '{"name":"Location name"}' @@ -171,7 +176,8 @@ Added by JSON System or Admin - (Required) System or Admin Example: curl https://api.teeseng.uk/api/v0/location/new -H "Authorization: provide + (Required) System or Admin Example: curl https://api.teeseng.uk/api/v0/location/new + -H "Authorization: provide your API key here" -d '{"added_by":"system"}' @@ -179,7 +185,8 @@ Description JSON Description of Location - (Required) System or Admin Example: curl https://api.teeseng.uk/api/v0/location/new -H "Authorization: provide + (Required) System or Admin Example: curl https://api.teeseng.uk/api/v0/location/new + -H "Authorization: provide your API key here" -d '{"description":"test"}' @@ -191,13 +198,14 @@

    Update Location (Only for system or admin API key)

    To update an Location you need to make a PUT call to the following url :
    - https://api.teeseng.uk/api/v0/location/update + https://api.teeseng.uk/api/v0/location/update

    Example :
    - curl https://api.teeseng.uk/api/v0/location/update -H "Content-Type: application/json" -X POST -d '{"id": "7" , "name": "SAMPLE", "added_by": "system" , "description": "test"}' + curl https://api.teeseng.uk/api/v0/location/update -H "Content-Type: application/json" -X POST -d '{"id": "7" , "name": "SAMPLE", "added_by": "system" , "description": "test"}' +

    -
    Return Response :
    {"status":"200","message":"Location 7 updated"}

    @@ -216,7 +224,8 @@ Authorization JSON Your API key. - (Required) example: curl https://api.teeseng.uk/api/v0/location/update -H "Authorization: {provide your + (Required) example: curl https://api.teeseng.uk/api/v0/location/update -H + "Authorization: {provide your API key here}" @@ -224,7 +233,8 @@ ID JSON Location ID - (Required) Location ID Example: curl https://api.teeseng.uk/api/v0/location/update -H "Authorization: provide + (Required) Location ID Example: curl https://api.teeseng.uk/api/v0/location/update + -H "Authorization: provide your API key here" -d '{"id": "7"}' @@ -232,7 +242,8 @@ Location name JSON Location name. - (Optional) Location name. Example: curl https://api.teeseng.uk/api/v0/location/new -H "Authorization: provide + (Optional) Location name. Example: curl https://api.teeseng.uk/api/v0/location/new + -H "Authorization: provide your API key here" -d '{"name":"Location name"}' @@ -240,7 +251,8 @@ Added by JSON System or Admin - (Optional) System or Admin Example: curl https://api.teeseng.uk/api/v0/location/new -H "Authorization: provide + (Optional) System or Admin Example: curl https://api.teeseng.uk/api/v0/location/new + -H "Authorization: provide your API key here" -d '{"added_by":"system"}' @@ -248,7 +260,8 @@ Description JSON Description of Location - (Optional) System or Admin Example: curl https://api.teeseng.uk/api/v0/location/new -H "Authorization: provide + (Optional) System or Admin Example: curl https://api.teeseng.uk/api/v0/location/new + -H "Authorization: provide your API key here" -d '{"description":"test"}' @@ -260,11 +273,12 @@

    Delete Location (Only for system or admin API key)

    To delete an Location you need to make a DELETE call to the following url :
    - https://api.teeseng.uk/api/v0/location/delete + https://api.teeseng.uk/api/v0/location/delete

    Example :
    - curl https://api.teeseng.uk/api/v0/location/delete -H "Content-Type: application/json" -X POST -d '{"id": "7"}' + curl https://api.teeseng.uk/api/v0/location/delete -H "Content-Type: application/json" -X POST -d '{"id": "7"}'


    QUERY PARAMETERS

    @@ -281,7 +295,8 @@ Authorization JSON Your API key. - (Required) example: curl https://api.teeseng.uk/api/v0/location/delete -H "Authorization: {provide your + (Required) example: curl https://api.teeseng.uk/api/v0/location/delete -H + "Authorization: {provide your API key here}" @@ -289,7 +304,8 @@ ID JSON Location ID - (Required) Location ID Example: curl https://api.teeseng.uk/api/v0/location/delete -H "Authorization: provide + (Required) Location ID Example: curl https://api.teeseng.uk/api/v0/location/delete + -H "Authorization: provide your API key here" -d '{"id": "7"}' @@ -297,24 +313,6 @@
    • - - - - - - - - - - - - - - - - - -

    Errors

    @@ -360,6 +358,38 @@

    +
    +
    +

    API Keys

    + +

    + You can generate API Keys here: +

    + + + + + + + + + + + + + + + + + + + +
    NamePublic KeyPrivate KeyKey TypeCreated
    API KeyGR234-We34greR-234-fEGType2024-01-22
    +
    +
    + + + diff --git a/consumerWebsite/views/contact.ejs b/consumerWebsite/views/contact.ejs index f93c0f2..edc98f5 100644 --- a/consumerWebsite/views/contact.ejs +++ b/consumerWebsite/views/contact.ejs @@ -1,4 +1,5 @@ <%- include('top') %> +
    diff --git a/consumerWebsite/views/learnmore.ejs b/consumerWebsite/views/learnmore.ejs index 9be0da4..f5e89e8 100644 --- a/consumerWebsite/views/learnmore.ejs +++ b/consumerWebsite/views/learnmore.ejs @@ -1,4 +1,5 @@ <%- include('top') %> +

    @@ -38,5 +39,4 @@

    - <%- include('bot') %> diff --git a/consumerWebsite/views/profile.ejs b/consumerWebsite/views/profile.ejs index c779825..4163961 100644 --- a/consumerWebsite/views/profile.ejs +++ b/consumerWebsite/views/profile.ejs @@ -1,8 +1,5 @@ <%- include('top') %> - +
    diff --git a/consumerWebsite/views/top.ejs b/consumerWebsite/views/top.ejs index 59cc921..74ab3e8 100644 --- a/consumerWebsite/views/top.ejs +++ b/consumerWebsite/views/top.ejs @@ -21,9 +21,6 @@ - - -