Skip to content

Commit daf56d8

Browse files
committed
requested changes done
1 parent fb10e4a commit daf56d8

File tree

7 files changed

+82
-104
lines changed

7 files changed

+82
-104
lines changed
Lines changed: 77 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,80 @@
11
<script lang="ts">
2-
import SettingsPage from '$lib/fragments/SettingsPage/SettingsPage.svelte';
2+
import { goto } from '$app/navigation';
3+
import { page } from '$app/state';
4+
import SettingsNavigationButton from '$lib/fragments/SettingsNavigationButton/SettingsNavigationButton.svelte';
5+
import {
6+
DatabaseIcon,
7+
Logout01Icon,
8+
Notification02FreeIcons
9+
} from '@hugeicons/core-free-icons';
10+
import { HugeiconsIcon } from '@hugeicons/svelte';
11+
12+
let route = $derived(page.url.pathname);
13+
14+
let username: string = $state('_.ananyayaya._');
15+
let userEmail: string = $state('ananya@auvo.io');
316
</script>
417

5-
<SettingsPage username="_.ananyayaya._" userEmail="ananya@auvo.io" />
18+
<div class="bg-grey rounded-xl p-3 md:p-5">
19+
<SettingsNavigationButton
20+
onclick={() => goto(`/settings/account`)}
21+
profileSrc="https://picsum.photos/200/300"
22+
>
23+
{#snippet children()}
24+
<div class="flex flex-col items-start">
25+
<h2 class="text-lg">{username}</h2>
26+
<p class="text-sm">{userEmail}</p>
27+
</div>
28+
{/snippet}
29+
</SettingsNavigationButton>
30+
</div>
31+
<hr class="text-grey" />
32+
<div class="flex flex-col gap-3">
33+
<h3 class="text-brand-burnt-orange text-base font-semibold">Personalisation</h3>
34+
<div class="{route === `/settings/notifications` ? 'bg-grey' : ''} rounded-xl p-2">
35+
<SettingsNavigationButton onclick={() => goto(`/settings/notifications`)}>
36+
{#snippet leadingIcon()}
37+
<HugeiconsIcon
38+
size="24px"
39+
icon={Notification02FreeIcons}
40+
color="var(--color-brand-burnt-orange)"
41+
/>
42+
{/snippet}
43+
{#snippet children()}
44+
Notifications
45+
{/snippet}
46+
</SettingsNavigationButton>
47+
</div>
48+
</div>
49+
<hr class="text-grey" />
50+
<div class="flex flex-col gap-3">
51+
<h3 class="text-brand-burnt-orange text-base font-semibold">System</h3>
52+
<div class="{route === `/settings/data-and-storage` ? 'bg-grey' : ''} rounded-xl p-2">
53+
<SettingsNavigationButton onclick={() => goto(`/settings/data-and-storage`)}>
54+
{#snippet leadingIcon()}
55+
<HugeiconsIcon
56+
size="24px"
57+
icon={DatabaseIcon}
58+
color="var(--color-brand-burnt-orange)"
59+
/>
60+
{/snippet}
61+
{#snippet children()}
62+
Data & Storage
63+
{/snippet}
64+
</SettingsNavigationButton>
65+
</div>
66+
<div class="{route === `/settings/logout` ? 'bg-grey' : ''} rounded-xl p-2">
67+
<SettingsNavigationButton onclick={() => goto(`/settings/logout`)}>
68+
{#snippet leadingIcon()}
69+
<HugeiconsIcon
70+
size="24px"
71+
icon={Logout01Icon}
72+
color="var(--color-brand-burnt-orange)"
73+
/>
74+
{/snippet}
75+
{#snippet children()}
76+
Logout
77+
{/snippet}
78+
</SettingsNavigationButton>
79+
</div>
80+
</div>

platforms/metagram/src/routes/(protected)/settings/account/deactivate/+page.svelte

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<script>
2-
import { goto } from '$app/navigation';
32
import { SettingsNavigationButton } from '$lib/fragments';
43
import { Button } from '$lib/ui';
54
</script>

platforms/metagram/src/routes/(protected)/settings/account/username/+page.svelte

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<script lang="ts">
22
import { Button, Helper, Input, Label } from '$lib/ui';
3+
4+
let username: string;
35
</script>
46

57
<div>
68
<Label>Change your username</Label>
7-
<Input type="text" placeholder="Edit Username" />
9+
<Input type="text" placeholder="Edit Username" bind:value={username} />
810
<Helper>You can only do this 3 more times</Helper>
911
</div>
1012
<hr class="text-grey" />

platforms/metagram/src/routes/(protected)/settings/data-and-storage/+page.svelte

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
11
<script lang="ts">
2-
import { goto } from '$app/navigation';
32
import { SettingsNavigationButton } from '$lib/fragments';
43
</script>
54

65
<div class="flex flex-col gap-3">
7-
<SettingsNavigationButton onclick={() => goto('/settings/data-and-storage/clear-cache')}>
6+
<SettingsNavigationButton>
87
{#snippet children()}
9-
Clear cache
10-
{/snippet}
11-
</SettingsNavigationButton>
12-
<hr class="text-grey" />
13-
<SettingsNavigationButton onclick={() => goto('/settings/data-and-storage/download-data')}>
14-
{#snippet children()}
15-
Download my data
16-
{/snippet}
17-
</SettingsNavigationButton>
18-
<hr class="text-grey" />
19-
<SettingsNavigationButton onclick={() => goto('/settings/data-and-storage/active-devices')}>
20-
{#snippet children()}
21-
Logged in devices
8+
Merul will add things here (as per out discussion)
229
{/snippet}
2310
</SettingsNavigationButton>
2411
<hr class="text-grey" />

platforms/metagram/src/routes/(protected)/settings/data-and-storage/active-devices/+page.svelte

Lines changed: 0 additions & 37 deletions
This file was deleted.

platforms/metagram/src/routes/(protected)/settings/data-and-storage/clear-cache/+page.svelte

Lines changed: 0 additions & 23 deletions
This file was deleted.

platforms/metagram/src/routes/(protected)/settings/data-and-storage/download-data/+page.svelte

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)