diff --git a/consumerWebsite/public/contactform.html b/consumerWebsite/public/contactform.html deleted file mode 100644 index 04d0e94..0000000 --- a/consumerWebsite/public/contactform.html +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
-
- -

Contact -

-
-
- - -
-
-
    -
  1. - Home -
    2. -
  2. Contact
    3. -
-
- - -
- -
- - -
- -
-

Contact Details

-

- 50 Ubi Ave 3 -
S(408866) -
-

-

- P: (+65) 90064959 -

-

- E: - leongdingxuan@gmail.com - -

-

- H: Monday - Friday: 9:00 AM to 5:00 PM -

-
-
- - - - -
-
-

Send us a Message

-
- -
- - -
-
- - -
-
- - -
- -
-
-
- -
- - - - - - - - - - - - - - - - - - \ 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

-
- -
-
- -
-
- - - - - - - - - - - \ 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