wmantly/mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Leo 2024-01-21 02:33:00 +08:00
parent 90f4f39795
commit c2651785df
11 changed files with 166 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
consumerWebsite/public/css/sp.css
View File

@ -251,4 +251,4 @@ form
.top-nav .navbar-toggler:hover{
color: #4eae3a;
border-color: #4eae3a;
}
}

4
consumerWebsite/public/js/contact.js
View File

@ -23,17 +23,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) {

24
consumerWebsite/routes/render.js
View File

@ -51,12 +51,36 @@ router.get('/news', function(req, res, next) {
res.render('news');
});
<<<<<<< Updated upstream
//login / register page
=======
//learn more page
router.get('/learnmore', function(req, res, next) {
res.render('learnmore');
});
//login | register page
>>>>>>> Stashed changes
router.get('/login', function(req, res, next) {
res.render('signuplogin');
});
<<<<<<< Updated upstream
//login / register page
=======
//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
>>>>>>> Stashed changes
router.get('/contact', function(req, res, next) {
res.render('contact');
});

3
consumerWebsite/views/bot.ejs
View File

@ -85,4 +85,7 @@
<!-- Bootstrap core JavaScript -->
<script src="vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<script src="js/learnmore.js"></script>
<script src="js/contact.js"></script>
<script src="js/search.js"></script>
</body>

17
consumerWebsite/views/forgotPassword.ejs Normal file
View File

@ -0,0 +1,17 @@
<%- include('logintop') %>
<body>
<section class="wrapper">
<div class="form">
<header>Reset Password</header>
<form action="resetpassword.html">
<input type="text" id="email" placeholder="Email" required />
<input type="password" id="password" placeholder="Password" required />
<input type="password" id="confirmPassword" placeholder="Confirm Password" required />
<input type="submit" onclick="validateReset()" value="Reset Password" />
</form>
<br>
<a>Dont have an account?</a> <a href="signuplogin.html">Sign Up</a>
</div>
</section>
</body>

6
consumerWebsite/views/index.ejs
View File

@ -56,7 +56,7 @@
<p class="card-text display-4"> 70% - 75% </p>
</div>
<div class="card-footer">
<a href="learnmore.html" class="btn btn-primary">Learn More</a>
<a href="/learnmore" class="btn btn-primary">Learn More</a>
</div>
</div>
</div>
@ -67,7 +67,7 @@
<p class="card-text display-4"> 15 - 18 PSI </p>
</div>
<div class="card-footer">
<a href="learnmore.html" class="btn btn-primary">Learn More</a>
<a href="/learnmore" class="btn btn-primary">Learn More</a>
</div>
</div>
</div>
@ -78,7 +78,7 @@
<p class="card-text display-4"> 30&deg; - 37&deg; </p>
</div>
<div class="card-footer">
<a href="learnmore.html" class="btn btn-primary">Learn More</a>
<a href="/learnmore" class="btn btn-primary">Learn More</a>
</div>
</div>
</div>

41
consumerWebsite/views/learnmore.ejs Normal file
View File

@ -0,0 +1,41 @@
<%- include('top') %>
<br>
<br>
<div id="map-container">
<img src="images/map.png" alt="Singapore Map" id="map">
<!-- Information boxes for each region -->
<div class="info-box" id="north">
<h3>North</h3>
<p>Air Quality Index: 15 <span id="north-aqi"></span></p>
</div>
<div class="info-box" id="south">
<h3>South</h3>
<p>Air Quality Index: 16 <span id="south-aqi"></span></p>
</div>
<div class="info-box" id="east">
<h3>East</h3>
<p>Air Quality Index: 16 <span id="east-aqi"></span></p>
</div>
<div class="info-box" id="west">
<h3>West</h3>
<p>Air Quality Index: 18 <span id="west-aqi"></span></p>
</div>
<div class="info-box" id="central">
<h3>Central</h3>
<p>Air Quality Index: 17 <span id="central-aqi"></span></p>
</div>
</div>
<div id="additional-info"></div>
<br>
<br>
<%- include('bot') %>

2
consumerWebsite/views/logintop.ejs
View File

@ -62,7 +62,7 @@
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ms-auto">
<li class="nav-item">
<a class="nav-link active" href="/">Home</a>
<a class="nav-link" href="/">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/news">News</a>

57
consumerWebsite/views/profile.ejs Normal file
View File

@ -0,0 +1,57 @@
<%- include('top') %>
<div class="full-title">
<div class="container">
<h1 class="mt-4 mb-3">Profile
</h1>
</div>
</div>
<br>
<br>
<div class="centered-content">
<div class="container">
<div class="row">
<div class="col-md-3 border-right">
<div class="d-flex flex-column align-items-center text-center p-3 py-5"><img
class="rounded-circle mt-5" width="150px"
src="https://st3.depositphotos.com/15648834/17930/v/600/depositphotos_179308454-stock-illustration-unknown-person-silhouette-glasses-profile.jpg">
</div>
</div>
<div class="col-md-5 border-right">
<div class="p-3 py-5">
<div class="d-flex justify-content-between align-items-center mb-3">
<h4 class="text-right">Profile Settings</h4>
</div>
<div class="row mt-2">
<div class="col-md-6"><label class="labels">Name</label><input type="text"
class="form-control" placeholder="first name" value=""></div>
<div class="col-md-6"><label class="labels">Surname</label><input type="text"
class="form-control" value="" placeholder="surname"></div>
</div>
<div class="row mt-3">
<div class="col-md-12"><label class="labels">Mobile Number</label><input type="text"
class="form-control" placeholder="enter phone number" value=""></div>
<div class="col-md-12"><label class="labels">Address</label><input type="text"
class="form-control" placeholder="enter address" value=""></div>
<div class="col-md-12"><label class="labels">Email</label><input type="text"
class="form-control" placeholder="enter email" value=""></div>
<div class="col-md-12"><label class="labels">Password</label><input type="text"
class="form-control" placeholder="enter password" value=""></div>
<div class="col-md-12"><label class="labels">Password</label><input type="text"
class="form-control" placeholder="re enter password" value=""></div>
</div>
<div class="mt-2 text-center">
<button class="btn btn-sm btn-secondary change-password-button" type="button">Change
Password</button>
</div>
<div class="mt-5 text-center"><button class="btn btn-primary profile-button" type="button">Save
Profile</button></div>
</div>
</div>
</div>
</div>
</div>
<%- include('bot') %>

15
consumerWebsite/views/signuplogin.ejs
View File

@ -23,12 +23,27 @@
<div class="form login">
<header>Login</header>
<<<<<<< Updated upstream
<!-- Return message from api -->
<div class="actionMessage" style="display:none"></div>
<form action="user/login" onsubmit="formAJAX(this)" evalAJAX="app.auth.logInRedirect();">
<input type="text" id="email" placeholder="Email address" required />
<input type="password" id="password" placeholder="Password" required />
<a href="/resetPassword">Forgot password?</a>
=======
<div class="card-header shadow actionMessage" style="display:none"></div>
<!-- evalAjax Fires when status 200 is returned -->
<form action="user/login" onsubmit="formAJAX(this)"
evalAJAX="app.auth.homeRedirect();
app.auth.setToken(data.token);
app.auth.setUserId(data.userId);
app.auth.setUsername(data.username);
">
<input type="text" name="userInfo" placeholder="Email address | Username" required />
<input type="password" name="password" placeholder="Password" required />
<a href="/forgotPassword">Forgot password?</a>
>>>>>>> Stashed changes
<input type="submit" value="Login" />
</form>
</div>

6
consumerWebsite/views/top.ejs
View File

@ -20,7 +20,6 @@
<!-- jQuery library -->
<script src="https://code.jquery.com/jquery-3.7.1.min.js"
integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
@ -53,7 +52,6 @@
});
</script>
<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-light top-nav fixed-top">
<div class="container">
<a class="navbar-brand" href="/">
@ -66,7 +64,7 @@
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ms-auto">
<li class="nav-item">
<a class="nav-link active" href="/">Home</a>
<a class="nav-link" href="/">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/news">News</a>
@ -96,6 +94,8 @@
</div>
</div>
</nav>
</body>
</html>