From ce431364a08283f4a1462c178de1df7033244b0e Mon Sep 17 00:00:00 2001
From: Jake/Rads <jake.fulminated@gmail.com>
Date: Mon, 27 Jun 2022 13:09:13 +0200
Subject: [PATCH] fix(dashboard): reuse list component in randomizer

---
 dashboard/src/lib/list/CardsList.svelte |  8 +--
 dashboard/src/pages/Random.svelte       | 83 +------------------------
 2 files changed, 6 insertions(+), 85 deletions(-)

diff --git a/dashboard/src/lib/list/CardsList.svelte b/dashboard/src/lib/list/CardsList.svelte
index 4b51732f..7bbf14af 100644
--- a/dashboard/src/lib/list/CardsList.svelte
+++ b/dashboard/src/lib/list/CardsList.svelte
@@ -20,6 +20,8 @@
     export let isPublic: boolean;
     export let itemType: string;
     export let isMainDash: boolean;
+
+    export let openByDefault = false;
     
     let cardIndexArray = [];
 
@@ -61,10 +63,8 @@
     function toggleCard(index: number) {
         if (isOpenArray[index] === true) {
             isOpenArray[index] = false;
-            cardIndexArray[index].classList.add("collapsed");
         } else {
             isOpenArray[index] = true;
-            cardIndexArray[index].classList.remove("collapsed");
         }
     }
 
@@ -101,7 +101,7 @@
     }
 </script>
 
-{#if settings && settings.accessibility ? (!settings.accessibility.expandedcards && !settings.accessibility.pagelinks) : true}
+{#if !openByDefault && (settings && settings.accessibility ? (!settings.accessibility.expandedcards && !settings.accessibility.pagelinks) : true)}
     <div class="mb-3">    
     {#each list as item, index (item.id + index)}
         <Card>
@@ -135,7 +135,7 @@
         </Card>
     {/each}
     </div>
-{:else if settings.accessibility.expandedcards}
+{:else if openByDefault || settings.accessibility.expandedcards}
     {#each list as item, index (item.id + index)}
     <Card class="mb-3">
         <div class="accordion-button collapsed p-0" bind:this={cardIndexArray[index]} on:keydown={(e) => skipToNextItem(e, index)} tabindex={0}>
diff --git a/dashboard/src/pages/Random.svelte b/dashboard/src/pages/Random.svelte
index 5ef554bb..5ed532eb 100644
--- a/dashboard/src/pages/Random.svelte
+++ b/dashboard/src/pages/Random.svelte
@@ -4,14 +4,9 @@
     import { Alert, Col, Container, Row, Card, CardBody, CardHeader, CardTitle, Input, Label, Button, Accordion, AccordionHeader, AccordionItem } from 'sveltestrap';
     import FaRandom from 'svelte-icons/fa/FaRandom.svelte'
     
-    import MemberBody from '../lib/member/Body.svelte';
-    import GroupBody from '../lib/group/Body.svelte';
-    import CardsHeader from '../lib/CardsHeader.svelte';
+    import CardsList from '../lib/list/CardsList.svelte';
     import api from '../api';
     import { Group, Member } from '../api/types';
-    import FaUserCircle from 'svelte-icons/fa/FaUserCircle.svelte';
-    import FaUsers from 'svelte-icons/fa/FaUsers.svelte';
-    import FaLock from 'svelte-icons/fa/FaLock.svelte';
 
     export let isPublic: boolean = false;
     export let type: string = "member";
@@ -210,81 +205,7 @@
             {:else if err}
                 <Alert color="danger">{err}</Alert>
             {:else}
-            {#if !openByDefault && (settings && settings.accessibility ? (!settings.accessibility.expandedcards && !settings.accessibility.pagelinks) : true)}
-            <Accordion class="my-3" stayOpen>
-                {#each randomList as item, index (item.id + index)}
-                <AccordionItem>
-                    <CardsHeader {item} slot="header">
-                        <div slot="icon">
-                            {#if isPublic || item.privacy.visibility === "public"}
-                            {#if type === "member"}
-                            <FaUserCircle />
-                            {:else if type === "group"}
-                            <FaUsers />
-                            {/if}
-                            {:else}
-                            <FaLock />
-                            {/if}
-                        </div>
-                    </CardsHeader>
-                    {#if type === "member"}
-                    <MemberBody isPublic={true} bind:member={item} isMainDash={false} />
-                    {:else if type === "group"}
-                    <GroupBody isPublic={true} bind:group={item} isMainDash={false} />
-                    {/if}
-                </AccordionItem>
-                {/each}
-            </Accordion>
-            {:else if openByDefault || settings.accessibility.expandedcards}
-                {#each randomList as item, index (item.id + index)}
-                <Card class="mb-3">
-                    <CardHeader>
-                        <CardsHeader {item}>
-                            <div slot="icon">
-                                {#if isPublic || item.privacy.visibility === "public"}
-                                {#if type === "member"}
-                                <FaUserCircle />
-                                {:else if type === "group"}
-                                <FaUsers />
-                                {/if}
-                                {:else}
-                                <FaLock />
-                                {/if}
-                            </div>
-                        </CardsHeader>
-                    </CardHeader>
-                    <CardBody>
-                        {#if type === "member"}
-                        <MemberBody isPublic={true} bind:member={item} isMainDash={false} />
-                        {:else if type === "group"}
-                        <GroupBody isPublic={true} bind:group={item} isMainDash={false} />
-                        {/if}
-                    </CardBody>
-                </Card>
-                {/each}
-            {:else}
-                <div class="my-3">
-                {#each randomList as item, index (item.id + index)}
-                <Card>
-                    <Link class="accordion-button collapsed" style="text-decoration: none;" to={getItemLink(item)}>
-                        <CardsHeader {item}>
-                            <div slot="icon">
-                                {#if isPublic || item.privacy.visibility === "public"}
-                                {#if type === "member"}
-                                <FaUserCircle />
-                                {:else if type === "group"}
-                                <FaUsers />
-                                {/if}
-                                {:else}
-                                <FaLock />
-                                {/if}
-                            </div>
-                        </CardsHeader>
-                    </Link>
-                </Card>
-                {/each}
-                </div>
-            {/if}
+                <CardsList openByDefault={openByDefault} bind:list={randomList} isPublic={true} isMainDash={false} itemType={type} />
             {/if}
         </Col>
     </Row>