diff --git a/consumerWebsite/public/css/sp.css b/consumerWebsite/public/css/sp.css index 907b813..971c161 100644 --- a/consumerWebsite/public/css/sp.css +++ b/consumerWebsite/public/css/sp.css @@ -253,4 +253,4 @@ form .top-nav .navbar-toggler:hover{ color: #4eae3a; border-color: #4eae3a; -} \ No newline at end of file +} diff --git a/consumerWebsite/routes/render.js b/consumerWebsite/routes/render.js index eb16f7e..9bd1783 100644 --- a/consumerWebsite/routes/render.js +++ b/consumerWebsite/routes/render.js @@ -51,11 +51,27 @@ router.get('/news', function(req, res, next) { res.render('news'); }); +//learn more page +router.get('/learnmore', function(req, res, next) { + res.render('learnmore'); +}); + //login | register page router.get('/login', function(req, res, next) { res.render('signuplogin'); }); +//profile page +router.get('/profile', function(req, res, next) { + res.render('profile'); +}); + +//forgot password page +router.get('/forgotPassword', function(req, res, next) { + res.render('forgotPassword'); +}); + + //contact page router.get('/contact', function(req, res, next) { res.render('contact'); diff --git a/consumerWebsite/views/bot.ejs b/consumerWebsite/views/bot.ejs index af81d8c..9d211b0 100644 --- a/consumerWebsite/views/bot.ejs +++ b/consumerWebsite/views/bot.ejs @@ -85,5 +85,8 @@ + + + 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%

@@ -68,7 +68,7 @@

15 - 18 PSI

@@ -79,7 +79,7 @@

30° - 37°

diff --git a/consumerWebsite/views/learnmore.ejs b/consumerWebsite/views/learnmore.ejs new file mode 100644 index 0000000..70cfd55 --- /dev/null +++ b/consumerWebsite/views/learnmore.ejs @@ -0,0 +1,41 @@ +<%- 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') %> \ No newline at end of file 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 @@ + + \ No newline at end of file diff --git a/contact.js b/contact.js index 0485125..5fb66c9 100644 --- a/contact.js +++ b/contact.js @@ -24,17 +24,15 @@ document.addEventListener('DOMContentLoaded', () => { const result = await response.json(); // Handle the API response - //console.log(result); + console.log(result); if (result.success) { // Form submitted successfully, display notification alert('Form submitted successfully!'); location.reload() - // You can replace the alert with your custom notification logic } else { // Form submission failed, display error notification alert('Form submission failed. Please try again.'); - // You can replace the alert with your custom error notification logic } } catch (error) {