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 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/routes/render.js b/consumerWebsite/routes/render.js index eb16f7e..b47643a 100644 --- a/consumerWebsite/routes/render.js +++ b/consumerWebsite/routes/render.js @@ -66,6 +66,16 @@ router.get('/api', function(req, res, next) { res.render('api'); }); +//forget password page +router.get('/forgotPassword', function(req, res, next) { + res.render('forgotPassword'); +}); + +//learn more page +router.get('/forgotPassword', function(req, res, next) { + res.render('forgotPassword'); +}); + //profile page router.get('/profile', function(req, res, next) { res.render('profile'); diff --git a/consumerWebsite/views/api.ejs b/consumerWebsite/views/api.ejs index db3d1b7..172b220 100644 --- a/consumerWebsite/views/api.ejs +++ b/consumerWebsite/views/api.ejs @@ -6,6 +6,7 @@ !--> <%- 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%

@@ -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..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 @@