From 98f7a391856d85ebf339b0ed156097b33b565753 Mon Sep 17 00:00:00 2001
From: Jake/Rads <jake.fulminated@gmail.com>
Date: Mon, 27 Jun 2022 17:00:48 +0200
Subject: [PATCH] fix(dashboard): fix public profile page links

---
 dashboard/src/lib/list/CardsList.svelte | 3 +--
 dashboard/src/lib/list/List.svelte      | 3 +--
 dashboard/src/pages/Group.svelte        | 2 +-
 dashboard/src/pages/Member.svelte       | 2 +-
 dashboard/src/pages/Random.svelte       | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dashboard/src/lib/list/CardsList.svelte b/dashboard/src/lib/list/CardsList.svelte
index 5e13eaa2..b0d3dab2 100644
--- a/dashboard/src/lib/list/CardsList.svelte
+++ b/dashboard/src/lib/list/CardsList.svelte
@@ -19,7 +19,6 @@
     
     export let isPublic: boolean;
     export let itemType: string;
-    export let isMainDash: boolean;
     export let itemsPerPage: number;
     export let currentPage: number;
     export let fullLength: number;
@@ -31,7 +30,7 @@
     function getItemLink(item: Member | Group): string {
         let url: string;
 
-        if (isMainDash) url = "/dash/";
+        if (!isPublic) url = "/dash/";
         else url = "/profile/";
         
         if (itemType === "member") url += "m/";
diff --git a/dashboard/src/lib/list/List.svelte b/dashboard/src/lib/list/List.svelte
index 6044f98c..b4af4be0 100644
--- a/dashboard/src/lib/list/List.svelte
+++ b/dashboard/src/lib/list/List.svelte
@@ -41,7 +41,6 @@
     $: slicedList = processedList.slice(indexOfFirstItem, indexOfLastItem);
 
     export let isPublic: boolean;
-    export let isMainDash = true;
     export let itemType: string;
 
     let searchValue: string = "";
@@ -132,6 +131,6 @@
     <NewGroup on:create={addItemToList} />
     {/if}
 {/if}
-<CardsList on:deletion bind:list={slicedList} bind:groups bind:members isMainDash={isMainDash} isPublic={isPublic} itemType={itemType} itemsPerPage={itemsPerPage} currentPage={currentPage} fullLength={list.length} />
+<CardsList on:deletion bind:list={slicedList} bind:groups bind:members isPublic={isPublic} itemType={itemType} itemsPerPage={itemsPerPage} currentPage={currentPage} fullLength={list.length} />
 <ListPagination bind:currentPage {pageAmount} />
 {/if}
diff --git a/dashboard/src/pages/Group.svelte b/dashboard/src/pages/Group.svelte
index 0a40546e..38cba0f8 100644
--- a/dashboard/src/pages/Group.svelte
+++ b/dashboard/src/pages/Group.svelte
@@ -156,7 +156,7 @@
                 </CardHeader>
             </Card>
             <ListPagination bind:currentPage bind:pageAmount />
-            <CardsList on:deletion={(e) => deleteMemberFromList(e)} bind:list={slicedMembers} isPublic={isPublic} isMainDash={false} itemType="member" itemsPerPage={itemsPerPage} currentPage={currentPage} fullLength={members.length} />
+            <CardsList on:deletion={(e) => deleteMemberFromList(e)} bind:list={slicedMembers} isPublic={isPublic} itemType="member" itemsPerPage={itemsPerPage} currentPage={currentPage} fullLength={members.length} />
             <ListPagination bind:currentPage bind:pageAmount />
             {/if}
             {/if}
diff --git a/dashboard/src/pages/Member.svelte b/dashboard/src/pages/Member.svelte
index cc279372..eb34ecef 100644
--- a/dashboard/src/pages/Member.svelte
+++ b/dashboard/src/pages/Member.svelte
@@ -158,7 +158,7 @@
                 </CardHeader>
             </Card>
             <ListPagination bind:currentPage bind:pageAmount />
-            <CardsList on:deletion={(e) => deleteGroupFromList(e)} bind:list={slicedGroups} isPublic={isPublic} isMainDash={false} itemType="group" itemsPerPage={itemsPerPage} currentPage={currentPage} fullLength={groups.length} />
+            <CardsList on:deletion={(e) => deleteGroupFromList(e)} bind:list={slicedGroups} isPublic={isPublic} itemType="group" itemsPerPage={itemsPerPage} currentPage={currentPage} fullLength={groups.length} />
             <ListPagination bind:currentPage bind:pageAmount />
             {/if}
             {/if}
diff --git a/dashboard/src/pages/Random.svelte b/dashboard/src/pages/Random.svelte
index fc29a5c7..963212f4 100644
--- a/dashboard/src/pages/Random.svelte
+++ b/dashboard/src/pages/Random.svelte
@@ -206,7 +206,7 @@
             {:else if err}
                 <Alert color="danger">{err}</Alert>
             {:else}
-                <CardsList openByDefault={openByDefault} bind:list={randomList} isPublic={true} isMainDash={false} itemType={type} itemsPerPage={5} currentPage={rollCounter} fullLength={randomList.length} />
+                <CardsList openByDefault={openByDefault} bind:list={randomList} isPublic={true} itemType={type} itemsPerPage={5} currentPage={rollCounter} fullLength={randomList.length} />
             {/if}
         </Col>
     </Row>