Commit Graph

159 Commits

Author SHA1 Message Date
59c94e6c51 CHORE: Updated dockerfile to include entrypoint 2024-02-18 20:06:12 +00:00
02f69f2e68 CHORE: Removed unecessary environ variables from pipeline 2024-02-18 19:28:38 +00:00
cd112fa644 CHORE: gitignore stopped actual env file being committed 2024-02-18 19:27:03 +00:00
dba4cf01a3 CHORE: Created .env file to store environment vars 2024-02-18 19:22:35 +00:00
01cf5d641b Merge branch 'master' of https://mygit.wmg.warwick.ac.uk/u5500327/wmgzon 2024-02-16 17:11:00 +00:00
1a673f866f CHORE: Updated readme to container new deployment instructions 2024-02-16 17:10:51 +00:00
u5500327
8d99fc5595 Merge branch 'CICD' into 'master'
Cicd

See merge request u5500327/wmgzon!1
2024-02-16 15:06:22 +00:00
164e4aa213 #11 Changed pipeline to only run on master branch 2024-02-16 15:03:46 +00:00
22833ec7ad #11 Those were actually important XD 2024-02-16 14:27:52 +00:00
5776bcb73f #11 Removed unecessary env vars form pipeline 2024-02-16 14:23:39 +00:00
e5308ecda2 #11 Created a separate runner withappropriate container for running 2024-02-16 14:02:07 +00:00
7551da4aaa #11 Changed container name 2024-02-16 13:32:12 +00:00
e4d8cb2def #11 Changed container name 2024-02-16 13:31:04 +00:00
3c1eaf048c #11 Moved login to before any registry actions 2024-02-16 13:28:30 +00:00
b340beab3c #11 Corrected container name 2024-02-16 13:25:45 +00:00
4024578591 #11 Fixed lint warnings on pipeline 2024-02-16 13:23:14 +00:00
8f7842eb0a #11 Missing - added 2024-02-16 13:20:29 +00:00
1420a3115f #11 corrected indentaiton on ci file 2024-02-16 13:19:23 +00:00
61f2b86746 #11 Added alias to registry to allow for connection. 2024-02-16 13:18:41 +00:00
61e845c5b1 #11 Moved env vars into correct location for pipeline 2024-02-16 13:15:22 +00:00
76f1a5d992 #11 Removed : from pipeline as it caused failure 2024-02-16 13:12:56 +00:00
737e0e7a22 #11 Added variables to allow for connection to registry 2024-02-16 13:07:54 +00:00
31215585da #11 Trying difference permutations to connect to the registry 2024-02-16 13:04:04 +00:00
2ec07edb7e #11 Updated pipeline to pass token via stdin 2024-02-16 12:58:44 +00:00
50ec369dae #11 Updated pipeline to pass password via stdin 2024-02-16 12:55:49 +00:00
cc090daa6d First test of deploying to the container registry 2024-02-16 12:49:13 +00:00
f1f00257ef FEATURE: Added modal for product photos 2024-02-16 12:36:59 +00:00
d74f26c028 CHORE: Fixed pep8 test failure 2024-02-14 22:14:42 +00:00
bbb4ed50fc #10 Cleaned up user alteration code. Stopped user being able to add arbitrary roles. Stopped logged in user from changing when updaing a given user account. 2024-02-14 22:13:34 +00:00
3b8be99e15 #10 Added ability to update user details 2024-02-14 21:59:31 +00:00
d6f7b3e549 #10 Added Product section to admin page 2024-02-14 16:46:30 +00:00
45d2773f9a REFACTOR: Changed blueprints to allow for preprocessing of requests 2024-02-14 14:57:12 +00:00
2f7ba0d963 CHORE: Test failure fixed 2024-02-13 23:21:20 +00:00
82f1eed554 REFACTOR: Changes all raw url's to url_fors 2024-02-13 23:15:32 +00:00
3dc7a1f861 #10 Added ability for users to be removed from the site. 2024-02-13 22:48:23 +00:00
d6244223c4 Updated colours on buttons 2024-02-13 19:05:38 +00:00
0ace3273b4 #10 Started to create a table for administrating users 2024-02-13 11:59:14 +00:00
b6721cc777 #10 Started on creating front end pages for the admin 2024-02-13 10:04:59 +00:00
7f77dcdd02 CHORE: Updated styling on stats page and fixed test failure 2024-02-12 21:44:40 +00:00
cc9aaff6e1 #10 Started on the admin endpoints 2024-02-12 19:28:15 +00:00
7faca50b73 #7 Added basic set of product orderings. 2024-02-12 18:27:04 +00:00
cafaf94a00 #5 Completed product ranking in category 2024-02-12 17:25:16 +00:00
83829af06f #5 Changed styling and added product ranking in category to the stats page 2024-02-11 15:52:12 +00:00
9943a1492c CHORE: Removed random prints and cleaned code 2024-02-09 22:10:25 +00:00
60cb8d7951 #5 Added more data to stats page and improved CSS 2024-02-09 22:01:25 +00:00
7c27aa31b6 WIP: Started to add more stats to the product stats page. 2024-02-09 18:45:33 +00:00
c55fdde3fc Massively improved styling of product pages 2024-02-08 20:38:35 +00:00
b1ee09e35a #9 Delete Product box now available 2024-02-08 19:58:49 +00:00
b49022f7f9 Cleaned up code 2024-02-06 20:11:04 +00:00
7ebeb10cda Changed urls to all use 'url_for' syntax 2024-02-06 19:30:08 +00:00