101 Commits

Author SHA1 Message Date
efc16aa92a Added many todos 2025-05-20 13:53:25 +01:00
IZZY
1b0b751b32 more pictures 2025-05-20 09:09:42 +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
IZZY
f25b8789c0 Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-13 12:07:32 +01:00
dce7e51a53 More renaming 2025-05-13 10:24:58 +01:00
b0ec146bf0 Renamed to british spelling 2025-05-13 10:00:09 +01:00
Emily Neighbour
579c1c205a shop extras 2025-05-12 21:38:46 +01:00
IZZY
db3e0f958b All the route files 2025-05-12 14:19:52 +01:00
Emily Neighbour
52f17d5a00 emily user to edit admin 2025-05-12 14:00:03 +01:00
Emily Neighbour
8a45f49a04 admin button added 2025-05-12 13:52:47 +01:00
Emily Neighbour
8d007a7393 Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-12 13:49:18 +01:00
Emily Neighbour
8fefc67428 extra bits 2025-05-12 13:49:15 +01:00
IZZY
4890af1e25 Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-12 13:44:57 +01:00
IZZY
628b4a9370 Did stuff 2025-05-12 13:42:44 +01:00
Emily Neighbour
06403d254f Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-12 13:26:01 +01:00
Emily Neighbour
53c6292e1a home page fixes 2025-05-12 13:25:57 +01:00
IZZY
1cdace58b0 Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-12 13:10:55 +01:00
IZZY
28e6a556f8 Fixed prisma schema file 2025-05-12 13:10:51 +01:00
Emily Neighbour
481fadec3c home page bits again 2025-05-12 12:58:01 +01:00
IZZY
0b6167ed4b Merge branch 'master' of ssh://stash.dyson.global.corp:7999/~thowitz/tremor-tracker 2025-05-12 12:20:40 +01:00
Lukeshan Thananchayan
7be535c27a Created admin page 2025-05-12 12:20:28 +01:00
IZZY
b615524c6c Updated all the bcrypt files to bcryptjs 2025-05-12 09:58:25 +01:00
Emily Neighbour
73eec43a8d homepage design 2025-05-10 21:00:28 +01:00
Emily Neighbour
8ef6cccc40 home page start 2025-05-10 15:21:28 +01:00
Emily Neighbour
be60b811a9 cleaning shop, team, mission and contact pages 2025-05-10 14:05:56 +01:00