Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/example/clientproject/web/controllers/Throw500.java

+package com.example.clientproject.web.controllers;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class Throw500 {
+
+    @GetMapping("/return500")
+    public String throw500(){
+
+        return "index.html";
+
+    }
+}

src/main/resources/application.properties

 spring.thymeleaf.cache=false
 
+server.error.whitelabel.enabled=false
+
 #spring.datasource.url=jdbc:mariadb://localhost:3306/mydb?useSSL=false&requireSSL=false&serverTimezone=UTC
 #
 ##set credentials explicitly
@@ -14,4 +16,6 @@ spring.session.store-type=jdbc
 spring.session.jdbc.initialize-schema=always
 spring.session.timeout.seconds=900
 
+
+
 jwt.secret_key=xfVBfHdprpZqn73pbPotfLyBXNR8IWZ7MxhD59sFuBB7QjnLnWppFiZp6Yhu
\ No newline at end of file

src/main/resources/database/Data Script/script.sql

@@ -24,8 +24,14 @@ INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (13,1,3);
 
 
 
-INSERT INTO Stamp_Boards (Stamp_Board_Size, Stamp_Board_Colour, Stamp_Board_Icon) VALUES (10,'#ff0000','stamp.png');
+INSERT INTO Stamp_Boards (Stamp_Board_Size, Stamp_Board_Colour, Stamp_Board_Icon) VALUES (26,'#c6ee4b','imgs/vibezStamp.jpg');
 INSERT INTO Rewards (Reward_Name, Reward_Stamp_Location, Stamp_Board_Id) VALUES ('10% off',3,2);
+INSERT INTO Rewards (Reward_Name, Reward_Stamp_Location, Stamp_Board_Id) VALUES ('free drink',6,2);
+INSERT INTO Rewards (Reward_Name, Reward_Stamp_Location, Stamp_Board_Id) VALUES ('3 for 1 deal',8,2);
+INSERT INTO Rewards (Reward_Name, Reward_Stamp_Location, Stamp_Board_Id) VALUES ('£10 gift voucher',13,2);
+INSERT INTO Rewards (Reward_Name, Reward_Stamp_Location, Stamp_Board_Id) VALUES ('crate of cans for £15',17,2);
+INSERT INTO Rewards (Reward_Name, Reward_Stamp_Location, Stamp_Board_Id) VALUES ('free crate of cans',20,2);
+INSERT INTO Rewards (Reward_Name, Reward_Stamp_Location, Stamp_Board_Id) VALUES ('free crate of limited edition cans',26,2);
 INSERT INTO Stamp_Boards (Stamp_Board_Size, Stamp_Board_Colour, Stamp_Board_Icon) VALUES (10,'#ff0000','stamp.png');
 INSERT INTO Rewards (Reward_Name, Reward_Stamp_Location, Stamp_Board_Id) VALUES ('2 for 1',8,3);
 INSERT INTO Stamp_Boards (Stamp_Board_Size, Stamp_Board_Colour, Stamp_Board_Icon) VALUES (10,'#ff0000','stamp.png');
@@ -64,7 +70,8 @@ INSERT INTO Stamp_Boards (Stamp_Board_Size, Stamp_Board_Colour, Stamp_Board_Icon
 INSERT INTO Rewards (Reward_Name, Reward_Stamp_Location, Stamp_Board_Id) VALUES ('10% off',7,20);
 INSERT INTO Stamp_Boards (Stamp_Board_Size, Stamp_Board_Colour, Stamp_Board_Icon) VALUES (10,'#ff0000','stamp.png');
 INSERT INTO Rewards (Reward_Name, Reward_Stamp_Location, Stamp_Board_Id) VALUES ('5% off',3,21);
-INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Banner, Shop_Active, Stamp_Board_Id, Category_Id) VALUES ('Hudson Group','','hudsongroup.com','21722','ge georgia','shopPic.png','shopBanner.png',1,2,2);
+INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Banner, Shop_Active, Stamp_Board_Id, Category_Id) VALUES ('Vibez Drinks','','https://https://www.vibezdrinks.co.uk/','21722','ge georgia','imgs/vibezLogo.png','imgs/vibezdrinkbanner.png',1,2,2);
+INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Banner, Shop_Active, Stamp_Board_Id, Category_Id) VALUES ('Hudson Group','','https://hudsongroup.com','21722','ge georgia','imgs/HudsongroupLogo.png','imgs/HudsonGroupBanner.png',1,2,2);
 INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Banner, Shop_Active, Stamp_Board_Id, Category_Id) VALUES ('Wyman - Mertz','','wymanmertz.com','27121','ir iran islamic republic of','shopPic.png','shopBanner.png',0,3,4);
 INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Banner, Shop_Active, Stamp_Board_Id, Category_Id) VALUES ('Sauer, Hoppe and Hartmann','','sauerhoppeandhartmann.com','12603','kp korea democratic peoples republic of','shopPic.png','shopBanner.png',1,4,2);
 INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Banner, Shop_Active, Stamp_Board_Id, Category_Id) VALUES ('Flatley LLC','','flatleyllc.com','34968','tn tunisia','shopPic.png','shopBanner.png',1,5,6);
@@ -85,21 +92,9 @@ INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Sho
 INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Banner, Shop_Active, Stamp_Board_Id, Category_Id) VALUES ('Senger - Ryan','','sengerryan.com','25887','iq iraq','shopPic.png','shopBanner.png',0,20,3);
 INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Banner, Shop_Active, Stamp_Board_Id, Category_Id) VALUES ('Fay - Koepp','','faykoepp.com','13482','gf french guiana','shopPic.png','shopBanner.png',1,21,2);
 INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (1,7);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,10);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,2);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,14);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,12);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,3);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,16);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,15);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,1);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,13);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,11);
 INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,9);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,5);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,4);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,18);
-INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,8);
+INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,17);
+INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (2,10);
 INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (3,19);
 INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (3,9);
 INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES (3,5);

src/main/resources/database/schema.sql

@@ -330,6 +330,7 @@ INSERT INTO Tags (Tag_Name) VALUES ('beauty');
 INSERT INTO Tags (Tag_Name) VALUES ('eco-friendly');
 INSERT INTO Tags (Tag_Name) VALUES ('decorations');
 INSERT INTO Tags (Tag_Name) VALUES ('photography');
+INSERT INTO Tags (Tag_Name) VALUES ('vegan');
 
 INSERT INTO Events (Event_Name) VALUES ('New User');
 INSERT INTO Events (Event_Name) VALUES ('Failed Login');

src/main/resources/templates/error.html

+<html lang="en" style="
+    height: 100vh;
+"><head>
+    <meta charset="UTF-8">
+    <title>Something went wrong</title>
+    <link th:replace="fragments/libs.html :: bulma"/>
+    <link th:replace="fragments/libs.html :: fa"/></head>
+<body>
+<div class="is-flex is-justify-content-center is-align-items-center" style="text-align: center;min-height: 100vh;">
+    <h1 class="title is-1 mb-6" style="max-width:75%;">
+        Whoops! It looks like something went wrong! Click below
+        to return to the
+        <a href="/">dashboard</a>
+    </h1>
+</div>
+
+
+</body></html>
\ No newline at end of file