eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-12 16:50:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: move loading spinner from top of card to submit button

Browse source
This commit is contained in:
Spectralitree 2021-12-30 10:22:08 +01:00
parent 6deb792afa
commit 85a758ee15
8 changed files with 23 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/member/Body.svelte
View file

@ -10,12 +10,10 @@
export let groups: Group[] = [];
export let member: Member;
export let loading: boolean;
export let isPublic: boolean = false;
let editMode: boolean = false;
let groupMode: boolean = false;
let privacyLoading = false;
let htmlDescription: string;
$: if (member.description) {
@ -105,7 +103,7 @@
<b>Privacy:</b> <Button size="sm" color="secondary" on:click={togglePrivacyModal}>Edit</Button>
<Modal size="lg" isOpen={privacyOpen} toggle={togglePrivacyModal}>
<ModalHeader toggle={togglePrivacyModal}>
{#if privacyLoading}<div style="float: left; width: 3rem;"><Spinner color="primary" /></div>{/if} Edit privacy
Edit privacy
</ModalHeader>
<ModalBody>
whoops! this is yet to be added.
@ -127,6 +125,6 @@
{:else if editMode}
editing tba o_o
{:else if groupMode}
<GroupEdit bind:loading bind:member bind:groups bind:groupMode />
<GroupEdit on:update bind:member bind:groups bind:groupMode />
{/if}
</CardBody>

2
src/lib/member/GroupEdit.svelte
View file

@ -15,7 +15,7 @@
export let member: Member;
export let groups: Group[] = [];
export let loading: boolean = false;
let loading: boolean = false;
export let groupMode: boolean = true;
let groupsWithMember: Group[];

8
src/lib/member/List.svelte
View file

@ -14,7 +14,6 @@
import Body from './Body.svelte';
export let isPublic: boolean;
let itemLoading: boolean[] = [];
export let list: Member[] = [];
export let groups: Group[] = [];
@ -275,17 +274,16 @@
{#each slicedList as member, index (member.id)}
{#if (!isPublic && member.privacy.visibility === "public") || isPublic}
<AccordionItem>
<CardsHeader bind:item={member} loading={itemLoading[index]} slot="header">
<FaUserCircle slot="icon" />
</CardsHeader>
<Body on:update={updateList} on:updateGroups={updateGroups} bind:isPublic bind:groups bind:member loading={itemLoading[index]} />
<Body on:update={updateList} on:updateGroups={updateGroups} bind:isPublic bind:groups bind:member />
</AccordionItem>
{:else}
<AccordionItem>
<CardsHeader bind:item={member} loading={itemLoading[index]} slot="header">
<CardsHeader bind:item={member} slot="header">
<FaLock slot="icon" />
</CardsHeader>
<Body on:update={updateList} on:updateGroups={updateGroups} bind:isPublic bind:groups bind:member loading={itemLoading[index]} />
<Body on:update={updateList} on:updateGroups={updateGroups} bind:isPublic bind:groups bind:member />
</AccordionItem>
{/if}
{/each}