48 Commits

Author SHA1 Message Date
Leo
b3e2533ec0 Merge branch 'main' of https://github.com/Newtbot/MP 2024-01-27 05:54:35 +08:00
newtbot
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
newtbot
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
newtbot
ba498a4d4b BLAH stupid middleware error 2024-01-25 05:11:28 +08:00
newtbot
057fbe2afb iotsensor fixed but session valid broken 2024-01-25 03:26:56 +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
newtbot
e710fa15a1 overhaul 2024-01-24 14:21:13 +08:00
newtbot
4aea6a8e4c Update dependencies and fix file paths 2024-01-24 04:23:54 +08:00
newtbot
5b262eb803 Add JavaScript files and edit profile CSS
1) finished edit profile with delete profile
2024-01-23 01:44:11 +08:00
Leo
409e647646 update 2024-01-22 16:35:06 +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
newtbot
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
newtbot
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
newtbot
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
newtbot
efcaaf87f6 Merge branch 'Dev-branch' 2024-01-21 03:59:15 +08:00
newtbot
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
c2651785df update 2024-01-21 02:33:00 +08:00
newtbot
13c1959925 Merge remote-tracking branch 'origin/updet' 2024-01-20 04:15:13 +08:00
noot
4a9af2ae7c
Merge pull request #40 from Newtbot/Dev-branch
login WIP
2024-01-20 04:13:41 +08:00
newtbot
32be41ea46 login WIP 2024-01-20 04:13:20 +08:00
noot
f20b4d2088
Merge pull request #39 from Newtbot/Dev-branch
Dev branch
2024-01-20 01:22:48 +08:00
newtbot
2ecb69c828 a 2024-01-20 01:22:19 +08:00
Leo
90f4f39795 update 2024-01-19 20:30:03 +08:00
Leo
60c132d9ea update 2024-01-19 20:22:41 +08:00
newtbot
c6c7ea978a Merge branch 'update' 2024-01-19 18:17:32 +08:00
Leo
bd58f96d3c update 2024-01-19 16:07:47 +08:00
newtbot
e63bcf1734 register blah 2024-01-19 16:04:50 +08:00
newtbot
8dd917e541 Merge branch 'main' into Dev-branch 2024-01-19 03:23:13 +08:00
newtbot
908a8bd351 ejs templating 2024-01-19 03:21:15 +08:00
newtbot
61aeca0961 fixed 2024-01-18 03:18:18 +08:00
newtbot
8133bc7aca a 2024-01-18 03:17:36 +08:00
newtbot
63f07add82 Merge branch 'Dev-branch' 2024-01-18 03:17:00 +08:00
newtbot
4e4e8bfee2 a 2024-01-18 03:15:31 +08:00
Leo
cafdcf64d0 env not working 2024-01-17 18:35:29 +08:00
Leo
f03b2d10aa update 2024-01-17 17:48:10 +08:00
Leo
a826f9c58b update 2024-01-17 17:30:08 +08:00
Leo
79ed9c471a test 2024-01-17 16:46:14 +08:00
Leo
061b1af39e update 2024-01-17 16:05:10 +08:00
newtbot
935709c2eb tidy up 2024-01-14 23:31:00 +08:00