diff --git a/package.json b/package.json index 45c9f0cb1..d4136ff28 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9193", "@appwrite.io/pink": "0.25.0", "@appwrite.io/pink-icons": "0.25.0", - "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5824678", + "@appwrite.io/pink-icons-svelte": "1.0.0-next.7", "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@250", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", @@ -46,7 +46,7 @@ }, "devDependencies": { "@melt-ui/pp": "^0.3.2", - "@melt-ui/svelte": "^0.86.2", + "@melt-ui/svelte": "^0.83.0", "@playwright/test": "^1.49.0", "@sveltejs/adapter-static": "^3.0.6", "@sveltejs/kit": "^2.8.1", diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 1144e11b1..8312bd08e 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -338,5 +338,6 @@ export enum Submit { SiteUpdateBuildSettings = 'submit_site_update_build_settings', SiteUpdateSinglePageApplication = 'submit_site_update_single_page_application', SiteConnectRepo = 'submit_site_connect_repo', - SiteRedeploy = 'submit_site_redeploy' + SiteRedeploy = 'submit_site_redeploy', + SiteDisconnectRepo = 'submit_site_disconnect_repo' } diff --git a/src/lib/components/billing/paymentModal.svelte b/src/lib/components/billing/paymentModal.svelte index 16388b948..4d98f6e45 100644 --- a/src/lib/components/billing/paymentModal.svelte +++ b/src/lib/components/billing/paymentModal.svelte @@ -68,12 +68,7 @@ } - + - + {#if isFree} Usage on the {$plansInfo?.get(BillingPlan.FREE).name} plan is limited for the following resources. Next billing period: {toLocaleDate(nextDate)}. diff --git a/src/lib/components/billing/validateCreditModal.svelte b/src/lib/components/billing/validateCreditModal.svelte index 961e04144..71775a383 100644 --- a/src/lib/components/billing/validateCreditModal.svelte +++ b/src/lib/components/billing/validateCreditModal.svelte @@ -37,13 +37,7 @@ } - + Credits will be applied automatically to your next invoice. diff --git a/src/lib/components/card.svelte b/src/lib/components/card.svelte index dbbc17085..e92df5316 100644 --- a/src/lib/components/card.svelte +++ b/src/lib/components/card.svelte @@ -26,7 +26,6 @@ export let isTile = false; export let isDashed = false; export let isButton = false; - export let danger = false; export let href: string = null; let classes = ''; export { classes as class }; diff --git a/src/lib/components/cardGrid.svelte b/src/lib/components/cardGrid.svelte index 28f70a2ca..f12b7db0c 100644 --- a/src/lib/components/cardGrid.svelte +++ b/src/lib/components/cardGrid.svelte @@ -1,7 +1,6 @@ diff --git a/src/lib/components/copy.svelte b/src/lib/components/copy.svelte index 48c572063..280a95df6 100644 --- a/src/lib/components/copy.svelte +++ b/src/lib/components/copy.svelte @@ -1,6 +1,5 @@ -
- + + + + diff --git a/src/lib/components/permissions/custom.svelte b/src/lib/components/permissions/custom.svelte index b472d34fb..fe49acbf0 100644 --- a/src/lib/components/permissions/custom.svelte +++ b/src/lib/components/permissions/custom.svelte @@ -1,5 +1,5 @@ - -
- - - {#if search} - (search = '')} /> - {/if} - - -
- - +
+ + + {#if search} + (search = '')} /> + {/if} + + +
diff --git a/src/lib/components/trim.svelte b/src/lib/components/trim.svelte index 9a260832d..f17a409f1 100644 --- a/src/lib/components/trim.svelte +++ b/src/lib/components/trim.svelte @@ -1,25 +1,13 @@ - - - - {container?.innerText ?? undefined} - + + + + + {container?.innerText ?? undefined} + diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index 4deaf455f..2e2e0a290 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -73,40 +73,37 @@ }, 0); -
- {#if !hideColumns && view === View.Table} - {#if $columns?.length} - - - - {#each $columns as column} - - {/each} - - - {/if} +{#if !hideColumns && view === View.Table} + {#if $columns?.length} + + + + {#each $columns as column} + + {/each} + + {/if} -
+{/if} {#if !hideView}
diff --git a/src/lib/elements/forms/button.svelte b/src/lib/elements/forms/button.svelte index f84e44d94..25e5e342d 100644 --- a/src/lib/elements/forms/button.svelte +++ b/src/lib/elements/forms/button.svelte @@ -6,14 +6,12 @@ import { Button } from '@appwrite.io/pink-svelte'; import type { ComponentProps } from 'svelte'; - type Props = ComponentProps; + type Props = ComponentProps; export let submit = false; export let secondary = false; export let text = false; - export let danger = false; export let icon = false; - export let link = false; export let size: Props['size'] = 's'; export let disabled = false; export let external = false; diff --git a/src/lib/elements/forms/formItem.svelte b/src/lib/elements/forms/formItem.svelte deleted file mode 100644 index e6dd8b731..000000000 --- a/src/lib/elements/forms/formItem.svelte +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/src/lib/elements/forms/formItemPart.svelte b/src/lib/elements/forms/formItemPart.svelte deleted file mode 100644 index f43b94d4a..000000000 --- a/src/lib/elements/forms/formItemPart.svelte +++ /dev/null @@ -1,8 +0,0 @@ - - -
- -
diff --git a/src/lib/elements/forms/formList.svelte b/src/lib/elements/forms/formList.svelte index 04ca9db58..d45423ef7 100644 --- a/src/lib/elements/forms/formList.svelte +++ b/src/lib/elements/forms/formList.svelte @@ -1,10 +1,5 @@ diff --git a/src/lib/elements/forms/index.ts b/src/lib/elements/forms/index.ts index a3e0393bb..1bd7f80e1 100644 --- a/src/lib/elements/forms/index.ts +++ b/src/lib/elements/forms/index.ts @@ -1,6 +1,4 @@ export { default as Form } from './form.svelte'; -export { default as FormItem } from './formItem.svelte'; -export { default as FormItemPart } from './formItemPart.svelte'; export { default as FormList } from './formList.svelte'; export { default as Button } from './button.svelte'; export { default as InputDomain } from './inputDomain.svelte'; diff --git a/src/lib/elements/forms/inputCheckbox.svelte b/src/lib/elements/forms/inputCheckbox.svelte index 3f1604d76..844f18c25 100644 --- a/src/lib/elements/forms/inputCheckbox.svelte +++ b/src/lib/elements/forms/inputCheckbox.svelte @@ -1,7 +1,6 @@ - - + -
- - {#if isNullable} -
    -
  • - -
    • -
- {/if} -
- {#if error} - {error} +
+ + {#if isNullable} +
    +
  • + +
    • +
{/if} - +
+{#if error} + {error} +{/if} diff --git a/src/lib/elements/forms/inputDateTime.svelte b/src/lib/elements/forms/inputDateTime.svelte index b63bd628f..fd1c1bee5 100644 --- a/src/lib/elements/forms/inputDateTime.svelte +++ b/src/lib/elements/forms/inputDateTime.svelte @@ -1,6 +1,6 @@ - - + -
- - {#if isNullable} -
    -
  • - -
    • -
- {/if} -
- {#if error} - {error} +
+ + {#if isNullable} +
    +
  • + +
    • +
{/if} - +
+{#if error} + {error} +{/if} diff --git a/src/lib/elements/forms/inputDigits.svelte b/src/lib/elements/forms/inputDigits.svelte index 07d7f755e..6ec6e1ad2 100644 --- a/src/lib/elements/forms/inputDigits.svelte +++ b/src/lib/elements/forms/inputDigits.svelte @@ -1,6 +1,5 @@ - -
    - {#each Array.from({ length }) as _} -
  1. - -
    2. - {/each} -
- +
    + {#each Array.from({ length }) as _} +
  1. + +
    2. + {/each} +
diff --git a/src/routes/(console)/project-[project]/uploadVariablesModal.svelte b/src/routes/(console)/project-[project]/uploadVariablesModal.svelte index 74b6e3f4e..10a324399 100644 --- a/src/routes/(console)/project-[project]/uploadVariablesModal.svelte +++ b/src/routes/(console)/project-[project]/uploadVariablesModal.svelte @@ -67,7 +67,7 @@ const title = `Import new ${isGlobal ? 'global' : 'environment'} variables`; - +

{title} from diff --git a/src/routes/(console)/store.ts b/src/routes/(console)/store.ts index 662572c6f..edecfd4e7 100644 --- a/src/routes/(console)/store.ts +++ b/src/routes/(console)/store.ts @@ -9,6 +9,11 @@ export const consoleVariables = derived( page, ($page) => $page.data.consoleVariables as Models.ConsoleVariables ); +export const protocol = derived(page, ($page) => + ($page.data.consoleVariables as Models.ConsoleVariables)?._APP_OPTIONS_FORCE_HTTPS + ? 'https://' + : 'http://' +); export const activeHeaderAlert = writable(null); export const orgMissingPaymentMethod = writable(null); diff --git a/src/routes/(public)/(guest)/login/+page.svelte b/src/routes/(public)/(guest)/login/+page.svelte index 809fcc66c..7986a7023 100644 --- a/src/routes/(public)/(guest)/login/+page.svelte +++ b/src/routes/(public)/(guest)/login/+page.svelte @@ -1,14 +1,7 @@ - - - +

+
+ + + +
+
+ + + POWERED BY + + {#if $app.themeInUse === 'dark'} + Appwrite Logo + {:else} + Appwrite Logo + {/if} +
+
+ + diff --git a/src/routes/(public)/auth/preview/+page.svelte b/src/routes/(public)/auth/preview/+page.svelte new file mode 100644 index 000000000..9f82172eb --- /dev/null +++ b/src/routes/(public)/auth/preview/+page.svelte @@ -0,0 +1,28 @@ + + + + Preview - Appwrite + + + + + + Authenticating... + + Please wait while we authenticate you + diff --git a/src/routes/(public)/auth/preview/+page.ts b/src/routes/(public)/auth/preview/+page.ts new file mode 100644 index 000000000..c13cb1228 --- /dev/null +++ b/src/routes/(public)/auth/preview/+page.ts @@ -0,0 +1,14 @@ +import { base } from '$app/paths'; +import { redirect } from '@sveltejs/kit'; + +export const load = async ({ parent }) => { + const { account } = await parent(); + + if (!account) { + redirect(303, `${base}/auth/preview/access`); + } else { + return { + account + }; + } +}; diff --git a/src/routes/(public)/auth/preview/access/+page.svelte b/src/routes/(public)/auth/preview/access/+page.svelte new file mode 100644 index 000000000..b64444ed5 --- /dev/null +++ b/src/routes/(public)/auth/preview/access/+page.svelte @@ -0,0 +1,245 @@ + + +{#if $app.themeInUse === 'dark'} + +{:else} + +{/if} + + + Preview access - Appwrite + + + + + + {#if state === 'login'} + + + + {#if isCloud} + or + + {/if} + + {:else if state === 'register'} + + + + + By registering, you agree that you have read, understand, and acknowledge our + Privacy Policy + and accept our + General Terms of Use. + + {#if isCloud} + or + + {/if} + + {:else if state === 'authenticated'} + + +

+ You're signed in as {data.account.email} +

+ { + logout(); + state = 'login'; + }}>Swith account + + + {/if} + + + + + + + + + diff --git a/src/routes/(public)/auth/preview/access/+page.ts b/src/routes/(public)/auth/preview/access/+page.ts new file mode 100644 index 000000000..87603f585 --- /dev/null +++ b/src/routes/(public)/auth/preview/access/+page.ts @@ -0,0 +1,7 @@ +export const load = async ({ parent }) => { + const { account } = await parent(); + + return { + account + }; +}; diff --git a/src/routes/(public)/auth/preview/access/bg_dark.jpg b/src/routes/(public)/auth/preview/access/bg_dark.jpg new file mode 100644 index 000000000..1fbbdc128 Binary files /dev/null and b/src/routes/(public)/auth/preview/access/bg_dark.jpg differ diff --git a/src/routes/(public)/auth/preview/access/bg_light.jpg b/src/routes/(public)/auth/preview/access/bg_light.jpg new file mode 100644 index 000000000..febb1bab8 Binary files /dev/null and b/src/routes/(public)/auth/preview/access/bg_light.jpg differ diff --git a/src/routes/(public)/hackathon/+page.svelte b/src/routes/(public)/hackathon/+page.svelte index e67767823..b6f9ed2a2 100644 --- a/src/routes/(public)/hackathon/+page.svelte +++ b/src/routes/(public)/hackathon/+page.svelte @@ -5,7 +5,6 @@ import HashnodeDark from './hashnode-dark.svg'; import HashnodeLight from './hashnode-light.svg'; import Badge from './hackathon-badge.svg'; - import { tooltip } from '$lib/actions/tooltip'; import { base } from '$app/paths'; import { Tooltip } from '@appwrite.io/pink-svelte'; diff --git a/src/routes/(public)/recover/+page.svelte b/src/routes/(public)/recover/+page.svelte index 95c294ad1..9b9df13dc 100644 --- a/src/routes/(public)/recover/+page.svelte +++ b/src/routes/(public)/recover/+page.svelte @@ -1,13 +1,6 @@