diff --git a/Vivian/login.html b/Vivian/login.html deleted file mode 100644 index 25f261c..0000000 --- a/Vivian/login.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - Login Page - - - -

Login

-
- - - - - - - -
- - diff --git a/Vivian/login.js b/Vivian/login.js deleted file mode 100644 index a88887f..0000000 --- a/Vivian/login.js +++ /dev/null @@ -1,37 +0,0 @@ -function validateForm() { - var username = document.getElementById('email').value; - var password = document.getElementById('password').value; - - // Perform basic validation - if (!email || !password) { - alert('Please enter both email and password'); - return; - } - - // If validation passes, send data to the server - sendDataToServer(email, password); -} - -function sendDataToServer(email, password) { - // Use AJAX or fetch to send data to the server - // Example using fetch: - fetch('/login', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ email, password }), - }) - .then(response => response.json()) - .then(data => { - // Handle the response from the server - console.log(data); - if (data.success) { - // Redirect or perform other actions for successful login - alert('Login successful'); - } else { - alert('Login failed. Please check your credentials.'); - } - }) - .catch(error => console.error('Error:', error)); -} diff --git a/Vivian/signup.html b/Vivian/signup.html deleted file mode 100644 index 28a7d84..0000000 --- a/Vivian/signup.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - Signup Page - - - -

Signup

-
- - - - - - - - - - -
- - diff --git a/Vivian/signup.js b/Vivian/signup.js deleted file mode 100644 index 2f036a4..0000000 --- a/Vivian/signup.js +++ /dev/null @@ -1,35 +0,0 @@ -function validateForm() { - var userid = document.getElementById('user_id').value; - var username = document.getElementById('user_name').value; - var email = document.getElementById('email').value; - var password = document.getElementById('password').value; - var confirmPassword = document.getElementById('confirmPassword').value; - var email = document.getElementById('email').value; - - // Perform basic validation - if (password !== confirmPassword) { - alert('Passwords do not match'); - return; - } - - // If validation passes, send data to the server - sendDataToServer(username, email, password); -} - -function sendDataToServer(username, password) { - // Use AJAX or fetch to send data to the server - // Example using fetch: - fetch('/signup', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ username, email, password }), - }) - .then(response => response.json()) - .then(data => { - // Handle the response from the server - console.log(data); - }) - .catch(error => console.error('Error:', error)); -} diff --git a/consumerWebsite/Vivian/eco saver.mwb b/consumerWebsite/Vivian/eco saver.mwb deleted file mode 100644 index 563e07f..0000000 Binary files a/consumerWebsite/Vivian/eco saver.mwb and /dev/null differ diff --git a/consumerWebsite/Vivian/index.php b/consumerWebsite/Vivian/index.php deleted file mode 100644 index ba3725b..0000000 --- a/consumerWebsite/Vivian/index.php +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - Hello, world! - - -

Hello, world!

- - - - - - - - \ No newline at end of file diff --git a/consumerWebsite/Vivian/login.html b/consumerWebsite/Vivian/login.html deleted file mode 100644 index 25f261c..0000000 --- a/consumerWebsite/Vivian/login.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - Login Page - - - -

Login

-
- - - - - - - -
- - diff --git a/consumerWebsite/Vivian/server.js b/consumerWebsite/Vivian/server.js deleted file mode 100644 index 6d8edc6..0000000 --- a/consumerWebsite/Vivian/server.js +++ /dev/null @@ -1,44 +0,0 @@ -const express = require('express'); -const bodyParser = require('body-parser'); -const mysql = require('mysql'); - -const app = express(); -const port = 3000; - -app.use(bodyParser.json()); - -const db = mysql.createConnection({ - host: 'localhost', - user: 'root', - password: 'your_mysql_password', - database: 'your_database_name', -}); - -db.connect(err => { - if (err) { - console.error('Error connecting to MySQL:', err); - } else { - console.log('Connected to MySQL'); - } -}); - -app.post('/signup', (req, res) => { - const { username, password } = req.body; - - // Perform server-side validation if needed - - const sql = 'INSERT INTO users (username, password) VALUES (?, ?)'; - db.query(sql, [username, password], (err, result) => { - if (err) { - console.error('Error executing SQL query:', err); - res.status(500).json({ success: false, message: 'Internal Server Error' }); - } else { - console.log('User signed up successfully'); - res.json({ success: true, message: 'User signed up successfully' }); - } - }); -}); - -app.listen(port, () => { - console.log(`Server is running on http://localhost:${port}`); -}); diff --git a/consumerWebsite/Vivian/signup.html b/consumerWebsite/Vivian/signup.html deleted file mode 100644 index 28a7d84..0000000 --- a/consumerWebsite/Vivian/signup.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - Signup Page - - - -

Signup

-
- - - - - - - - - - -
- - diff --git a/consumerWebsite/Vivian/signup.js b/consumerWebsite/Vivian/signup.js deleted file mode 100644 index 2f036a4..0000000 --- a/consumerWebsite/Vivian/signup.js +++ /dev/null @@ -1,35 +0,0 @@ -function validateForm() { - var userid = document.getElementById('user_id').value; - var username = document.getElementById('user_name').value; - var email = document.getElementById('email').value; - var password = document.getElementById('password').value; - var confirmPassword = document.getElementById('confirmPassword').value; - var email = document.getElementById('email').value; - - // Perform basic validation - if (password !== confirmPassword) { - alert('Passwords do not match'); - return; - } - - // If validation passes, send data to the server - sendDataToServer(username, email, password); -} - -function sendDataToServer(username, password) { - // Use AJAX or fetch to send data to the server - // Example using fetch: - fetch('/signup', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ username, email, password }), - }) - .then(response => response.json()) - .then(data => { - // Handle the response from the server - console.log(data); - }) - .catch(error => console.error('Error:', error)); -} diff --git a/consumerWebsite/public/404.html b/consumerWebsite/public/404.html index c78fd96..63805cf 100644 --- a/consumerWebsite/public/404.html +++ b/consumerWebsite/public/404.html @@ -1,11 +1,11 @@ + - N & LW Lawn Care - Landscaping Bootstrap4 HTML5 Responsive Template @@ -13,67 +13,42 @@ + - - - + + + + +
@@ -84,8 +59,8 @@
- -
+ +
  1. @@ -101,40 +76,39 @@

We can’t find the page your are looking for. You can check out our Homepage.

- Back To Homepage + Back To Homepage
-
- + + - - +
+
+

All Rights Reserved. © 2023 EcoSaver +

+
+ - - - + + + - + + \ No newline at end of file diff --git a/consumerWebsite/public/contact.html b/consumerWebsite/public/contact.html deleted file mode 100644 index 6987ae3..0000000 --- a/consumerWebsite/public/contact.html +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - N & LW Lawn Care - Landscaping Bootstrap4 HTML5 Responsive Template - - - - - - - - - - - - -
-
- -

Contact -

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

Contact Details

-

- Blk 645 Jalan Tenaga -
S(410645) -
-

-

- P: (+65) 90064959 -

-

- E: - leongdingxuan@gmail.com - -

-

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

-
-
- - - - -
-
-

Send us a Message

-
-
-
- - -

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

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/contact.css b/consumerWebsite/public/css/contact.css new file mode 100644 index 0000000..349ecc0 --- /dev/null +++ b/consumerWebsite/public/css/contact.css @@ -0,0 +1,34 @@ +.contact-left { + width: 100%; /* Make the form take the whole width */ + } + + form { + background-color: #fff; + padding: 20px; + border-radius: 8px; + box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); + } + + input, + textarea, + button { + width: 100%; + margin-bottom: 10px; + padding: 10px; + box-sizing: border-box; + border: 1px solid #ccc; + border-radius: 4px; + font-size: 14px; + } + + button { + background-color: #007bff; + color: #fff; + cursor: pointer; + max-width: 150px; + margin-left: auto; + } + + button:hover { + background-color: #0056b3; + } \ No newline at end of file diff --git a/consumerWebsite/public/css/forgot.css b/consumerWebsite/public/css/forgot.css new file mode 100644 index 0000000..cde0e97 --- /dev/null +++ b/consumerWebsite/public/css/forgot.css @@ -0,0 +1,83 @@ +@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@200;300;400;500;600;700&display=swap"); + +* { + margin: 0; + padding: 0; + box-sizing: border-box; + font-family: "Poppins", + sans-serif; +} + +body { + min-height: 100vh; + display: flex; + align-items: center; + justify-content: center; + background: #f0faff; +} + +.wrapper { + position: relative; + max-width: 470px; + width: 100%; + border-radius: 12px; + padding: 20px 30px 120px; + background: #fff; + box-shadow: 0 5px 10px rgba(0, + 0, + 0, + 0.1); + overflow: hidden; +} + +.form header { + font-size: 30px; + text-align: center; + color: #333; + font-weight: 600; + cursor: pointer; +} + +.wrapper.active .form.login header { + opacity: 1; +} + +.wrapper.active .signup header { + opacity: 0.6; +} + +.wrapper form { + display: flex; + flex-direction: column; + gap: 20px; + margin-top: 40px; +} + +form a { + color: #333; + text-decoration: none; +} + +form input { + height: 60px; + outline: none; + border: none; + padding: 0 15px; + font-size: 16px; + font-weight: 400; + color: #333; + border-radius: 8px; + background: #fff; + border: 1px solid #aaa; +} + + +form input[type="submit"] { + margin-top: 15px; + padding: none; + font-size: 18px; + font-weight: 500; + cursor: pointer; + background: #4070f4; + color: #fff; +} \ No newline at end of file diff --git a/consumerWebsite/public/css/learnmore.css b/consumerWebsite/public/css/learnmore.css new file mode 100644 index 0000000..f8a3b5b --- /dev/null +++ b/consumerWebsite/public/css/learnmore.css @@ -0,0 +1,6 @@ +img { + display: block; + margin: auto; + max-width: 100%; + max-height: 100vh; +} \ No newline at end of file diff --git a/consumerWebsite/public/css/reset.css b/consumerWebsite/public/css/reset.css new file mode 100644 index 0000000..320aece --- /dev/null +++ b/consumerWebsite/public/css/reset.css @@ -0,0 +1,80 @@ +@import url('https://fonts.googleapis.com/css?family=Lato:400,700&display=swap'); +body { + margin: 0; + padding: 0; + font-family: 'Lato', sans-serif; + background-color: #f9f9f9; + color: #000000; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 100vh; + } + + table { + border-collapse: collapse; + margin: 0 auto; + width: 600px; + } + + td { + padding: 15px; + } + + .main-header { + background-color: #4070f4; + } + + .main-header img { + width: 10%; + vertical-align: middle; /* Center the image vertically */ + } + + .main-header h1 { + color: #ffffff; + font-size: 28px; + text-align: center; + } + + .content-section { + background-color: #ffffff; + padding: 40px; + } + + .content-section h2 { + font-size: 18px; + line-height: 25.2px; + color: #666666; + } + + .footer { + background-color: #1c103b; + text-align: center; + } + + .footer p { + font-size: 14px; + color: #ffffff; + } + + .wrapper { + position: relative; + max-width: 470px; + width: 100%; + border-radius: 12px; + padding: 20px + 30px + 120px; + background: #4070f4; + box-shadow: 0 + 5px + 10px + rgba( + 0, + 0, + 0, + 0.1 + ); + overflow: hidden; + } diff --git a/consumerWebsite/public/css/sp.css b/consumerWebsite/public/css/sp.css new file mode 100644 index 0000000..2cc21bb --- /dev/null +++ b/consumerWebsite/public/css/sp.css @@ -0,0 +1,204 @@ +@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@200;300;400;500;600;700&display=swap"); +* { + margin: 0; + padding: 0; + box-sizing: border-box; + font-family: "Poppins", + sans-serif; +} +body { + min-height: 100vh; + display: flex; + align-items: center; + justify-content: center; + background: #f0faff; +} +.wrapper { + position: relative; + max-width: 470px; + width: 100%; + border-radius: 12px; + padding: 20px + 30px + 120px; + background: #4070f4; + box-shadow: 0 + 5px + 10px + rgba( + 0, + 0, + 0, + 0.1 + ); + overflow: hidden; +} + +.form.login { + position: absolute; + left: 50%; + bottom: -86%; + transform: translateX( + -50% + ); + width: calc( + 100% + + 220px + ); + padding: 20px + 140px; + border-radius: 50%; + height: 100%; + background: #fff; + transition: all + 0.6s + ease; +} +.wrapper.active + .form.login { + bottom: -12%; + border-radius: 35%; + box-shadow: 0 -5px + 10px rgba(0, 0, 0, 0.1); +} +.form + header { + font-size: 30px; + text-align: center; + color: #fff; + font-weight: 600; + cursor: pointer; +} +.form.login + header { + color: #333; + opacity: 0.6; +} +.wrapper.active + .form.login + header { + opacity: 1; +} +.wrapper.active + .signup + header { + opacity: 0.6; +} +.wrapper + form { + display: flex; + flex-direction: column; + gap: 20px; + margin-top: 40px; +} +form + input { + height: 60px; + outline: none; + border: none; + padding: 0 + 15px; + font-size: 16px; + font-weight: 400; + color: #333; + border-radius: 8px; + background: #fff; +} +.form.login + input { + border: 1px + solid + #aaa; +} +.form.login + input:focus { + box-shadow: 0 + 1px 0 + #ddd; +} +form + .checkbox { + display: flex; + align-items: center; + gap: 10px; +} +.checkbox + input[type="checkbox"] { + height: 16px; + width: 16px; + accent-color: #fff; + cursor: pointer; +} +form + .checkbox + label { + cursor: pointer; + color: #fff; +} +form a { + color: #333; + text-decoration: none; +} +form + a:hover { + text-decoration: underline; +} +form + input[type="submit"] { + margin-top: 15px; + padding: none; + font-size: 18px; + font-weight: 500; + cursor: pointer; +} +.form.login + input[type="submit"] { + background: #4070f4; + color: #fff; + border: none; +} + + +.form.login .forgot-password-section { + display: none; + margin-top: 20px; +} + +.form.login .forgot-password-section p { + color: #333; + font-size: 16px; + margin-bottom: 10px; +} + +.form.login .forgot-password-section input[type="text"], +.form.login .forgot-password-section input[type="submit"] { + width: 100%; + height: 50px; + outline: none; + border: 1px solid #aaa; + padding: 0 15px; + font-size: 16px; + font-weight: 400; + color: #333; + border-radius: 8px; + margin-bottom: 15px; +} + +.form.login .forgot-password-section input[type="submit"] { + background: #4070f4; + color: #fff; + border: none; + cursor: pointer; +} + +.form.login .back-to-login { + display: block; + color: #4070f4; + text-decoration: none; + font-size: 14px; + cursor: pointer; +} + +.form.login .back-to-login:hover { + text-decoration: underline; +} diff --git a/consumerWebsite/public/css/style.css b/consumerWebsite/public/css/style.css index bb5296b..d707ecb 100644 --- a/consumerWebsite/public/css/style.css +++ b/consumerWebsite/public/css/style.css @@ -577,7 +577,6 @@ footer p { text-align: center; } - .pricing-box{ padding: 30px 0px; } diff --git a/Vivian/eco saver.mwb b/consumerWebsite/public/eco saver.mwb similarity index 100% rename from Vivian/eco saver.mwb rename to consumerWebsite/public/eco saver.mwb diff --git a/consumerWebsite/public/forgotpassword.html b/consumerWebsite/public/forgotpassword.html new file mode 100644 index 0000000..6de9045 --- /dev/null +++ b/consumerWebsite/public/forgotpassword.html @@ -0,0 +1,27 @@ + + + + + + + + + + + +
+
+
Reset Password
+
+ + + + +
+
+ Dont have an account? Sign Up +
+
+ + + \ No newline at end of file diff --git a/consumerWebsite/public/images/blog-img-01.jpg b/consumerWebsite/public/images/blog-img-01.jpg deleted file mode 100644 index 0869dd8..0000000 Binary files a/consumerWebsite/public/images/blog-img-01.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/blog-img-02.jpg b/consumerWebsite/public/images/blog-img-02.jpg deleted file mode 100644 index 177cf25..0000000 Binary files a/consumerWebsite/public/images/blog-img-02.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/blog-img-03.jpg b/consumerWebsite/public/images/blog-img-03.jpg deleted file mode 100644 index c85451f..0000000 Binary files a/consumerWebsite/public/images/blog-img-03.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/blog-img-04.jpg b/consumerWebsite/public/images/blog-img-04.jpg deleted file mode 100644 index ea5dbfe..0000000 Binary files a/consumerWebsite/public/images/blog-img-04.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/blog-item-01.jpg b/consumerWebsite/public/images/blog-item-01.jpg deleted file mode 100644 index 666c5b2..0000000 Binary files a/consumerWebsite/public/images/blog-item-01.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/logo_01.png b/consumerWebsite/public/images/logo_01.png deleted file mode 100644 index 829789f..0000000 Binary files a/consumerWebsite/public/images/logo_01.png and /dev/null differ diff --git a/consumerWebsite/public/images/logo_02.png b/consumerWebsite/public/images/logo_02.png deleted file mode 100644 index bec2247..0000000 Binary files a/consumerWebsite/public/images/logo_02.png and /dev/null differ diff --git a/consumerWebsite/public/images/logo_03.png b/consumerWebsite/public/images/logo_03.png deleted file mode 100644 index 93b673d..0000000 Binary files a/consumerWebsite/public/images/logo_03.png and /dev/null differ diff --git a/consumerWebsite/public/images/logo_04.png b/consumerWebsite/public/images/logo_04.png deleted file mode 100644 index 8a2c683..0000000 Binary files a/consumerWebsite/public/images/logo_04.png and /dev/null differ diff --git a/consumerWebsite/public/images/logo_05.png b/consumerWebsite/public/images/logo_05.png deleted file mode 100644 index 0a74b63..0000000 Binary files a/consumerWebsite/public/images/logo_05.png and /dev/null differ diff --git a/consumerWebsite/public/images/logo_06.png b/consumerWebsite/public/images/logo_06.png deleted file mode 100644 index 98a695f..0000000 Binary files a/consumerWebsite/public/images/logo_06.png and /dev/null differ diff --git a/consumerWebsite/public/images/map.png b/consumerWebsite/public/images/map.png new file mode 100644 index 0000000..7738be4 Binary files /dev/null and b/consumerWebsite/public/images/map.png differ diff --git a/consumerWebsite/public/images/passwordreset.png b/consumerWebsite/public/images/passwordreset.png new file mode 100644 index 0000000..98d364c Binary files /dev/null and b/consumerWebsite/public/images/passwordreset.png differ diff --git a/consumerWebsite/public/images/portfolio-big-01.jpg b/consumerWebsite/public/images/portfolio-big-01.jpg deleted file mode 100644 index 3a2a20f..0000000 Binary files a/consumerWebsite/public/images/portfolio-big-01.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/portfolio-big-02.jpg b/consumerWebsite/public/images/portfolio-big-02.jpg deleted file mode 100644 index 678a234..0000000 Binary files a/consumerWebsite/public/images/portfolio-big-02.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/portfolio-big-03.jpg b/consumerWebsite/public/images/portfolio-big-03.jpg deleted file mode 100644 index 135020b..0000000 Binary files a/consumerWebsite/public/images/portfolio-big-03.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/portfolio-big-04.jpg b/consumerWebsite/public/images/portfolio-big-04.jpg deleted file mode 100644 index 6e6310d..0000000 Binary files a/consumerWebsite/public/images/portfolio-big-04.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/portfolio-big-05.jpg b/consumerWebsite/public/images/portfolio-big-05.jpg deleted file mode 100644 index f52ffd5..0000000 Binary files a/consumerWebsite/public/images/portfolio-big-05.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/portfolio-big-Item.jpg b/consumerWebsite/public/images/portfolio-big-Item.jpg deleted file mode 100644 index 0392db4..0000000 Binary files a/consumerWebsite/public/images/portfolio-big-Item.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/portfolio-img-01.jpg b/consumerWebsite/public/images/portfolio-img-01.jpg deleted file mode 100644 index e6c3ef4..0000000 Binary files a/consumerWebsite/public/images/portfolio-img-01.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/portfolio-img-02.jpg b/consumerWebsite/public/images/portfolio-img-02.jpg deleted file mode 100644 index ccfef1e..0000000 Binary files a/consumerWebsite/public/images/portfolio-img-02.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/portfolio-img-03.jpg b/consumerWebsite/public/images/portfolio-img-03.jpg deleted file mode 100644 index 5cd92a5..0000000 Binary files a/consumerWebsite/public/images/portfolio-img-03.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/portfolio-img-04.jpg b/consumerWebsite/public/images/portfolio-img-04.jpg deleted file mode 100644 index 5bb9e2e..0000000 Binary files a/consumerWebsite/public/images/portfolio-img-04.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/portfolio-img-05.jpg b/consumerWebsite/public/images/portfolio-img-05.jpg deleted file mode 100644 index d33416c..0000000 Binary files a/consumerWebsite/public/images/portfolio-img-05.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/post-img-02.jpg b/consumerWebsite/public/images/post-img-02.jpg deleted file mode 100644 index 5a75e09..0000000 Binary files a/consumerWebsite/public/images/post-img-02.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/post-img-03.jpg b/consumerWebsite/public/images/post-img-03.jpg deleted file mode 100644 index 7898893..0000000 Binary files a/consumerWebsite/public/images/post-img-03.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/services-big.jpg b/consumerWebsite/public/images/services-big.jpg deleted file mode 100644 index 10c21e5..0000000 Binary files a/consumerWebsite/public/images/services-big.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/services-img-01.jpg b/consumerWebsite/public/images/services-img-01.jpg deleted file mode 100644 index cd4f1d4..0000000 Binary files a/consumerWebsite/public/images/services-img-01.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/services-img-02.jpg b/consumerWebsite/public/images/services-img-02.jpg deleted file mode 100644 index 022fb85..0000000 Binary files a/consumerWebsite/public/images/services-img-02.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/services-img-03.jpg b/consumerWebsite/public/images/services-img-03.jpg deleted file mode 100644 index 325092f..0000000 Binary files a/consumerWebsite/public/images/services-img-03.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/team_01.jpg b/consumerWebsite/public/images/team_01.jpg deleted file mode 100644 index caa213c..0000000 Binary files a/consumerWebsite/public/images/team_01.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/team_02.jpg b/consumerWebsite/public/images/team_02.jpg deleted file mode 100644 index a0ccc3b..0000000 Binary files a/consumerWebsite/public/images/team_02.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/team_03.jpg b/consumerWebsite/public/images/team_03.jpg deleted file mode 100644 index ef235f6..0000000 Binary files a/consumerWebsite/public/images/team_03.jpg and /dev/null differ diff --git a/consumerWebsite/public/images/testi_01.png b/consumerWebsite/public/images/testi_01.png deleted file mode 100644 index a8a30b1..0000000 Binary files a/consumerWebsite/public/images/testi_01.png and /dev/null differ diff --git a/consumerWebsite/public/images/testi_02.png b/consumerWebsite/public/images/testi_02.png deleted file mode 100644 index 1e3ff78..0000000 Binary files a/consumerWebsite/public/images/testi_02.png and /dev/null differ diff --git a/consumerWebsite/public/images/testi_03.png b/consumerWebsite/public/images/testi_03.png deleted file mode 100644 index 215f7f1..0000000 Binary files a/consumerWebsite/public/images/testi_03.png and /dev/null differ diff --git a/consumerWebsite/public/index.html b/consumerWebsite/public/index.html index 38274fa..5e69868 100644 --- a/consumerWebsite/public/index.html +++ b/consumerWebsite/public/index.html @@ -36,16 +36,20 @@ News
  • - Contact + Contact
  • Profile
    • +
  • + Logout +
    • +
    @@ -109,10 +113,10 @@

    Air Quality Index

    -

    18 PSI

    +

    15 - 18 PSI

    - Learn More + Learn More
    @@ -120,10 +124,10 @@

    Temperature

    -

    30°

    +

    30° - 37°

    - Learn More + Learn More
    diff --git a/consumerWebsite/public/js/contact.js b/consumerWebsite/public/js/contact.js new file mode 100644 index 0000000..87b1e17 --- /dev/null +++ b/consumerWebsite/public/js/contact.js @@ -0,0 +1,42 @@ +const newAccessKey = '7f7ce777-6a56-4e5e-bfac-3b83c6453e65'; + +document.addEventListener('DOMContentLoaded', () => { + const form = document.getElementById('form'); + + // Set the new value for the access_key input field + form.querySelector('input[name="access_key"]').value = newAccessKey; + + form.addEventListener('submit', async (event) => { + event.preventDefault(); // Prevent default form submission + + // Create a FormData object to include the key + const formData = new FormData(form); + + // Submit the form using fetch API + try { + const response = await fetch('https://api.web3forms.com/submit', { + method: 'POST', + body: formData + }); + + const result = await response.json(); + + // Handle the API response + //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) { + //console.error('Error:', error); + } + }); +}); diff --git a/consumerWebsite/public/js/contact_me.js b/consumerWebsite/public/js/contact_me.js deleted file mode 100644 index 6e91590..0000000 --- a/consumerWebsite/public/js/contact_me.js +++ /dev/null @@ -1,75 +0,0 @@ -$(function() { - - $("#contactForm input,#contactForm textarea").jqBootstrapValidation({ - preventSubmit: true, - submitError: function($form, event, errors) { - // additional error messages or events - }, - submitSuccess: function($form, event) { - event.preventDefault(); // prevent default submit behaviour - // get values from FORM - var name = $("input#name").val(); - var email = $("input#email").val(); - var phone = $("input#phone").val(); - var message = $("textarea#message").val(); - var firstName = name; // For Success/Failure Message - // Check for white space in name for Success/Fail message - if (firstName.indexOf(' ') >= 0) { - firstName = name.split(' ').slice(0, -1).join(' '); - } - $this = $("#sendMessageButton"); - $this.prop("disabled", true); // Disable submit button until AJAX call is complete to prevent duplicate messages - $.ajax({ - url: "././mail/contact_me.php", - type: "POST", - data: { - name: name, - phone: phone, - email: email, - message: message - }, - cache: false, - success: function() { - // Success message - $('#success').html("
    "); - $('#success > .alert-success').html(""); - $('#success > .alert-success') - .append("Your message has been sent. "); - $('#success > .alert-success') - .append('
    '); - //clear all fields - $('#contactForm').trigger("reset"); - }, - error: function() { - // Fail message - $('#success').html("
    "); - $('#success > .alert-danger').html(""); - $('#success > .alert-danger').append($("").text("Sorry " + firstName + ", it seems that my mail server is not responding. Please try again later!")); - $('#success > .alert-danger').append('
    '); - //clear all fields - $('#contactForm').trigger("reset"); - }, - complete: function() { - setTimeout(function() { - $this.prop("disabled", false); // Re-enable submit button when AJAX call is complete - }, 1000); - } - }); - }, - filter: function() { - return $(this).is(":visible"); - }, - }); - - $("a[data-toggle=\"tab\"]").click(function(e) { - e.preventDefault(); - $(this).tab("show"); - }); -}); - -/*When clicking on Full hide fail/success boxes */ -$('#name').focus(function() { - $('#success').html(''); -}); diff --git a/consumerWebsite/Vivian/login.js b/consumerWebsite/public/js/login.js similarity index 87% rename from consumerWebsite/Vivian/login.js rename to consumerWebsite/public/js/login.js index a88887f..056151c 100644 --- a/consumerWebsite/Vivian/login.js +++ b/consumerWebsite/public/js/login.js @@ -1,14 +1,13 @@ -function validateForm() { - var username = document.getElementById('email').value; +function validateFormLogin() { + var email = document.getElementById('email').value; var password = document.getElementById('password').value; - + // Perform basic validation if (!email || !password) { alert('Please enter both email and password'); return; } - // If validation passes, send data to the server sendDataToServer(email, password); } diff --git a/consumerWebsite/public/js/resetpassword.js b/consumerWebsite/public/js/resetpassword.js new file mode 100644 index 0000000..e69de29 diff --git a/Vivian/server.js b/consumerWebsite/public/js/server.js similarity index 100% rename from Vivian/server.js rename to consumerWebsite/public/js/server.js diff --git a/consumerWebsite/public/js/signup.js b/consumerWebsite/public/js/signup.js new file mode 100644 index 0000000..4fcf511 --- /dev/null +++ b/consumerWebsite/public/js/signup.js @@ -0,0 +1,53 @@ +function validateFormSignup() { + var username = document.getElementById('username').value; + var email = document.getElementById('email').value; + var password = document.getElementById('password').value; + var confirmPassword = document.getElementById('confirmPassword').value; + + + if (!/^[a-zA-Z0-9]+$/.test(username)) { + alert("Username can only contain letters and numbers."); + return false; + } + + if (!/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/.test(email)) { + alert("Enter a valid email address."); + return false; + } + + if (!/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/.test(password)) { + alert("Password must be more than 8 characters and contain at least 1 upper and lower case letter and 1 special character."); + return false; + } + + if (password !== confirmPassword) { + alert('Passwords do not match'); + return; + } + + if (!signupCheck.checked) { + alert("Please accept the terms & conditions to proceed."); + return false; + } + + // If validation passes, send data to the server + sendDataToServer(username, email, password); +} + +function sendDataToServer(username, password) { + // Use AJAX or fetch to send data to the server + // Example using fetch: + fetch('/signup', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ username, email, password }), + }) + .then(response => response.json()) + .then(data => { + // Handle the response from the server + console.log(data); + }) + .catch(error => console.error('Error:', error)); +} diff --git a/consumerWebsite/public/learnmore.html b/consumerWebsite/public/learnmore.html new file mode 100644 index 0000000..ada7a5d --- /dev/null +++ b/consumerWebsite/public/learnmore.html @@ -0,0 +1,153 @@ + + + + + + + + + EcoSaver + + + + + + + + + + + + + +
    +
    + +
    + Map Image +
    + + +
    +
    + + +
    +
    +
    +
    +
    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/public/mail/contact_me.php b/consumerWebsite/public/mail/contact_me.php deleted file mode 100644 index 9770270..0000000 --- a/consumerWebsite/public/mail/contact_me.php +++ /dev/null @@ -1,26 +0,0 @@ - diff --git a/consumerWebsite/public/news.html b/consumerWebsite/public/news.html index 7d72ac8..23d79c8 100644 --- a/consumerWebsite/public/news.html +++ b/consumerWebsite/public/news.html @@ -36,11 +36,14 @@ News
  • - Contact + Contact
  • Profile
    • +
  • + Logout +
    • @@ -74,9 +77,12 @@
    Card image Blog
    -

    Singapore's air quality hits unhealthy range, 'slightly hazy' conditions forecast for Saturday

    -

    he National Environment Agency said there has been a "significant increase" in the number of hotspots in Sumatra.

    - Read More → +

    Singapore's air quality hits unhealthy range, 'slightly hazy' conditions + forecast for Saturday

    +

    he National Environment Agency said there has been a "significant increase" + in the number of hotspots in Sumatra.

    + Read More →
    Posted on October 6, 2023 by @@ -88,8 +94,13 @@ Card image Blog

    Singapore Government Agencies Stand Ready To Mitigate Impact Of Haze

    -

    As of 29 September 2023, 3pm, the 24-hr Pollutant Standards Index (PSI) is 81 (Moderate range) in the East region of Singapore. Accordingly, the 28 public agencies that make up the Government’s Haze Task Force (HTF), are ready to roll out their respective haze action plans should the air quality deteriorate into the Unhealthy range (24-hour PSI above 100).

    - Read More → +

    As of 29 September 2023, 3pm, the 24-hr Pollutant Standards Index (PSI) is + 81 (Moderate range) in the East region of Singapore. Accordingly, the 28 public agencies + that make up the Government’s Haze Task Force (HTF), are ready to roll out their respective + haze action plans should the air quality deteriorate into the Unhealthy range (24-hour PSI + above 100).

    + Read More →
    Posted on September 29, 2023 by @@ -100,9 +111,12 @@
    Card image Blog
    -

    High risk of severe transboundary haze in 2023, public advised to be prepared: Singapore institute

    -

    A latest report predicts a high risk of severe haze occurring in Southeast Asia, though not as severe as in 2015

    - Read More → +

    High risk of severe transboundary haze in 2023, public advised to be + prepared: Singapore institute

    +

    A latest report predicts a high risk of severe haze occurring in Southeast + Asia, though not as severe as in 2015

    + Read More →
    Posted on June 22, 2023 by @@ -197,24 +211,24 @@
    • -
      - -
      -
      -

      Singapore Government ...

      - 29 Sep 2023 -
      -
    -
      +
      + +
      +
      +

      Singapore Government ...

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

      High risk of severe ...

      - 22 Jun 2023 -
      -
    +
    + +
    +
    +

    High risk of severe ...

    + 22 Jun 2023 +
    +
    diff --git a/Vivian/index.php b/consumerWebsite/public/php/index.php similarity index 100% rename from Vivian/index.php rename to consumerWebsite/public/php/index.php diff --git a/consumerWebsite/public/profile.html b/consumerWebsite/public/profile.html index 2373ef3..2d4e66f 100644 --- a/consumerWebsite/public/profile.html +++ b/consumerWebsite/public/profile.html @@ -36,11 +36,14 @@ News
  • - Contact + Contact
  • Profile
    • +
  • + Logout +
    • @@ -89,7 +92,8 @@ class="form-control" placeholder="re enter password" value="">
    - +
    diff --git a/consumerWebsite/public/resetpassword.html b/consumerWebsite/public/resetpassword.html new file mode 100644 index 0000000..18f140e --- /dev/null +++ b/consumerWebsite/public/resetpassword.html @@ -0,0 +1,39 @@ + + + + + Your password has been resetted + + + + + + + + + +
    + Image +

    Your password has been resetted

    +
    + + + + + +
    +

    Hello,

    +

    Please check your email to reset your password.

    +
    + + + + + +
    +

    © 2023 EcoSaver

    +
    + + + + diff --git a/consumerWebsite/public/signuplogin.html b/consumerWebsite/public/signuplogin.html new file mode 100644 index 0000000..0bd27e6 --- /dev/null +++ b/consumerWebsite/public/signuplogin.html @@ -0,0 +1,56 @@ + + + + + + + + Login & Signup Form + + + + +
    + + + + + +
    + + + + + \ No newline at end of file