173 Commits

Author SHA1 Message Date
8a48857ac0 Switched Earthquake, Observatory and Artefact creator to a user 2025-05-26 14:27:28 +01:00
a56579ea0b Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-26 14:11:40 +01:00
fbbc0a4cdb Merge branch 'master' of 192.168.11.4:thowitz-work/tremor-tracker 2025-05-26 14:09:35 +01:00
373908d387 Made some fixes 2025-05-26 14:09:06 +01:00
dd77bd2550 Finished prisma schema, implementing todo comments 2025-05-26 14:07:07 +01:00
IZZY
66509b9f85 Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-25 19:59:57 +01:00
IZZY
b1b873925b Added a couple features 2025-05-25 19:59:53 +01:00
bec31f76c0 Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-25 19:09:48 +01:00
0a34470e65 Merge branch 'master' of 192.168.11.4:thowitz-work/tremor-tracker 2025-05-25 18:54:00 +01:00
7311e379e8 Fixed scientists importing, and added linking by name 2025-05-25 11:57:51 +01:00
db6ba00ded Added linking of nearest observatories to earthquakes 2025-05-25 11:46:42 +01:00
a03d265410 Fixed import observatories and a few small bugs 2025-05-25 11:37:05 +01:00
87d2cfbc25 Fixed importing earthquakes 2025-05-25 11:14:56 +01:00
Lukeshan Thananchayan
265f6613d2 Added management page
Not connected to database
2025-05-24 20:09:10 +01:00
68d47a4fe3 Fixed users importing script 2025-05-22 18:18:34 +01:00
3142f73c80 Moved Users into public 2025-05-22 18:14:51 +01:00
b40d0aedb4 Fixed a few small things 2025-05-22 17:59:48 +01:00
cb6dd05071 Fixed import artefacts and added imageName to artefact 2025-05-22 17:59:20 +01:00
885e694ad2 Converted to a prisma singleton 2025-05-20 18:26:40 +01:00
IZZY
3088c667fd allthepics 2025-05-20 15:53:20 +01:00
Lukeshan Thananchayan
d303083e0f updated user csv 2025-05-20 15:48:15 +01:00
efc16aa92a Added many todos 2025-05-20 13:53:25 +01:00
IZZY
1b0b751b32 more pictures 2025-05-20 09:09:42 +01:00
8341d9d8ce Fixed warehouse api auth and extended artefact type 2025-05-19 18:05:40 +01:00
3b2927e896 Merge branch 'master' of 192.168.11.4:thowitz-work/tremor-tracker 2025-05-19 17:06:49 +01:00
8bd3b10368 Fixed some errors 2025-05-19 15:38:24 +01:00
7773801de4 Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-19 14:58:35 +01:00
64338d8be7 Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-19 14:58:32 +01:00
66986654dd Added todo instructions to import route files 2025-05-19 14:58:08 +01:00
IZZY
48fa0fa7a4 Imagespart1 2025-05-19 14:56:42 +01:00
IZZY
f26dbb465a Merge and added artefact name 2025-05-19 14:41:14 +01:00
1bd327ea1a Switched to local prismaclient 2025-05-19 14:36:29 +01:00
IZZY
de02f94f6a Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-19 13:57:33 +01:00
IZZY
8599ad885f Updated schema 2025-05-19 13:57:27 +01:00
Lukeshan Thananchayan
bd3a7bae27 reverted to user only admin page
user page still requires prisma dependant bits
2025-05-19 13:56:19 +01:00
IZZY
360ca52ed6 Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-19 13:38:55 +01:00
Emily Neighbour
80113329ef Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-19 13:32:23 +01:00
Emily Neighbour
662c1cb0d4 modal pop-up's when buying 2025-05-19 13:32:20 +01:00
IZZY
8fa8f6c5cd earthquake file updated 2025-05-19 13:25:10 +01:00
31a0c622d5 Added auto get-user with jwt 2025-05-19 13:11:02 +01:00
IZZY
3c31b2187b route file no longer uses enums 2025-05-19 13:00:10 +01:00
c407d26e8b Modified Artefact and added Pallet models 2025-05-19 12:51:46 +01:00
IZZY
376f6500d5 Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-19 12:42:25 +01:00
IZZY
46411667d6 imports 2025-05-19 12:42:13 +01:00
Lukeshan Thananchayan
24de12e481 d 2025-05-19 12:28:38 +01:00
IZZY
30a9f38888 Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-19 12:28:19 +01:00
Emily Neighbour
166f48a3da artifact icon fix 2025-05-18 22:28:57 +01:00
IZZY
20a6034f07 Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-17 21:05:21 +01:00
158dbbf166 Removed comment 2025-05-13 23:05:14 +01:00
3d59e86559 Made some changes 2025-05-13 22:53:17 +01:00