Active shop now shows, clicking the shop takes you to that shop's settings page

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

@@ -117,43 +117,36 @@ public class AdminController {
             }
 
             //Get the shops paired with admin, sorted by category
-            Map<String,ArrayList<Map<Shops,Users>>> categorySortedShops = new HashMap<>();
+            Map<String,ArrayList<Shops>> categorySortedShops = new HashMap<>();
             //For each shop
             for (Shops sh : shopsRepo.findAll()){
-                Map<Shops, Users> shopsUsersMap = new HashMap<>();
                 //Get the perms for that shop
                 List<UserPermissions> permList = userPermissionsRepo.findByShopID(sh.getShopId());
                 //For each perm
                 for(UserPermissions p : permList){
                     //If it is the shop creator then pair them with the shop
-                    if(p.getAdminType().getAdminTypeId() == 2){
-                        shopsUsersMap.put(sh, p.getUser());
+                    if(p.getAdminType().getAdminTypeId() == 2 && user.get().getUserId() == p.getUser().getUserId()){
+                        //Set an empty list for the category if it doesn't exist
+                        if(!categorySortedShops.containsKey(sh.getCategory().getCategoryName())){
+                            categorySortedShops.put(sh.getCategory().getCategoryName(),new ArrayList<>());
+                        }
+
+                        //Add the pair to the correct category list
+                        ArrayList<Shops> cat = categorySortedShops.get(sh.getCategory().getCategoryName());
+                        cat.add(sh);
+                        categorySortedShops.put(sh.getCategory().getCategoryName(), cat);
                     }
                 }
-
-                //Set an empty list for the category if it doesn't exist
-                if(!categorySortedShops.containsKey(sh.getCategory())){
-                    categorySortedShops.put(sh.getCategory().getCategoryName(),new ArrayList<>());
-                }
-
-                //Add the pair to the correct category list
-                ArrayList<Map<Shops,Users>> cat = categorySortedShops.get(sh.getCategory().getCategoryName());
-                if(shopsUsersMap.size() != 0){
-                    cat.add(shopsUsersMap);
-                    categorySortedShops.put(sh.getCategory().getCategoryName(), cat);
-                }
             }
 
-            Map<String,ArrayList<Map<Shops,Users>>> filteredCategorySortedShops = new HashMap<>();
+            Map<String,ArrayList<Shops>> filteredCategorySortedShops = new HashMap<>();
             for(Map.Entry e : categorySortedShops.entrySet()){
-                ArrayList<Map<Shops,Users>> val = (ArrayList<Map<Shops, Users>>) e.getValue();
+                ArrayList<Shops> val = (ArrayList<Shops>) e.getValue();
                 if(val.size() != 0){
                     filteredCategorySortedShops.put(e.getKey().toString(), val);
                 }
             }
 
-            System.out.println(filteredCategorySortedShops);
-
 
             model.addAttribute("adminOfByCategory",filteredCategorySortedShops);
             model.addAttribute("linkedShop", userShopLinked.hasShop(user.get().getUserId()));

src/main/resources/static/css/admin.css

@@ -167,8 +167,12 @@ html{
 }
 
 .sidebar .shop-tab.shop-name{
-	color: red;
 	height: 50px;
+	color: #4a4a4a;
+}
+
+.sidebar .shop-tab.shop-name:hover{
+	opacity: 0.8;
 }
 
 .shop-tab-container{

src/main/resources/templates/admin.html

@@ -46,16 +46,19 @@
 		</div>
 		<div class="sidebar closed" id="side_shop_select">
 			<th:block th:each="category: ${adminOfByCategory.entrySet()}">
-				<div class="shop-tab-container" onclick="this.classList.toggle('open')">
-					<div class="shop-tab shop-category">
+				<div class="shop-tab-container">
+					<div class="shop-tab shop-category"  onclick="this.parentElement.classList.toggle('open')">
 						<p th:text="${category.getKey()}"></p>
 						<div class="baseIcon">
 							<i class="fas fa-caret-down fa-lg"></i>
 						</div>
 					</div>
-					<div class="shop-tab shop-name" th:each="shop: ${category.getValue()}">
-						<p th:text="${shop.entrySet.iterator.next().getKey()}"></p>
-					</div>
+					<th:block th:each="sh: ${category.getValue()}">
+						<div th:class="'shop-tab shop-name' + ${shop.getShopId() == sh.getShopId()?' active':''}"
+						th:onclick="'window.location.href=\'/settings?shopId='+${sh.getShopId()} + '&tab=shop-setup\''">
+							<p th:text="'- ' + ${sh.getShopName()}"></p>
+						</div>
+					</th:block>
 				</div>
 			</th:block>
 		</div>