Skip to content

Commit 248c8cc

Browse files
ItzNotABugItzNotABug
committed
Merge remote-tracking branch 'origin/feat-plan-update' into feat-plan-update
2 parents 5c84939 + b8e2281 commit 248c8cc

File tree

14 files changed

+172
-174
lines changed

14 files changed

+172
-174
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
},
2323
"dependencies": {
2424
"@ai-sdk/svelte": "^1.1.24",
25-
"@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e190a19",
25+
"@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@a5e5564",
2626
"@appwrite.io/pink-icons": "0.25.0",
2727
"@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
2828
"@appwrite.io/pink-legacy": "^1.0.3",
29-
"@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@4e03f34",
29+
"@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40bae6b",
3030
"@popperjs/core": "^2.11.8",
3131
"@sentry/sveltekit": "^8.38.0",
3232
"@stripe/stripe-js": "^3.5.0",

‎pnpm-lock.yaml

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/lib/commandCenter/panels/ai.svelte

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,10 @@
167167
<div style="padding: 1rem; padding-block-end: 0;">
168168
<Alert.Inline
169169
dismissible
170+
title="We collect user responses to refine our experimental AI feature."
170171
on:dismiss={() => {
171172
$preferences.hideAiDisclaimer = true;
172-
}}>
173-
<span slot="title">
174-
We collect user responses to refine our experimental AI feature.
175-
</span>
176-
</Alert.Inline>
173+
}} />
177174
</div>
178175
{/if}
179176

@@ -229,15 +226,19 @@
229226
<Layout.Stack direction="row" gap="s">
230227
<AvatarInitials size="s" name={$user.name} />
231228
<form
232-
class="input-text-wrapper u-width-full-line"
229+
class="u-full-width input-text-wrapper"
233230
style="--amount-of-buttons: 1;"
231+
style:display="flex"
232+
style:width="100%"
233+
style:align-items="center"
234234
on:submit|preventDefault={(e) => {
235235
handleSubmit(e);
236236
}}>
237237
<!-- svelte-ignore a11y-autofocus -->
238238
<input
239239
type="text"
240240
class="input-text"
241+
style:width="100%"
241242
placeholder="Ask a question..."
242243
autofocus
243244
bind:value={$input}

‎src/lib/components/billing/gradientBanner.svelte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
const alertHeight = container?.getBoundingClientRect()?.height || 0;
2323
const { header, sidebar, content } = queryLayoutElements();
2424
const headerHeight = header?.getBoundingClientRect().height || 0;
25-
const offset = alertHeight + (!isTabletViewport && header ? headerHeight : 0);
26-
25+
const offset = alertHeight + (!$isTabletViewport && header ? headerHeight : 0);
2726
if (header) header.style.top = `${alertHeight}px`;
2827
if (sidebar) {
2928
sidebar.style.top = `${offset}px`;

‎src/lib/components/navbar.svelte

Lines changed: 69 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@
2323
Navbar,
2424
Icon,
2525
Layout,
26-
Link,
2726
Tooltip,
28-
Card,
2927
ActionMenu,
3028
ToggleButton,
3129
Button,
3230
Avatar,
33-
Typography
31+
Typography,
32+
Popover
3433
} from '@appwrite.io/pink-svelte';
3534
import { toggleCommandCenter } from '$lib/commandCenter/commandCenter.svelte';
3635
import {
@@ -209,91 +208,79 @@
209208
</Button.Button>
210209
<span slot="tooltip">{isMac() ? '⌘ + K' : 'Ctrl + K'}</span></Tooltip>
211210
</Layout.Stack>
212-
<Link.Button
213-
on:click={() => {
214-
showAccountMenu = !showAccountMenu;
215-
shouldAnimateThemeToggle = false;
216-
if (showAccountMenu) {
217-
trackEvent(Click.MenuDropDownClick);
218-
}
219-
}}>
220-
<div style:user-select="none">
211+
<Popover let:toggle let:showing>
212+
<button
213+
type="button"
214+
on:click|preventDefault={(e) => {
215+
toggle(e);
216+
shouldAnimateThemeToggle = false;
217+
if (showing) {
218+
trackEvent(Click.MenuDropDownClick);
219+
}
220+
}}
221+
style:user-select="none">
221222
<Avatar size="s" src={avatar} />
222-
</div>
223-
</Link.Button>
224-
{#if showAccountMenu}
225-
<div class="account-container">
226-
<Card.Base padding="xxxs" shadow={true}>
223+
</button>
224+
<svelte:fragment slot="tooltip" let:toggle>
225+
<ActionMenu.Root noPadding>
227226
<Layout.Stack gap="xxs">
228-
<ActionMenu.Root>
229-
<Layout.Stack gap="xxs">
230-
<div
231-
style:padding-inline-start="10px"
232-
style:padding-inline-end="8px"
233-
style:padding-block="4px">
234-
<Typography.Text variant="m-500">
235-
{$user.email}
236-
</Typography.Text>
237-
</div>
238-
<ActionMenu.Item.Anchor
239-
trailingIcon={IconUser}
240-
size="l"
241-
href={`${base}/account`}>
242-
Account</ActionMenu.Item.Anchor>
227+
<div
228+
style:padding-inline-start="10px"
229+
style:padding-inline-end="8px"
230+
style:padding-block="4px">
231+
<Typography.Text variant="m-500">
232+
{$user.email}
233+
</Typography.Text>
234+
</div>
235+
<ActionMenu.Item.Anchor
236+
trailingIcon={IconUser}
237+
on:click={toggle}
238+
size="l"
239+
href={`${base}/account`}>
240+
Account</ActionMenu.Item.Anchor>
243241

244-
<ActionMenu.Item.Button
245-
trailingIcon={IconLogoutRight}
246-
size="l"
247-
on:click={() => logout()}>Sign out</ActionMenu.Item.Button>
248-
<div
249-
style:padding-inline-start="10px"
250-
style:padding-inline-end="8px">
251-
<Layout.Stack
252-
justifyContent="space-between"
253-
direction="row"
254-
alignItems="center">
255-
<Typography.Text>Theme</Typography.Text>
256-
<div
257-
class:keepTransformTransition={shouldAnimateThemeToggle}>
258-
<ToggleButton
259-
bind:active={activeTheme}
260-
on:change={() => {
261-
setTimeout(() => {
262-
shouldAnimateThemeToggle = true;
263-
}, 150);
264-
}}
265-
buttons={[
266-
{
267-
id: 'light',
268-
label: 'Light',
269-
icon: IconSun
270-
},
271-
{
272-
id: 'dark',
273-
label: 'Dark',
274-
icon: IconMoon
275-
},
276-
{
277-
id: 'auto',
278-
label: 'System',
279-
icon: IconMode
280-
}
281-
]}></ToggleButton>
282-
</div>
283-
</Layout.Stack>
242+
<ActionMenu.Item.Button
243+
trailingIcon={IconLogoutRight}
244+
size="l"
245+
on:click={() => logout()}>Sign out</ActionMenu.Item.Button>
246+
<div style:padding-inline-start="10px" style:padding-inline-end="8px">
247+
<Layout.Stack
248+
justifyContent="space-between"
249+
direction="row"
250+
alignItems="center">
251+
<Typography.Text>Theme</Typography.Text>
252+
<div class:keepTransformTransition={shouldAnimateThemeToggle}>
253+
<ToggleButton
254+
bind:active={activeTheme}
255+
on:change={() => {
256+
setTimeout(() => {
257+
shouldAnimateThemeToggle = true;
258+
}, 150);
259+
}}
260+
buttons={[
261+
{
262+
id: 'light',
263+
label: 'Light',
264+
icon: IconSun
265+
},
266+
{
267+
id: 'dark',
268+
label: 'Dark',
269+
icon: IconMoon
270+
},
271+
{
272+
id: 'auto',
273+
label: 'System',
274+
icon: IconMode
275+
}
276+
]}></ToggleButton>
284277
</div>
285278
</Layout.Stack>
286-
</ActionMenu.Root>
279+
</div>
287280
</Layout.Stack>
288-
</Card.Base>
289-
</div>
290-
<button
291-
class="account-backdrop"
292-
aria-label="Account menu"
293-
on:click={() => {
294-
showAccountMenu = false;
295-
}}></button>
296-
{/if}
281+
</ActionMenu.Root>
282+
</svelte:fragment>
283+
</Popover>
297284
</div>
298285
</div>
299286
</Navbar.Base>
@@ -405,24 +392,6 @@
405392
}
406393
}
407394
408-
.account-container {
409-
position: absolute;
410-
right: var(--space-7);
411-
top: var(--base-44);
412-
width: 244px;
413-
display: flex;
414-
z-index: 1;
415-
}
416-
417-
.account-backdrop {
418-
position: absolute;
419-
left: 0;
420-
top: 0;
421-
width: 100vw;
422-
height: 100vh;
423-
background-color: transparent;
424-
}
425-
426395
/* The default drop list has a max-inline width of 280px, which squeezes the support modal. */
427396
:global(.extended-width) {
428397
max-inline-size: none;

‎src/lib/stores/billing.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ export function isServiceLimited(serviceId: PlanServices, plan: Tier, total: num
275275
}
276276

277277
export function checkForEnterpriseTrial(org: Organization) {
278+
if (!org || !org.billingNextInvoiceDate) return;
278279
if (calculateEnterpriseTrial(org) > 0) {
279280
headerAlert.add({
280281
id: 'teamEnterpriseTrial',

‎src/routes/(console)/organization-[organization]/createProject.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
let error: string;
2121
let showCustomId = false;
2222
let disabled: boolean = false;
23-
let name: string = 'Appwrite project';
23+
let name: string = 'New project';
2424
2525
async function create() {
2626
try {

‎src/routes/(console)/organization-[organization]/createProjectCloud.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
export let showCreateProjectCloud: boolean;
1818
1919
let id: string = null;
20-
let name: string = 'Appwrite project';
20+
let name: string = 'New project';
2121
let region: string = Region.Fra;
2222
let error: string = null;
2323

0 commit comments

Comments
 (0)