diff --git a/src/main/java/team5/smartTowns/users/UserController.java b/src/main/java/team5/smartTowns/users/UserController.java
index 58ce89287d678d74f512b0070db9fd968e9c1e6d..d86675595962232be59a9d5978d3eda4adcbec3c 100644
--- a/src/main/java/team5/smartTowns/users/UserController.java
+++ b/src/main/java/team5/smartTowns/users/UserController.java
@@ -55,13 +55,7 @@ public class UserController {
}
mav.addObject("user", userRepository.getUser(id));
mav.addObject("packs", allPacks);
- mav.addObject("selectedPack", rewardsRepository.findPackByID(1));
- mav.addObject("stickers", allStickers);
-
- /* CHANGE THIS BIT WHEN DEFAULT IS ADDED TO PAGE*/
- int progress = getPackProgress(allStickers);
- mav.addObject("progress", progress);
-
+ mav.addAllObjects(getPackInfo(id, 1).getModelMap());
return mav;
@@ -80,7 +74,6 @@ public class UserController {
}
mav.addObject("stickers", allStickers);
-
int progress = getPackProgress(allStickers);
mav.addObject("progress", progress);
mav.addObject("selectedPack", rewardsRepository.findPackByID(packID));
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index abd792c293fcebb3720a57b942fd1bf7e2d1fca0..ac503ab9202fbe400462aef8a2c96c077b2e3f4c 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -51,12 +51,23 @@ insert into stickers (name, description, rarity, packID) value ('neco_williams',
insert into stickers (name, description, rarity, packID) value ('joe_morrell', 'Wales Football Team Player', '2', 1);
insert into stickers (name, description, rarity, packID) value ('ethan_ampadu', 'Wales Football Team Player', '2', 1);
insert into stickers (name, description, rarity, packID) value ('connor_roberts', 'Wales Football Team Player', '2', 1);
-insert into stickers (name, description, rarity, packID) value ('TownRegular', 'You visited the town 3 days in a row!', '1', 2);
-insert into stickers (name, description, rarity, packID) value ('TownRegular', 'You visited the town 3 days in a row!', '1', 2);
+insert into stickers (name, description, rarity, packID) value ('Taine_Basham', 'Wales Rugby Team Player', '1', 2);
+insert into stickers (name, description, rarity, packID) value ('Adam Beard', 'Wales Rugby Team Player', '1', 2);
+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);
delete from stickerprogress;
insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '1', true);
insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '2', true);
insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '3', true);
insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '5', true);
-insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '2', true);
\ No newline at end of file
+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 ('2', '2', true);
+insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '4', true);
+insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '6', true);
+insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '7', true);
+insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '8', true);
+insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '9', true);
+insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '10', true);
\ No newline at end of file
diff --git a/src/main/resources/static/css/userProfile2.css b/src/main/resources/static/css/userProfile2.css
index 1f388ce4321cac226e53c602f574018c5c3ed126..ab52e7771966601c45fcaa50fcd418774923b533 100644
--- a/src/main/resources/static/css/userProfile2.css
+++ b/src/main/resources/static/css/userProfile2.css
@@ -168,6 +168,7 @@ main {
}
& .packImg {
transition: 0.5s ease-in-out 1ms;
+ border-radius: 20%;
}
& .packImg:hover {
transform: scale(1.5, 1.5)
@@ -191,6 +192,7 @@ main {
& .progImg {
height: 14svh;
width: 16svh;
+ border-radius: 20%;
}
& .progImgFill {
position: absolute;
@@ -202,14 +204,14 @@ main {
filter: grayscale(1);
}
& .progText {
- color: rgba(255, 255, 255, 0.5);
- text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
+ font-family: Consolas, serif;
+ opacity: 0.5;
+ -webkit-text-stroke: 1px black;
position: absolute;
text-align: center;
- /*height: 14svh;*/
width: 16svh;
left:50%;
- transform: translate(-50%, 100%);
+ transform: translate(-50%, 150%);
font-size: 3em;
}
diff --git a/src/main/resources/static/images/rewards/packs/2.png b/src/main/resources/static/images/rewards/packs/2.png
index 0ab3c664abab3e781909f556cc9d6c629492dbb5..49e1ffc1ddad8ce3d6806f388f4dd70cd59c233e 100644
Binary files a/src/main/resources/static/images/rewards/packs/2.png and b/src/main/resources/static/images/rewards/packs/2.png differ
diff --git a/src/main/resources/static/images/rewards/stickers/10.png b/src/main/resources/static/images/rewards/stickers/10.png
new file mode 100644
index 0000000000000000000000000000000000000000..7192f23cadeaf4762a4657480a8863700ae61c1f
Binary files /dev/null and b/src/main/resources/static/images/rewards/stickers/10.png differ
diff --git a/src/main/resources/static/images/rewards/stickers/6.png b/src/main/resources/static/images/rewards/stickers/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..c26b4f87093b037dffae07f955d76c627e17af4a
Binary files /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..9ba5d0e68b4fb3a1b0ee09d6dc8fa6124899e806
Binary files /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..223910489bdc769d06421a8492ecb1ccdc852897
Binary files /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..ea1a6d1bd8b1c967fd9a1114875ed5c7b18417d7
Binary files /dev/null and b/src/main/resources/static/images/rewards/stickers/9.png differ