Commit Graph

101 Commits

Author SHA1 Message Date
LilleBRG
c9155d582b no errors after merge. update database please 2025-03-31 15:49:35 +02:00
LilleBRG
db023ac84e Merge branch 'master' of git.reim.ar:ReiMerc/temperature-alarm 2025-03-31 14:49:34 +02:00
Jeas0001
1ca64702d7 Merge branch 'master' of git.reim.ar:ReiMerc/temperature-alarm 2025-03-31 11:16:29 +02:00
Jeas0001
6cb36947cb Made the datetime optional 2025-03-31 11:16:16 +02:00
fb3705690d
Don't send undefined content type in frontend 2025-03-31 11:03:38 +02:00
e2dd9d9e6e
Fix cookie path 2025-03-31 11:00:20 +02:00
Jeas0001
668b29c068 Undid last commit from me 2025-03-31 10:50:21 +02:00
Jeas0001
d9205d425c Datetime ranged have any logs 2025-03-31 10:48:20 +02:00
fe85e1ff23
Add JS constants to gitignore 2025-03-31 10:42:23 +02:00
Jeas0001
7a3d5b4f71 Merge branch 'master' of git.reim.ar:ReiMerc/temperature-alarm 2025-03-31 10:39:35 +02:00
Jeas0001
9dc19efd83 Removed unnessesary usings and added a datetimerange for getting logs 2025-03-31 10:39:07 +02:00
6fe0841cbc
Add error handling on dashboard 2025-03-31 10:31:57 +02:00
df130b312c
Style dashboard 2025-03-31 10:20:26 +02:00
dd2a3cf150
Show real temperature data in frontend 2025-03-31 09:30:08 +02:00
Jeas0001
f6e2c8f450 Gets userId from the jwttoken 2025-03-31 09:19:50 +02:00
LilleBRG
8202885870 devices half made 2025-03-27 22:17:45 +01:00
b8bb86edca
Fix JWT bearer authentication 2025-03-27 10:47:31 +01:00
Jeas0001
595ade2d79 Merge branch 'master' of git.reim.ar:ReiMerc/temperature-alarm 2025-03-27 10:37:25 +01:00
02bfbabcfc
Set auth token when logging in 2025-03-27 10:33:40 +01:00
0f1b10d2d7
Change how requests are sent in order to send auth token 2025-03-27 10:33:40 +01:00
Jeas0001
8ad863b781 Added securityDefinition and requirements 2025-03-27 10:22:46 +01:00
Jeas0001
46de83dc42 RefreshToken is made 2025-03-27 10:17:25 +01:00
Jeas0001
edc195b234 Fixed AMQPPublish and split the code into more functions and added Refresh token to Usermodel 2025-03-27 09:48:08 +01:00
Jeas0001
bce48fe8d1 Merge branch 'master' of git.reim.ar:ReiMerc/temperature-alarm 2025-03-26 14:28:30 +01:00
Jeas0001
998cb90acc Changed the name of the publisher 2025-03-26 14:28:20 +01:00
Jeas0001
47797d18a0 Made AMQPPush for pushing the device limits to RabbitMQ and consume after 1 hour 2025-03-26 13:14:12 +01:00
Jeas0001
6f311fabd4 Comments 2025-03-26 12:14:42 +01:00
2f5f753ab6
Implement printing temperature on display 2025-03-26 09:59:25 +01:00
LilleBRG
8f6f332292 device table header 2025-03-25 16:20:08 +01:00
LilleBRG
a3f3d8f861 changes to updateuser, added logout button 2025-03-25 16:11:14 +01:00
LilleBRG
f42dcd743a profile gets data from db, changes to edituser 2025-03-25 14:24:36 +01:00
Jeas0001
60c0fc9475 Merge branch 'master' of git.reim.ar:ReiMerc/temperature-alarm 2025-03-25 13:15:52 +01:00
Jeas0001
507e156f17 Some comment in AMQPReciever, AMQPReciever and DBAccess 2025-03-25 13:15:42 +01:00
90cbf7ae81
Fix listening for AMQP messages, remove test console app 2025-03-25 12:54:52 +01:00
8c6037b010
Implement AMQP in IoT 2025-03-25 12:30:53 +01:00
Jeas0001
fccea25296 Merge branch 'Jeppe' 2025-03-25 10:51:20 +01:00
Jeas0001
d289f28e93 AMQP set up and port is gotten from appsettings now 2025-03-25 10:50:03 +01:00
b943ad5f97
Fix dockerfile and add exec perms to deploy script 2025-03-25 09:40:06 +01:00
Jeas0001
be2a6c5d6f Merge branch 'master' of git.reim.ar:ReiMerc/temperature-alarm 2025-03-25 09:25:31 +01:00
Jeas0001
97091c1a5c Authorize turned back on was off for debug purpose 2025-03-25 09:25:09 +01:00
f1621228db
Add volume to deploy script 2025-03-25 09:24:24 +01:00
Jeas0001
95d3c51543 Deleted some things that did not merge properly 2025-03-24 13:14:07 +01:00
Jeas0001
1f5515ac88 Merging Jeppe branch into master 2025-03-24 13:10:07 +01:00
Jeas0001
837f10037d Mqtt works at the same time as api 2025-03-24 13:02:39 +01:00
Jeas0001
eade0f6d69 Merge branch 'master' of git.reim.ar:ReiMerc/temperature-alarm 2025-03-24 12:29:06 +01:00
Jeas0001
428e187aa4 removed unnesesary using 2025-03-24 12:28:45 +01:00
Jeas0001
80981e8786 Hentet en nuget pakke 2025-03-24 12:14:26 +01:00
Jeas0001
c85047a57d Test 2025-03-24 12:03:33 +01:00
Jeas0001
d711134e7f staged 2025-03-24 12:00:18 +01:00
Jeas0001
2d7e80b3a1 Mqttreciever 2025-03-24 12:00:04 +01:00