wmantly/mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
280 Commits 2 Branches 0 Tags
397efb3734d959633cb24207250ec19f4548dd57
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
newtbot 2996684267 no luck.. 2024-01-31 03:32:41 +08:00
newtbot fea986a841 Fix file paths and add password reset functionality 2024-01-31 03:17:24 +08:00
noot 12597ad774 reset password wip 2024-01-30 16:53:42 +08:00
noot e0b64b2252 Merge branch 'main' of https://github.com/Newtbot/MP 2024-01-30 15:58:31 +08:00
noot 4346f92471 blah 2024-01-30 15:58:05 +08:00
noot 22230eca12 Merge pull request #62 from Newtbot/Vivian 
c
 2024-01-30 15:57:40 +08:00
noot 884209ee9c Merge pull request #61 from Newtbot/Vivian 
Vivian
 2024-01-30 14:50:23 +08:00
newtbot 899eaf202a Merge branch 'main' of https://github.com/Newtbot/MP 2024-01-30 02:59:17 +08:00
newtbot 129ca202c0 Update API routes and sensor data functionality And API.ejs 2024-01-30 02:59:14 +08:00
noot 46ea3ae593 Merge pull request #59 from Newtbot/apilog-and-cleanup 
implement display download and filter api logs
 2024-01-29 03:42:03 +08:00
newtbot 8836a3cfd4 Add apilog route and remove unused files 2024-01-29 03:40:49 +08:00
newtbot 9c5aaed414 Merge branch 'main' of https://github.com/Newtbot/MP 2024-01-29 00:44:22 +08:00
newtbot c268e1d33d Add routes to get location and sensor by name 
Added viewdata using chart.js
 2024-01-29 00:44:10 +08:00
newtbot fadabf3451 Remove unnecessary code and update button styles 2024-01-28 03:31:39 +08:00
newtbot d491750916 Fix database model associations and update API route 2024-01-27 20:15:29 +08:00
noot 6190cb63cd Merge pull request #56 from Newtbot/y 
Y
 2024-01-27 17:19:35 +08:00
noot ec1dbfee44 Merge pull request #55 from Newtbot/update 
update with server info
 2024-01-27 16:04:14 +08:00
newtbot 740915f50e Merge branch 'main' of https://github.com/Newtbot/MP 2024-01-27 04:52:05 +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
noot 11c5eccafb Update README.md 2024-01-26 19:09:33 +08:00
noot 818d90b440 Merge pull request #54 from Newtbot/api 
edited the api.ejs file
 2024-01-26 04:08:45 +08:00
newtbot d3b031a50d Merge branch 'main' of https://github.com/Newtbot/MP 2024-01-26 04:07:13 +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
noot a77e4c72c9 Merge pull request #53 from Newtbot/sensor 
csp removed sensor wip
 2024-01-25 16:47:42 +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
newtbot 7403f66c8a more fix 2024-01-24 16:01:30 +08:00
newtbot d0aeab286a a 2024-01-24 14:37:57 +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 7e9b6af0ba socket.io for WS 2024-01-23 16:00:22 +08:00
noot ca3527b53c Update README.md 2024-01-23 02:17:51 +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
noot d819ac71b2 Merge pull request #52 from Newtbot/newest 
Newest
 2024-01-22 17:03:09 +08:00
newtbot 3c8dd68473 Refactor API key validation logic 
Added API page documentation
 2024-01-22 03:23:48 +08:00
newtbot 3ffcfb4e77 remove sql 2024-01-21 21:24:46 +08:00
newtbot ca53d5c1de Merge branch 'dev-' 2024-01-21 21:07:13 +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
noot 29488362f1 Merge pull request #50 from Newtbot/csp-wip 
CSP WIP add sessionid as well
 2024-01-21 20:09:28 +08:00
newtbot a749d91425 big doma bug 2024-01-21 16:04:39 +08:00
noot 74b610a7b8 Update README.md 2024-01-21 04:33:23 +08:00
noot 7537880cb1 Merge pull request #45 from Newtbot/Dev-branch 
blah
 2024-01-21 04:29:08 +08:00
newtbot dfb9a524b4 blah 2024-01-21 04:28:16 +08:00
noot 8adf304f1a Merge pull request #44 from Newtbot/ttr 
Ttr
 2024-01-21 04:11:44 +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
noot 615b0ef292 Merge pull request #41 from Newtbot/design-update 
design change
 2024-01-20 18:07:33 +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
newtbot 1ed59aba97 Update apiDatabase.js 2024-01-20 01:20:44 +08:00
newtbot c6c7ea978a Merge branch 'update' 2024-01-19 18:17:32 +08:00
noot fbbeebd10f Merge pull request #35 from Newtbot/minor-cleanup 
minor cleanup
 2024-01-19 18:15:03 +08:00
noot a4f178bb21 Merge pull request #36 from Newtbot/Dev-branch 
register blah
 2024-01-19 16:05:52 +08:00
newtbot e63bcf1734 register blah 2024-01-19 16:04:50 +08:00
noot 35040df1ed Merge pull request #34 from Newtbot/Dev-branch 
ejs templating
 2024-01-19 03:23:33 +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
noot a6ae83265e Merge pull request #31 from Newtbot/BRUTEFORCE 
ADDED BRUTE FORCE PREVENTION
 2024-01-18 03:14:15 +08:00
noot 1f63afd4a5 Merge pull request #30 from Newtbot/newest 
Newest
 2024-01-17 19:12:07 +08:00
noot 36b9531b2a Merge pull request #29 from Newtbot/t 
T
 2024-01-17 17:30:08 +08:00
noot 15b36a7ce2 Merge pull request #28 from Newtbot/minor 
minor changes not stroeeing anti csrf token in sesssion but in a vari…
 2024-01-17 17:29:21 +08:00
newtbot 269627597e a 2024-01-17 16:45:22 +08:00
noot 0bc096fd3c Merge pull request #27 from Newtbot/Dev-branch 
blah
 2024-01-16 21:06:55 +08:00
newtbot 1ddce4b743 blah 2024-01-16 21:06:37 +08:00
noot df27700262 Update README.md 2024-01-16 20:58:37 +08:00
noot e9409f8560 Merge pull request #26 from Newtbot/Dev-branch 
apimiddleware done?
 2024-01-16 20:55:08 +08:00
newtbot 915e4a7e5c apimiddleware done? 
Not fully tested
 2024-01-16 20:54:18 +08:00
noot 1fbfa68f1a Merge pull request #24 from Newtbot/Dev-branch 
WIP token
 2024-01-16 04:43:58 +08:00
newtbot 7e4b2d8026 WIP token 2024-01-16 04:43:39 +08:00
noot 462e67c779 Merge pull request #23 from Newtbot/cleanup 
cleanup
 2024-01-15 17:28:53 +08:00
noot 7aeea7646a Merge pull request #22 from Newtbot/Dev-branch 
tidy up
 2024-01-15 17:28:21 +08:00
newtbot 290d0653d9 models update 2024-01-15 01:56:18 +08:00
newtbot 935709c2eb tidy up 2024-01-14 23:31:00 +08:00
noot d26b0a74bf Merge pull request #21 from Newtbot/Dev-branch 
migrated database folder to my own folders
 2024-01-14 17:50:10 +08:00
newtbot d9e028d300 migrated database folder to my own folders 2024-01-14 17:49:44 +08:00
noot 70efee14f8 Update README.md 2024-01-14 02:50:22 +08:00
noot b55ca3d3a3 Update README.md 2024-01-14 02:50:09 +08:00
noot 21360f0573 Update README.md 2024-01-14 02:49:22 +08:00
noot 05a2ec0b17 Update README.md 2024-01-14 02:48:52 +08:00
noot f2c7cd1067 Update README.md 2024-01-14 02:48:37 +08:00
noot 9f2b0dbba4 Update README.md 2024-01-14 02:48:08 +08:00
noot b7cd104025 Merge pull request #20 from Newtbot/Dev-branch 
iot sensor finished
 2024-01-14 02:43:54 +08:00
newtbot c00a57d5f6 iot sensor finished 
1)with validation on front and backend
2)fixed seed route generating value 0 for data
 2024-01-14 02:43:27 +08:00
noot 5cd52f9991 Merge pull request #19 from Newtbot/ANTI-CSRF-FUNCTION-ALL 
ANTI CSRF FUNCTION
 2024-01-13 17:13:47 +08:00
noot f91e99330a Merge pull request #17 from Newtbot/anti-csrf 
redo ant csrf token
 2024-01-13 02:53:11 +08:00
newtbot 75062e7e30 Update package-lock.json 2024-01-13 02:52:50 +08:00
newtbot d3208d9dce Merge branch 'Dev-branch' 2024-01-13 02:52:48 +08:00
newtbot a7e1a0028e blah 2024-01-13 02:47:01 +08:00
noot 7f81fecb86 Merge pull request #16 from Newtbot/Dev-branch 
data routes done
 2024-01-12 20:10:37 +08:00
newtbot b3f2f4e5f6 data routes done 2024-01-12 18:03:51 +08:00
noot acdfaffd26 Merge pull request #14 from Newtbot/Dev-branch 
express backend
 2024-01-12 16:23:52 +08:00
newtbot 21edf3aa07 express backend 2024-01-12 02:50:46 +08:00
newtbot f1d13a1217 a 2024-01-12 02:47:37 +08:00