397efb3734
merged
2024-01-30 14:44:56 -05:00
7bdfb02f9a
merged
2024-01-30 14:44:07 -05:00
2996684267
no luck..
2024-01-31 03:32:41 +08:00
fea986a841
Fix file paths and add password reset functionality
2024-01-31 03:17:24 +08:00
12597ad774
reset password wip
2024-01-30 16:53:42 +08:00
e0b64b2252
Merge branch 'main' of https://github.com/Newtbot/MP
2024-01-30 15:58:31 +08:00
4346f92471
blah
2024-01-30 15:58:05 +08:00
22230eca12
Merge pull request #62 from Newtbot/Vivian
...
c
2024-01-30 15:57:40 +08:00
7bd92805dd
c
2024-01-30 15:54:04 +08:00
884209ee9c
Merge pull request #61 from Newtbot/Vivian
...
Vivian
2024-01-30 14:50:23 +08:00
31fe6b3c7c
b
2024-01-30 14:48:17 +08:00
9a5e128f3f
a
2024-01-30 13:07:41 +08:00
4ee164ebfd
a
2024-01-30 13:06:44 +08:00
da46db3134
a
2024-01-30 13:05:01 +08:00
ac98abc23e
a
2024-01-30 13:03:58 +08:00
f7e4775ed3
reset password
2024-01-30 12:52:52 +08:00
899eaf202a
Merge branch 'main' of https://github.com/Newtbot/MP
2024-01-30 02:59:17 +08:00
129ca202c0
Update API routes and sensor data functionality And API.ejs
2024-01-30 02:59:14 +08:00
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
8836a3cfd4
Add apilog route and remove unused files
2024-01-29 03:40:49 +08:00
9c5aaed414
Merge branch 'main' of https://github.com/Newtbot/MP
2024-01-29 00:44:22 +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
052e3c8664
implement display download and filter api logs
2024-01-28 20:19:45 +08:00
03d2031644
Merge pull request #58 from Newtbot/cleanups
...
clean up
2024-01-28 16:16:40 +08:00
fadabf3451
Remove unnecessary code and update button styles
2024-01-28 03:31:39 +08:00
548064782e
clean up
2024-01-28 00:09:22 +08:00
d491750916
Fix database model associations and update API route
2024-01-27 20:15:29 +08:00
6190cb63cd
Merge pull request #56 from Newtbot/y
...
Y
2024-01-27 17:19:35 +08:00
c3ffbc00af
f
2024-01-27 16:59:14 +08:00
ec1dbfee44
Merge pull request #55 from Newtbot/update
...
update with server info
2024-01-27 16:04:14 +08:00
54e2987762
upload
2024-01-27 16:03:23 +08:00
b3e2533ec0
Merge branch 'main' of https://github.com/Newtbot/MP
2024-01-27 05:54:35 +08:00
740915f50e
Merge branch 'main' of https://github.com/Newtbot/MP
2024-01-27 04:52:05 +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
34962b84cf
update with server info
2024-01-26 19:13:11 +08:00
11c5eccafb
Update README.md
2024-01-26 19:09:33 +08:00
818d90b440
Merge pull request #54 from Newtbot/api
...
edited the api.ejs file
2024-01-26 04:08:45 +08:00
d3b031a50d
Merge branch 'main' of https://github.com/Newtbot/MP
2024-01-26 04:07:13 +08:00
d38423fa6d
Update CSS, add relationship between sensorModel and locationModel, and remove console.log statements
2024-01-26 04:07:11 +08:00
52e01e2699
minor changes
2024-01-25 18:45:32 +08:00
8b944268a2
Merge branch 'main' of https://github.com/Newtbot/MP
2024-01-25 17:46:28 +08:00
d4149cebbf
edited the api.ejs file
2024-01-25 17:30:55 +08:00
a77e4c72c9
Merge pull request #53 from Newtbot/sensor
...
csp removed sensor wip
2024-01-25 16:47:42 +08:00
39f7ad3c73
landing page done
2024-01-25 16:33:56 +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
92b0f86be6
Merge branch 'main' into sensor
2024-01-24 16:38:43 +08:00
2d7501bdca
MINOR
2024-01-24 16:31:18 +08:00
7403f66c8a
more fix
2024-01-24 16:01:30 +08:00
ba5b10a068
Merge branch 'main' of https://github.com/Newtbot/MP
2024-01-24 15:51:56 +08:00
