Commit Graph

48 Commits

Author SHA1 Message Date
4346f92471 blah 2024-01-30 15:58:05 +08:00
31fe6b3c7c b 2024-01-30 14:48:17 +08:00
da46db3134 a 2024-01-30 13:05:01 +08:00
ac98abc23e a 2024-01-30 13:03:58 +08:00
129ca202c0 Update API routes and sensor data functionality And API.ejs 2024-01-30 02:59:14 +08:00
8836a3cfd4 Add apilog route and remove unused files 2024-01-29 03:40:49 +08:00
c268e1d33d Add routes to get location and sensor by name
Added viewdata using chart.js
2024-01-29 00:44:10 +08:00
d491750916 Fix database model associations and update API route 2024-01-27 20:15:29 +08:00
Leo
b3e2533ec0 Merge branch 'main' of https://github.com/Newtbot/MP 2024-01-27 05:54:35 +08:00
c234aa3616 Add nodemailer configuration and console.log statement
Update formAJAX function to log data from the server
Add getUserByEmail and checkEmail functions
Update profile.ejs to require login
Update addSensorData function to emit new sensor data
Update api.css with styling changes
Update token route to generate and send token email
Update authChecker middleware to allow user and token routes
2024-01-27 04:52:02 +08:00
d38423fa6d Update CSS, add relationship between sensorModel and locationModel, and remove console.log statements 2024-01-26 04:07:11 +08:00
Leo
8b944268a2 Merge branch 'main' of https://github.com/Newtbot/MP 2024-01-25 17:46:28 +08:00
ba498a4d4b BLAH stupid middleware error 2024-01-25 05:11:28 +08:00
057fbe2afb iotsensor fixed but session valid broken 2024-01-25 03:26:56 +08:00
7403f66c8a more fix 2024-01-24 16:01:30 +08:00
Leo
ba5b10a068 Merge branch 'main' of https://github.com/Newtbot/MP 2024-01-24 15:51:56 +08:00
Leo
dae836e49b update 2024-01-24 15:51:51 +08:00
d0aeab286a a 2024-01-24 14:37:57 +08:00
e710fa15a1 overhaul 2024-01-24 14:21:13 +08:00
5b262eb803 Add JavaScript files and edit profile CSS
1) finished edit profile with delete profile
2024-01-23 01:44:11 +08:00
Leo
7dceee0b79 Merge branch 'main' of https://github.com/Newtbot/MP 2024-01-22 14:37:27 +08:00
Leo
dd345e14e5 update 2024-01-22 14:35:24 +08:00
877eaeae43 update
1) added html regex
2) added welcome user
3) change forgotpassword and resetpassword to ejs
2024-01-21 21:06:10 +08:00
Leo
8f37282f9a Merge branch 'main' of https://github.com/Newtbot/MP 2024-01-21 20:02:12 +08:00
a749d91425 big doma bug 2024-01-21 16:04:39 +08:00
Leo
638993a66a Merge branch 'main' of https://github.com/Newtbot/MP 2024-01-21 14:31:45 +08:00
Leo
58d3fcaadc update 2024-01-21 14:31:08 +08:00
Leo
9b7de43534 update 2024-01-21 04:33:06 +08:00
dfb9a524b4 blah 2024-01-21 04:28:16 +08:00
Leo
5d39c6d43f Merge branch 'main' into new 2024-01-21 04:07:16 +08:00
efcaaf87f6 Merge branch 'Dev-branch' 2024-01-21 03:59:15 +08:00
d2ad32e6d6 added api page
added login
added api.ejs
added middleware for authorization check
2024-01-21 03:58:03 +08:00
Leo
9b5ac4fa3a Merge branch 'main' into new 2024-01-21 02:37:44 +08:00
Leo
170441c829 update 2024-01-21 02:35:28 +08:00
Leo
c2651785df update 2024-01-21 02:33:00 +08:00
13c1959925 Merge remote-tracking branch 'origin/updet' 2024-01-20 04:15:13 +08:00
32be41ea46 login WIP 2024-01-20 04:13:20 +08:00
2ecb69c828 a 2024-01-20 01:22:19 +08:00
Leo
90f4f39795 update 2024-01-19 20:30:03 +08:00
e63bcf1734 register blah 2024-01-19 16:04:50 +08:00
8dd917e541 Merge branch 'main' into Dev-branch 2024-01-19 03:23:13 +08:00
908a8bd351 ejs templating 2024-01-19 03:21:15 +08:00
61aeca0961 fixed 2024-01-18 03:18:18 +08:00
63f07add82 Merge branch 'Dev-branch' 2024-01-18 03:17:00 +08:00
4e4e8bfee2 a 2024-01-18 03:15:31 +08:00
269627597e a 2024-01-17 16:45:22 +08:00
915e4a7e5c apimiddleware done?
Not fully tested
2024-01-16 20:54:18 +08:00
7e4b2d8026 WIP token 2024-01-16 04:43:39 +08:00