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

Merge pull request #44 from Newtbot/ttr

Browse Source 
Ttr
This commit is contained in:
noot 2024-01-21 04:11:44 +08:00 committed by GitHub
commit 8adf304f1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 87 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

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

16
consumerWebsite/routes/render.js
View File

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

3
consumerWebsite/views/bot.ejs
View File

@ -85,5 +85,8 @@
<!-- Bootstrap core JavaScript --> <!-- Bootstrap core JavaScript -->
<script src="vendor/jquery/jquery.min.js"></script> <script src="vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.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>
<script src="js/api.js"></script> <script src="js/api.js"></script>
</body> </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

@ -57,7 +57,7 @@
<p class="card-text display-4"> 70% - 75% </p> <p class="card-text display-4"> 70% - 75% </p>
</div> </div>
<div class="card-footer"> <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> </div>
</div> </div>
@ -68,7 +68,7 @@
<p class="card-text display-4"> 15 - 18 PSI </p> <p class="card-text display-4"> 15 - 18 PSI </p>
</div> </div>
<div class="card-footer"> <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> </div>
</div> </div>
@ -79,7 +79,7 @@
<p class="card-text display-4"> 30&deg; - 37&deg; </p> <p class="card-text display-4"> 30&deg; - 37&deg; </p>
</div> </div>
<div class="card-footer"> <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> </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

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

2
consumerWebsite/views/profile.ejs
View File

@ -61,4 +61,4 @@
<br> <br>
<%- include('bot') %> <%- include('bot') %>

5
consumerWebsite/views/top.ejs
View File

@ -28,7 +28,6 @@
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,500;1,300&family=Source+Code+Pro:wght@300&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,500;1,300&family=Source+Code+Pro:wght@300&display=swap" rel="stylesheet">
<!-- jQuery library --> <!-- jQuery library -->
<script src="https://code.jquery.com/jquery-3.7.1.min.js" <script src="https://code.jquery.com/jquery-3.7.1.min.js"
integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script> integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
@ -82,7 +81,7 @@
<div class="collapse navbar-collapse" id="navbarResponsive"> <div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ms-auto"> <ul class="navbar-nav ms-auto">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" href="/">Home</a> <a class="nav-link" href="/">Home</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/news">News</a> <a class="nav-link" href="/news">News</a>
@ -114,6 +113,8 @@
</div> </div>
</div> </div>
</nav> </nav>
</body> </body>
</html> </html>

4
contact.js
View File

@ -24,17 +24,15 @@ document.addEventListener('DOMContentLoaded', () => {
const result = await response.json(); const result = await response.json();
// Handle the API response // Handle the API response
//console.log(result); console.log(result);
if (result.success) { if (result.success) {
// Form submitted successfully, display notification // Form submitted successfully, display notification
alert('Form submitted successfully!'); alert('Form submitted successfully!');
location.reload() location.reload()
// You can replace the alert with your custom notification logic
} else { } else {
// Form submission failed, display error notification // Form submission failed, display error notification
alert('Form submission failed. Please try again.'); alert('Form submission failed. Please try again.');
// You can replace the alert with your custom error notification logic
} }
} catch (error) { } catch (error) {