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/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/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/public/images/404.png b/consumerWebsite/public/images/404.png index bcf5936..6b34292 100644 Binary files a/consumerWebsite/public/images/404.png and b/consumerWebsite/public/images/404.png differ diff --git a/consumerWebsite/public/images/4044.png b/consumerWebsite/public/images/4044.png deleted file mode 100644 index 6b34292..0000000 Binary files a/consumerWebsite/public/images/4044.png and /dev/null differ 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/routes/render.js b/consumerWebsite/routes/render.js index f2c52e7..d347453 100644 --- a/consumerWebsite/routes/render.js +++ b/consumerWebsite/routes/render.js @@ -66,11 +66,17 @@ router.get("/profile", function (req, res, next) { res.render("profile"); }); + //forgot password page router.get("/forgotpassword", function (req, res, next) { res.render("forgotpassword"); }); +//resetted password page +router.get("/resetpassword", function (req, res, next) { + res.render("resetpassword"); +}); + //contact page router.get("/contact", function (req, res, next) { res.render("contact"); @@ -82,5 +88,4 @@ router.get("/api", function (req, res, next) { }); - module.exports = router; diff --git a/consumerWebsite/views/api.ejs b/consumerWebsite/views/api.ejs index eeabf16..fd19cb7 100644 --- a/consumerWebsite/views/api.ejs +++ b/consumerWebsite/views/api.ejs @@ -6,6 +6,7 @@ !--> <%- include('top') %> +
@@ -38,8 +39,8 @@
  • GET STARTED
    • -
  • - Get Data From API +
  • + Generate API
  • Errors @@ -86,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}" @@ -118,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}" @@ -129,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 :
    @@ -154,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}" @@ -162,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"}' @@ -170,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"}' @@ -178,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"}' @@ -190,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"}

    @@ -215,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}" @@ -223,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"}' @@ -231,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"}' @@ -239,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"}' @@ -247,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"}' @@ -259,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

    @@ -280,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}" @@ -288,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"}' @@ -296,24 +313,6 @@
    • - - - - - - - - - - - - - - - - - -

    Errors

    @@ -359,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/bot.ejs b/consumerWebsite/views/bot.ejs index 04adff0..931a5a2 100644 --- a/consumerWebsite/views/bot.ejs +++ b/consumerWebsite/views/bot.ejs @@ -86,7 +86,6 @@ - \ No newline at end of file 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/forgotPassword.ejs b/consumerWebsite/views/forgotPassword.ejs index 4018890..ca37f61 100644 --- a/consumerWebsite/views/forgotPassword.ejs +++ b/consumerWebsite/views/forgotPassword.ejs @@ -4,7 +4,7 @@
    Reset Password
    -
    + diff --git a/consumerWebsite/views/learnmore.ejs b/consumerWebsite/views/learnmore.ejs index 70cfd55..f5e89e8 100644 --- a/consumerWebsite/views/learnmore.ejs +++ b/consumerWebsite/views/learnmore.ejs @@ -1,4 +1,5 @@ <%- include('top') %> +

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

    -<%- include('bot') %> \ No newline at end of file +<%- include('bot') %> diff --git a/consumerWebsite/views/profile.ejs b/consumerWebsite/views/profile.ejs index 03f9351..4163961 100644 --- a/consumerWebsite/views/profile.ejs +++ b/consumerWebsite/views/profile.ejs @@ -1,64 +1,112 @@ <%- 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 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 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 @@ - - -