Skip to content

Commit 9e6193f

Browse files
TorstenDittmannTorstenDittmann
committed
fix: merge conflicts
2 parents 6a10e22 + 87026cc commit 9e6193f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1342
-683
lines changed

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"e2e:ui": "playwright test tests/e2e --ui"
2020
},
2121
"dependencies": {
22-
"@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@ae1eb53",
22+
"@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@d13e864",
2323
"@appwrite.io/pink-icons": "0.25.0",
2424
"@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@2ff4e332",
2525
"@appwrite.io/pink-legacy": "^1.0.1",
26-
"@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@2ff4e332",
26+
"@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@134aa5d",
2727
"@popperjs/core": "^2.11.8",
2828
"@sentry/sveltekit": "^8.38.0",
2929
"@stripe/stripe-js": "^3.5.0",

‎pnpm-lock.yaml

+17-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/lib/components/confirm.svelte

+6-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@
2828
<slot />
2929
<svelte:fragment slot="footer">
3030
<Layout.Stack direction="row" gap="s" justifyContent="flex-end">
31-
<Button text on:click={() => (open = false)}>Cancel</Button>
32-
{#if canDelete}
33-
<Button danger submit {disabled}>{action}</Button>
34-
{/if}
31+
<slot name="footer">
32+
<Button text on:click={() => (open = false)}>Cancel</Button>
33+
{#if canDelete}
34+
<Button danger submit {disabled}>{action}</Button>
35+
{/if}
36+
</slot>
3537
</Layout.Stack>
3638
</svelte:fragment>
3739
</Dialog>

‎src/lib/components/sidebar.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<a
137137
href={`/console/project-${project.$id}/overview`}
138138
class="link"
139-
class:active={pathname.includes('platforms')}
139+
class:active={pathname.includes('overview')}
140140
on:click={() => {
141141
sideBarIsOpen = false;
142142
}}
@@ -252,7 +252,7 @@
252252
variant="secondary"
253253
size="s"
254254
on:click={() => toggleFeedback()}
255-
>Feedback
255+
><span>Feedback</span>
256256
</Button.Button>
257257
<svelte:fragment slot="other">
258258
<MobileFeedbackModal />

‎src/lib/components/usageCard.svelte

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@
77
</script>
88

99
<Card radius="s" padding="xs" isTile>
10-
<Layout.Stack gap="xxs">
10+
<Layout.Stack gap="xxxs">
11+
<Typography.Caption variant="400" color="--color-fgcolor-neutral-tertiary">
12+
{description}
13+
</Typography.Caption>
1114
<slot>
1215
{#if value !== null && value !== undefined}
13-
<Typography.Title size="s">{value}</Typography.Title>
16+
<Typography.Text size="s" truncate color="--color-fgcolor-neutral-primary"
17+
>{value}</Typography.Text>
1418
{:else}
15-
<Skeleton variant="line" width={100} height={26} />
19+
<Skeleton variant="line" width={100} height={20} />
1620
{/if}
1721
</slot>
18-
<Typography.Text variant="m-400" color="--color-fgcolor-neutral-tertiary">
19-
{description}
20-
</Typography.Text>
2122
</Layout.Stack>
2223
</Card>

‎src/lib/elements/selectSearchCheckbox.svelte

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<script lang="ts">
2+
import { ActionMenu, Layout } from '@appwrite.io/pink-svelte';
3+
import InputCheckbox from './forms/inputCheckbox.svelte';
4+
25
export let value = false;
36
export let padding: number | null = null;
47
</script>
58

6-
<li class="drop-list-item">
7-
<button
8-
class="drop-button u-flex u-cross-center u-gap-12"
9-
style:--button-padding-horizontal={padding ? `${padding / 16}rem` : ''}
10-
style:--button-padding-vertical={padding ? `${padding / 16}rem` : ''}
11-
on:click|preventDefault
12-
type="button">
13-
<input type="checkbox" class="is-small" bind:checked={value} />
9+
<ActionMenu.Item.Button on:click>
10+
<Layout.Stack direction="row" gap="xs" alignItems="center">
11+
<InputCheckbox bind:checked={value} id="filter" size="s" />
12+
1413
<slot />
15-
</button>
16-
</li>
14+
</Layout.Stack>
15+
</ActionMenu.Item.Button>

‎src/lib/layout/shell.svelte

+1-4
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,10 @@
165165
<svelte:component this={$page.data.header} />
166166
{/if}
167167
<slot />
168-
{#if showFooter && showSideNavigation}
168+
{#if showFooter}
169169
<slot name="footer" />
170170
{/if}
171171
</section>
172-
{#if showFooter && !showSideNavigation}
173-
<slot name="footer" />
174-
{/if}
175172
</div>
176173

177174
<button

‎src/routes/(console)/organization-[organization]/domains/+page.svelte

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@
9494
{/if}
9595
</Layout.Stack>
9696
</Table.Cell>
97-
<Table.Cell>{domain?.registrar ?? 'N/A'}</Table.Cell>
98-
<Table.Cell>{domain?.nameservers ?? 'N/A'}</Table.Cell>
99-
<Table.Cell>{domain?.expiry ?? 'N/A'}</Table.Cell>
97+
<Table.Cell>{domain?.registrar ?? '-'}</Table.Cell>
98+
<Table.Cell>{domain?.nameservers ?? '-'}</Table.Cell>
99+
<Table.Cell>{domain?.expiry ?? '-'}</Table.Cell>
100100
<Table.Cell>
101-
{domain.renewAt ? toLocaleDateTime(domain.renewAt) : 'N/A'}
101+
{domain.renewAt ? toLocaleDateTime(domain.renewAt) : '-'}
102102
</Table.Cell>
103103
<Table.Cell>{domain.autoRenewal ? 'On' : 'Off'}</Table.Cell>
104104
<Table.Cell>

0 commit comments

Comments
 (0)