diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index ac503ab9202fbe400462aef8a2c96c077b2e3f4c..0837a3deae70a43557159160c360227b434fbb55 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -35,9 +35,9 @@ insert into locations (locationID, locationName , locationEmail,locationDescript delete from packs; -insert into packs (name, description) value ('Wales National Team', 'Pack of Welsh Football Players in the National Team'); -insert into packs (name, description) value ('Pack2', 'This is pack 2'); -insert into packs (name, description) value ('Pack3', 'This is pack 2'); +insert into packs (name, description) value ('Wales Football Team', 'Pack of Welsh Football Players in the National Team'); +insert into packs (name, description) value ('Wales Rugby Team', 'Pack of Welsh Rugby Players in the National Team'); +insert into packs (name, description) value ('Welsh Heritage', 'Pack About Welsh Heritage'); insert into packs (name, description) value ('Pack3', 'This is pack 2'); insert into packs (name, description) value ('Pack3', 'This is pack 2'); insert into packs (name, description) value ('Pack3', 'This is pack 2'); @@ -56,6 +56,9 @@ insert into stickers (name, description, rarity, packID) value ('Adam Beard', 'W insert into stickers (name, description, rarity, packID) value ('Elliot Dee', 'Wales Rugby Team Player', '1', 2); insert into stickers (name, description, rarity, packID) value ('Corey Domachowski', 'Wales Rugby Team Player', '1', 2); insert into stickers (name, description, rarity, packID) value ('Ryan Elias', 'Wales Rugby Team Player', '1', 2); +insert into stickers (name, description, rarity, packID) value ('Welsh Lady', 'Welsh Heritage', '1', 3); +insert into stickers (name, description, rarity, packID) value ('Welsh Outline', 'Welsh Heritage', '1', 3); +insert into stickers (name, description, rarity, packID) value ('Welsh Spoon', 'Welsh Heritage', '1', 3); delete from stickerprogress; insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '1', true); @@ -64,6 +67,8 @@ insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '3', tru insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '5', true); insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '7', true); insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '9', true); +insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '12', true); +insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '13', true); insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '2', true); insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '4', true); insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '6', true); diff --git a/src/main/resources/static/css/userProfile2.css b/src/main/resources/static/css/userProfile2.css index ab52e7771966601c45fcaa50fcd418774923b533..605f63c054fe609faab275a294252da2ac0c22e2 100644 --- a/src/main/resources/static/css/userProfile2.css +++ b/src/main/resources/static/css/userProfile2.css @@ -191,7 +191,7 @@ main { margin-inline: auto; & .progImg { height: 14svh; - width: 16svh; + /*width: 16svh;*/ border-radius: 20%; } & .progImgFill { @@ -232,7 +232,7 @@ main { } .stickerImg { - height: 15em; + height: 17em; margin: 1.5em; } /*}*/ diff --git a/src/main/resources/static/images/rewards/dragonFilled.png b/src/main/resources/static/images/rewards/packs/3.png similarity index 100% rename from src/main/resources/static/images/rewards/dragonFilled.png rename to src/main/resources/static/images/rewards/packs/3.png diff --git a/src/main/resources/static/images/rewards/stickers/10.png b/src/main/resources/static/images/rewards/stickers/10.png index 7192f23cadeaf4762a4657480a8863700ae61c1f..8926f0b96019ca755895a071a34e7368533ff23d 100644 Binary files a/src/main/resources/static/images/rewards/stickers/10.png and b/src/main/resources/static/images/rewards/stickers/10.png differ diff --git a/src/main/resources/static/images/rewards/stickers/11.png b/src/main/resources/static/images/rewards/stickers/11.png new file mode 100644 index 0000000000000000000000000000000000000000..d759091a2ffb55680062749f999a238a6ae9c26e Binary files /dev/null and b/src/main/resources/static/images/rewards/stickers/11.png differ diff --git a/src/main/resources/static/images/rewards/stickers/12.png b/src/main/resources/static/images/rewards/stickers/12.png new file mode 100644 index 0000000000000000000000000000000000000000..9d03b83e1e071ab15c4f9fed3a6cb6df597ffb1a Binary files /dev/null and b/src/main/resources/static/images/rewards/stickers/12.png differ diff --git a/src/main/resources/static/images/rewards/stickers/13.png b/src/main/resources/static/images/rewards/stickers/13.png new file mode 100644 index 0000000000000000000000000000000000000000..db70b88cd891c33fcbb3ef5c2b3bcfc8ba6cefb9 Binary files /dev/null and b/src/main/resources/static/images/rewards/stickers/13.png differ diff --git a/src/main/resources/static/images/rewards/stickers/6.png b/src/main/resources/static/images/rewards/stickers/6.png index c26b4f87093b037dffae07f955d76c627e17af4a..9db9fe209598c122fac00f272b9a0dac20925b06 100644 Binary files a/src/main/resources/static/images/rewards/stickers/6.png and b/src/main/resources/static/images/rewards/stickers/6.png differ diff --git a/src/main/resources/static/images/rewards/stickers/7.png b/src/main/resources/static/images/rewards/stickers/7.png index 9ba5d0e68b4fb3a1b0ee09d6dc8fa6124899e806..8235ea3febeeeae29076d810dc0a989df02c7b3a 100644 Binary files a/src/main/resources/static/images/rewards/stickers/7.png and b/src/main/resources/static/images/rewards/stickers/7.png differ diff --git a/src/main/resources/static/images/rewards/stickers/8.png b/src/main/resources/static/images/rewards/stickers/8.png index 223910489bdc769d06421a8492ecb1ccdc852897..81f9ca020c4596076834fdbebb6ca2d51a3b5a35 100644 Binary files a/src/main/resources/static/images/rewards/stickers/8.png and b/src/main/resources/static/images/rewards/stickers/8.png differ diff --git a/src/main/resources/static/images/rewards/stickers/9.png b/src/main/resources/static/images/rewards/stickers/9.png index ea1a6d1bd8b1c967fd9a1114875ed5c7b18417d7..43a57a6f9d580bd669eb7bc88b1cd56fb43b5c3c 100644 Binary files a/src/main/resources/static/images/rewards/stickers/9.png and b/src/main/resources/static/images/rewards/stickers/9.png differ