diff --git a/.env.example b/.env.example index 138249fc1..ae9250596 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,6 @@ -PUBLIC_APPWRITE_ENDPOINT=https://localhost/v1 PUBLIC_CONSOLE_MODE=self-hosted +PUBLIC_APPWRITE_MULTI_REGION=false +PUBLIC_APPWRITE_ENDPOINT=http://localhost/v1 + PUBLIC_STRIPE_KEY= PUBLIC_GROWTH_ENDPOINT= \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 91c98b81f..2a37e81d1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -39,6 +39,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} build-args: | "PUBLIC_CONSOLE_MODE=cloud" + "PUBLIC_APPWRITE_MULTI_REGION=true" "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}" "PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY }}" "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" @@ -77,6 +78,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} build-args: | "PUBLIC_CONSOLE_MODE=cloud" + "PUBLIC_APPWRITE_MULTI_REGION=true" "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}" "PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}" publish-self-hosted: @@ -113,4 +115,43 @@ jobs: labels: ${{ steps.meta.outputs.labels }} build-args: | "PUBLIC_CONSOLE_MODE=self-hosted" + "PUBLIC_APPWRITE_MULTI_REGION=false" + "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}" + + publish-cloud-no-regions: + runs-on: ubuntu-latest + steps: + - name: Checkout the repo + uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ vars.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: appwrite/console-cloud-no-regions + tags: | + type=semver,pattern={{major}}.{{minor}}.{{patch}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + - name: Build and push Docker image + id: push + uses: docker/build-push-action@v6 + with: + context: . + push: true + platforms: linux/amd64,linux/arm64 + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + build-args: | + "PUBLIC_CONSOLE_MODE=cloud" + "PUBLIC_APPWRITE_MULTI_REGION=false" + "PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}" "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}" diff --git a/Dockerfile b/Dockerfile index 9c33636a1..6b9b23b8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ ADD ./src /app/src ADD ./static /app/static ARG PUBLIC_CONSOLE_MODE +ARG PUBLIC_APPWRITE_MULTI_REGION ARG PUBLIC_APPWRITE_ENDPOINT ARG PUBLIC_GROWTH_ENDPOINT ARG PUBLIC_STRIPE_KEY @@ -31,6 +32,7 @@ ARG SENTRY_RELEASE ENV PUBLIC_APPWRITE_ENDPOINT=$PUBLIC_APPWRITE_ENDPOINT ENV PUBLIC_GROWTH_ENDPOINT=$PUBLIC_GROWTH_ENDPOINT ENV PUBLIC_CONSOLE_MODE=$PUBLIC_CONSOLE_MODE +ENV PUBLIC_APPWRITE_MULTI_REGION=$PUBLIC_APPWRITE_MULTI_REGION ENV PUBLIC_STRIPE_KEY=$PUBLIC_STRIPE_KEY ENV SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN ENV SENTRY_RELEASE=$SENTRY_RELEASE diff --git a/build.js b/build.js index 9753d0378..f56506dae 100644 --- a/build.js +++ b/build.js @@ -24,6 +24,7 @@ async function main() { log(bold().magenta('APPWRITE CONSOLE')); log(); logEnv('CONSOLE MODE', env?.PUBLIC_CONSOLE_MODE); + logEnv('MULTI REGION', env?.PUBLIC_APPWRITE_MULTI_REGION); logEnv('APPWRITE ENDPOINT', env?.PUBLIC_APPWRITE_ENDPOINT, 'relative'); logEnv('GROWTH ENDPOINT', env?.PUBLIC_GROWTH_ENDPOINT); log(); diff --git a/compose.yml b/compose.yml index d1bf277a9..3a9bbb4a1 100644 --- a/compose.yml +++ b/compose.yml @@ -5,6 +5,7 @@ services: context: . args: PUBLIC_CONSOLE_MODE: ${PUBLIC_CONSOLE_MODE} + PUBLIC_APPWRITE_MULTI_REGION: ${PUBLIC_APPWRITE_MULTI_REGION} PUBLIC_APPWRITE_ENDPOINT: ${PUBLIC_APPWRITE_ENDPOINT} PUBLIC_GROWTH_ENDPOINT: ${PUBLIC_GROWTH_ENDPOINT} PUBLIC_STRIPE_KEY: ${PUBLIC_STRIPE_KEY} @@ -21,6 +22,7 @@ services: - build/ environment: - PUBLIC_CONSOLE_MODE + - PUBLIC_APPWRITE_MULTI_REGION - PUBLIC_APPWRITE_ENDPOINT - PUBLIC_GROWTH_ENDPOINT - PUBLIC_STRIPE_KEY diff --git a/docker/nginx.conf b/docker/nginx.conf index d94a944b0..e26105222 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -2,22 +2,17 @@ server { listen 80; server_name localhost; - # serve compressed file if filename.gz exists gzip_static on; - # serve static files from root directory root /usr/share/nginx/html; - # deny IE browsers from going into quirks mode + # Security headers for all locations add_header X-UA-Compatible "IE=Edge"; - # X-Frame-Options is to prevent from clickJacking attack add_header X-Frame-Options SAMEORIGIN; - # this header enables the Cross-site scripting (XSS) filter add_header X-XSS-Protection "1; mode=block;"; - # disable content-type sniffing on some browsers. add_header X-Content-Type-Options nosniff; - # only cache files in /console/_app/immutable/ + # Only cache files in /console/_app/immutable/ for 1 year location /console/_app/immutable/ { try_files $uri =404; @@ -26,9 +21,20 @@ server { add_header Cache-Control "public"; } + # Cache, but revalidate, for images, css, fonts, and icons folders + location ~* ^/console/(images|css|fonts|icons)/ { + expires 1d; + add_header Cache-Control "public, must-revalidate"; + } + + # All other /console requests (no cache) location /console { index index.html index.html; try_files $uri /console/index.html; + + expires 0; + add_header Cache-Control "no-cache, no-store"; + add_header Pragma "no-cache"; } location / { diff --git a/e2e/helpers/url.ts b/e2e/helpers/url.ts index 61c4c2425..a6fc879ac 100644 --- a/e2e/helpers/url.ts +++ b/e2e/helpers/url.ts @@ -12,7 +12,7 @@ export function getOrganizationIdFromUrl(pathname: string) { export function getProjectIdFromUrl(pathname: string) { // TODO: use base path from svelte here - const regex = /\/console\/project-([^/]+)(\/.*)?/; + const regex = /\/console\/project-(?:[a-z]{2,3}-)?([^/]+)(\/.*)?/; const match = pathname.match(regex); if (match) { diff --git a/e2e/journeys/upgrade-free-tier.spec.ts b/e2e/journeys/upgrade-free-tier.spec.ts index 024379820..76d5fafcd 100644 --- a/e2e/journeys/upgrade-free-tier.spec.ts +++ b/e2e/journeys/upgrade-free-tier.spec.ts @@ -8,12 +8,12 @@ test('upgrade - free tier', async ({ page }) => { await createFreeProject(page); await test.step('upgrade project', async () => { await page.getByRole('link', { name: 'Upgrade', exact: true }).click(); - await page.waitForURL('./organization-**/change-plan'); + await page.waitForURL(/\/organization-[^/]+\/change-plan/); await page.locator('input[value="tier-1"]').click(); await page.getByRole('button', { name: 'add' }).first().click(); await enterCreditCard(page); // skip members await page.getByRole('button', { name: 'change plan' }).click(); - await page.waitForURL('**/console/project-*/overview/platforms'); + await page.waitForURL(/\/console\/project-(?:[a-z0-9]+-)?([^/]+)\/get-started/); }); }); diff --git a/e2e/steps/account.ts b/e2e/steps/account.ts index a1eac5b57..5a74a736e 100644 --- a/e2e/steps/account.ts +++ b/e2e/steps/account.ts @@ -10,7 +10,6 @@ export function registerUserStep(page: Page): Promise { return test.step('register user', async () => { const seed = crypto.randomUUID(); await page.goto('./register'); - // await page.getByRole('button', { name: 'only required' }).click(); const inputs = { name: page.locator('id=name'), email: page.locator('id=email'), @@ -25,9 +24,9 @@ export function registerUserStep(page: Page): Promise { await inputs.name.fill(values.name); await inputs.email.fill(values.email); await inputs.password.fill(values.password); - await inputs.terms.check(); + await inputs.terms.check({ force: true }); await page.getByRole('button', { name: 'Sign up', exact: true }).click(); - await page.waitForURL('./onboarding'); + await page.waitForURL('./onboarding/create-project'); return values; }); diff --git a/e2e/steps/free-project.ts b/e2e/steps/free-project.ts index 6a51bf313..a8a3dadb9 100644 --- a/e2e/steps/free-project.ts +++ b/e2e/steps/free-project.ts @@ -9,23 +9,18 @@ type Metadata = { export async function createFreeProject(page: Page): Promise { const organizationId = await test.step('create organization', async () => { await page.goto('./'); - await page.waitForURL('./onboarding'); - await page.locator('id=name').fill('test org'); - await page.locator('id=plan').selectOption('tier-0'); - await page.getByRole('button', { name: 'get started' }).click(); - await page.waitForURL('./organization-**'); + await page.waitForURL(/\/organization-[^/]+/); return getOrganizationIdFromUrl(page.url()); }); const projectId = await test.step('create project', async () => { - await page.waitForURL('./organization-**'); + await page.waitForURL(/\/organization-[^/]+/); await page.getByRole('button', { name: 'create project' }).first().click(); - await page.locator('id=name').fill('test project'); - await page.getByRole('button', { name: 'next' }).click(); - await page.locator('label').filter({ hasText: 'Frankfurt' }).click(); - await page.getByRole('button', { name: 'create' }).click(); - await page.waitForURL('./project-**/overview/platforms'); - expect(page.url()).toContain('/console/project-'); + const dialog = page.locator('dialog[open]'); + await dialog.getByPlaceholder('Project name').fill('test project'); + await dialog.getByRole('button', { name: 'create' }).click(); + await page.waitForURL(/\/project-fra-[^/]+/); + expect(page.url()).toContain('/console/project-fra-'); return getProjectIdFromUrl(page.url()); }); diff --git a/e2e/steps/pro-project.ts b/e2e/steps/pro-project.ts index 566658aff..05c95895f 100644 --- a/e2e/steps/pro-project.ts +++ b/e2e/steps/pro-project.ts @@ -19,7 +19,7 @@ export async function enterCreditCard(page: Page) { await stripe.locator('id=Field-expiryInput').fill('1250'); await stripe.locator('id=Field-cvcInput').fill('123'); await stripe.locator('id=Field-countryInput').selectOption('DE'); - await page.getByRole('button', { name: 'Add', exact: true }).click(); + await dialog.getByRole('button', { name: 'Add', exact: true }).click(); await dialog.waitFor({ state: 'hidden' }); @@ -27,30 +27,28 @@ export async function enterCreditCard(page: Page) { export async function createProProject(page: Page): Promise { const organizationId = await test.step('create organization', async () => { - await page.goto('./'); - await page.waitForURL('./onboarding'); + await page.goto('./create-organization'); await page.locator('id=name').fill('test org'); - await page.locator('id=plan').selectOption('tier-1'); - await page.getByRole('button', { name: 'get started' }).click(); - await page.waitForURL('./create-organization**'); + await page.getByRole('radio', { name: /^Pro\b/ }).check(); + // `create organization` because there's already free created on start! + await page.getByRole('button', { name: 'create organization' }).click(); await page.getByRole('button', { name: 'add' }).first().click(); await enterCreditCard(page); // skip members await page.getByRole('button', { name: 'create organization' }).click(); - await page.waitForURL('./organization-**'); + await page.waitForURL(/\/organization-[^/]+/); return getOrganizationIdFromUrl(page.url()); }); const projectId = await test.step('create project', async () => { - await page.waitForURL('./organization-**'); + await page.waitForURL(/\/organization-[^/]+/); await page.getByRole('button', { name: 'create project' }).first().click(); - await page.getByPlaceholder('project name').fill('test project'); - await page.getByRole('button', { name: 'next' }).click(); - await page.locator('label').filter({ hasText: 'frankfurt' }).click(); - await page.getByRole('button', { name: 'create' }).click(); - await page.waitForURL('./project-**/overview/platforms'); - expect(page.url()).toContain('/project-'); + const dialog = page.locator('dialog[open]'); + await dialog.getByPlaceholder('Project name').fill('test project'); + await dialog.getByRole('button', { name: 'create' }).click(); + await page.waitForURL(/\/project-fra-[^/]+/); + expect(page.url()).toContain('/console/project-fra-'); return getProjectIdFromUrl(page.url()); }); diff --git a/package.json b/package.json index 6c3e71a9b..a6a6558a2 100644 --- a/package.json +++ b/package.json @@ -21,13 +21,12 @@ "e2e:ui": "playwright test --ui" }, "dependencies": { - "@ai-sdk/svelte": "^1.1.22", - "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1", - "@appwrite.io/pink": "0.25.0", + "@ai-sdk/svelte": "^1.1.24", + "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e190a19", "@appwrite.io/pink-icons": "0.25.0", - "@appwrite.io/pink-icons-svelte": "https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@282a767", + "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@325", + "@appwrite.io/pink-svelte": "https://try-module.cloud/-/@appwrite/@appwrite.io/pink-svelte@d74b893", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", @@ -70,6 +69,7 @@ "@vitest/ui": "^3.0.9", "@xterm/addon-fit": "^0.10.0", "@xterm/xterm": "^5.5.0", + "color": "^5.0.0", "eslint": "^9.23.0", "eslint-config-prettier": "^10.1.0", "eslint-plugin-svelte": "^3.3.3", @@ -85,6 +85,7 @@ "svelte-check": "^4.1.5", "svelte-preprocess": "^6.0.3", "svelte-sequential-preprocessor": "^2.0.2", + "tldts": "^7.0.7", "tslib": "^2.8.1", "typescript": "^5.8.2", "typescript-eslint": "^8.30.1", diff --git a/playwright.config.ts b/playwright.config.ts index de119fa1f..fbd977757 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -15,6 +15,7 @@ const config: PlaywrightTestConfig = { env: { PUBLIC_APPWRITE_ENDPOINT: 'https://stage.cloud.appwrite.io/v1', PUBLIC_CONSOLE_MODE: 'cloud', + PUBLIC_APPWRITE_MULTI_REGION: 'true', PUBLIC_STRIPE_KEY: 'pk_test_51LT5nsGYD1ySxNCyd7b304wPD8Y1XKKWR6hqo6cu3GIRwgvcVNzoZv4vKt5DfYXL1gRGw4JOqE19afwkJYJq1g3K004eVfpdWn' }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8fa55c3c8..19234569f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,26 +9,23 @@ importers: .: dependencies: '@ai-sdk/svelte': - specifier: ^1.1.22 + specifier: ^1.1.24 version: 1.1.24(svelte@5.25.3)(zod@3.24.3) '@appwrite.io/console': - specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1 - version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1 - '@appwrite.io/pink': - specifier: 0.25.0 - version: 0.25.0 + specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e190a19 + version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e190a19 '@appwrite.io/pink-icons': specifier: 0.25.0 version: 0.25.0 '@appwrite.io/pink-icons-svelte': - specifier: https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@282a767 - version: https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@282a767(svelte@5.25.3) + specifier: ^2.0.0-RC.1 + version: https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@12707b9(svelte@5.25.3) '@appwrite.io/pink-legacy': specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@325 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@325(svelte@5.25.3) + specifier: https://try-module.cloud/-/@appwrite/@appwrite.io/pink-svelte@d74b893 + version: https://try-module.cloud/-/@appwrite/%40appwrite.io%2Fpink-svelte@d74b893(svelte@5.25.3) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -59,9 +56,6 @@ importers: ignore: specifier: ^6.0.2 version: 6.0.2 - monaco-editor: - specifier: ^0.52.2 - version: 0.52.2 nanoid: specifier: ^5.1.5 version: 5.1.5 @@ -83,9 +77,6 @@ importers: svelte-confetti: specifier: ^1.4.0 version: 1.4.0(svelte@5.25.3) - svelte-exmarkdown: - specifier: ^5.0.0 - version: 5.0.0(svelte@5.25.3) tippy.js: specifier: ^6.3.7 version: 6.3.7 @@ -95,7 +86,7 @@ importers: version: 1.2.7(eslint@9.23.0) '@eslint/js': specifier: ^9.24.0 - version: 9.25.1 + version: 9.24.0 '@melt-ui/pp': specifier: ^0.3.2 version: 0.3.2(@melt-ui/svelte@0.86.5(svelte@5.25.3))(svelte@5.25.3) @@ -144,12 +135,9 @@ importers: '@vitest/ui': specifier: ^3.0.9 version: 3.0.9(vitest@3.0.9) - '@xterm/addon-fit': - specifier: ^0.10.0 - version: 0.10.0(@xterm/xterm@5.5.0) - '@xterm/xterm': - specifier: ^5.5.0 - version: 5.5.0 + color: + specifier: ^5.0.0 + version: 5.0.0 eslint: specifier: ^9.23.0 version: 9.23.0 @@ -162,9 +150,6 @@ importers: globals: specifier: ^16.0.0 version: 16.0.0 - highlight.js: - specifier: ^11.11.1 - version: 11.11.1 jsdom: specifier: ^26.0.0 version: 26.0.0 @@ -177,9 +162,6 @@ importers: prettier-plugin-svelte: specifier: ^3.3.3 version: 3.3.3(prettier@3.5.3)(svelte@5.25.3) - rehype-highlight: - specifier: ^7.0.2 - version: 7.0.2 sass: specifier: ^1.86.0 version: 1.86.0 @@ -195,6 +177,9 @@ importers: svelte-sequential-preprocessor: specifier: ^2.0.2 version: 2.0.2 + tldts: + specifier: ^7.0.7 + version: 7.0.7 tslib: specifier: ^2.8.1 version: 2.8.1 @@ -203,13 +188,13 @@ importers: version: 5.8.2 typescript-eslint: specifier: ^8.30.1 - version: 8.31.1(eslint@9.23.0)(typescript@5.8.2) + version: 8.30.1(eslint@9.23.0)(typescript@5.8.2) vite: specifier: ^6.2.3 version: 6.2.3(@types/node@22.13.14)(sass@1.86.0) vitest: specifier: ^3.0.0 - version: 3.0.9(@types/debug@4.1.12)(@types/node@22.13.14)(@vitest/ui@3.0.9)(jsdom@26.0.0)(sass@1.86.0) + version: 3.0.9(@types/node@22.13.14)(@vitest/ui@3.0.9)(jsdom@26.0.0)(sass@1.86.0) packages: @@ -272,18 +257,17 @@ packages: '@analytics/type-utils@0.6.2': resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==} - '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1': - resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1} - version: 1.2.1 + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e190a19': + resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e190a19} + version: 1.8.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@282a767ad8af373bcd34d7ab9192870f07634ce8': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@282a767ad8af373bcd34d7ab9192870f07634ce8} - version: 2.0.0-RC.1 + '@appwrite.io/pink-icons-svelte@2.0.0-RC.1': + resolution: {integrity: sha512-iLFlV55hj8mGuAbmxJGenxN5RaZMmVT4GJb9dv/MP1xBAtYibFq7JvBcxm18qV2KU8c31Rntf+Ub4GL7HwqTYg==} peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@282a767': - resolution: {tarball: https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@282a767} + '@appwrite.io/pink-icons-svelte@https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@12707b9': + resolution: {tarball: https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@12707b9} version: 2.0.0-RC.1 peerDependencies: svelte: ^4.0.0 @@ -297,15 +281,12 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@325': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@325} + '@appwrite.io/pink-svelte@https://try-module.cloud/-/@appwrite/%40appwrite.io%2Fpink-svelte@d74b893': + resolution: {tarball: https://try-module.cloud/-/@appwrite/%40appwrite.io%2Fpink-svelte@d74b893} version: 2.0.0-RC.2 peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink@0.25.0': - resolution: {integrity: sha512-9z4G/iAhjvVpM7tkNqzGqrokst4hvNt3Fkf2jD4W6n8j//EJbQ3mJ0I+5dye5Sry0a33wUanq5DSztqFNYq5zw==} - '@asamuzakjp/css-color@3.1.1': resolution: {integrity: sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==} @@ -593,8 +574,8 @@ packages: resolution: {integrity: sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/js@9.25.1': - resolution: {integrity: sha512-dEIwmjntEx8u3Uvv+kr3PDeeArL8Hw07H9kyYxCjnM9pBjfEhk6uLXSchxxzgiwtRhhzVzqmUSDFBOi1TuZ7qg==} + '@eslint/js@9.24.0': + resolution: {integrity: sha512-uIY/y3z0uvOGX8cp1C2fiC4+ZmBhp6yZWkojtHL1YEMnRt1Y63HB9TM17proGEmeG7HeUY+UP36F0aknKYTpYA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/object-schema@2.1.6': @@ -1320,9 +1301,6 @@ packages: '@types/cookie@0.6.0': resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} - '@types/debug@4.1.12': - resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==} - '@types/deep-equal@1.0.4': resolution: {integrity: sha512-tqdiS4otQP4KmY0PR3u6KbZ5EWvhNdUoS/jc93UuK23C220lOZ/9TvjfxdPcKvqwwDVtmtSCrnr0p/2dirAxkA==} @@ -1344,9 +1322,6 @@ packages: '@types/mdast@4.0.4': resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==} - '@types/ms@2.1.0': - resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==} - '@types/mysql@2.15.26': resolution: {integrity: sha512-DSLCOXhkvfS5WNNPbfn2KdICAmk8lLc+/PNvnPnF7gOdMZCxopXduqv0OQ13y/yA/zXTSikZZqVgybUxOEg6YQ==} @@ -1365,8 +1340,8 @@ packages: '@types/prop-types@15.7.14': resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==} - '@types/react@18.3.20': - resolution: {integrity: sha512-IPaCZN7PShZK/3t6Q87pfTkRm6oLTd4vztyoj+cbHUF1g3FfVb2tFIL79uCRKEfv16AhqDMBywP2VW3KIZUvcg==} + '@types/react@18.3.22': + resolution: {integrity: sha512-vUhG0YmQZ7kL/tmKLrD3g5zXbXXreZXB3pmROW8bg3CnLnpjkRVwUlLne7Ufa2r9yJ8+/6B73RzhAek5TBKh2Q==} '@types/remarkable@2.0.8': resolution: {integrity: sha512-eKXqPZfpQl1kOADjdKchHrp2gwn9qMnGXhH/AtZe0UrklzhGJkawJo/Y/D0AlWcdWoWamFNIum8+/nkAISQVGg==} @@ -1388,8 +1363,8 @@ packages: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <5.9.0' - '@typescript-eslint/eslint-plugin@8.31.1': - resolution: {integrity: sha512-oUlH4h1ABavI4F0Xnl8/fOtML/eu8nI2A1nYd+f+55XI0BLu+RIqKoCiZKNo6DtqZBEQm5aNKA20G3Z5w3R6GQ==} + '@typescript-eslint/eslint-plugin@8.30.1': + resolution: {integrity: sha512-v+VWphxMjn+1t48/jO4t950D6KR8JaJuNXzi33Ve6P8sEmPr5k6CEXjdGwT6+LodVnEa91EQCtwjWNUCPweo+Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 @@ -1403,8 +1378,8 @@ packages: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <5.9.0' - '@typescript-eslint/parser@8.31.1': - resolution: {integrity: sha512-oU/OtYVydhXnumd0BobL9rkJg7wFJ9bFFPmSmB/bf/XWN85hlViji59ko6bSKBXyseT9V8l+CN1nwmlbiN0G7Q==} + '@typescript-eslint/parser@8.30.1': + resolution: {integrity: sha512-H+vqmWwT5xoNrXqWs/fesmssOW70gxFlgcMlYcBaWNPIEWDgLa4W9nkSPmhuOgLnXq9QYgkZ31fhDyLhleCsAg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -1414,8 +1389,8 @@ packages: resolution: {integrity: sha512-u2oITX3BJwzWCapoZ/pXw6BCOl8rJP4Ij/3wPoGvY8XwvXflOzd1kLrDUUUAIEdJSFh+ASwdTHqtan9xSg8buw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/scope-manager@8.31.1': - resolution: {integrity: sha512-BMNLOElPxrtNQMIsFHE+3P0Yf1z0dJqV9zLdDxN/xLlWMlXK/ApEsVEKzpizg9oal8bAT5Sc7+ocal7AC1HCVw==} + '@typescript-eslint/scope-manager@8.30.1': + resolution: {integrity: sha512-+C0B6ChFXZkuaNDl73FJxRYT0G7ufVPOSQkqkpM/U198wUwUFOtgo1k/QzFh1KjpBitaK7R1tgjVz6o9HmsRPg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@typescript-eslint/type-utils@8.28.0': @@ -1425,8 +1400,8 @@ packages: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <5.9.0' - '@typescript-eslint/type-utils@8.31.1': - resolution: {integrity: sha512-fNaT/m9n0+dpSp8G/iOQ05GoHYXbxw81x+yvr7TArTuZuCA6VVKbqWYVZrV5dVagpDTtj/O8k5HBEE/p/HM5LA==} + '@typescript-eslint/type-utils@8.30.1': + resolution: {integrity: sha512-64uBF76bfQiJyHgZISC7vcNz3adqQKIccVoKubyQcOnNcdJBvYOILV1v22Qhsw3tw3VQu5ll8ND6hycgAR5fEA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -1436,8 +1411,8 @@ packages: resolution: {integrity: sha512-bn4WS1bkKEjx7HqiwG2JNB3YJdC1q6Ue7GyGlwPHyt0TnVq6TtD/hiOdTZt71sq0s7UzqBFXD8t8o2e63tXgwA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/types@8.31.1': - resolution: {integrity: sha512-SfepaEFUDQYRoA70DD9GtytljBePSj17qPxFHA/h3eg6lPTqGJ5mWOtbXCk1YrVU1cTJRd14nhaXWFu0l2troQ==} + '@typescript-eslint/types@8.30.1': + resolution: {integrity: sha512-81KawPfkuulyWo5QdyG/LOKbspyyiW+p4vpn4bYO7DM/hZImlVnFwrpCTnmNMOt8CvLRr5ojI9nU1Ekpw4RcEw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@typescript-eslint/typescript-estree@8.28.0': @@ -1446,8 +1421,8 @@ packages: peerDependencies: typescript: '>=4.8.4 <5.9.0' - '@typescript-eslint/typescript-estree@8.31.1': - resolution: {integrity: sha512-kaA0ueLe2v7KunYOyWYtlf/QhhZb7+qh4Yw6Ni5kgukMIG+iP773tjgBiLWIXYumWCwEq3nLW+TUywEp8uEeag==} + '@typescript-eslint/typescript-estree@8.30.1': + resolution: {integrity: sha512-kQQnxymiUy9tTb1F2uep9W6aBiYODgq5EMSk6Nxh4Z+BDUoYUSa029ISs5zTzKBFnexQEh71KqwjKnRz58lusQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <5.9.0' @@ -1459,8 +1434,8 @@ packages: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <5.9.0' - '@typescript-eslint/utils@8.31.1': - resolution: {integrity: sha512-2DSI4SNfF5T4oRveQ4nUrSjUqjMND0nLq9rEkz0gfGr3tg0S5KB6DhwR+WZPCjzkZl3cH+4x2ce3EsL50FubjQ==} + '@typescript-eslint/utils@8.30.1': + resolution: {integrity: sha512-T/8q4R9En2tcEsWPQgB5BQ0XJVOtfARcUvOa8yJP3fh9M/mXraLxZrkCfGb6ChrO/V3W+Xbd04RacUEqk1CFEQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -1470,8 +1445,8 @@ packages: resolution: {integrity: sha512-hbn8SZ8w4u2pRwgQ1GlUrPKE+t2XvcCW5tTRF7j6SMYIuYG37XuzIW44JCZPa36evi0Oy2SnM664BlIaAuQcvg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/visitor-keys@8.31.1': - resolution: {integrity: sha512-I+/rgqOVBn6f0o7NDTmAPWWC6NuqhV174lfYvAm9fUaWeiefLdux9/YI3/nLugEn9L8fcSi0XmpKi/r5u0nmpw==} + '@typescript-eslint/visitor-keys@8.30.1': + resolution: {integrity: sha512-aEhgas7aJ6vZnNFC7K4/vMGDGyOiqWcYZPpIWrTKuTAlsvDNKy2GFDqh9smL+iq069ZvR0YzEeq0B8NJlLzjFA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@ungap/structured-clone@1.3.0': @@ -1540,14 +1515,6 @@ packages: '@vue/shared@3.5.13': resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==} - '@xterm/addon-fit@0.10.0': - resolution: {integrity: sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==} - peerDependencies: - '@xterm/xterm': ^5.0.0 - - '@xterm/xterm@5.5.0': - resolution: {integrity: sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==} - acorn-import-attributes@1.9.5: resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==} peerDependencies: @@ -1658,9 +1625,6 @@ packages: resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==} engines: {node: '>= 0.4'} - bail@2.0.2: - resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==} - balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} @@ -1727,9 +1691,6 @@ packages: character-entities-legacy@3.0.0: resolution: {integrity: sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==} - character-entities@2.0.2: - resolution: {integrity: sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==} - check-error@2.1.1: resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} engines: {node: '>= 16'} @@ -1756,9 +1717,25 @@ packages: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} + color-convert@3.1.0: + resolution: {integrity: sha512-TVoqAq8ZDIpK5lsQY874DDnu65CSsc9vzq0wLpNQ6UMBq81GSZocVazPiBbYGzngzBOIRahpkTzCLVe2at4MfA==} + engines: {node: '>=14.6'} + color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + color-name@2.0.0: + resolution: {integrity: sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==} + engines: {node: '>=12.20'} + + color-string@2.0.1: + resolution: {integrity: sha512-5z9FbYTZPAo8iKsNEqRNv+OlpBbDcoE+SY9GjLfDUHEfcNNV7tS9eSAlFHEaub/r5tBL9LtskAeq1l9SaoZ5tQ==} + engines: {node: '>=18'} + + color@5.0.0: + resolution: {integrity: sha512-16BlyiuyLq3MLxpRWyOTiWsO3ii/eLQLJUQXBSNcxMBBSnyt1ee9YUdaozQp03ifwm5woztEZGDbk9RGVuCsdw==} + engines: {node: '>=18'} + combined-stream@1.0.8: resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==} engines: {node: '>= 0.8'} @@ -1953,9 +1930,6 @@ packages: decimal.js@10.5.0: resolution: {integrity: sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==} - decode-named-character-reference@1.1.0: - resolution: {integrity: sha512-Wy+JTSbFThEOXQIR2L6mxJvEs+veIzpmqD7ynWxMXGpnk3smkHQOp6forLdHsKpAMW9iJpaBBIxz285t1n1C3w==} - deep-eql@5.0.2: resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==} engines: {node: '>=6'} @@ -2066,10 +2040,6 @@ packages: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} - escape-string-regexp@5.0.0: - resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==} - engines: {node: '>=12'} - eslint-compat-utils@0.6.4: resolution: {integrity: sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==} engines: {node: '>=12'} @@ -2155,17 +2125,14 @@ packages: resolution: {integrity: sha512-9jgfSCa3dmEme2ES3mPByGXfgZ87VbP97tng1G2nWwWx6bV2nYxm2AWCrbQjXToSe+yYlqaZNtxffR9IeQr95g==} engines: {node: '>=14.18'} - eventsource-parser@3.0.1: - resolution: {integrity: sha512-VARTJ9CYeuQYb0pZEPbzi740OWFgpHe7AYJ2WFZVnUDUQp5Dk2yJUgF36YsZ81cOyxT0QxmXD2EQpapAouzWVA==} + eventsource-parser@3.0.0: + resolution: {integrity: sha512-T1C0XCUimhxVQzW4zFipdx0SficT651NnkR0ZSH3yQwh+mFMdLfgjABVi4YtMTtaL4s168593DaoaRLMqryavA==} engines: {node: '>=18.0.0'} expect-type@1.2.0: resolution: {integrity: sha512-80F22aiJ3GLyVnS/B3HzgR6RelZVumzj9jkL0Rhz4h0xYbNW9PjlQz5h3J/SShErbXBc295vseR4/MIbVmUbeA==} engines: {node: '>=12.0.0'} - extend@3.0.2: - resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} - fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} @@ -2324,25 +2291,15 @@ packages: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} - hast-util-is-element@3.0.0: - resolution: {integrity: sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==} - hast-util-to-html@9.0.5: resolution: {integrity: sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==} - hast-util-to-text@4.0.2: - resolution: {integrity: sha512-KK6y/BN8lbaq654j7JgBydev7wuNMcID54lkRav1P0CaE1e47P72AWWPiGKXTJU271ooYzcvTAn/Zt0REnvc7A==} - hast-util-whitespace@3.0.0: resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==} hey-listen@1.0.8: resolution: {integrity: sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==} - highlight.js@11.11.1: - resolution: {integrity: sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==} - engines: {node: '>=12.0.0'} - html-encoding-sniffer@4.0.0: resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==} engines: {node: '>=18'} @@ -2455,10 +2412,6 @@ packages: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - is-plain-obj@4.1.0: - resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==} - engines: {node: '>=12'} - is-potential-custom-element-name@1.0.1: resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} @@ -2568,9 +2521,6 @@ packages: lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - longest-streak@3.1.0: - resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==} - loose-envify@1.4.0: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} hasBin: true @@ -2578,9 +2528,6 @@ packages: loupe@3.1.3: resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==} - lowlight@3.3.0: - resolution: {integrity: sha512-0JNhgFoPvP6U6lE/UdVsSq99tn6DhjjpAj5MxG49ewd2mOBVtwWYIT8ClyABhq198aXXODMU6Ox8DrGy/CpTZQ==} - lru-cache@10.4.3: resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==} @@ -2609,49 +2556,13 @@ packages: magicast@0.2.8: resolution: {integrity: sha512-zEnqeb3E6TfMKYXGyHv3utbuHNixr04o3/gVGviSzVQkbFiU46VZUd+Ea/1npKfvEsEWxBYuIksKzoztTDPg0A==} - markdown-table@3.0.4: - resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==} - math-intrinsics@1.1.0: resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==} engines: {node: '>= 0.4'} - mdast-util-find-and-replace@3.0.2: - resolution: {integrity: sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg==} - - mdast-util-from-markdown@2.0.2: - resolution: {integrity: sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==} - - mdast-util-gfm-autolink-literal@2.0.1: - resolution: {integrity: sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==} - - mdast-util-gfm-footnote@2.1.0: - resolution: {integrity: sha512-sqpDWlsHn7Ac9GNZQMeUzPQSMzR6Wv0WKRNvQRg0KqHh02fpTz69Qc1QSseNX29bhz1ROIyNyxExfawVKTm1GQ==} - - mdast-util-gfm-strikethrough@2.0.0: - resolution: {integrity: sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==} - - mdast-util-gfm-table@2.0.0: - resolution: {integrity: sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==} - - mdast-util-gfm-task-list-item@2.0.0: - resolution: {integrity: sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==} - - mdast-util-gfm@3.1.0: - resolution: {integrity: sha512-0ulfdQOM3ysHhCJ1p06l0b0VKlhU0wuQs3thxZQagjcjPrlFRqY215uZGHHJan9GEAXd9MbfPjFJz+qMkVR6zQ==} - - mdast-util-phrasing@4.1.0: - resolution: {integrity: sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==} - mdast-util-to-hast@13.2.0: resolution: {integrity: sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==} - mdast-util-to-markdown@2.1.2: - resolution: {integrity: sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==} - - mdast-util-to-string@4.0.0: - resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==} - mdn-data@2.0.30: resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==} @@ -2659,90 +2570,21 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} - micromark-core-commonmark@2.0.3: - resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==} - - micromark-extension-gfm-autolink-literal@2.1.0: - resolution: {integrity: sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==} - - micromark-extension-gfm-footnote@2.1.0: - resolution: {integrity: sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==} - - micromark-extension-gfm-strikethrough@2.1.0: - resolution: {integrity: sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==} - - micromark-extension-gfm-table@2.1.1: - resolution: {integrity: sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==} - - micromark-extension-gfm-tagfilter@2.0.0: - resolution: {integrity: sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==} - - micromark-extension-gfm-task-list-item@2.1.0: - resolution: {integrity: sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==} - - micromark-extension-gfm@3.0.0: - resolution: {integrity: sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==} - - micromark-factory-destination@2.0.1: - resolution: {integrity: sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==} - - micromark-factory-label@2.0.1: - resolution: {integrity: sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==} - - micromark-factory-space@2.0.1: - resolution: {integrity: sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==} - - micromark-factory-title@2.0.1: - resolution: {integrity: sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==} - - micromark-factory-whitespace@2.0.1: - resolution: {integrity: sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==} - micromark-util-character@2.1.1: resolution: {integrity: sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==} - micromark-util-chunked@2.0.1: - resolution: {integrity: sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==} - - micromark-util-classify-character@2.0.1: - resolution: {integrity: sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==} - - micromark-util-combine-extensions@2.0.1: - resolution: {integrity: sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==} - - micromark-util-decode-numeric-character-reference@2.0.2: - resolution: {integrity: sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==} - - micromark-util-decode-string@2.0.1: - resolution: {integrity: sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==} - micromark-util-encode@2.0.1: resolution: {integrity: sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==} - micromark-util-html-tag-name@2.0.1: - resolution: {integrity: sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==} - - micromark-util-normalize-identifier@2.0.1: - resolution: {integrity: sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==} - - micromark-util-resolve-all@2.0.1: - resolution: {integrity: sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==} - micromark-util-sanitize-uri@2.0.1: resolution: {integrity: sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==} - micromark-util-subtokenize@2.1.0: - resolution: {integrity: sha512-XQLu552iSctvnEcgXw6+Sx75GflAPNED1qx7eBJ+wydBb2KCbRZe+NwvIEEMM83uml1+2WSXpBAcp9IUCgCYWA==} - micromark-util-symbol@2.0.1: resolution: {integrity: sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==} micromark-util-types@2.0.2: resolution: {integrity: sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==} - micromark@4.0.2: - resolution: {integrity: sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==} - micromatch@4.0.8: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} @@ -2784,9 +2626,6 @@ packages: module-details-from-path@1.0.3: resolution: {integrity: sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==} - monaco-editor@0.52.2: - resolution: {integrity: sha512-GEQWEZmfkOGLdd3XK8ryrfWz3AIP8YymVXiPHEdewrUq7mh0qrKrfHLNCXcbB6sTnMLnOZ3ztSiKcciFUkIJwQ==} - mri@1.2.0: resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} engines: {node: '>=4'} @@ -2838,9 +2677,6 @@ packages: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - normalize.css@8.0.1: - resolution: {integrity: sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==} - nwsapi@2.2.20: resolution: {integrity: sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==} @@ -3029,8 +2865,8 @@ packages: resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==} engines: {node: '>=0.4.0'} - property-information@7.0.0: - resolution: {integrity: sha512-7D/qOz/+Y4X/rzSB6jKxKUsQnphO046ei8qxG59mtM3RG3DHgTK81HrxrmoDVINJb8NKT5ZsRbwHvQ6B68Iyhg==} + property-information@7.1.0: + resolution: {integrity: sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==} proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} @@ -3081,21 +2917,6 @@ packages: resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==} engines: {node: '>= 0.4'} - rehype-highlight@7.0.2: - resolution: {integrity: sha512-k158pK7wdC2qL3M5NcZROZ2tR/l7zOzjxXd5VGdcfIyoijjQqpHd3JKtYSBDpDZ38UI2WJWuFAtkMDxmx5kstA==} - - remark-gfm@4.0.1: - resolution: {integrity: sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==} - - remark-parse@11.0.0: - resolution: {integrity: sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==} - - remark-rehype@11.1.1: - resolution: {integrity: sha512-g/osARvjkBXb6Wo0XvAeXQohVta8i84ACbenPpoSsxTOQH/Ae0/RGP4WZgnMH5pMLpsj4FG7OHmcIcXxpza8eQ==} - - remark-stringify@11.0.0: - resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==} - remarkable@2.0.1: resolution: {integrity: sha512-YJyMcOH5lrR+kZdmB0aJJ4+93bEojRZ1HGDn9Eagu6ibg7aVZhc3OWbbShRid+Q5eAfsEqWxpe+g5W5nYNfNiA==} engines: {node: '>= 6.0.0'} @@ -3312,11 +3133,6 @@ packages: svelte: optional: true - svelte-exmarkdown@5.0.0: - resolution: {integrity: sha512-ImkQCbSp6fZJsIgwQCLch1WC1CTjEPioYB2GSdvLcwRa3pI45PCrpW0/MSITs4MjuTFKf1W8z4ij1IGv+uWNOg==} - peerDependencies: - svelte: ^5.1.3 - svelte-motion@0.12.2: resolution: {integrity: sha512-7RrdRz9iVP55B9HT/C0hYW3pyrKlF61kAby/AkDtOAP0uHFQDrfd0qQetDC81cEsK9b40jt+jfcqSAXcA7LPEw==} peerDependencies: @@ -3436,10 +3252,17 @@ packages: tldts-core@6.1.85: resolution: {integrity: sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==} + tldts-core@7.0.7: + resolution: {integrity: sha512-ECqb8imSroX1UmUuhRBNPkkmtZ8mHEenieim80UVxG0M5wXVjY2Fp2tYXCPvk+nLy1geOhFpeD5YQhM/gF63Jg==} + tldts@6.1.85: resolution: {integrity: sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==} hasBin: true + tldts@7.0.7: + resolution: {integrity: sha512-ETNXj36ql5BXDa4VVJk3wgqansg8TI1Yqo217twSAPjyDnh/b2T+XzrI0ftn6EnzVPbXpMTZHOWj5s3a8/uGPA==} + hasBin: true + to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -3462,9 +3285,6 @@ packages: trim-lines@3.0.1: resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==} - trough@2.2.0: - resolution: {integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==} - ts-api-utils@2.1.0: resolution: {integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==} engines: {node: '>=18.12'} @@ -3487,8 +3307,8 @@ packages: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} - typescript-eslint@8.31.1: - resolution: {integrity: sha512-j6DsEotD/fH39qKzXTQRwYYWlt7D+0HmfpOK+DVhwJOFLcdmn92hq3mBb7HlKJHbjjI/gTOqEcc9d6JfpFf/VA==} + typescript-eslint@8.30.1: + resolution: {integrity: sha512-D7lC0kcehVH7Mb26MRQi64LMyRJsj3dToJxM1+JVTl53DQSV5/7oUGWQLcKl1C1KnoVHxMMU2FNQMffr7F3Row==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -3502,12 +3322,6 @@ packages: undici-types@6.20.0: resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==} - unified@11.0.5: - resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==} - - unist-util-find-after@5.0.0: - resolution: {integrity: sha512-amQa0Ep2m6hE2g72AugUItjbuM8X8cGQnFoHk0pGfrFeT9GZhzN5SW8nRsiGKK7Aif4CrACPENkA6P/Lw6fHGQ==} - unist-util-is@6.0.0: resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==} @@ -3755,7 +3569,7 @@ snapshots: '@ai-sdk/provider-utils@2.1.13(zod@3.24.3)': dependencies: '@ai-sdk/provider': 1.0.11 - eventsource-parser: 3.0.1 + eventsource-parser: 3.0.0 nanoid: 3.3.11 secure-json-parse: 2.7.0 optionalDependencies: @@ -3821,13 +3635,13 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1': {} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e190a19': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@282a767ad8af373bcd34d7ab9192870f07634ce8(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@2.0.0-RC.1(svelte@5.25.3)': dependencies: svelte: 5.25.3 - '@appwrite.io/pink-icons-svelte@https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@282a767(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@12707b9(svelte@5.25.3)': dependencies: svelte: 5.25.3 @@ -3840,9 +3654,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@325(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://try-module.cloud/-/@appwrite/%40appwrite.io%2Fpink-svelte@d74b893(svelte@5.25.3)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@282a767ad8af373bcd34d7ab9192870f07634ce8(svelte@5.25.3) + '@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.25.3) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.6(svelte@5.25.3))(svelte@5.25.3) '@melt-ui/svelte': 0.86.6(svelte@5.25.3) @@ -3855,12 +3669,6 @@ snapshots: svelte-motion: 0.12.2(svelte@5.25.3) svelte-sonner: 0.3.28(svelte@5.25.3) - '@appwrite.io/pink@0.25.0': - dependencies: - '@appwrite.io/pink-icons': 0.25.0 - normalize.css: 8.0.1 - the-new-css-reset: 1.11.3 - '@asamuzakjp/css-color@3.1.1': dependencies: '@csstools/css-calc': 2.1.2(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3) @@ -4107,7 +3915,7 @@ snapshots: '@eslint/js@9.23.0': {} - '@eslint/js@9.25.1': {} + '@eslint/js@9.24.0': {} '@eslint/object-schema@2.1.6': {} @@ -4929,7 +4737,7 @@ snapshots: svelte: 5.25.3 optionalDependencies: vite: 6.2.3(@types/node@22.13.14)(sass@1.86.0) - vitest: 3.0.9(@types/debug@4.1.12)(@types/node@22.13.14)(@vitest/ui@3.0.9)(jsdom@26.0.0)(sass@1.86.0) + vitest: 3.0.9(@types/node@22.13.14)(@vitest/ui@3.0.9)(jsdom@26.0.0)(sass@1.86.0) '@testing-library/user-event@14.6.1(@testing-library/dom@10.4.0)': dependencies: @@ -4943,10 +4751,6 @@ snapshots: '@types/cookie@0.6.0': {} - '@types/debug@4.1.12': - dependencies: - '@types/ms': 2.1.0 - '@types/deep-equal@1.0.4': {} '@types/dlv@1.1.5': {} @@ -4965,8 +4769,6 @@ snapshots: dependencies: '@types/unist': 3.0.3 - '@types/ms@2.1.0': {} - '@types/mysql@2.15.26': dependencies: '@types/node': 22.13.14 @@ -4989,7 +4791,7 @@ snapshots: '@types/prop-types@15.7.14': {} - '@types/react@18.3.20': + '@types/react@18.3.22': dependencies: '@types/prop-types': 15.7.14 csstype: 3.1.3 @@ -5021,14 +4823,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/eslint-plugin@8.31.1(@typescript-eslint/parser@8.31.1(eslint@9.23.0)(typescript@5.8.2))(eslint@9.23.0)(typescript@5.8.2)': + '@typescript-eslint/eslint-plugin@8.30.1(@typescript-eslint/parser@8.30.1(eslint@9.23.0)(typescript@5.8.2))(eslint@9.23.0)(typescript@5.8.2)': dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.31.1(eslint@9.23.0)(typescript@5.8.2) - '@typescript-eslint/scope-manager': 8.31.1 - '@typescript-eslint/type-utils': 8.31.1(eslint@9.23.0)(typescript@5.8.2) - '@typescript-eslint/utils': 8.31.1(eslint@9.23.0)(typescript@5.8.2) - '@typescript-eslint/visitor-keys': 8.31.1 + '@typescript-eslint/parser': 8.30.1(eslint@9.23.0)(typescript@5.8.2) + '@typescript-eslint/scope-manager': 8.30.1 + '@typescript-eslint/type-utils': 8.30.1(eslint@9.23.0)(typescript@5.8.2) + '@typescript-eslint/utils': 8.30.1(eslint@9.23.0)(typescript@5.8.2) + '@typescript-eslint/visitor-keys': 8.30.1 eslint: 9.23.0 graphemer: 1.4.0 ignore: 5.3.2 @@ -5050,12 +4852,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.31.1(eslint@9.23.0)(typescript@5.8.2)': + '@typescript-eslint/parser@8.30.1(eslint@9.23.0)(typescript@5.8.2)': dependencies: - '@typescript-eslint/scope-manager': 8.31.1 - '@typescript-eslint/types': 8.31.1 - '@typescript-eslint/typescript-estree': 8.31.1(typescript@5.8.2) - '@typescript-eslint/visitor-keys': 8.31.1 + '@typescript-eslint/scope-manager': 8.30.1 + '@typescript-eslint/types': 8.30.1 + '@typescript-eslint/typescript-estree': 8.30.1(typescript@5.8.2) + '@typescript-eslint/visitor-keys': 8.30.1 debug: 4.4.0 eslint: 9.23.0 typescript: 5.8.2 @@ -5067,10 +4869,10 @@ snapshots: '@typescript-eslint/types': 8.28.0 '@typescript-eslint/visitor-keys': 8.28.0 - '@typescript-eslint/scope-manager@8.31.1': + '@typescript-eslint/scope-manager@8.30.1': dependencies: - '@typescript-eslint/types': 8.31.1 - '@typescript-eslint/visitor-keys': 8.31.1 + '@typescript-eslint/types': 8.30.1 + '@typescript-eslint/visitor-keys': 8.30.1 '@typescript-eslint/type-utils@8.28.0(eslint@9.23.0)(typescript@5.8.2)': dependencies: @@ -5083,10 +4885,10 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/type-utils@8.31.1(eslint@9.23.0)(typescript@5.8.2)': + '@typescript-eslint/type-utils@8.30.1(eslint@9.23.0)(typescript@5.8.2)': dependencies: - '@typescript-eslint/typescript-estree': 8.31.1(typescript@5.8.2) - '@typescript-eslint/utils': 8.31.1(eslint@9.23.0)(typescript@5.8.2) + '@typescript-eslint/typescript-estree': 8.30.1(typescript@5.8.2) + '@typescript-eslint/utils': 8.30.1(eslint@9.23.0)(typescript@5.8.2) debug: 4.4.0 eslint: 9.23.0 ts-api-utils: 2.1.0(typescript@5.8.2) @@ -5096,7 +4898,7 @@ snapshots: '@typescript-eslint/types@8.28.0': {} - '@typescript-eslint/types@8.31.1': {} + '@typescript-eslint/types@8.30.1': {} '@typescript-eslint/typescript-estree@8.28.0(typescript@5.8.2)': dependencies: @@ -5112,10 +4914,10 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@8.31.1(typescript@5.8.2)': + '@typescript-eslint/typescript-estree@8.30.1(typescript@5.8.2)': dependencies: - '@typescript-eslint/types': 8.31.1 - '@typescript-eslint/visitor-keys': 8.31.1 + '@typescript-eslint/types': 8.30.1 + '@typescript-eslint/visitor-keys': 8.30.1 debug: 4.4.0 fast-glob: 3.3.3 is-glob: 4.0.3 @@ -5137,12 +4939,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.31.1(eslint@9.23.0)(typescript@5.8.2)': + '@typescript-eslint/utils@8.30.1(eslint@9.23.0)(typescript@5.8.2)': dependencies: '@eslint-community/eslint-utils': 4.5.1(eslint@9.23.0) - '@typescript-eslint/scope-manager': 8.31.1 - '@typescript-eslint/types': 8.31.1 - '@typescript-eslint/typescript-estree': 8.31.1(typescript@5.8.2) + '@typescript-eslint/scope-manager': 8.30.1 + '@typescript-eslint/types': 8.30.1 + '@typescript-eslint/typescript-estree': 8.30.1(typescript@5.8.2) eslint: 9.23.0 typescript: 5.8.2 transitivePeerDependencies: @@ -5153,9 +4955,9 @@ snapshots: '@typescript-eslint/types': 8.28.0 eslint-visitor-keys: 4.2.0 - '@typescript-eslint/visitor-keys@8.31.1': + '@typescript-eslint/visitor-keys@8.30.1': dependencies: - '@typescript-eslint/types': 8.31.1 + '@typescript-eslint/types': 8.30.1 eslint-visitor-keys: 4.2.0 '@ungap/structured-clone@1.3.0': {} @@ -5203,7 +5005,7 @@ snapshots: sirv: 3.0.1 tinyglobby: 0.2.12 tinyrainbow: 2.0.0 - vitest: 3.0.9(@types/debug@4.1.12)(@types/node@22.13.14)(@vitest/ui@3.0.9)(jsdom@26.0.0)(sass@1.86.0) + vitest: 3.0.9(@types/node@22.13.14)(@vitest/ui@3.0.9)(jsdom@26.0.0)(sass@1.86.0) '@vitest/utils@3.0.9': dependencies: @@ -5265,12 +5067,6 @@ snapshots: '@vue/shared@3.5.13': {} - '@xterm/addon-fit@0.10.0(@xterm/xterm@5.5.0)': - dependencies: - '@xterm/xterm': 5.5.0 - - '@xterm/xterm@5.5.0': {} - acorn-import-attributes@1.9.5(acorn@8.14.1): dependencies: acorn: 8.14.1 @@ -5374,8 +5170,6 @@ snapshots: axobject-query@4.1.0: {} - bail@2.0.2: {} - balanced-match@1.0.2: {} binary-extensions@2.3.0: {} @@ -5447,8 +5241,6 @@ snapshots: character-entities-legacy@3.0.0: {} - character-entities@2.0.2: {} - check-error@2.1.1: {} chokidar@3.6.0: @@ -5483,8 +5275,23 @@ snapshots: dependencies: color-name: 1.1.4 + color-convert@3.1.0: + dependencies: + color-name: 2.0.0 + color-name@1.1.4: {} + color-name@2.0.0: {} + + color-string@2.0.1: + dependencies: + color-name: 2.0.0 + + color@5.0.0: + dependencies: + color-convert: 3.1.0 + color-string: 2.0.1 + combined-stream@1.0.8: dependencies: delayed-stream: 1.0.0 @@ -5690,10 +5497,6 @@ snapshots: decimal.js@10.5.0: {} - decode-named-character-reference@1.1.0: - dependencies: - character-entities: 2.0.2 - deep-eql@5.0.2: {} deep-equal@2.2.3: @@ -5836,8 +5639,6 @@ snapshots: escape-string-regexp@4.0.0: {} - escape-string-regexp@5.0.0: {} - eslint-compat-utils@0.6.4(eslint@9.23.0): dependencies: eslint: 9.23.0 @@ -5948,12 +5749,10 @@ snapshots: eventsource-parser@1.0.0: {} - eventsource-parser@3.0.1: {} + eventsource-parser@3.0.0: {} expect-type@1.2.0: {} - extend@3.0.2: {} - fast-deep-equal@3.1.3: {} fast-glob@3.3.3: @@ -6100,10 +5899,6 @@ snapshots: dependencies: function-bind: 1.1.2 - hast-util-is-element@3.0.0: - dependencies: - '@types/hast': 3.0.4 - hast-util-to-html@9.0.5: dependencies: '@types/hast': 3.0.4 @@ -6113,26 +5908,17 @@ snapshots: hast-util-whitespace: 3.0.0 html-void-elements: 3.0.0 mdast-util-to-hast: 13.2.0 - property-information: 7.0.0 + property-information: 7.1.0 space-separated-tokens: 2.0.2 stringify-entities: 4.0.4 zwitch: 2.0.4 - hast-util-to-text@4.0.2: - dependencies: - '@types/hast': 3.0.4 - '@types/unist': 3.0.3 - hast-util-is-element: 3.0.0 - unist-util-find-after: 5.0.0 - hast-util-whitespace@3.0.0: dependencies: '@types/hast': 3.0.4 hey-listen@1.0.8: {} - highlight.js@11.11.1: {} - html-encoding-sniffer@4.0.0: dependencies: whatwg-encoding: 3.1.1 @@ -6246,8 +6032,6 @@ snapshots: is-number@7.0.0: {} - is-plain-obj@4.1.0: {} - is-potential-custom-element-name@1.0.1: {} is-reference@3.0.3: @@ -6360,20 +6144,12 @@ snapshots: lodash@4.17.21: {} - longest-streak@3.1.0: {} - loose-envify@1.4.0: dependencies: js-tokens: 4.0.0 loupe@3.1.3: {} - lowlight@3.3.0: - dependencies: - '@types/hast': 3.0.4 - devlop: 1.1.0 - highlight.js: 11.11.1 - lru-cache@10.4.3: {} lru-cache@5.1.1: @@ -6402,96 +6178,8 @@ snapshots: '@babel/types': 7.27.0 recast: 0.23.11 - markdown-table@3.0.4: {} - math-intrinsics@1.1.0: {} - mdast-util-find-and-replace@3.0.2: - dependencies: - '@types/mdast': 4.0.4 - escape-string-regexp: 5.0.0 - unist-util-is: 6.0.0 - unist-util-visit-parents: 6.0.1 - - mdast-util-from-markdown@2.0.2: - dependencies: - '@types/mdast': 4.0.4 - '@types/unist': 3.0.3 - decode-named-character-reference: 1.1.0 - devlop: 1.1.0 - mdast-util-to-string: 4.0.0 - micromark: 4.0.2 - micromark-util-decode-numeric-character-reference: 2.0.2 - micromark-util-decode-string: 2.0.1 - micromark-util-normalize-identifier: 2.0.1 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - unist-util-stringify-position: 4.0.0 - transitivePeerDependencies: - - supports-color - - mdast-util-gfm-autolink-literal@2.0.1: - dependencies: - '@types/mdast': 4.0.4 - ccount: 2.0.1 - devlop: 1.1.0 - mdast-util-find-and-replace: 3.0.2 - micromark-util-character: 2.1.1 - - mdast-util-gfm-footnote@2.1.0: - dependencies: - '@types/mdast': 4.0.4 - devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 - mdast-util-to-markdown: 2.1.2 - micromark-util-normalize-identifier: 2.0.1 - transitivePeerDependencies: - - supports-color - - mdast-util-gfm-strikethrough@2.0.0: - dependencies: - '@types/mdast': 4.0.4 - mdast-util-from-markdown: 2.0.2 - mdast-util-to-markdown: 2.1.2 - transitivePeerDependencies: - - supports-color - - mdast-util-gfm-table@2.0.0: - dependencies: - '@types/mdast': 4.0.4 - devlop: 1.1.0 - markdown-table: 3.0.4 - mdast-util-from-markdown: 2.0.2 - mdast-util-to-markdown: 2.1.2 - transitivePeerDependencies: - - supports-color - - mdast-util-gfm-task-list-item@2.0.0: - dependencies: - '@types/mdast': 4.0.4 - devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 - mdast-util-to-markdown: 2.1.2 - transitivePeerDependencies: - - supports-color - - mdast-util-gfm@3.1.0: - dependencies: - mdast-util-from-markdown: 2.0.2 - mdast-util-gfm-autolink-literal: 2.0.1 - mdast-util-gfm-footnote: 2.1.0 - mdast-util-gfm-strikethrough: 2.0.0 - mdast-util-gfm-table: 2.0.0 - mdast-util-gfm-task-list-item: 2.0.0 - mdast-util-to-markdown: 2.1.2 - transitivePeerDependencies: - - supports-color - - mdast-util-phrasing@4.1.0: - dependencies: - '@types/mdast': 4.0.4 - unist-util-is: 6.0.0 - mdast-util-to-hast@13.2.0: dependencies: '@types/hast': 3.0.4 @@ -6504,217 +6192,27 @@ snapshots: unist-util-visit: 5.0.0 vfile: 6.0.3 - mdast-util-to-markdown@2.1.2: - dependencies: - '@types/mdast': 4.0.4 - '@types/unist': 3.0.3 - longest-streak: 3.1.0 - mdast-util-phrasing: 4.1.0 - mdast-util-to-string: 4.0.0 - micromark-util-classify-character: 2.0.1 - micromark-util-decode-string: 2.0.1 - unist-util-visit: 5.0.0 - zwitch: 2.0.4 - - mdast-util-to-string@4.0.0: - dependencies: - '@types/mdast': 4.0.4 - mdn-data@2.0.30: {} merge2@1.4.1: {} - micromark-core-commonmark@2.0.3: - dependencies: - decode-named-character-reference: 1.1.0 - devlop: 1.1.0 - micromark-factory-destination: 2.0.1 - micromark-factory-label: 2.0.1 - micromark-factory-space: 2.0.1 - micromark-factory-title: 2.0.1 - micromark-factory-whitespace: 2.0.1 - micromark-util-character: 2.1.1 - micromark-util-chunked: 2.0.1 - micromark-util-classify-character: 2.0.1 - micromark-util-html-tag-name: 2.0.1 - micromark-util-normalize-identifier: 2.0.1 - micromark-util-resolve-all: 2.0.1 - micromark-util-subtokenize: 2.1.0 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - - micromark-extension-gfm-autolink-literal@2.1.0: - dependencies: - micromark-util-character: 2.1.1 - micromark-util-sanitize-uri: 2.0.1 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - - micromark-extension-gfm-footnote@2.1.0: - dependencies: - devlop: 1.1.0 - micromark-core-commonmark: 2.0.3 - micromark-factory-space: 2.0.1 - micromark-util-character: 2.1.1 - micromark-util-normalize-identifier: 2.0.1 - micromark-util-sanitize-uri: 2.0.1 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - - micromark-extension-gfm-strikethrough@2.1.0: - dependencies: - devlop: 1.1.0 - micromark-util-chunked: 2.0.1 - micromark-util-classify-character: 2.0.1 - micromark-util-resolve-all: 2.0.1 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - - micromark-extension-gfm-table@2.1.1: - dependencies: - devlop: 1.1.0 - micromark-factory-space: 2.0.1 - micromark-util-character: 2.1.1 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - - micromark-extension-gfm-tagfilter@2.0.0: - dependencies: - micromark-util-types: 2.0.2 - - micromark-extension-gfm-task-list-item@2.1.0: - dependencies: - devlop: 1.1.0 - micromark-factory-space: 2.0.1 - micromark-util-character: 2.1.1 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - - micromark-extension-gfm@3.0.0: - dependencies: - micromark-extension-gfm-autolink-literal: 2.1.0 - micromark-extension-gfm-footnote: 2.1.0 - micromark-extension-gfm-strikethrough: 2.1.0 - micromark-extension-gfm-table: 2.1.1 - micromark-extension-gfm-tagfilter: 2.0.0 - micromark-extension-gfm-task-list-item: 2.1.0 - micromark-util-combine-extensions: 2.0.1 - micromark-util-types: 2.0.2 - - micromark-factory-destination@2.0.1: - dependencies: - micromark-util-character: 2.1.1 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - - micromark-factory-label@2.0.1: - dependencies: - devlop: 1.1.0 - micromark-util-character: 2.1.1 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - - micromark-factory-space@2.0.1: - dependencies: - micromark-util-character: 2.1.1 - micromark-util-types: 2.0.2 - - micromark-factory-title@2.0.1: - dependencies: - micromark-factory-space: 2.0.1 - micromark-util-character: 2.1.1 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - - micromark-factory-whitespace@2.0.1: - dependencies: - micromark-factory-space: 2.0.1 - micromark-util-character: 2.1.1 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - micromark-util-character@2.1.1: dependencies: micromark-util-symbol: 2.0.1 micromark-util-types: 2.0.2 - micromark-util-chunked@2.0.1: - dependencies: - micromark-util-symbol: 2.0.1 - - micromark-util-classify-character@2.0.1: - dependencies: - micromark-util-character: 2.1.1 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - - micromark-util-combine-extensions@2.0.1: - dependencies: - micromark-util-chunked: 2.0.1 - micromark-util-types: 2.0.2 - - micromark-util-decode-numeric-character-reference@2.0.2: - dependencies: - micromark-util-symbol: 2.0.1 - - micromark-util-decode-string@2.0.1: - dependencies: - decode-named-character-reference: 1.1.0 - micromark-util-character: 2.1.1 - micromark-util-decode-numeric-character-reference: 2.0.2 - micromark-util-symbol: 2.0.1 - micromark-util-encode@2.0.1: {} - micromark-util-html-tag-name@2.0.1: {} - - micromark-util-normalize-identifier@2.0.1: - dependencies: - micromark-util-symbol: 2.0.1 - - micromark-util-resolve-all@2.0.1: - dependencies: - micromark-util-types: 2.0.2 - micromark-util-sanitize-uri@2.0.1: dependencies: micromark-util-character: 2.1.1 micromark-util-encode: 2.0.1 micromark-util-symbol: 2.0.1 - micromark-util-subtokenize@2.1.0: - dependencies: - devlop: 1.1.0 - micromark-util-chunked: 2.0.1 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - micromark-util-symbol@2.0.1: {} micromark-util-types@2.0.2: {} - micromark@4.0.2: - dependencies: - '@types/debug': 4.1.12 - debug: 4.4.0 - decode-named-character-reference: 1.1.0 - devlop: 1.1.0 - micromark-core-commonmark: 2.0.3 - micromark-factory-space: 2.0.1 - micromark-util-character: 2.1.1 - micromark-util-chunked: 2.0.1 - micromark-util-combine-extensions: 2.0.1 - micromark-util-decode-numeric-character-reference: 2.0.2 - micromark-util-encode: 2.0.1 - micromark-util-normalize-identifier: 2.0.1 - micromark-util-resolve-all: 2.0.1 - micromark-util-sanitize-uri: 2.0.1 - micromark-util-subtokenize: 2.1.0 - micromark-util-symbol: 2.0.1 - micromark-util-types: 2.0.2 - transitivePeerDependencies: - - supports-color - micromatch@4.0.8: dependencies: braces: 3.0.3 @@ -6748,8 +6246,6 @@ snapshots: module-details-from-path@1.0.3: {} - monaco-editor@0.52.2: {} - mri@1.2.0: {} mrmime@2.0.1: {} @@ -6777,8 +6273,6 @@ snapshots: normalize-path@3.0.0: {} - normalize.css@8.0.1: {} - nwsapi@2.2.20: {} object-inspect@1.13.4: {} @@ -6945,7 +6439,7 @@ snapshots: progress@2.0.3: {} - property-information@7.0.0: {} + property-information@7.1.0: {} proxy-from-env@1.1.0: {} @@ -7000,48 +6494,6 @@ snapshots: gopd: 1.2.0 set-function-name: 2.0.2 - rehype-highlight@7.0.2: - dependencies: - '@types/hast': 3.0.4 - hast-util-to-text: 4.0.2 - lowlight: 3.3.0 - unist-util-visit: 5.0.0 - vfile: 6.0.3 - - remark-gfm@4.0.1: - dependencies: - '@types/mdast': 4.0.4 - mdast-util-gfm: 3.1.0 - micromark-extension-gfm: 3.0.0 - remark-parse: 11.0.0 - remark-stringify: 11.0.0 - unified: 11.0.5 - transitivePeerDependencies: - - supports-color - - remark-parse@11.0.0: - dependencies: - '@types/mdast': 4.0.4 - mdast-util-from-markdown: 2.0.2 - micromark-util-types: 2.0.2 - unified: 11.0.5 - transitivePeerDependencies: - - supports-color - - remark-rehype@11.1.1: - dependencies: - '@types/hast': 3.0.4 - '@types/mdast': 4.0.4 - mdast-util-to-hast: 13.2.0 - unified: 11.0.5 - vfile: 6.0.3 - - remark-stringify@11.0.0: - dependencies: - '@types/mdast': 4.0.4 - mdast-util-to-markdown: 2.1.2 - unified: 11.0.5 - remarkable@2.0.1: dependencies: argparse: 1.0.10 @@ -7298,19 +6750,9 @@ snapshots: optionalDependencies: svelte: 5.25.3 - svelte-exmarkdown@5.0.0(svelte@5.25.3): - dependencies: - remark-gfm: 4.0.1 - remark-parse: 11.0.0 - remark-rehype: 11.1.1 - svelte: 5.25.3 - unified: 11.0.5 - transitivePeerDependencies: - - supports-color - svelte-motion@0.12.2(svelte@5.25.3): dependencies: - '@types/react': 18.3.20 + '@types/react': 18.3.22 framesync: 6.1.2 popmotion: 11.0.5 style-value-types: 5.1.2 @@ -7419,10 +6861,16 @@ snapshots: tldts-core@6.1.85: {} + tldts-core@7.0.7: {} + tldts@6.1.85: dependencies: tldts-core: 6.1.85 + tldts@7.0.7: + dependencies: + tldts-core: 7.0.7 + to-regex-range@5.0.1: dependencies: is-number: 7.0.0 @@ -7441,8 +6889,6 @@ snapshots: trim-lines@3.0.1: {} - trough@2.2.0: {} - ts-api-utils@2.1.0(typescript@5.8.2): dependencies: typescript: 5.8.2 @@ -7459,11 +6905,11 @@ snapshots: dependencies: prelude-ls: 1.2.1 - typescript-eslint@8.31.1(eslint@9.23.0)(typescript@5.8.2): + typescript-eslint@8.30.1(eslint@9.23.0)(typescript@5.8.2): dependencies: - '@typescript-eslint/eslint-plugin': 8.31.1(@typescript-eslint/parser@8.31.1(eslint@9.23.0)(typescript@5.8.2))(eslint@9.23.0)(typescript@5.8.2) - '@typescript-eslint/parser': 8.31.1(eslint@9.23.0)(typescript@5.8.2) - '@typescript-eslint/utils': 8.31.1(eslint@9.23.0)(typescript@5.8.2) + '@typescript-eslint/eslint-plugin': 8.30.1(@typescript-eslint/parser@8.30.1(eslint@9.23.0)(typescript@5.8.2))(eslint@9.23.0)(typescript@5.8.2) + '@typescript-eslint/parser': 8.30.1(eslint@9.23.0)(typescript@5.8.2) + '@typescript-eslint/utils': 8.30.1(eslint@9.23.0)(typescript@5.8.2) eslint: 9.23.0 typescript: 5.8.2 transitivePeerDependencies: @@ -7473,21 +6919,6 @@ snapshots: undici-types@6.20.0: {} - unified@11.0.5: - dependencies: - '@types/unist': 3.0.3 - bail: 2.0.2 - devlop: 1.1.0 - extend: 3.0.2 - is-plain-obj: 4.1.0 - trough: 2.2.0 - vfile: 6.0.3 - - unist-util-find-after@5.0.0: - dependencies: - '@types/unist': 3.0.3 - unist-util-is: 6.0.0 - unist-util-is@6.0.0: dependencies: '@types/unist': 3.0.3 @@ -7579,7 +7010,7 @@ snapshots: optionalDependencies: vite: 6.2.3(@types/node@22.13.14)(sass@1.86.0) - vitest@3.0.9(@types/debug@4.1.12)(@types/node@22.13.14)(@vitest/ui@3.0.9)(jsdom@26.0.0)(sass@1.86.0): + vitest@3.0.9(@types/node@22.13.14)(@vitest/ui@3.0.9)(jsdom@26.0.0)(sass@1.86.0): dependencies: '@vitest/expect': 3.0.9 '@vitest/mocker': 3.0.9(vite@6.2.3(@types/node@22.13.14)(sass@1.86.0)) @@ -7602,7 +7033,6 @@ snapshots: vite-node: 3.0.9(@types/node@22.13.14)(sass@1.86.0) why-is-node-running: 2.3.0 optionalDependencies: - '@types/debug': 4.1.12 '@types/node': 22.13.14 '@vitest/ui': 3.0.9(vitest@3.0.9) jsdom: 26.0.0 diff --git a/src/hooks.client.ts b/src/hooks.client.ts index aa476c394..5f34c360f 100644 --- a/src/hooks.client.ts +++ b/src/hooks.client.ts @@ -1,7 +1,7 @@ import * as Sentry from '@sentry/sveltekit'; +import { isCloud, isProd, isStudio } from '$lib/system'; import { AppwriteException } from '@appwrite.io/console'; import type { HandleClientError } from '@sveltejs/kit'; -import { isCloud, isProd, isStudio } from '$lib/system'; Sentry.init({ enabled: isCloud && isProd, @@ -30,17 +30,15 @@ function setLoader() { setLoader(); -export const handleError: HandleClientError = Sentry.handleErrorWithSentry( - async ({ error, message, status }) => { - console.error(error); - if (error instanceof AppwriteException) { - status = error.code === 0 ? undefined : error.code; - message = error.message; - } - - return { - message, - status - }; +export const handleError: HandleClientError = ({ error, message, status }) => { + console.error(error); + if (error instanceof AppwriteException) { + status = error.code === 0 ? undefined : error.code; + message = error.message; } -); + + return { + message, + status + }; +}; diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 8ca755571..d9c86e0d9 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -314,6 +314,7 @@ export enum Submit { VariableDelete = 'submit_variable_delete', VariableUpdate = 'submit_variable_update', VariableEditor = 'submit_variable_editor', + LogDelete = 'submit_log_delete', KeyCreate = 'submit_key_create', KeyDelete = 'submit_key_delete', diff --git a/src/lib/commandCenter/panels/createAttribute.svelte b/src/lib/commandCenter/panels/createAttribute.svelte index 950d4af72..98d312698 100644 --- a/src/lib/commandCenter/panels/createAttribute.svelte +++ b/src/lib/commandCenter/panels/createAttribute.svelte @@ -1,6 +1,6 @@ @@ -271,8 +276,11 @@ @@ -305,7 +313,7 @@ on:mouseleave={getOptionBlurHandler()} on:focus={getOptionFocusHandler(item)}> - + {#if item.icon} { +const getBucketCommand = (bucket: Models.Bucket, region: string, projectId: string) => { return { label: `${bucket.name}`, callback() { - goto(`${base}/project-${projectId}/storage/bucket-${bucket.$id}`); + goto(`${base}/project-${region}-${projectId}/storage/bucket-${bucket.$id}`); }, group: 'buckets', icon: IconFolder @@ -27,19 +28,24 @@ const getBucketCommand = (bucket: Models.Bucket, projectId: string) => { }; export const bucketSearcher = (async (query: string) => { - const { buckets } = await sdk.forProject.storage.listBuckets([Query.orderDesc('$createdAt')]); - const $project = get(project); + const region = page.params.region; + const { buckets } = await sdk + .forProject(page.params.region, page.params.project) + .storage.listBuckets([Query.orderDesc('$createdAt')]); + const filtered = buckets.filter((bucket) => bucket.name.includes(query)); if (filtered.length === 1) { const bucket = filtered[0]; return [ - getBucketCommand(bucket, $project.$id), + getBucketCommand(bucket, region, $project.$id), { label: 'Find files', async callback() { - await goto(`${base}/project-${$project.$id}/storage/bucket-${bucket.$id}`); + await goto( + `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${bucket.$id}` + ); addSubPanel(FilesPanel); }, group: 'buckets', @@ -51,7 +57,7 @@ export const bucketSearcher = (async (query: string) => { label: 'Permissions', async callback() { await goto( - `${base}/project-${$project.$id}/storage/bucket-${bucket.$id}/settings#permissions` + `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${bucket.$id}/settings#permissions` ); scrollBy({ top: -100 }); }, @@ -63,7 +69,7 @@ export const bucketSearcher = (async (query: string) => { label: 'Extensions', async callback() { await goto( - `${base}/project-${$project.$id}/storage/bucket-${bucket.$id}/settings#extensions` + `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${bucket.$id}/settings#extensions` ); }, group: 'buckets', @@ -74,7 +80,7 @@ export const bucketSearcher = (async (query: string) => { label: 'File Security', async callback() { await goto( - `${base}/project-${$project.$id}/storage/bucket-${bucket.$id}/settings#file-security` + `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${bucket.$id}/settings#file-security` ); scrollBy({ top: -100 }); }, @@ -85,5 +91,5 @@ export const bucketSearcher = (async (query: string) => { ]; } - return filtered.map((bucket) => getBucketCommand(bucket, $project.$id)); + return filtered.map((bucket) => getBucketCommand(bucket, $project.region, $project.$id)); }) satisfies Searcher; diff --git a/src/lib/commandCenter/searchers/collections.ts b/src/lib/commandCenter/searchers/collections.ts index 8a3a9ed54..c3ffaebe9 100644 --- a/src/lib/commandCenter/searchers/collections.ts +++ b/src/lib/commandCenter/searchers/collections.ts @@ -1,16 +1,17 @@ import { goto } from '$app/navigation'; -import { database } from '$routes/(console)/project-[project]/databases/database-[database]/store'; -import { project } from '$routes/(console)/project-[project]/store'; +import { database } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/store'; import { get } from 'svelte/store'; import type { Searcher } from '../commands'; import { sdk } from '$lib/stores/sdk'; import { base } from '$app/paths'; +import { page } from '$app/state'; export const collectionsSearcher = (async (query: string) => { const databaseId = get(database).$id; - const { collections } = await sdk.forProject.databases.listCollections(databaseId); + const { collections } = await sdk + .forProject(page.params.region, page.params.project) + .databases.listCollections(databaseId); - const projectId = get(project).$id; return collections .filter((col) => col.name.toLowerCase().includes(query.toLowerCase())) .map( @@ -20,7 +21,7 @@ export const collectionsSearcher = (async (query: string) => { label: col.name, callback: () => { goto( - `${base}/project-${projectId}/databases/database-${databaseId}/collection-${col.$id}` + `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${col.$id}` ); } }) as const diff --git a/src/lib/commandCenter/searchers/databases.ts b/src/lib/commandCenter/searchers/databases.ts index 5464b9ddc..f50a1474d 100644 --- a/src/lib/commandCenter/searchers/databases.ts +++ b/src/lib/commandCenter/searchers/databases.ts @@ -1,13 +1,14 @@ import { goto } from '$app/navigation'; -import { project } from '$routes/(console)/project-[project]/store'; -import { get } from 'svelte/store'; import type { Searcher } from '../commands'; import { sdk } from '$lib/stores/sdk'; import { base } from '$app/paths'; import { IconDatabase } from '@appwrite.io/pink-icons-svelte'; +import { page } from '$app/state'; export const dbSearcher = (async (query: string) => { - const { databases } = await sdk.forProject.databases.list(); + const { databases } = await sdk + .forProject(page.params.region, page.params.project) + .databases.list(); return databases .filter((db) => db.name.toLowerCase().includes(query.toLowerCase())) @@ -17,7 +18,9 @@ export const dbSearcher = (async (query: string) => { group: 'databases', label: db.name, callback: () => { - goto(`${base}/project-${get(project).$id}/databases/database-${db.$id}`); + goto( + `${base}/project-${page.params.region}-${page.params.project}/databases/database-${db.$id}` + ); }, icon: IconDatabase }) as const diff --git a/src/lib/commandCenter/searchers/files.ts b/src/lib/commandCenter/searchers/files.ts index cbaf6123e..858441740 100644 --- a/src/lib/commandCenter/searchers/files.ts +++ b/src/lib/commandCenter/searchers/files.ts @@ -1,27 +1,28 @@ import { sdk } from '$lib/stores/sdk'; import { get } from 'svelte/store'; import type { Searcher } from '../commands'; -import { bucket } from '$routes/(console)/project-[project]/storage/bucket-[bucket]/store'; +import { bucket } from '$routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/store'; import { Query } from '@appwrite.io/console'; import { goto } from '$app/navigation'; -import { project } from '$routes/(console)/project-[project]/store'; +import { project } from '$routes/(console)/project-[region]-[project]/store'; import { base } from '$app/paths'; import { IconDocument } from '@appwrite.io/pink-icons-svelte'; +import { page } from '$app/state'; export const fileSearcher = (async (query: string) => { const $bucket = get(bucket); const $project = get(project); - const { files } = await sdk.forProject.storage.listFiles( - $bucket.$id, - [Query.orderDesc('')], - query || undefined - ); + const { files } = await sdk + .forProject(page.params.region, page.params.project) + .storage.listFiles($bucket.$id, [Query.orderDesc('')], query || undefined); return files.map((file) => ({ label: file.name, callback: () => { - goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/file-${file.$id}`); + goto( + `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/file-${file.$id}` + ); }, icon: IconDocument, group: 'files' diff --git a/src/lib/commandCenter/searchers/functions.ts b/src/lib/commandCenter/searchers/functions.ts index 0a22eedc9..d28992964 100644 --- a/src/lib/commandCenter/searchers/functions.ts +++ b/src/lib/commandCenter/searchers/functions.ts @@ -1,19 +1,19 @@ import { goto } from '$app/navigation'; import { sdk } from '$lib/stores/sdk'; -import { project } from '$routes/(console)/project-[project]/store'; +import { project } from '$routes/(console)/project-[region]-[project]/store'; import { get } from 'svelte/store'; import type { Searcher } from '../commands'; import type { Models } from '@appwrite.io/console'; -import { page } from '$app/stores'; -import { showCreateDeployment } from '$routes/(console)/project-[project]/functions/function-[function]/store'; +import { page } from '$app/state'; +import { showCreateDeployment } from '$routes/(console)/project-[region]-[project]/functions/function-[function]/store'; import { base } from '$app/paths'; import { IconLightningBolt, IconPlus } from '@appwrite.io/pink-icons-svelte'; -const getFunctionCommand = (fn: Models.Function, projectId: string) => { +const getFunctionCommand = (fn: Models.Function, region: string, projectId: string) => { return { label: fn.name, callback: () => { - goto(`${base}/project-${projectId}/functions/function-${fn.$id}`); + goto(`${base}/project-${region}-${projectId}/functions/function-${fn.$id}`); }, group: 'functions', icon: IconLightningBolt @@ -21,23 +21,25 @@ const getFunctionCommand = (fn: Models.Function, projectId: string) => { }; export const functionsSearcher = (async (query: string) => { - const { functions } = await sdk.forProject.functions.list(); - const projectId = get(project).$id; + const { functions } = await sdk + .forProject(page.params.region, page.params.project) + .functions.list(); const filtered = functions.filter((fn) => fn.name.toLowerCase().includes(query.toLowerCase())); if (filtered.length === 1) { const func = filtered[0]; return [ - getFunctionCommand(func, projectId), + getFunctionCommand(func, page.params.region, projectId), { label: 'Create deployment', nested: true, async callback() { - const $page = get(page); - if (!$page.url.pathname.endsWith(func.$id)) { - await goto(`${base}/project-${projectId}/functions/function-${func.$id}`); + if (!page.url.pathname.endsWith(func.$id)) { + await goto( + `${base}/project-${page.params.region}-${projectId}/functions/function-${func.$id}` + ); } showCreateDeployment.set(true); }, @@ -48,7 +50,9 @@ export const functionsSearcher = (async (query: string) => { label: 'Go to deployments', nested: true, callback() { - goto(`${base}/project-${projectId}/functions/function-${func.$id}`); + goto( + `${base}/project-${page.params.region}-${projectId}/functions/function-${func.$id}` + ); }, group: 'functions' }, @@ -56,7 +60,9 @@ export const functionsSearcher = (async (query: string) => { label: 'Go to usage', nested: true, callback() { - goto(`${base}/project-${projectId}/functions/function-${func.$id}/usage`); + goto( + `${base}/project-${page.params.region}-${projectId}/functions/function-${func.$id}/usage` + ); }, group: 'functions' }, @@ -64,7 +70,9 @@ export const functionsSearcher = (async (query: string) => { label: 'Go to executions', nested: true, callback() { - goto(`${base}/project-${projectId}/functions/function-${func.$id}/executions`); + goto( + `${base}/project-${page.params.region}-${projectId}/functions/function-${func.$id}/executions` + ); }, group: 'functions' }, @@ -72,12 +80,14 @@ export const functionsSearcher = (async (query: string) => { label: 'Go to settings', nested: true, callback() { - goto(`${base}/project-${projectId}/functions/function-${func.$id}/settings`); + goto( + `${base}/project-${page.params.region}-${projectId}/functions/function-${func.$id}/settings` + ); }, group: 'functions' } ]; } - return filtered.map((fn) => getFunctionCommand(fn, projectId)); + return filtered.map((fn) => getFunctionCommand(fn, page.params.region, projectId)); }) satisfies Searcher; diff --git a/src/lib/commandCenter/searchers/messages.ts b/src/lib/commandCenter/searchers/messages.ts index 71f6664a2..e90db994b 100644 --- a/src/lib/commandCenter/searchers/messages.ts +++ b/src/lib/commandCenter/searchers/messages.ts @@ -1,11 +1,10 @@ import { goto } from '$app/navigation'; -import { project } from '$routes/(console)/project-[project]/store'; -import { get } from 'svelte/store'; import { type Searcher } from '../commands'; import { sdk } from '$lib/stores/sdk'; import { MessagingProviderType, type Models } from '@appwrite.io/console'; import { base } from '$app/paths'; import { IconAnnotation, IconDeviceMobile, IconMail } from '@appwrite.io/pink-icons-svelte'; +import { page } from '$app/state'; const getLabel = (message: Models.Message) => { switch (message.providerType) { @@ -34,9 +33,9 @@ const getIcon = (message: Models.Message) => { }; export const messagesSearcher = (async (query: string) => { - const { messages } = await sdk.forProject.messaging.listMessages([], query || undefined); - - const projectId = get(project).$id; + const { messages } = await sdk + .forProject(page.params.region, page.params.project) + .messaging.listMessages([], query || undefined); return messages .filter((message) => getLabel(message).toLowerCase().includes(query.toLowerCase())) @@ -46,7 +45,9 @@ export const messagesSearcher = (async (query: string) => { group: 'messages', label: getLabel(message), callback: () => { - goto(`${base}/project-${projectId}/messaging/message-${message.$id}`); + goto( + `${base}/project-${page.params.region}-${page.params.project}/messaging/message-${message.$id}` + ); }, icon: getIcon(message) }) as const diff --git a/src/lib/commandCenter/searchers/projects.ts b/src/lib/commandCenter/searchers/projects.ts index a3f88c242..5787da93c 100644 --- a/src/lib/commandCenter/searchers/projects.ts +++ b/src/lib/commandCenter/searchers/projects.ts @@ -18,7 +18,7 @@ export const projectsSearcher = (async (query: string) => { return { label: project.name, callback: () => { - goto(`${base}/project-${project.$id}`); + goto(`${base}/project-${project.region}-${project.$id}`); }, group: 'projects' } as const; diff --git a/src/lib/commandCenter/searchers/providers.ts b/src/lib/commandCenter/searchers/providers.ts index 121125508..f2c154c45 100644 --- a/src/lib/commandCenter/searchers/providers.ts +++ b/src/lib/commandCenter/searchers/providers.ts @@ -1,10 +1,9 @@ import { goto } from '$app/navigation'; -import { project } from '$routes/(console)/project-[project]/store'; -import { get } from 'svelte/store'; import type { Searcher } from '../commands'; import { sdk } from '$lib/stores/sdk'; -import { getProviderDisplayNameAndIcon } from '$routes/(console)/project-[project]/messaging/provider.svelte'; +import { getProviderDisplayNameAndIcon } from '$routes/(console)/project-[region]-[project]/messaging/provider.svelte'; import { base } from '$app/paths'; +import { page } from '$app/state'; const getIcon = (provider: string) => { const { icon } = getProviderDisplayNameAndIcon(provider); @@ -12,9 +11,9 @@ const getIcon = (provider: string) => { }; export const providersSearcher = (async (query: string) => { - const { providers } = await sdk.forProject.messaging.listProviders([], query || undefined); - - const projectId = get(project).$id; + const { providers } = await sdk + .forProject(page.params.region, page.params.project) + .messaging.listProviders([], query || undefined); return providers .filter((provider) => provider.name.toLowerCase().includes(query.toLowerCase())) @@ -25,7 +24,7 @@ export const providersSearcher = (async (query: string) => { label: provider.name, callback: () => { goto( - `${base}/project-${projectId}/messaging/providers/provider-${provider.$id}` + `${base}/project-${page.params.region}-${page.params.project}/messaging/providers/provider-${provider.$id}` ); }, image: getIcon(provider.provider) diff --git a/src/lib/commandCenter/searchers/teams.ts b/src/lib/commandCenter/searchers/teams.ts index 201e07f56..ba8d76ca9 100644 --- a/src/lib/commandCenter/searchers/teams.ts +++ b/src/lib/commandCenter/searchers/teams.ts @@ -1,33 +1,35 @@ import { goto } from '$app/navigation'; import { sdk } from '$lib/stores/sdk'; -import { project } from '$routes/(console)/project-[project]/store'; -import { get } from 'svelte/store'; import type { Command, Searcher } from '../commands'; import type { Models } from '@appwrite.io/console'; import { base } from '$app/paths'; import { IconUserCircle } from '@appwrite.io/pink-icons-svelte'; +import { page } from '$app/state'; -const getTeamCommand = (team: Models.Team, projectId: string) => +const getTeamCommand = (team: Models.Team, region: string, projectId: string) => ({ label: team.name, callback: () => { - goto(`${base}/project-${projectId}/auth/teams/team-${team.$id}`); + goto(`${base}/project-${region}-${projectId}/auth/teams/team-${team.$id}`); }, group: 'teams', icon: IconUserCircle }) satisfies Command; export const teamSearcher = (async (query: string) => { - const { teams } = await sdk.forProject.teams.list([], query); - const projectId = get(project).$id; + const { teams } = await sdk + .forProject(page.params.region, page.params.project) + .teams.list([], query); if (teams.length === 1) { return [ - getTeamCommand(teams[0], projectId), + getTeamCommand(teams[0], page.params.region, page.params.project), { label: 'Go to members', callback: () => { - goto(`${base}/project-${projectId}/auth/teams/team-${teams[0].$id}/members`); + goto( + `${base}/project-${page.params.region}-${page.params.project}/auth/teams/team-${teams[0].$id}/members` + ); }, group: 'teams', nested: true @@ -36,12 +38,14 @@ export const teamSearcher = (async (query: string) => { { label: 'Go to activity', callback: () => { - goto(`${base}/project-${projectId}/auth/teams/team-${teams[0].$id}/activity`); + goto( + `${base}/project-${page.params.region}-${page.params.project}/auth/teams/team-${teams[0].$id}/activity` + ); }, group: 'teams', nested: true } ]; } - return teams.map((team) => getTeamCommand(team, projectId)); + return teams.map((team) => getTeamCommand(team, page.params.region, page.params.project)); }) satisfies Searcher; diff --git a/src/lib/commandCenter/searchers/topics.ts b/src/lib/commandCenter/searchers/topics.ts index 42b11e651..a2407c39a 100644 --- a/src/lib/commandCenter/searchers/topics.ts +++ b/src/lib/commandCenter/searchers/topics.ts @@ -1,15 +1,14 @@ import { goto } from '$app/navigation'; -import { project } from '$routes/(console)/project-[project]/store'; -import { get } from 'svelte/store'; import type { Searcher } from '../commands'; import { sdk } from '$lib/stores/sdk'; import { base } from '$app/paths'; import { IconChevronRight } from '@appwrite.io/pink-icons-svelte'; +import { page } from '$app/state'; export const topicsSearcher = (async (query: string) => { - const { topics } = await sdk.forProject.messaging.listTopics([], query || undefined); - - const projectId = get(project).$id; + const { topics } = await sdk + .forProject(page.params.region, page.params.project) + .messaging.listTopics([], query || undefined); return topics .filter((topic) => topic.name.toLowerCase().includes(query.toLowerCase())) @@ -19,7 +18,9 @@ export const topicsSearcher = (async (query: string) => { group: 'topics', label: topic.name, callback: () => { - goto(`${base}/project-${projectId}/messaging/topics/topic-${topic.$id}`); + goto( + `${base}/project-${page.params.region}-${page.params.project}/messaging/topics/topic-${topic.$id}` + ); }, icon: IconChevronRight // TODO: @itznotabug - 'send' no replacement yet. }) as const diff --git a/src/lib/commandCenter/searchers/users.ts b/src/lib/commandCenter/searchers/users.ts index 5695fe840..197b15e89 100644 --- a/src/lib/commandCenter/searchers/users.ts +++ b/src/lib/commandCenter/searchers/users.ts @@ -1,30 +1,30 @@ import { goto } from '$app/navigation'; import { sdk } from '$lib/stores/sdk'; -import { project } from '$routes/(console)/project-[project]/store'; -import { get } from 'svelte/store'; import type { Command, Searcher } from '../commands'; import type { Models } from '@appwrite.io/console'; -import { promptDeleteUser } from '$routes/(console)/project-[project]/auth/user-[user]/dangerZone.svelte'; +import { promptDeleteUser } from '$routes/(console)/project-[region]-[project]/auth/user-[user]/dangerZone.svelte'; import { base } from '$app/paths'; import { IconTrash, IconUserCircle } from '@appwrite.io/pink-icons-svelte'; +import { page } from '$app/state'; -const getUserCommand = (user: Models.User, projectId: string) => +const getUserCommand = (user: Models.User, region: string, projectId: string) => ({ label: user.name, callback: () => { - goto(`${base}/project-${projectId}/auth/user-${user.$id}`); + goto(`${base}/project-${region}-${projectId}/auth/user-${user.$id}`); }, group: 'users', icon: IconUserCircle }) satisfies Command; export const userSearcher = (async (query: string) => { - const { users } = await sdk.forProject.users.list([], query || undefined); - const projectId = get(project).$id; + const { users } = await sdk + .forProject(page.params.region, page.params.project) + .users.list([], query || undefined); if (users.length === 1) { return [ - getUserCommand(users[0], projectId), + getUserCommand(users[0], page.params.region, page.params.project), { label: 'Delete user', callback: () => { @@ -37,7 +37,9 @@ export const userSearcher = (async (query: string) => { { label: 'Go to activity', callback: () => { - goto(`${base}/project-${projectId}/auth/user-${users[0].$id}/activity`); + goto( + `${base}/project-${page.params.region}-${page.params.project}/auth/user-${users[0].$id}/activity` + ); }, group: 'users', nested: true @@ -45,7 +47,9 @@ export const userSearcher = (async (query: string) => { { label: 'Go to sessions', callback: () => { - goto(`${base}/project-${projectId}/auth/user-${users[0].$id}/sessions`); + goto( + `${base}/project-${page.params.region}-${page.params.project}/auth/user-${users[0].$id}/sessions` + ); }, group: 'users', nested: true @@ -53,12 +57,14 @@ export const userSearcher = (async (query: string) => { { label: 'Go to memberships', callback: () => { - goto(`${base}/project-${projectId}/auth/user-${users[0].$id}/memberships`); + goto( + `${base}/project-${page.params.region}-${page.params.project}/auth/user-${users[0].$id}/memberships` + ); }, group: 'users', nested: true } ]; } - return users.map((user) => getUserCommand(user, projectId)); + return users.map((user) => getUserCommand(user, page.params.region, page.params.project)); }) satisfies Searcher; diff --git a/src/lib/components/avatar.svelte b/src/lib/components/avatar.svelte index 0ff36651a..e341375aa 100644 --- a/src/lib/components/avatar.svelte +++ b/src/lib/components/avatar.svelte @@ -1,6 +1,12 @@ diff --git a/src/lib/components/billing/alerts/newDevUpgradePro.svelte b/src/lib/components/billing/alerts/newDevUpgradePro.svelte index ab48d3798..4631c1721 100644 --- a/src/lib/components/billing/alerts/newDevUpgradePro.svelte +++ b/src/lib/components/billing/alerts/newDevUpgradePro.svelte @@ -7,6 +7,8 @@ import { organization } from '$lib/stores/organization'; import { activeHeaderAlert } from '$routes/(console)/store'; import GradientBanner from '../gradientBanner.svelte'; + import { isSmallViewport } from '$lib/stores/viewport'; + import { Layout, Typography } from '@appwrite.io/pink-svelte'; let show = true; @@ -23,8 +25,13 @@ {#if show && $organization?.$id && $organization?.billingPlan === BillingPlan.FREE && !page.url.pathname.includes('/console/account')} -
- Get $50 Cloud credits for Appwrite Pro. + + Get $50 Cloud credits for Appwrite Pro. + -
+
{/if} diff --git a/src/lib/components/billing/alerts/paymentFailed.svelte b/src/lib/components/billing/alerts/paymentFailed.svelte index 9646864a9..83b44dc2d 100644 --- a/src/lib/components/billing/alerts/paymentFailed.svelte +++ b/src/lib/components/billing/alerts/paymentFailed.svelte @@ -1,12 +1,12 @@ {#if $failedInvoice && $failedInvoice.teamId === $organization.$id && isOnProjects} diff --git a/src/lib/components/billing/discountsApplied.svelte b/src/lib/components/billing/discountsApplied.svelte deleted file mode 100644 index e77bf3ca3..000000000 --- a/src/lib/components/billing/discountsApplied.svelte +++ /dev/null @@ -1,49 +0,0 @@ - - -{#if value > 0} - -
-

- - - {label} - -

- {#if !fixedCoupon && label.toLowerCase() === 'credits'} - - {/if} -
- {#if value >= 100} -

Credits applied

- {:else} - -{formatCurrency(value)} - {/if} -
-{/if} diff --git a/src/lib/components/billing/estimatedTotal.svelte b/src/lib/components/billing/estimatedTotal.svelte deleted file mode 100644 index 7e7e84803..000000000 --- a/src/lib/components/billing/estimatedTotal.svelte +++ /dev/null @@ -1,144 +0,0 @@ - - -{#if estimation} - - - {#if estimation} - {#each estimation.items ?? [] as item} - {#if item.value > 0} - -

{item.label}

-

{formatCurrency(item.value)}

-
- {/if} - {/each} - {#each estimation.discounts ?? [] as item} - - {/each} -
- -

Total due

-

- {formatCurrency(estimation.grossAmount)} -

-
- -

- You'll pay {formatCurrency(estimation.grossAmount)} now. - {#if couponData?.code}Once your credits run out,{:else}Then{/if} you'll be charged - {formatCurrency(estimation.amount)} every 30 days. -

- {/if} - - - {#if budgetEnabled} -
- -
- {/if} -
-
-{/if} diff --git a/src/lib/components/billing/estimatedTotalBox.svelte b/src/lib/components/billing/estimatedTotalBox.svelte index 112d506c1..438120824 100644 --- a/src/lib/components/billing/estimatedTotalBox.svelte +++ b/src/lib/components/billing/estimatedTotalBox.svelte @@ -1,96 +1,146 @@ - - - - - {currentPlan.name} plan - {formatCurrency(currentPlan.price)} - - - Additional seats ({collaborators?.length ?? 0}) - {formatCurrency(extraSeatsCost)} - - {#if couponData?.status === 'active'} - - {/if} - - +{#if estimation} + + + + + {#each estimation.items ?? [] as item} + + {item.label} + {formatCurrency(item.value)} + + {/each} + + {#if couponData?.status === 'active'} + + {/if} + + + Total due + + {formatCurrency(estimatedTotal)} + + + - Upcoming charge
- Due on {!currentPlan.trialDays - ? toLocaleDate(billingPayDate.toString()) - : toLocaleDate(trialEndDate.toString())}
- {formatCurrency(estimatedTotal)} + You'll pay {formatCurrency(estimatedTotal)} + now. + {#if couponData?.code}Once your credits run out,{:else}Then{/if} you'll be charged + {formatCurrency(estimation.grossAmount)} every 30 days. + + + + {#if budgetEnabled} +
+ +
+ {/if} +
- - - You'll pay {formatCurrency(estimatedTotal)} now, with your first billing cycle - starting on - {!currentPlan.trialDays - ? toLocaleDate(billingPayDate.toString()) - : toLocaleDate(trialEndDate.toString())}. {#if couponData?.status === 'active'}Once your credits run out, you'll be charged - {formatCurrency(currentPlan.price)} plus usage fees every 30 days. - {/if} - - - - {#if budgetEnabled} -
- -
- {/if} -
-
-
+ +{/if} diff --git a/src/lib/components/billing/gradientBanner.svelte b/src/lib/components/billing/gradientBanner.svelte index 5cae07cd9..27c58ce62 100644 --- a/src/lib/components/billing/gradientBanner.svelte +++ b/src/lib/components/billing/gradientBanner.svelte @@ -1,11 +1,41 @@ -
+ + +
+
- + +
+ + diff --git a/src/lib/components/billing/index.ts b/src/lib/components/billing/index.ts index 1cc70d3d9..11e9245b3 100644 --- a/src/lib/components/billing/index.ts +++ b/src/lib/components/billing/index.ts @@ -6,5 +6,4 @@ export { default as PlanComparisonBox } from './planComparisonBox.svelte'; export { default as EmptyCardCloud } from './emptyCardCloud.svelte'; export { default as CreditsApplied } from './creditsApplied.svelte'; export { default as PlanSelection } from './planSelection.svelte'; -export { default as EstimatedTotal } from './estimatedTotal.svelte'; export { default as SelectPlan } from './selectPlan.svelte'; diff --git a/src/lib/components/billing/paymentModal.svelte b/src/lib/components/billing/paymentModal.svelte index 4f1afcdf6..9ef191311 100644 --- a/src/lib/components/billing/paymentModal.svelte +++ b/src/lib/components/billing/paymentModal.svelte @@ -15,11 +15,12 @@ let name: string; let error: string; + let modal: FakeModal; async function handleSubmit() { try { const card = await submitStripeCard(name, page?.params?.organization ?? null); - show = false; + modal.closeModal(); invalidate(Dependencies.PAYMENT_METHODS); dispatch('submit', card); addNotification({ @@ -65,7 +66,12 @@ } - + {/if} -
+
@@ -105,7 +114,8 @@ .loader-element { width: 100%; align-self: center; - justify-items: end; + justify-content: center; + display: flex; } } diff --git a/src/lib/components/billing/selectPaymentMethod.svelte b/src/lib/components/billing/selectPaymentMethod.svelte index dac287731..7dfe14a2e 100644 --- a/src/lib/components/billing/selectPaymentMethod.svelte +++ b/src/lib/components/billing/selectPaymentMethod.svelte @@ -21,6 +21,7 @@ async function cardSaved(event: CustomEvent) { value = event.detail.$id; invalidate(Dependencies.UPGRADE_PLAN); + invalidate(Dependencies.CREATE_ORGANIZATION); } onMount(() => { diff --git a/src/lib/components/billing/selectPlan.svelte b/src/lib/components/billing/selectPlan.svelte index 8aae2f0ac..2b9d9498f 100644 --- a/src/lib/components/billing/selectPlan.svelte +++ b/src/lib/components/billing/selectPlan.svelte @@ -24,8 +24,7 @@ tooltipShow={plan.$id === BillingPlan.FREE && anyOrgFree} tooltipText={plan.$id === BillingPlan.FREE ? 'You are limited to 1 Free organization per account.' - : ''} - padding={1.5}> + : ''}>
{ + const getCorrectSeatsCountValue = (count: number): string | number => { // php int max is always larger than js const exceedsSafeLimit = count >= Number.MAX_SAFE_INTEGER; return exceedsSafeLimit ? 'Unlimited' : count || 0; }; + + function getPlanLimit(key: string): number | false { + return plan[key] || false; + } @@ -77,29 +56,33 @@ Limit Rate - {#each planData as usage} - {#if usage['id'] === 'members'} - - {usage.resource} - - {getCorrectSeatsCountValue(plan.addons.seats.limit)} - + {#each Object.values(plan.addons) as addon} + + {addon.invoiceDesc} + + {getCorrectSeatsCountValue(addon.limit)} + + {#if !isFree} - {formatCurrency(plan.addons?.seats?.price)}/{usage?.unit} + {formatCurrency(addon.price)}/member - - {:else} - {@const addon = plan.addons[usage.id]} + {/if} + + {/each} + {#each Object.entries(plan.usage) as [key, usage]} + {@const limit = getPlanLimit(key)} + {@const show = limit !== false} + {#if show} - {usage.resource} + {usage.name} - {abbreviateNumber(plan[usage.id])}{usage?.unit} + {abbreviateNumber(limit)}{usage.unit} {#if !isFree} - {formatCurrency(addon?.price)}/{['MB', 'GB', 'TB'].includes(addon?.unit) - ? addon?.value - : abbreviateNumber(addon?.value, 0)}{usage?.unit} + {formatCurrency(usage.price)}/{abbreviateNumber( + usage.value + )}{usage.unit} {/if} diff --git a/src/lib/components/billing/validateCreditModal.svelte b/src/lib/components/billing/validateCreditModal.svelte index 130532a7b..b2c3f6190 100644 --- a/src/lib/components/billing/validateCreditModal.svelte +++ b/src/lib/components/billing/validateCreditModal.svelte @@ -38,14 +38,6 @@ message: 'Credits applied successfully' }); } - couponData = response; - dispatch('validation', couponData); - coupon = null; - show = false; - addNotification({ - type: 'success', - message: 'Credits applied successfully' - }); } catch (e) { error = e.message; } diff --git a/src/lib/components/bottomModalAlert.svelte b/src/lib/components/bottomModalAlert.svelte index c1a57c300..406b40222 100644 --- a/src/lib/components/bottomModalAlert.svelte +++ b/src/lib/components/bottomModalAlert.svelte @@ -3,8 +3,9 @@ import { hideNotification, shouldShowNotification } from '$lib/helpers/notifications'; import { app } from '$lib/stores/app'; import { + type BottomModalAlertAction, type BottomModalAlertItem, - bottomModalAlerts, + bottomModalAlertsConfig, dismissBottomModalAlert, hideAllModalAlerts } from '$lib/stores/bottom-alerts'; @@ -13,15 +14,17 @@ import { BillingPlan } from '$lib/constants'; import { upgradeURL } from '$lib/stores/billing'; import { addBottomModalAlerts } from '$routes/(console)/bottomAlerts'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; import { page } from '$app/state'; import { Click, trackEvent } from '$lib/actions/analytics'; + import { goto } from '$app/navigation'; + import { Typography } from '@appwrite.io/pink-svelte'; let currentIndex = 0; let openModalOnMobile = false; function getPageScope(pathname: string) { - const isProjectPage = pathname.includes('project-[project]'); + const isProjectPage = pathname.includes('project-[region]-[project]'); const isOrganizationPage = pathname.includes('organization-[organization]'); return { isProjectPage, isOrganizationPage }; @@ -33,23 +36,27 @@ return alerts .sort((a, b) => b.importance - a.importance) .filter((alert) => { - return ( - alert.show && - shouldShowNotification(alert.id) && - // if no scope > show in projects & org pages. - ((!alert.scope && (isProjectPage || isOrganizationPage)) || - // project scope, show only in project pages - (isProjectPage && alert.scope === 'project') || - // organization scope, show only in organization pages - (isOrganizationPage && alert.scope === 'organization')) - ); + if (!alert.show || !shouldShowNotification(alert.id)) return false; + + switch (alert.scope) { + case 'everywhere': + return true; + case 'project': + return isProjectPage; + case 'organization': + return isOrganizationPage; + default: + return false; + } }); } - $: filteredModalAlerts = filterModalAlerts($bottomModalAlerts, page.route.id); + $: filteredModalAlerts = filterModalAlerts($bottomModalAlertsConfig.alerts, page.route.id); $: currentModalAlert = filteredModalAlerts[currentIndex] as BottomModalAlertItem; + $: hasOnlyPrimaryCta = typeof currentModalAlert?.learnMore === 'undefined'; + function handleClose() { filteredModalAlerts.forEach((alert) => { const modalAlert = alert; @@ -67,9 +74,76 @@ currentIndex = (currentIndex - 1 + filteredModalAlerts.length) % filteredModalAlerts.length; } + function getMobileWindowConfig(): { + html: boolean; + cta: boolean; + title: string; + message: string; + } { + const config = $bottomModalAlertsConfig?.mobileSingleLayout; + const visibleAlerts = $bottomModalAlertsConfig.alerts.filter((a) => a.show); + + const fallback = { + title: 'New features available', + message: 'Explore new features to enhance your projects and improve security.' + }; + + const shouldApplyConfig = config?.enabled === true && visibleAlerts.length === 1; + + return { + cta: !!(shouldApplyConfig && config.cta), + html: !!(shouldApplyConfig && config.isHtml), + title: shouldApplyConfig && config.title ? config.title : fallback.title, + message: shouldApplyConfig && config.message ? config.message : fallback.message + }; + } + + function triggerMobileWindowLink() { + handleClose(); + + const url = $bottomModalAlertsConfig.mobileSingleLayout.cta.link({ + organization: $organization, + project: $project + }); + + if ($bottomModalAlertsConfig.mobileSingleLayout.cta.external) { + window.open(url, '_blank'); + } else { + goto(url); + } + } + + // the button component cannot have both href and on:click! + function triggerWindowLink(alertAction: BottomModalAlertAction, event?: string) { + const shouldShowUpgrade = showUpgrade(); + const url = shouldShowUpgrade + ? $upgradeURL + : alertAction.link({ + organization: $organization, + project: $project + }); + + if (!shouldShowUpgrade && alertAction.external) { + window.open(url, '_blank'); + } else { + goto(url); + } + + if (alertAction?.hideOnClick === true) { + // be careful of this one. + // once clicked, its gone! + handleClose(); + } + + trackEvent(Click.PromoClick, { + promo: currentModalAlert.id, + type: shouldShowUpgrade ? 'upgrade' : (event ?? `cta_click_${currentModalAlert.id}`) + }); + } + function showUpgrade() { const plan = currentModalAlert.plan; - const organizationPlan = $organization.billingPlan; + const organizationPlan = $organization?.billingPlan; switch (plan) { case 'free': return false; @@ -87,7 +161,7 @@ }); -{#if filteredModalAlerts.length > 0 && currentModalAlert} +{#if filteredModalAlerts.length > 0 && currentModalAlert && !page.url.pathname.includes('console/onboarding')} {@const shouldShowUpgrade = showUpgrade()}
@@ -150,7 +224,9 @@ {/if}
-

{currentModalAlert.title}

+ + {currentModalAlert.title} + {#if currentModalAlert.isHtml} @@ -164,34 +240,23 @@
{#if currentModalAlert.learnMore} + @@ -266,7 +331,9 @@ {/if}
-

{currentModalAlert.title}

+ + {currentModalAlert.title} + {#if currentModalAlert.isHtml} @@ -280,22 +347,12 @@
{#if currentModalAlert.learnMore} + @@ -322,20 +380,41 @@
{:else} -
- Explore new features to enhance your projects and improve security. + {#if mobileConfig.html} + {@html mobileConfig.message} + {:else} + {mobileConfig.message} + {/if}
- +
{/if}
{/if} @@ -364,6 +443,7 @@ top: 1rem; right: 1rem; + cursor: pointer; background: #fff; position: absolute; display: inline-flex; @@ -377,6 +457,22 @@ border: hsl(var(--color-neutral-80)) solid 1px; } + :global(.main-alert-wrapper .only-primary-cta) { + width: 100%; + text-align: center; + justify-content: center; + } + + .showcase-image.u-only-light { + border-radius: 8px; + border: 0.795px solid var(--border-neutral-strong, #d8d8db); + } + + .showcase-image.u-only-dark { + border-radius: 8px; + border: 0.795px solid var(--border-neutral-strong, #414146); + } + .u-gap-10 { gap: 0.625rem; } diff --git a/src/lib/components/box.svelte b/src/lib/components/box.svelte index 448f93c85..d129900a0 100644 --- a/src/lib/components/box.svelte +++ b/src/lib/components/box.svelte @@ -1,10 +1,9 @@ diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte index 39aafa526..cdedfa1dc 100644 --- a/src/lib/components/breadcrumbs.svelte +++ b/src/lib/components/breadcrumbs.svelte @@ -21,6 +21,7 @@ name: string; $id: string; isSelected: boolean; + region: string; }; type Organization = { name: string; @@ -65,7 +66,7 @@ export let organizations: Organization[] = []; $: selectedOrg = organizations.find((organization) => organization.isSelected); - $: selectedProject = selectedOrg?.projects.find((project) => project.isSelected); + $: selectedProject = $page.data.project; let organisationBottomSheetOpen = false; let projectsBottomSheetOpen = false; @@ -98,7 +99,7 @@ $: organizationsBottomSheet = !selectedOrg ? switchOrganization - : { + : ({ top: { items: [ { @@ -127,8 +128,8 @@ } ] } - }; - let projectsBottomSheet: SheetMenu; + } satisfies SheetMenu); + $: projectsBottomSheet = { top: selectedOrg?.projects.length > 1 @@ -141,7 +142,7 @@ if (index < 4) { return { name: project.name, - href: `${base}/project-${project.$id}/overview` + href: `${base}/project-${project.region}-${project.$id}/overview` }; } else if (index === 4) { return { @@ -174,7 +175,7 @@ ] } : undefined - }; + } satisfies SheetMenu; function onResize() { if ((organisationBottomSheetOpen || projectsBottomSheetOpen) && !$isSmallViewport) { @@ -319,17 +320,20 @@ {#if index < 4}
- {project.name} + + {project.name} + +
{:else if index === 4}
All projects + href={`${base}/organization-${selectedOrg.$id}`}> + All projects + +
{/if} {/each} @@ -339,18 +343,16 @@ Create project + href={`${base}/organization-${selectedOrg?.$id}?create-project`}> + Create project +
{/if}
- - + + diff --git a/src/lib/elements/forms/inputCron.svelte b/src/lib/elements/forms/inputCron.svelte index 7e2a2ef53..7f31312f4 100644 --- a/src/lib/elements/forms/inputCron.svelte +++ b/src/lib/elements/forms/inputCron.svelte @@ -49,7 +49,7 @@ {pattern} on:input on:invalid={handleInvalid} - type="email" + type="text" helper={error} state={error ? 'error' : 'default'} autofocus={autofocus || undefined} diff --git a/src/lib/elements/forms/inputDateTime.svelte b/src/lib/elements/forms/inputDateTime.svelte index 8dcd115f6..360b0f4c7 100644 --- a/src/lib/elements/forms/inputDateTime.svelte +++ b/src/lib/elements/forms/inputDateTime.svelte @@ -3,7 +3,7 @@ import { Input, Layout, Selector } from '@appwrite.io/pink-svelte'; export let id: string; - export let label: string; + export let label: string = ''; export let value: string; export let required = false; export let nullable = false; @@ -48,6 +48,7 @@ {value} {step} helper={error} + on:change={(event) => (value = (event.target as HTMLInputElement).value)} autocomplete={autocomplete ? 'on' : 'off'}> {#if nullable} import { DropList } from '$lib/components'; import { SelectSearchCheckbox } from '..'; - import { Icon, Layout, Tag } from '@appwrite.io/pink-svelte'; + import { Icon, Tag } from '@appwrite.io/pink-svelte'; import { IconChevronDown, IconChevronUp } from '@appwrite.io/pink-icons-svelte'; type Option = { diff --git a/src/lib/elements/forms/inputText.svelte b/src/lib/elements/forms/inputText.svelte index 169d44245..800c661dc 100644 --- a/src/lib/elements/forms/inputText.svelte +++ b/src/lib/elements/forms/inputText.svelte @@ -6,7 +6,7 @@ export let name: string = id; export let helper: string = undefined; export let value = ''; - export let pattern: string = null; //TODO: implement pattern check + export let pattern: string = undefined; //TODO: implement pattern check export let patternError: string = ''; export let placeholder = ''; export let required = false; @@ -53,6 +53,7 @@ {label} {nullable} {readonly} + {pattern} autofocus={autofocus || undefined} autocomplete={autocomplete ? 'on' : 'off'} helper={error || helper} diff --git a/src/lib/helpers/domains.ts b/src/lib/helpers/domains.ts index 18e47e5f4..7d11aa59d 100644 --- a/src/lib/helpers/domains.ts +++ b/src/lib/helpers/domains.ts @@ -1,7 +1,7 @@ -import type { DnsRecord } from '$lib/sdk/domains'; import { sdk } from '$lib/stores/sdk'; +import type { Models } from '@appwrite.io/console'; -export async function createRecord(record: Partial, domainId: string) { +export async function createRecord(record: Partial, domainId: string) { switch (record.type) { case 'A': return await sdk.forConsole.domains.createRecordA( @@ -32,16 +32,16 @@ export async function createRecord(record: Partial, domainId: string) domainId, record.name, record.value, - record.priority || 10, record.ttl, + record.priority || 10, record?.comment || undefined ); case 'TXT': return await sdk.forConsole.domains.createRecordTXT( domainId, record.name, - record.value, record.ttl, + record.value, record?.comment || undefined ); case 'NS': @@ -91,16 +91,16 @@ export async function createRecord(record: Partial, domainId: string) } export type ParsedRecords = { - A: Partial[]; - AAAA: Partial[]; - CNAME: Partial[]; - MX: Partial[]; - TXT: Partial[]; - NS: Partial[]; - SRV: Partial[]; - CAA: Partial[]; - PTR: Partial[]; - HTTPS: Partial[]; - ALIAS: Partial[]; - [key: string]: Partial[]; + A: Partial[]; + AAAA: Partial[]; + CNAME: Partial[]; + MX: Partial[]; + TXT: Partial[]; + NS: Partial[]; + SRV: Partial[]; + CAA: Partial[]; + PTR: Partial[]; + HTTPS: Partial[]; + ALIAS: Partial[]; + [key: string]: Partial[]; }; diff --git a/src/lib/helpers/files.ts b/src/lib/helpers/files.ts index f85f4e7bd..b72e289f6 100644 --- a/src/lib/helpers/files.ts +++ b/src/lib/helpers/files.ts @@ -36,7 +36,6 @@ export async function processFileList(files: FileList): Promise { buffer: buffer }; } catch (e) { - // console.log(file); return null; } }); @@ -46,7 +45,6 @@ export async function processFileList(files: FileList): Promise { export async function gzipUpload(files: FileList) { let uploadFile: File; - const tick = performance.now(); if (!files?.length) return; // If the file is a tar.gz file, then return it as is @@ -79,9 +77,6 @@ export async function gzipUpload(files: FileList) { }); } } - console.log(uploadFile); - const tock = performance.now(); - console.log('Time taken to process files:', tock - tick); return uploadFile; } @@ -97,6 +92,11 @@ export function removeFile(file: File, files: FileList) { return dataTransfer.files; } +export enum InvalidFileType { + SIZE = 'invalid_size', + EXTENSION = 'invalid_extension' +} + export const defaultIgnore = ` ### Node ### # Logs diff --git a/src/lib/helpers/flag.ts b/src/lib/helpers/flag.ts index a2e8e9d86..0fb3254a6 100644 --- a/src/lib/helpers/flag.ts +++ b/src/lib/helpers/flag.ts @@ -4,5 +4,5 @@ import { sdk } from '$lib/stores/sdk'; export function getFlagUrl(countryCode: string) { if (!isValueOfStringEnum(Flag, countryCode)) return ''; - return sdk.forProject.avatars.getFlag(countryCode, 22, 15, 100)?.toString(); + return sdk.forConsole.avatars.getFlag(countryCode, 22, 15, 100)?.toString(); } diff --git a/src/lib/helpers/project.ts b/src/lib/helpers/project.ts index 91cfc90ac..58cfe7bcc 100644 --- a/src/lib/helpers/project.ts +++ b/src/lib/helpers/project.ts @@ -1,6 +1,44 @@ -export function getProjectId() { +import { page } from '$app/state'; +import { get } from 'svelte/store'; +import { sdk } from '$lib/stores/sdk'; +import { projectRegion } from '$routes/(console)/project-[region]-[project]/store'; + +/** + * Returns the current project ID. + * + * The function first checks for a `project` parameter in the Svelte `page` store. + * If not found, it extracts the project ID from the pathname. + * + * Supports: + * - Legacy structure: `/project-{projectID}/` + * - Multi-region structure: `/project-{region}-{projectID}/` + * + * Example: + * - `/project-console/` → `console` + * - `/project-fra-console/` → `console` + * - `/project-nyc-console/` → `console` + */ +export function getProjectId(): string | null { + // safety check! + const projectFromParams = page?.params?.project; + if (projectFromParams) { + return projectFromParams; + } + const pathname = window.location.pathname + '/'; - const projectMatch = pathname.match(/\/project-(.*?)\//); + const projectMatch = pathname.match(/\/project-(?:[a-z]{2,3}-)?([^/]+)/); return projectMatch?.[1] || null; } + +/** + * Returns the correct API endpoint for the project based on the current project region. + * + * @returns {string} The project-specific API endpoint. + */ +export function getProjectEndpoint(): string { + const currentProjectRegion = get(projectRegion); + const { protocol, hostname, href } = new URL(sdk.forConsole.client.config.endpoint); + + return currentProjectRegion ? `${protocol}//${currentProjectRegion.$id}.${hostname}/v1` : href; +} diff --git a/src/lib/helpers/regions.ts b/src/lib/helpers/regions.ts new file mode 100644 index 000000000..9f04f3fda --- /dev/null +++ b/src/lib/helpers/regions.ts @@ -0,0 +1,27 @@ +import { getFlagUrl } from '$lib/helpers/flag'; +import type { Models } from '@appwrite.io/console'; + +type RegionOption = { + label: string; + value: string; + disabled: boolean; + leadingHtml: string; +}; + +export function filterRegions(regions: Models.ConsoleRegion[]): RegionOption[] { + if (!regions.length) return []; + + return regions + .filter((region) => region.$id !== 'default') + .sort((a, b) => { + if (a.disabled && !b.disabled) return 1; + if (!a.disabled && b.disabled) return -1; + return a.name.localeCompare(b.name); + }) + .map((region) => ({ + label: region.name, + value: region.$id, + disabled: region.disabled || !region.available, + leadingHtml: `Region flag` + })); +} diff --git a/src/lib/helpers/string.ts b/src/lib/helpers/string.ts index 4ef014dd5..31e5f905b 100644 --- a/src/lib/helpers/string.ts +++ b/src/lib/helpers/string.ts @@ -53,3 +53,10 @@ export function formatNum(number: number): string { * Returns a regex to check hostname validity. Supports wildcards too! */ export const hostnameRegex = String.raw`(\*)|(\*\.)?(?!-)[A-Za-z0-9\-]+([\-\.]{1}[a-z0-9]+)*\.[A-Za-z]{2,18}|localhost`; + +/** + * Returns a regex to check hostname validity. + * + * Supports domains, localhost, wildcards, ip-addresses and Chrome extension IDs! + */ +export const extendedHostnameRegex = String.raw`(\*)|(\*\.)?((?!-)[A-Za-z0-9\-]+([\-\.]{1}[a-z0-9]+)*\.[A-Za-z]{2,18}|localhost|(\d{1,3}\.){3}\d{1,3}|[a-z0-9]{32})`; diff --git a/src/lib/helpers/tlds.ts b/src/lib/helpers/tlds.ts new file mode 100644 index 000000000..23adffb4c --- /dev/null +++ b/src/lib/helpers/tlds.ts @@ -0,0 +1,21 @@ +import { parse } from 'tldts'; + +/** + * Returns the apex/root domain from a full domain string. + */ +export function getApexDomain(domain: string): string | null { + return parse(domain).domain; +} + +/** + * Checks whether the given domain is a subdomain. + */ +export function isASubdomain(domain: string | null): boolean { + if (!domain) return false; + + const { domain: apex, subdomain } = parse(domain); + if (!apex) return false; + if (subdomain === 'www') return false; + + return !!subdomain; +} diff --git a/src/lib/helpers/types.ts b/src/lib/helpers/types.ts index cc00eb785..543fa39ba 100644 --- a/src/lib/helpers/types.ts +++ b/src/lib/helpers/types.ts @@ -52,3 +52,16 @@ export function isValueOfStringEnum>( ): value is T[keyof T] { return Object.values(enumType).includes(value); } + +export type TableRootProp = { + allowSelection: boolean; + selectedRows: string[]; + selectedAll: boolean; + selectedNone: boolean; + selectedSome: boolean; + columns: Record; + toggle: (id: string) => void; + toggleAll: () => void; + addAvailableId: (id: string) => void; + removeAvailableId: (id: string) => void; +}; diff --git a/src/lib/helpers/waitlist.ts b/src/lib/helpers/waitlist.ts new file mode 100644 index 000000000..773b04a24 --- /dev/null +++ b/src/lib/helpers/waitlist.ts @@ -0,0 +1,30 @@ +import { get } from 'svelte/store'; +import { user } from '$lib/stores/user'; +import { sdk } from '$lib/stores/sdk'; +const userPreferences = () => get(user)?.prefs; + +export const joinWaitlistSites = () => { + const prefs = userPreferences(); + const newPrefs = { + ...prefs, + joinWaitlistSites: true + }; + + sdk.forConsole.account.updatePrefs(newPrefs); + + if (sessionStorage) { + sessionStorage.setItem('joinWaitlistSites', 'true'); + } +}; + +export const isOnWaitlistSites = (): boolean => { + const prefs = userPreferences(); + const joinedInPrefs = 'joinWaitlistSites' in prefs; + + let joinedInSession = false; + if (sessionStorage) { + joinedInSession = sessionStorage.getItem('joinWaitlistSites') === 'true'; + } + + return joinedInSession || joinedInPrefs; +}; diff --git a/src/lib/images/backups/promo/backups-dark.png b/src/lib/images/backups/promo/backups-dark.png deleted file mode 100644 index 6b31eab88..000000000 Binary files a/src/lib/images/backups/promo/backups-dark.png and /dev/null differ diff --git a/src/lib/images/backups/promo/backups-light.png b/src/lib/images/backups/promo/backups-light.png deleted file mode 100644 index aa675d86b..000000000 Binary files a/src/lib/images/backups/promo/backups-light.png and /dev/null differ diff --git a/src/lib/layout/activity.svelte b/src/lib/layout/activity.svelte index 8ba977094..ca85ee004 100644 --- a/src/lib/layout/activity.svelte +++ b/src/lib/layout/activity.svelte @@ -5,14 +5,14 @@ import type { Models } from '@appwrite.io/console'; import { Layout, Table, Card, Empty } from '@appwrite.io/pink-svelte'; import Button from '$lib/elements/forms/button.svelte'; - import type { Column } from '@appwrite.io/pink-svelte/dist/table'; + import type { PinkColumn } from '$lib/helpers/types'; import { consoleProfile, isStudio } from '$lib/system'; export let logs: Models.LogList; export let offset = 0; export let limit = 0; - const columns: Column[] = [ + const columns: PinkColumn[] = [ { id: 'user' }, { id: 'event' }, { id: 'location' }, diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte index c72bf18eb..83654a708 100644 --- a/src/lib/layout/containerHeader.svelte +++ b/src/lib/layout/containerHeader.svelte @@ -135,7 +135,6 @@ {#if hasProjectLimitation} - {@const count = limit > 1 ? serviceId : serviceId.replace('s', '')}

You are limited to {limit} {title.toLocaleLowerCase()} per project on the {tier} plan. diff --git a/src/lib/layout/cover.svelte b/src/lib/layout/cover.svelte index 9024c7483..ed0c5e0aa 100644 --- a/src/lib/layout/cover.svelte +++ b/src/lib/layout/cover.svelte @@ -39,9 +39,9 @@ {:else} -

+
- + diff --git a/src/lib/layout/coverTitle.svelte b/src/lib/layout/coverTitle.svelte index 05b34d6d8..1dd9c87a4 100644 --- a/src/lib/layout/coverTitle.svelte +++ b/src/lib/layout/coverTitle.svelte @@ -1,22 +1,25 @@ -{#if href && !isStudio} - - - - - -{/if} - - - + + {#if href && !isStudio} + + + + + + {/if} + + + + \ No newline at end of file diff --git a/src/lib/layout/createProject.svelte b/src/lib/layout/createProject.svelte index 4758dbbb0..7d368dde0 100644 --- a/src/lib/layout/createProject.svelte +++ b/src/lib/layout/createProject.svelte @@ -2,36 +2,18 @@ import { Layout, Typography, Input, Tag, Icon } from '@appwrite.io/pink-svelte'; import { IconPencil } from '@appwrite.io/pink-icons-svelte'; import { CustomId } from '$lib/components/index.js'; - import type { Region } from '$lib/sdk/billing'; import { getFlagUrl } from '$lib/helpers/flag'; import { isCloud } from '$lib/system.js'; + import type { Models } from '@appwrite.io/console'; + import { filterRegions } from '$lib/helpers/regions'; export let projectName: string; export let id: string; - export let regions: Array = []; + export let regions: Array = []; export let region: string; export let showTitle = true; let showCustomId = false; - - function getRegions() { - return regions - .filter((region) => region.$id !== 'default') - .sort((regionA, regionB) => { - if (regionA.disabled && !regionB.disabled) { - return 1; - } - return regionA.name > regionB.name ? 1 : -1; - }) - .map((region) => { - return { - label: region.name, - value: region.$id, - leadingHtml: `Region flag`, - disabled: region.disabled - }; - }); - } @@ -39,6 +21,7 @@ {/each} +
{#if showTitle} @@ -68,7 +51,7 @@ Region cannot be changed after creation diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index 84edaeec6..8b9dcdf04 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -2,8 +2,7 @@ import { beforeNavigate } from '$app/navigation'; import { Navbar, Sidebar } from '$lib/components'; import type { NavbarProject } from '$lib/components/navbar.svelte'; - import { page } from '$app/stores'; - import { wizard } from '$lib/stores/wizard'; + import { isNewWizardStatusOpen, wizard } from '$lib/stores/wizard'; import { activeHeaderAlert } from '$routes/(console)/store'; import { setContext } from 'svelte'; import { writable } from 'svelte/store'; @@ -12,20 +11,20 @@ import { sdk } from '$lib/stores/sdk'; import { user } from '$lib/stores/user'; import { tierToPlan } from '$lib/stores/billing'; - import { type Models } from '@appwrite.io/console'; import { isCloud } from '$lib/system'; import SideNavigation from '$lib/layout/navigation.svelte'; import { hasOnboardingDismissed } from '$lib/helpers/onboarding'; import { isSidebarOpen } from '$lib/stores/sidebar'; import { BillingPlan } from '$lib/constants'; + import { page } from '$app/stores'; + import type { Models } from '@appwrite.io/console'; export let showSideNavigation = false; export let showHeader = true; export let showFooter = true; export let loadedProjects: Array = []; - export let projects: Array = []; + export let selectedProject: Models.Project | null = null; - $: selectedProject = loadedProjects.find((project) => project.isSelected); let yOnMenuOpen: number; let showContentTransition = false; let timeoutId: ReturnType; @@ -118,13 +117,11 @@ showAccountMenu = false; } - $: progressCard = function getProgressCard() { + const progressCard = function getProgressCard() { if (selectedProject && !hasOnboardingDismissed(selectedProject.$id)) { - const currentProject = projects.find((project) => project.$id === selectedProject.$id); - return { title: 'Get started', - percentage: currentProject && currentProject.platforms.length ? 100 : 33 + percentage: selectedProject && selectedProject.platforms.length ? 100 : 33 }; } @@ -134,7 +131,7 @@ -{#if $activeHeaderAlert?.show} +{#if $activeHeaderAlert?.show && !$isNewWizardStatusOpen} {/if}
- + {#if $isSidebarOpen} + + {/if} + diff --git a/src/routes/(console)/(migration-wizard)/step2.svelte b/src/routes/(console)/(migration-wizard)/step2.svelte index a19e67603..27a6896eb 100644 --- a/src/routes/(console)/(migration-wizard)/step2.svelte +++ b/src/routes/(console)/(migration-wizard)/step2.svelte @@ -1,7 +1,6 @@ @@ -18,5 +17,5 @@ Learn about which resources are supported. - + diff --git a/src/routes/(console)/(migration-wizard)/wizard.svelte b/src/routes/(console)/(migration-wizard)/wizard.svelte index 013dd3bf7..99c23b7d2 100644 --- a/src/routes/(console)/(migration-wizard)/wizard.svelte +++ b/src/routes/(console)/(migration-wizard)/wizard.svelte @@ -1,50 +1,388 @@ - + + + {#if !showResources} + + {#if organizations.length >= 1} +
+ ({ + label: project.name, + value: project.$id + }))} + disabled={loadingProjects} /> +
+ {/if} + +
+ {#if loadingProjects} + + + + + + + + {:else} + + + + Import data to an existing project + + + + Import data to a new project + + + + {#if projectType === 'existing'} + ({ + label: p.name, + value: p.$id + }))} /> + {:else} + + + + {#if isCloud && $regions.regions.length > 0} + + Region cannot be changed after creation + {/if} + + {/if} + + { + if (isExisting) { + showResources = true; + } else { + const project = await createNewProject(); + if (project !== null) { + projectSdkInstance = sdk.forProject( + project.region, + project.$id + ); + showResources = true; + } + } + }}> + {#if creatingProject} + + {/if} + + Next + + + + {/if} +
+
+ {:else} + + + + + + + {capitalize(getProjectName())} + + + + (showResources = !showResources)}> + Update + + + + {/if} + + {#if showResources} +
+ + + +
+ {/if} +
+ + + + + Good to know + + + + + + + + Project settings are not imported + You will need to set service and project settings manually. + + + + + + + + + + Keep your organization plan's limits in mind + Make sure to have enough storage in your organization plan when importing files. + + + + + + {@const isFirebase = $provider.provider === 'firebase'} + + + + + + {isFirebase + ? 'Possible charges by Firebase' + : 'Transfer is free of charge'} + + + {#if isFirebase} + Appwrite does not impose charges for importing data, but please note + that Firebase may have its own pricing for this service + {:else} + You won't be charged for Appwrite bandwidth usage for importing data + {/if} + + + + + + + + (showExitModal = true)}> + Cancel + + + + {#if migrationStarted} + + {/if} + Create + + +
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte index ead9a7aea..77315ddfb 100644 --- a/src/routes/(console)/+layout.svelte +++ b/src/routes/(console)/+layout.svelte @@ -31,7 +31,7 @@ import { addSubPanel } from '$lib/commandCenter/subPanels'; import { addNotification } from '$lib/stores/notifications'; import { openMigrationWizard } from './(migration-wizard)'; - import { project } from './project-[project]/store'; + import { project } from './project-[region]-[project]/store'; import { feedback } from '$lib/stores/feedback'; import { consoleProfile, hasStripePublicKey, isCloud, isStudio, VARS } from '$lib/system'; import { stripe } from '$lib/stores/stripe'; @@ -53,6 +53,8 @@ IconSparkles, IconSwitchHorizontal } from '@appwrite.io/pink-icons-svelte'; + import type { LayoutData } from './$types'; + import type { NavbarProject } from '$lib/components/navbar.svelte'; function kebabToSentenceCase(str: string) { return str @@ -63,19 +65,21 @@ const isAssistantEnabled = $consoleVariables?._APP_ASSISTANT_ENABLED === true; - export let data; + export let data: LayoutData; + $: loadedProjects = data.projects.map((project) => { return { name: project?.name, $id: project.$id, - isSelected: data.currentProjectId === project.$id, + isSelected: project.$id === page.params.project, + region: project.region, platformCount: project.platforms.length, pingCount: project.pingCount }; - }); + }) satisfies NavbarProject[]; $: isOnSettingsLayout = $project?.$id - ? page.url.pathname.includes(`project-${$project.$id}/settings`) + ? page.url.pathname.includes(`project-${$project.region}-${$project.$id}/settings`) : false; $: $registerCommands([ @@ -172,7 +176,9 @@ ({ label: kebabToSentenceCase(heading), async callback() { - await goto(`${base}/project-${$project.$id}/auth/security#${heading}`); + await goto( + `${base}/project-${$project.region}-${$project.$id}/auth/security#${heading}` + ); scrollBy({ top: -100 }); }, disabled: !$project?.$id, @@ -186,7 +192,7 @@ keys: isOnSettingsLayout ? ['g', 'o'] : undefined, callback: () => { - goto(`${base}/project-${$project.$id}/settings`); + goto(`${base}/project-${$project.region}-${$project.$id}/settings`); }, disabled: !$project?.$id || (isOnSettingsLayout && page.url.pathname.endsWith('settings')), @@ -198,7 +204,7 @@ keys: isOnSettingsLayout ? ['g', 'd'] : undefined, callback: () => { - goto(`${base}/project-${$project.$id}/settings/domains`); + goto(`${base}/project-${$project.region}-${$project.$id}/settings/domains`); }, disabled: !$project?.$id || (isOnSettingsLayout && page.url.pathname.includes('domains')), @@ -209,7 +215,7 @@ label: 'Go to webhooks', keys: isOnSettingsLayout ? ['g', 'w'] : undefined, callback: () => { - goto(`${base}/project-${$project.$id}/settings/webhooks`); + goto(`${base}/project-${$project.region}-${$project.$id}/settings/webhooks`); }, disabled: !$project?.$id || (isOnSettingsLayout && page.url.pathname.includes('webhooks')), @@ -221,7 +227,7 @@ label: 'Go to migrations', keys: isOnSettingsLayout ? ['g', 'm'] : undefined, callback: () => { - goto(`${base}/project-${$project.$id}/settings/migrations`); + goto(`${base}/project-${$project.region}-${$project.$id}/settings/migrations`); }, disabled: !$project?.$id || (isOnSettingsLayout && page.url.pathname.includes('migrations')), @@ -233,7 +239,7 @@ label: 'Go to SMTP settings', keys: isOnSettingsLayout ? ['g', 's'] : undefined, callback: () => { - goto(`${base}/project-${$project.$id}/settings/smtp`); + goto(`${base}/project-${$project.region}-${$project.$id}/settings/smtp`); }, disabled: !$project?.$id || (isOnSettingsLayout && page.url.pathname.includes('smtp')), group: isOnSettingsLayout ? 'navigation' : 'settings', @@ -288,9 +294,9 @@ } database.subscribe(async (database) => { - if (!database) return; + if (!database || !page.params.region || !page.params.project) return; // the component checks `isCloud` internally. - await checkForDatabaseBackupPolicies(database); + await checkForDatabaseBackupPolicies(page.params.region, page.params.project, database); }); let currentOrganizationId = null; @@ -339,10 +345,10 @@ !page.url.pathname.includes('/console/account') && !page.url.pathname.includes('/console/card') && !page.url.pathname.includes('/console/onboarding')} - showHeader={!page.url.pathname.includes('/console/onboarding')} - showFooter={!page.url.pathname.includes('/console/onboarding')} - bind:loadedProjects - bind:projects={data.projects}> + showHeader={!page.url.pathname.includes('/console/onboarding/create-project')} + showFooter={!page.url.pathname.includes('/console/onboarding/create-project')} + {loadedProjects} + selectedProject={page.data?.project}>
diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts index 447f41d90..249914fc8 100644 --- a/src/routes/(console)/+layout.ts +++ b/src/routes/(console)/+layout.ts @@ -4,7 +4,7 @@ import type { Tier } from '$lib/stores/billing'; import { sdk } from '$lib/stores/sdk'; import { isCloud } from '$lib/system'; import type { LayoutLoad } from './$types'; -import { Query } from '@appwrite.io/console'; +import { Query, type Models } from '@appwrite.io/console'; export const load: LayoutLoad = async ({ params, fetch, depends, parent }) => { await parent(); @@ -38,7 +38,7 @@ export const load: LayoutLoad = async ({ params, fetch, depends, parent }) => { ? await sdk.forConsole.teams.list() : await sdk.forConsole.billing.listOrganization(); - let projects = []; + let projects: Models.Project[] = []; let currentOrgId = params.organization ? params.organization : prefs.organization; if (!currentOrgId && organizations.teams.length > 0) { @@ -47,12 +47,17 @@ export const load: LayoutLoad = async ({ params, fetch, depends, parent }) => { if (currentOrgId) { const orgProjects = await sdk.forConsole.projects.list([ Query.equal('teamId', currentOrgId), - Query.limit(100), + Query.limit(5), Query.orderDesc('$updatedAt') ]); projects = orgProjects.projects.length > 0 ? orgProjects.projects : []; } + // set `default` if no region! + for (const project of projects) { + project.region ??= 'default'; + } + return { consoleVariables: variables, version: data?.version ?? null, diff --git a/src/routes/(console)/account/header.svelte b/src/routes/(console)/account/header.svelte index b0f030d80..507dbfd91 100644 --- a/src/routes/(console)/account/header.svelte +++ b/src/routes/(console)/account/header.svelte @@ -41,7 +41,7 @@ ...permanentTabs, { href: `${path}/payments`, - title: 'Payment details', + title: 'Payments', event: 'payments', hasChildren: true } diff --git a/src/routes/(console)/account/mfa.svelte b/src/routes/(console)/account/mfa.svelte index 4768c28ee..777abe4f8 100644 --- a/src/routes/(console)/account/mfa.svelte +++ b/src/routes/(console)/account/mfa.svelte @@ -75,7 +75,7 @@ {/await} {:else} - + {/if} {/key} diff --git a/src/routes/(console)/account/payments/addressModal.svelte b/src/routes/(console)/account/payments/addressModal.svelte index b7d3fb8e7..55405deb1 100644 --- a/src/routes/(console)/account/payments/addressModal.svelte +++ b/src/routes/(console)/account/payments/addressModal.svelte @@ -1,5 +1,6 @@ diff --git a/src/routes/(console)/account/payments/paymentMethods.svelte b/src/routes/(console)/account/payments/paymentMethods.svelte index 6b700d4c2..3c2b83ef5 100644 --- a/src/routes/(console)/account/payments/paymentMethods.svelte +++ b/src/routes/(console)/account/payments/paymentMethods.svelte @@ -40,6 +40,15 @@ $: filteredMethods = $paymentMethods?.paymentMethods.filter( (method: PaymentMethodData) => !!method?.last4 ); + + const isMethodLinkedToOrg = (methodId: string, org: Organization) => + methodId === org.paymentMethodId || methodId === org.backupPaymentMethodId; + + $: linkedMethodIds = new Set( + orgList.flatMap((org) => [org.paymentMethodId, org.backupPaymentMethodId].filter(Boolean)) + ); + $: hasLinkedOrgs = filteredMethods.some((method) => linkedMethodIds.has(method.$id)); + $: hasPaymentError = filteredMethods.some((method) => method?.lastError || method?.expired); @@ -50,25 +59,26 @@ Credit card Name - Expiration date + + Expiration date + + + {#each filteredMethods as paymentMethod, i} - {@const linkedOrgs = orgList?.filter( - (org) => - paymentMethod.$id === org.paymentMethodId || - paymentMethod.$id === org.backupPaymentMethodId + {@const linkedOrgs = orgList?.filter((org) => + isMethodLinkedToOrg(paymentMethod.$id, org) )} diff --git a/src/routes/(console)/account/sessions/+page.svelte b/src/routes/(console)/account/sessions/+page.svelte index 53981f26d..ed52cef08 100644 --- a/src/routes/(console)/account/sessions/+page.svelte +++ b/src/routes/(console)/account/sessions/+page.svelte @@ -20,7 +20,8 @@ function getBrowser(clientCode: string) { const code = clientCode.toLowerCase(); if (!isValueOfStringEnum(Browser, code)) return ''; - return sdk.forProject.avatars.getBrowser(code, 40, 40); + + return sdk.forConsole.avatars.getBrowser(code, 40, 40); } function logoutSessionId(sessionId: string) { @@ -70,11 +71,11 @@ const sessionId = url.searchParams.get('sessionId'); if (sessionId) { logoutSessionId(sessionId); - } - // Clear the sessionId param from the URL - url.searchParams.delete('sessionId'); - goto(url.pathname + url.search, { replaceState: true }); + // Clear the sessionId param from the URL + url.searchParams.delete('sessionId'); + goto(url.pathname + url.search, { replaceState: true }); + } }); }); @@ -89,9 +90,9 @@ let:root columns={[ { id: 'client' }, - { id: 'location' }, - { id: 'ip' }, - { id: 'actions', width: 40 } + { id: 'location', width: 120 }, + { id: 'ip', width: 120 }, + { id: 'actions', width: 70 } ]}> Client diff --git a/src/routes/(console)/account/updateMfa.svelte b/src/routes/(console)/account/updateMfa.svelte index 35e6b97d6..b712e4c6b 100644 --- a/src/routes/(console)/account/updateMfa.svelte +++ b/src/routes/(console)/account/updateMfa.svelte @@ -13,7 +13,6 @@ import MfaRecoveryCodes from './mfaRecoveryCodes.svelte'; import type { Models } from '@appwrite.io/console'; import MfaRegenerateCodes from './mfaRegenerateCodes.svelte'; - import { Pill } from '$lib/elements'; import { page } from '$app/state'; import { onMount } from 'svelte'; import { Badge, Divider, Layout, Link, Typography } from '@appwrite.io/pink-svelte'; @@ -160,11 +159,11 @@
- + Authenticator app {#if $factors.totp} - connected + {/if} diff --git a/src/routes/(console)/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte index cdc813d09..e95952298 100644 --- a/src/routes/(console)/apply-credit/+page.svelte +++ b/src/routes/(console)/apply-credit/+page.svelte @@ -3,12 +3,12 @@ import { base } from '$app/paths'; import { page } from '$app/state'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; - import { CreditsApplied, EstimatedTotal, SelectPaymentMethod } from '$lib/components/billing'; + import { CreditsApplied, SelectPaymentMethod } from '$lib/components/billing'; import { BillingPlan, Dependencies } from '$lib/constants'; import { Button, Form, InputSelect, InputTags, InputText } from '$lib/elements/forms'; import { toLocaleDate } from '$lib/helpers/date'; import { Wizard } from '$lib/layout'; - import { type PaymentList, type Plan } from '$lib/sdk/billing'; + import type { PaymentList, Plan } from '$lib/sdk/billing'; import { addNotification } from '$lib/stores/notifications'; import { organizationList, @@ -72,7 +72,7 @@ let tempOrgId = null; let currentPlan: Plan; - $: onlyNewOrgs = (campaign && campaign.onlyNewOrgs) || (couponData && couponData.onlyNewOrgs); + $: onlyNewOrgs = campaign?.onlyNewOrgs || couponData?.onlyNewOrgs; $: selectedOrgId = tempOrgId; @@ -174,7 +174,7 @@ '', clientSecret, paymentMethodId, - '/console/apply-credit?' + params.toString() + `/console/apply-credit?${params}` ); org = await sdk.forConsole.billing.validateOrganization(org.teamId, collaborators); } @@ -205,7 +205,7 @@ async function addCoupon() { try { - const response = await sdk.forConsole.billing.getCoupon(coupon); + const response = await sdk.forConsole.billing.getCouponAccount(coupon); couponData = response; coupon = null; addNotification({ @@ -232,10 +232,15 @@ ? $plansInfo.get(selectedOrg.billingPlan) : null; - if (!campaignPlan || !orgPlan) { + if (!campaignPlan && !orgPlan) { return; } - + if (!campaignPlan) { + return selectedOrg?.billingPlan; + } + if (!orgPlan) { + return campaign.plan; + } return campaignPlan.order > orgPlan.order ? campaign.plan : selectedOrg?.billingPlan; } @@ -356,9 +361,9 @@ fixedCoupon={!!data?.couponData?.code} {billingPlan} {collaborators} - plans={$plansInfo} bind:couponData - bind:billingBudget> + bind:billingBudget + organizationId={selectedOrgId}> {#if campaign?.template === 'review' && (campaign?.cta || campaign?.claimed || campaign?.unclaimed)}

{campaign?.cta}

diff --git a/src/routes/(console)/bottomAlerts.ts b/src/routes/(console)/bottomAlerts.ts index a5a0550c7..5016b9c07 100644 --- a/src/routes/(console)/bottomAlerts.ts +++ b/src/routes/(console)/bottomAlerts.ts @@ -1,35 +1,27 @@ -import { base } from '$app/paths'; -import BackupsDark from '$lib/images/backups/promo/backups-dark.png'; -import BackupsLight from '$lib/images/backups/promo/backups-light.png'; - -import { type BottomModalAlertItem, showBottomModalAlert } from '$lib/stores/bottom-alerts'; import { isCloud } from '$lib/system'; +import { isSameDay } from '$lib/helpers/date'; +import { type BottomModalAlertItem, showBottomModalAlert } from '$lib/stores/bottom-alerts'; const listOfPromotions: BottomModalAlertItem[] = []; if (isCloud) { - listOfPromotions.push({ - id: 'modal:databaseBackups', - src: { - dark: BackupsDark, - light: BackupsLight - }, - title: 'Database Backups are available now', - message: 'Protect your data and ensure quick recovery with our new backups', - plan: 'pro', - scope: 'project', - importance: 8, - cta: { - text: 'Try now', - link: ({ project }) => `${base}/project-${project.$id}/databases` - }, - learnMore: { - text: 'Learn more', - link: () => 'https://appwrite.io/docs/products/databases/backups' - } - }); + /* add promos here */ } export function addBottomModalAlerts() { listOfPromotions.forEach((promotion) => showBottomModalAlert(promotion)); } + +// use this for time based promo handling +// noinspection JSUnusedGlobalSymbols +export function isPromoLive( + date: string, + time: string, + timeZone: string = 'Europe/Paris' +): boolean { + const now = new Date(); + const targetString = `${date}T${time}:00`; + const target = new Date(new Date(targetString).toLocaleString('en-US', { timeZone })); + + return isSameDay(now, target) && now >= target; +} diff --git a/src/routes/(console)/create-organization/+page.svelte b/src/routes/(console)/create-organization/+page.svelte index eebf3d31b..a45c2cdc3 100644 --- a/src/routes/(console)/create-organization/+page.svelte +++ b/src/routes/(console)/create-organization/+page.svelte @@ -3,21 +3,15 @@ import { base } from '$app/paths'; import { page } from '$app/state'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; - import { - PlanComparisonBox, - PlanSelection, - SelectPaymentMethod, - SelectPlan - } from '$lib/components/billing'; + import { PlanComparisonBox, PlanSelection, SelectPaymentMethod } from '$lib/components/billing'; import ValidateCreditModal from '$lib/components/billing/validateCreditModal.svelte'; import { BillingPlan, Dependencies } from '$lib/constants'; import { Button, Form, InputTags, InputText } from '$lib/elements/forms'; import { Wizard } from '$lib/layout'; - - import type { Coupon, PaymentList } from '$lib/sdk/billing'; + import type { Coupon } from '$lib/sdk/billing'; import { isOrganization, tierToPlan } from '$lib/stores/billing'; import { addNotification } from '$lib/stores/notifications'; - import { type OrganizationError, type Organization } from '$lib/stores/organization'; + import type { OrganizationError, Organization } from '$lib/stores/organization'; import { sdk } from '$lib/stores/sdk'; import { confirmPayment } from '$lib/stores/stripe'; import { ID } from '@appwrite.io/console'; @@ -37,16 +31,10 @@ let formComponent: Form; let isSubmitting = writable(false); - let methods: PaymentList; let name: string; let billingPlan: BillingPlan = BillingPlan.FREE; let paymentMethodId: string; let collaborators: string[] = []; - let couponData: Partial = { - code: null, - status: null, - credits: null - }; let taxId: string; let billingBudget: number; @@ -61,9 +49,9 @@ const coupon = page.url.searchParams.get('coupon'); try { const response = await sdk.forConsole.billing.getCouponAccount(coupon); - couponData = response; + selectedCoupon = response; } catch (e) { - couponData = { + selectedCoupon = { code: null, status: null, credits: null @@ -95,11 +83,6 @@ } }); - async function loadPaymentMethods() { - methods = await sdk.forConsole.billing.listPaymentMethods(); - paymentMethodId = methods.paymentMethods.find((method) => !!method?.last4)?.$id ?? null; - } - async function validate(organizationId: string, invites: string[]) { try { const org = await sdk.forConsole.billing.validateOrganization(organizationId, invites); @@ -139,7 +122,7 @@ selectedPlan, paymentMethodId, null, - couponData.code ? couponData.code : null, + selectedCoupon?.code, collaborators, billingBudget, taxId @@ -160,7 +143,7 @@ '', clientSecret, paymentMethodId, - '/console/create-organization?' + params.toString() + `/console/create-organization?${params}` ); await validate(org.teamId, collaborators); } @@ -207,35 +190,47 @@ required />
- - For more details on our plans, visit our - pricing page. - - + + + For more details on our plans, visit our + pricing page. + + + +
{#if selectedPlan !== BillingPlan.FREE}
- - - {#if !selectedCoupon?.code} - - - {/if} - - + + + + {#if !selectedCoupon?.code && paymentMethodId} + + + {/if} + + + + {#if !selectedCoupon?.code && !paymentMethodId} + + {/if} +
{:else} diff --git a/src/routes/(console)/create-organization/+page.ts b/src/routes/(console)/create-organization/+page.ts index 6c3cfe2f0..150cd76f3 100644 --- a/src/routes/(console)/create-organization/+page.ts +++ b/src/routes/(console)/create-organization/+page.ts @@ -1,10 +1,11 @@ -import { BillingPlan } from '$lib/constants'; +import { BillingPlan, Dependencies } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; import type { Coupon } from '$lib/sdk/billing'; import type { Organization } from '$lib/stores/organization'; -export const load: PageLoad = async ({ url, parent }) => { +export const load: PageLoad = async ({ url, parent, depends }) => { + depends(Dependencies.CREATE_ORGANIZATION); const { organizations } = await parent(); const [coupon, paymentMethods] = await Promise.all([ getCoupon(url), @@ -41,7 +42,7 @@ async function getCoupon(url: URL): Promise { if (url.searchParams.has('code')) { const coupon = url.searchParams.get('code'); try { - return sdk.forConsole.billing.getCoupon(coupon); + return sdk.forConsole.billing.getCouponAccount(coupon); } catch (e) { return null; } diff --git a/src/routes/(console)/onboarding/create-organization/+page.svelte b/src/routes/(console)/onboarding/create-organization/+page.svelte new file mode 100644 index 000000000..f77a7bc53 --- /dev/null +++ b/src/routes/(console)/onboarding/create-organization/+page.svelte @@ -0,0 +1,115 @@ + + + + Create organization - Appwrite + + + +
+
+ + + Create an organization + + + + + + {#if isLoading} + + {/if} + Create + + + + +
+
+ + + diff --git a/src/routes/(console)/onboarding/create-project/+page.svelte b/src/routes/(console)/onboarding/create-project/+page.svelte index 2d94cfedb..ded905694 100644 --- a/src/routes/(console)/onboarding/create-project/+page.svelte +++ b/src/routes/(console)/onboarding/create-project/+page.svelte @@ -5,84 +5,72 @@ import { sdk } from '$lib/stores/sdk'; import { ID, Region } from '@appwrite.io/console'; import Loading from './loading.svelte'; - import { BillingPlan, Dependencies } from '$lib/constants'; + import { Dependencies } from '$lib/constants'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { goto, invalidate } from '$app/navigation'; import { base } from '$app/paths'; import { addNotification } from '$lib/stores/notifications'; - import { tierToPlan } from '$lib/stores/billing'; import CreateProject from '$lib/layout/createProject.svelte'; + import { loadAvailableRegions } from '$routes/(console)/regions'; + import { regions as regionsStore } from '$lib/stores/organization'; + import { user } from '$lib/stores/user'; let isLoading = false; let id: string; let startAnimation = false; let projectName = consoleProfile.defaultProjectName; - let region = Region.Default; - export let data: { regions: RegionList | null }; + let region = Region.Fra; + + export let data; + + function markOnboardingComplete() { + const currentPrefs = data.accountPrefs ?? $user.prefs; + + const newPrefs = { + ...currentPrefs, + newOnboardingCompleted: true + }; + + sdk.forConsole.account.updatePrefs(newPrefs); + } async function createProject() { isLoading = true; - let org; try { - org = isCloud - ? await sdk.forConsole.billing.createOrganization( - ID.unique(), - 'Personal projects', - BillingPlan.FREE, - null, - null - ) - : await sdk.forConsole.teams.create(ID.unique(), 'Personal projects'); + const teamId = data.organization.$id; + const project = await sdk.forConsole.projects.create( + id ?? ID.unique(), + projectName, + teamId, + isCloud ? region : undefined + ); + + markOnboardingComplete(); + + trackEvent(Submit.ProjectCreate, { + customId: !!id, + teamId + }); + + startAnimation = true; + + setTimeout(async () => { + await invalidate(Dependencies.ACCOUNT); + goto(`${base}/project-${project.region ?? 'default'}-${project.$id}`); + }, 3000); } catch (e) { + trackError(e, Submit.ProjectCreate); isLoading = false; - trackError(e, Submit.OrganizationCreate); addNotification({ type: 'error', message: e.message }); } - - trackEvent(Submit.OrganizationCreate, { - plan: tierToPlan(BillingPlan.FREE)?.name, - budget_cap_enabled: false, - members_invited: 0 - }); - - if (org) { - const teamId = org.$id; - try { - const project = await sdk.forConsole.projects.create( - id ?? ID.unique(), - projectName, - teamId, - region - ); - trackEvent(Submit.ProjectCreate, { - customId: !!id, - teamId - }); - - startAnimation = true; - - trackEvent(Submit.ProjectCreate, { - teamId: teamId - }); - - setTimeout(async () => { - await invalidate(Dependencies.ACCOUNT); - goto(`${base}/project-${project.$id}`); - }, 3000); - } catch (e) { - trackError(e, Submit.ProjectCreate); - isLoading = false; - addNotification({ - type: 'error', - message: e.message - }); - } - } } + + // safe side! + loadAvailableRegions(data.organization?.$id); @@ -108,7 +96,7 @@ alt="Appwrite Logo" /> { - return { - regions: isCloud ? await sdk.forConsole.billing.listRegions() : null - }; +// TODO: this needs to be cleaned up! +export const load: PageLoad = async ({ parent }) => { + const { account, organizations } = await parent(); + + const accountPrefs = account.prefs; + const hasCompletedOnboarding = accountPrefs['newOnboardingCompleted'] ?? false; + + // user has already seen it, lets redirect now! + if (hasCompletedOnboarding && !organizations?.total) { + redirect(303, `${base}/onboarding/create-organization`); + } else if (hasCompletedOnboarding && organizations?.total) { + redirect(303, `${base}/organization-${organizations.teams[0].$id}`); + } + + if (!organizations?.total) { + try { + if (isCloud) { + const org = await sdk.forConsole.billing.createOrganization( + ID.unique(), + 'Personal projects', + BillingPlan.FREE, + null, + null + ); + trackEvent(Submit.OrganizationCreate, { + plan: tierToPlan(BillingPlan.FREE)?.name, + budget_cap_enabled: false, + members_invited: 0 + }); + + if (isOrganization(org)) { + return { + accountPrefs, + organization: org + }; + } else { + const e = new Error(org.message, { + cause: org + }); + trackError(e, Submit.OrganizationCreate); + } + } else { + return { + accountPrefs, + organization: await sdk.forConsole.teams.create( + ID.unique(), + 'Personal projects' + ) + }; + } + } catch (e) { + trackError(e, Submit.OrganizationCreate); + } + } else if (organizations?.total === 1) { + const org = organizations.teams[0]; + let projects: Models.ProjectList = null; + try { + projects = await sdk.forConsole.projects.list([ + Query.equal('teamId', org.$id), + Query.limit(1) + ]); + } catch (e) { + redirect(303, `${base}/organization-${org.$id}`); + } + if (!projects?.total) { + return { + accountPrefs, + organization: org + }; + } else { + redirect(303, `${base}/organization-${org.$id}`); + } + } else { + redirect(303, `${base}/organization-${organizations.teams[0].$id}`); + } }; diff --git a/src/routes/(console)/organization-[organization]/+layout.ts b/src/routes/(console)/organization-[organization]/+layout.ts index cd1968ea8..bda0a6d41 100644 --- a/src/routes/(console)/organization-[organization]/+layout.ts +++ b/src/routes/(console)/organization-[organization]/+layout.ts @@ -13,6 +13,7 @@ import { preferences } from '$lib/stores/preferences'; import type { Organization } from '$lib/stores/organization'; import { defaultRoles, defaultScopes } from '$lib/constants'; import type { Plan } from '$lib/sdk/billing'; +import { loadAvailableRegions } from '$routes/(console)/regions'; export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.ORGANIZATION); @@ -52,6 +53,8 @@ export const load: LayoutLoad = async ({ params, depends }) => { preferences.loadTeamPrefs(params.organization) ]); + await loadAvailableRegions(params.organization); + return { header: Header, breadcrumbs: Breadcrumbs, diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte index 4308e09df..241610941 100644 --- a/src/routes/(console)/organization-[organization]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/+page.svelte @@ -17,12 +17,11 @@ } from '$lib/components'; import { goto } from '$app/navigation'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; - import { services } from '$lib/stores/project-services'; import { sdk } from '$lib/stores/sdk'; import { loading } from '$routes/store'; import type { Models } from '@appwrite.io/console'; import { ID, Region } from '@appwrite.io/console'; - import { openImportWizard } from '../project-[project]/settings/migrations/(import)'; + import { openImportWizard } from '../project-[region]-[project]/settings/migrations/(import)'; import { readOnly } from '$lib/stores/billing'; import { onMount, type ComponentType } from 'svelte'; import { canWriteProjects } from '$lib/stores/roles'; @@ -47,7 +46,7 @@ } from '@appwrite.io/pink-icons-svelte'; import { getPlatformInfo } from '$lib/helpers/platform'; import CreateProjectCloud from './createProjectCloud.svelte'; - import { regions as regionsStore } from '$routes/(console)/organization-[organization]/store'; + import { regions as regionsStore } from '$lib/stores/organization'; import type { Column } from '@appwrite.io/pink-svelte/dist/table'; import { timeFromNow } from '$lib/helpers/date'; @@ -57,23 +56,6 @@ let showCreateProjectCloud = false; let addOrganization = false; - async function allServiceDisabled(project: Models.Project) { - let disabled = true; - try { - if (!project.$id) return false; - if (!project.platforms.length) return false; - services.load(project); - $services.list.forEach((service) => { - if (service.value) { - disabled = false; - } - }); - return disabled; - } catch (e) { - return true; - } - } - function filterPlatforms(platforms: { name: string; icon: string }[]) { return platforms.filter( (value, index, self) => index === self.findIndex((t) => t.name === value.name) @@ -127,31 +109,24 @@ ID.unique(), `Imported project ${new Date().toISOString()}`, page.params.organization, - Region.Default + Region.Fra // default ); trackEvent(Submit.ProjectCreate, { teamId: page.params.organization }); - await goto(`${base}/project-${project.$id}/settings/migrations`); + await goto(`${base}/project-${project.region}-${project.$id}/settings/migrations`); openImportWizard(); loading.set(false); } catch (e) { trackError(e, Submit.ProjectCreate); } }; - onMount(async () => { - if (isCloud) { - const regions = await sdk.forConsole.billing.listRegions(); - regionsStore.set(regions); - checkPricingRefAndRedirect(page.url.searchParams); - } + checkPricingRefAndRedirect(page.url.searchParams); }); function findRegion(project: Models.Project) { - return $regionsStore?.regions?.find( - (region) => region.$id === (project as Models.Project & { region: string }).region - ); + return $regionsStore.regions.find((region) => region.$id === project.region); } const columns: Column[] = [{ id: 'name' }, { id: 'updated' }]; @@ -214,67 +189,56 @@
- {#if data.projects.total} - - {#each data.projects.projects as project} - {@const platforms = filterPlatforms( - project.platforms.map((platform) => getPlatformInfo(platform.type)) - )} - - - {project?.platforms?.length ? project?.platforms?.length : 'No'} apps - - - {project.name} - - {#await allServiceDisabled(project) then isDisabled} - {#if isDisabled} -

- All services - are disabled. -

- {/if} - {/await} - - {#each platforms as platform, i} - {#if i < 3} - {@const icon = getIconForPlatform(platform.icon)} - - - - {/if} - {/each} - {#if platforms?.length > 3} - + {#if data.projects.total} + + {#each data.projects.projects as project} + {@const platforms = filterPlatforms( + project.platforms.map((platform) => getPlatformInfo(platform.type)) + )} + + + {project?.platforms?.length ? project?.platforms?.length : 'No'} apps + + + {project.name} + + {#each platforms as platform, i} + {#if i < 3} + {@const icon = getIconForPlatform(platform.icon)} + + + {/if} - - {#if isCloud && $regionsStore?.regions} - {@const region = findRegion(project)} - - {region?.name} - - {/if} - - - {/each} - -

Create a new project

-
-
- {:else} - - {/if} + {/each} + {#if platforms?.length > 3} + + {/if} + + {#if isCloud && $regionsStore?.regions} + {@const region = findRegion(project)} + + {region?.name} + + {/if} + +
+ {/each} + +

Create a new project

+
+
+ {:else} + + {/if} return redirect(301, `${base}/organization-${params.organization}/billing`); } + const projects = await sdk.forConsole.projects.list([ + Query.offset(offset), + Query.equal('teamId', params.organization), + Query.limit(limit), + Query.orderDesc('') + ]); + + // set `default` if no region! + for (const project of projects.projects) { + project.region ??= 'default'; + } + return { offset, limit, - projects: await sdk.forConsole.projects.list([ - Query.offset(offset), - Query.equal('teamId', params.organization), - Query.limit(limit), - Query.orderDesc('') - ]) + projects }; }; diff --git a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte index ddf7206a4..c44c40c9d 100644 --- a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte +++ b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte @@ -5,12 +5,11 @@ import { toLocaleDate } from '$lib/helpers/date'; import { formatCurrency } from '$lib/helpers/numbers'; import type { Invoice, InvoiceList } from '$lib/sdk/billing'; - import { sdk } from '$lib/stores/sdk'; + import { getApiEndpoint, sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { trackEvent } from '$lib/actions/analytics'; import { selectedInvoice, showRetryModal } from './store'; - import { organization } from '$lib/stores/organization'; import { ActionMenu, Badge, @@ -28,7 +27,6 @@ IconExternalLink, IconRefresh } from '@appwrite.io/pink-icons-svelte'; - import { base } from '$app/paths'; let offset = 0; let invoiceList: InvoiceList = { @@ -37,6 +35,7 @@ }; const limit = 5; + const endpoint = getApiEndpoint(); onMount(request); @@ -135,12 +134,12 @@ + href={`${endpoint}/organizations/${page.params.organization}/invoices/${invoice.$id}/view`}> View invoice + href={`${endpoint}/organizations/${page.params.organization}/invoices/${invoice.$id}/download`}> Download PDF {#if status === 'overdue' || status === 'failed'} diff --git a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte index 6cb9717e2..db32f3c91 100644 --- a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte +++ b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte @@ -99,6 +99,12 @@ $: if (!showReplace) { isSelectedBackup = false; } + + $: hasPaymentError = + defaultPaymentMethod?.lastError || + defaultPaymentMethod?.expired || + backupPaymentMethod?.lastError || + backupPaymentMethod?.expired; @@ -109,10 +115,10 @@ diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte index c007b40f5..f35163025 100644 --- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte +++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte @@ -7,7 +7,6 @@ import { organization } from '$lib/stores/organization'; import type { Aggregation, CreditList, Invoice, Plan } from '$lib/sdk/billing'; import { abbreviateNumber, formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers'; - import { humanFileSize } from '$lib/helpers/sizeConvertion'; import { BillingPlan } from '$lib/constants'; import { Click, trackEvent } from '$lib/actions/analytics'; import { @@ -35,22 +34,6 @@ new Date($organization?.billingStartDate).getTime() - today.getTime() > 0 && $plansInfo.get($organization.billingPlan)?.trialDays; const extraUsage = currentInvoice ? currentInvoice.amount - currentPlan?.price : 0; - const extraAddons = currentInvoice ? currentInvoice.usage?.length : 0; - - function usageNameToLabel(name: string): string { - switch (name) { - case 'executions': - return 'Executions'; - case 'storage': - return 'Storage'; - case 'users': - return 'Users'; - case 'bandwidth': - return 'Bandwidth'; - default: - return ''; - } - } {#if $organization} @@ -113,69 +96,29 @@ {#if i > 0 || currentAggregation.additionalMembers} {/if} - {#if ['storage', 'bandwidth'].includes(excess.name)} - {@const excessValue = humanFileSize(excess.value)} - - - {usageNameToLabel( - excess.name - )} - {formatCurrency( - excess.amount - )} - - - - - - {formatNumberWithCommas( - excess.value ?? 0 - )} bytes - - {excessValue.value ?? - 0}{excessValue.unit} - - - + + + + + {excess.name} + + + {formatCurrency(excess.amount)} + - {/if} - {#if ['users', 'executions'].includes(excess.name)} - - - {usageNameToLabel( - excess.name - )} - {formatCurrency( - excess.amount - )} - - - - - {formatNumberWithCommas(excess.value)} - - {abbreviateNumber(excess.value)} - - + + + + {formatNumberWithCommas(excess.value)} + + {abbreviateNumber(excess.value)} + - {/if} + {/each} {/if} diff --git a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte index 9a5587ae4..4d5fa0577 100644 --- a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte +++ b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte @@ -11,6 +11,7 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { base } from '$app/paths'; import { Alert, Badge, Card, Layout, Skeleton } from '@appwrite.io/pink-svelte'; + import { page } from '$app/state'; export let show = false; let loading = true; @@ -43,11 +44,13 @@ : null : null; - const locale = await sdk.forProject.locale.get(); + const locale = await sdk.forProject(page.params.region, page.params.project).locale.get(); if (locale?.countryCode) { country = locale.countryCode; } - const countryList = await sdk.forProject.locale.listCountries(); + const countryList = await sdk + .forProject(page.params.region, page.params.project) + .locale.listCountries(); options = countryList.countries.map((country) => { return { value: country.code, diff --git a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte index 117d485a4..c2aaa4542 100644 --- a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte +++ b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte @@ -66,20 +66,23 @@ if (setAsDefault) { await sdk.forConsole.billing.setDefaultPaymentMethod(paymentMethodId); } - const { clientSecret } = await sdk.forConsole.billing.retryPayment( + const { clientSecret, status } = await sdk.forConsole.billing.retryPayment( $organization.$id, invoice.$id, paymentMethodId ); - await confirmPayment( - $organization.$id, - clientSecret, - paymentMethodId ? paymentMethodId : $organization.paymentMethodId, - `${base}/organization-${$organization.$id}/billing?type=validate-invoice&invoice=${invoice.$id}` - ); + if (status !== 'succeeded' && status !== 'cancelled') { + // probably still pending, confirm via stripe! + await confirmPayment( + $organization.$id, + clientSecret, + paymentMethodId ? paymentMethodId : $organization.paymentMethodId, + `${base}/organization-${$organization.$id}/billing?type=validate-invoice&invoice=${invoice.$id}` + ); - await sdk.forConsole.billing.updateInvoiceStatus($organization.$id, invoice.$id); + await sdk.forConsole.billing.updateInvoiceStatus($organization.$id, invoice.$id); + } invalidate(Dependencies.ORGANIZATION); invalidate(Dependencies.INVOICES); diff --git a/src/routes/(console)/organization-[organization]/budgetLimitAlert.svelte b/src/routes/(console)/organization-[organization]/budgetLimitAlert.svelte index 2d1e25a46..ca84dbf21 100644 --- a/src/routes/(console)/organization-[organization]/budgetLimitAlert.svelte +++ b/src/routes/(console)/organization-[organization]/budgetLimitAlert.svelte @@ -1,5 +1,5 @@ -{#if $showBudgetAlert && $organization?.$id && $organization?.billingPlan !== BillingPlan.FREE && $readOnly && !hideBillingHeaderRoutes.includes($page.url.pathname)} +{#if $showBudgetAlert && $organization?.$id && $organization?.billingPlan !== BillingPlan.FREE && $readOnly && !hideBillingHeaderRoutes.includes(page.url.pathname)} This organization has reached its budget limit and is now blocked. To continue using diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte index 28c19625d..efe13f1a3 100644 --- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte +++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte @@ -10,8 +10,8 @@ import { Button, Form, InputSelect, InputTags, InputTextarea } from '$lib/elements/forms'; import { formatCurrency } from '$lib/helpers/numbers.js'; import { Wizard } from '$lib/layout'; - import { type Coupon, type PaymentList } from '$lib/sdk/billing'; - import { isOrganization, plansInfo, tierToPlan, type Tier } from '$lib/stores/billing'; + import { type Coupon } from '$lib/sdk/billing'; + import { isOrganization, plansInfo, tierToPlan } from '$lib/stores/billing'; import { addNotification } from '$lib/stores/notifications'; import { currentPlan, organization } from '$lib/stores/organization'; import { sdk } from '$lib/stores/sdk'; @@ -54,7 +54,6 @@ let showCreditModal = false; let feedbackDowngradeReason: string; let feedbackMessage: string; - let couponData: Partial = data.coupon; afterNavigate(({ from }) => { previousPage = from?.url?.pathname || previousPage; @@ -63,10 +62,9 @@ if (page.url.searchParams.has('code')) { const coupon = page.url.searchParams.get('code'); try { - const response = await sdk.forConsole.billing.getCouponAccount(coupon); - couponData = response; + selectedCoupon = await sdk.forConsole.billing.getCouponAccount(coupon); } catch (e) { - couponData = { + selectedCoupon = { code: null, status: null, credits: null @@ -179,7 +177,7 @@ async function upgrade() { try { - //Add collaborators + // Add collaborators let newCollaborators = []; if (collaborators?.length) { newCollaborators = collaborators.filter( @@ -192,7 +190,7 @@ selectedPlan, paymentMethodId, null, - couponData?.code, + selectedCoupon?.code, newCollaborators, billingBudget, taxId ? taxId : null @@ -242,9 +240,9 @@ } } - $: isUpgrade = $plansInfo.get(selectedPlan).order > $currentPlan.order; - $: isDowngrade = $plansInfo.get(selectedPlan).order < $currentPlan.order; - $: isButtonDisabled = $organization.billingPlan === selectedPlan; + $: isUpgrade = $plansInfo.get(selectedPlan).order > $currentPlan?.order; + $: isDowngrade = $plansInfo.get(selectedPlan).order < $currentPlan?.order; + $: isButtonDisabled = $organization?.billingPlan === selectedPlan; @@ -356,10 +354,10 @@ + bind:billingBudget + organizationId={data.organization.$id} /> {:else if data.organization.billingPlan !== BillingPlan.CUSTOM} {/if} diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.ts b/src/routes/(console)/organization-[organization]/change-plan/+page.ts index e3d79c69e..b698d60dc 100644 --- a/src/routes/(console)/organization-[organization]/change-plan/+page.ts +++ b/src/routes/(console)/organization-[organization]/change-plan/+page.ts @@ -49,7 +49,7 @@ async function getCoupon(url: URL): Promise { if (url.searchParams.has('code')) { const coupon = url.searchParams.get('code'); try { - return sdk.forConsole.billing.getCoupon(coupon); + return sdk.forConsole.billing.getCouponAccount(coupon); } catch (e) { return null; } diff --git a/src/routes/(console)/organization-[organization]/createProject.svelte b/src/routes/(console)/organization-[organization]/createProject.svelte index 9f9d92dc0..80881b0d5 100644 --- a/src/routes/(console)/organization-[organization]/createProject.svelte +++ b/src/routes/(console)/organization-[organization]/createProject.svelte @@ -6,7 +6,7 @@ import { InputText, Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import { ID, Region } from '@appwrite.io/console'; + import { ID } from '@appwrite.io/console'; import { IconPencil } from '@appwrite.io/pink-icons-svelte'; import { Icon, Layout, Tag } from '@appwrite.io/pink-svelte'; import { createEventDispatcher } from 'svelte'; @@ -26,12 +26,7 @@ async function create() { try { disabled = true; - const project = await sdk.forConsole.projects.create( - id ?? ID.unique(), - name, - teamId, - Region.Default - ); + const project = await sdk.forConsole.projects.create(id ?? ID.unique(), name, teamId); show = false; dispatch('created', project); trackEvent(Submit.ProjectCreate, { @@ -42,7 +37,7 @@ type: 'success', message: `${name} has been created` }); - await goto(`${base}/project-${project.$id}`); + await goto(`${base}/project-${project.region ?? 'default'}-${project.$id}`); } catch (e) { error = e.message; trackError(e, Submit.ProjectCreate); diff --git a/src/routes/(console)/organization-[organization]/createProjectCloud.svelte b/src/routes/(console)/organization-[organization]/createProjectCloud.svelte index 8aa09f9dd..16f5aa450 100644 --- a/src/routes/(console)/organization-[organization]/createProjectCloud.svelte +++ b/src/routes/(console)/organization-[organization]/createProjectCloud.svelte @@ -6,18 +6,20 @@ import { Dependencies } from '$lib/constants'; import { page } from '$app/state'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; - import { ID, Region as ConsoleRegion } from '@appwrite.io/console'; - import { createProject } from './wizard/store'; + import { ID, Region as ConsoleRegion, type Models, Region } from '@appwrite.io/console'; import { Button } from '@appwrite.io/pink-svelte'; import { base } from '$app/paths'; import CreateProject from '$lib/layout/createProject.svelte'; import { Modal } from '$lib/components'; - import type { Region } from '$lib/sdk/billing'; const teamId = page.params.organization; - export let regions: Array = []; + export let regions: Array = []; export let showCreateProjectCloud: boolean; + let id: string = null; + let name: string = 'Appwrite project'; + let region: string = Region.Fra; + async function onFinish() { await invalidate(Dependencies.FUNCTIONS); } @@ -26,22 +28,22 @@ try { // TODO: fix typing once SDK is updated const project = await sdk.forConsole.projects.create( - $createProject?.id ?? ID.unique(), - $createProject.name, + id ?? ID.unique(), + name, teamId, - $createProject.region as ConsoleRegion + region as ConsoleRegion ); trackEvent(Submit.ProjectCreate, { - customId: !!$createProject?.id, + customId: !!id, teamId, - region: $createProject.region + region: region }); addNotification({ type: 'success', - message: `${$createProject.name} has been created` + message: `${name} has been created` }); await onFinish(); - await goto(`${base}/project-${project.$id}`); + await goto(`${base}/project-${project.region}-${project.$id}`); } catch (e) { addNotification({ type: 'error', @@ -52,21 +54,14 @@ } onDestroy(() => { - $createProject = { - id: null, - name: null, - region: 'fra' - }; + id = null; + name = null; + region = 'fra'; }); - + Create diff --git a/src/routes/(console)/organization-[organization]/domains/+page.svelte b/src/routes/(console)/organization-[organization]/domains/+page.svelte index 555b0d147..b2726e561 100644 --- a/src/routes/(console)/organization-[organization]/domains/+page.svelte +++ b/src/routes/(console)/organization-[organization]/domains/+page.svelte @@ -15,6 +15,7 @@ } from '@appwrite.io/pink-icons-svelte'; import { ActionMenu, + Badge, Card, Empty, Icon, @@ -28,16 +29,20 @@ import { queries } from '$lib/components/filters'; import SearchQuery from '$lib/components/searchQuery.svelte'; import { app } from '$lib/stores/app'; - import type { Domain } from '$lib/sdk/domains'; import { Click, trackEvent } from '$lib/actions/analytics'; import { columns } from './store'; import { View } from '$lib/helpers/load'; + import type { Models } from '@appwrite.io/console'; export let data; let showDelete = false; let showRetry = false; - let selectedDomain: Domain = null; + let selectedDomain: Models.Domain = null; + + const isDomainVerified = (domain: Models.Domain) => { + return domain.nameservers.toLowerCase() === 'appwrite'; + }; @@ -76,19 +81,29 @@ {#if column.id === 'domain'} - - {domain.domain} - + + + + {domain.domain} + + + {#if !isDomainVerified(domain)} + + {/if} + {:else if column.id === 'registrar'} {domain.registrar || '-'} {:else if column.id === 'nameservers'} {domain.nameservers || '-'} {:else if column.id === 'expiry_date'} - {domain?.expiry ? toLocaleDateTime(domain.expiry) : '-'} + {domain?.expire ? toLocaleDateTime(domain.expire) : '-'} {:else if column.id === 'renewal'} {domain?.renewal ? toLocaleDateTime(domain.renewal) : '-'} {:else if column.id === 'auto_renewal'} @@ -113,7 +128,7 @@ - {#if domain.nameservers !== 'Appwrite'} + {#if !isDomainVerified(domain)} { @@ -209,5 +224,5 @@ {/if} {#if showRetry} - + {/if} diff --git a/src/routes/(console)/organization-[organization]/domains/+page.ts b/src/routes/(console)/organization-[organization]/domains/+page.ts index d51738731..eaa4368af 100644 --- a/src/routes/(console)/organization-[organization]/domains/+page.ts +++ b/src/routes/(console)/organization-[organization]/domains/+page.ts @@ -4,8 +4,10 @@ import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpe import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import { queries, queryParamToMap } from '$lib/components/filters'; -export const load = async ({ depends, url, route }) => { +export const load = async ({ depends, url, route, parent }) => { + const { organization } = await parent(); depends(Dependencies.DOMAINS); + const page = getPage(url); const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); @@ -24,6 +26,7 @@ export const load = async ({ depends, url, route }) => { Query.limit(limit), Query.offset(offset), Query.orderDesc(''), + Query.equal('teamId', organization.$id), ...parsedQueries.values() ]) }; diff --git a/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte b/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte index 327151445..9e0903a61 100644 --- a/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte @@ -10,17 +10,19 @@ import RecordsCard from '../recordsCard.svelte'; import { afterNavigate, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; - import type { Domain } from '$lib/sdk/domains'; + import type { Models } from '@appwrite.io/console'; let backPage = `${base}/organization-${page.params.organization}/domains`; let domainName = ''; - let domain: Domain; + let domain: Models.Domain; async function addDomain() { try { - domain = await sdk.forConsole.domains.create(page.params.organization, domainName); - console.log(domain); + domain = await sdk.forConsole.domains.create( + page.params.organization, + domainName.toLocaleLowerCase() + ); invalidate(Dependencies.DOMAINS); } catch (error) { addNotification({ diff --git a/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte b/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte index cdbb00b8c..53a0794f7 100644 --- a/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte @@ -1,27 +1,31 @@ - - - {#each metrics.slice(0, 3) as metric} - {#if metric.description === 'Domain'} - - - - {metric.value} - - - - {:else} - - {/if} - {/each} - - - {#each metrics.slice(3) as metric} + + {#each metrics.slice(0, 3) as metric} + {#if metric.description === 'Status'} + + + + + {#if !isDomainVerified} + Retry + {/if} + + + {:else} - {/each} - + {/if} + {/each} + {#each metrics.slice(3) as metric} + + {/each} diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/importRecordModal.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/importRecordModal.svelte index c9c47ebba..5d0eeda5a 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/importRecordModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/importRecordModal.svelte @@ -5,7 +5,7 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Icon, Layout, Tooltip, Typography, Upload } from '@appwrite.io/pink-svelte'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; - import { removeFile } from '$lib/helpers/files'; + import { InvalidFileType, removeFile } from '$lib/helpers/files'; import { page } from '$app/state'; import { sdk } from '$lib/stores/sdk'; import { invalidate } from '$app/navigation'; @@ -36,10 +36,23 @@ } } + function handleInvalid(e: CustomEvent) { + const reason = e.detail.reason; + if (reason === InvalidFileType.EXTENSION) { + error = 'Only .txt files allowed'; + } else if (reason === InvalidFileType.SIZE) { + error = 'File size exceeds 5MB'; + } else { + error = 'Invalid file'; + } + } + $: filesList = files?.length ? Array.from(files).map((f) => { return { ...f, + name: f.name, + size: f.size, extension: f.type, removable: true }; @@ -59,7 +72,12 @@ Upload a .txt file with your DNS records - + Only .txt files allowed - Max file size 10MB + Max file size 5MB
diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/changeOrganization.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/changeOrganization.svelte index 34303a5fe..80473f542 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/changeOrganization.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/changeOrganization.svelte @@ -4,13 +4,13 @@ import { CardGrid } from '$lib/components'; import { Dependencies } from '$lib/constants'; import { Button, InputSelect } from '$lib/elements/forms'; - import type { Domain } from '$lib/sdk/domains'; import { addNotification } from '$lib/stores/notifications'; import type { OrganizationList } from '$lib/stores/organization'; import { sdk } from '$lib/stores/sdk'; + import type { Models } from '@appwrite.io/console'; import { base } from '$app/paths'; - export let domain: Domain; + export let domain: Models.Domain; export let organizations: OrganizationList; let selectedOrg: string = null; @@ -54,6 +54,6 @@ - + diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/deleteDomain.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/deleteDomain.svelte index 49fbc915e..9dc214933 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/deleteDomain.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/deleteDomain.svelte @@ -2,10 +2,10 @@ import { BoxAvatar, CardGrid } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { toLocaleDateTime } from '$lib/helpers/date'; + import type { Models } from '@appwrite.io/console'; import Delete from '../../deleteDomainModal.svelte'; - import type { Domain } from '$lib/sdk/domains'; - export let domain: Domain; + export let domain: Models.Domain; let show = false; diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts index 18afb8527..b3a5d2b2c 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts @@ -1,17 +1,17 @@ import { page } from '$app/stores'; import type { Column } from '$lib/helpers/types'; -import type { Domain } from '$lib/sdk/domains'; +import type { Models } from '@appwrite.io/console'; import { derived, writable } from 'svelte/store'; -export const domain = derived(page, ($page) => $page.data.domain as Domain); +export const domain = derived(page, ($page) => $page.data.domain as Models.Domain); export const columns = writable([ - { id: 'name', title: 'Name', type: 'string' }, - { id: 'type', title: 'Type', type: 'string' }, - { id: 'value', title: 'Value', type: 'string' }, - { id: 'ttl', title: 'TTL', type: 'integer' }, - { id: 'priority', title: 'Priority', type: 'integer', hide: true }, - { id: 'comment', title: 'Comment', type: 'string', hide: true }, - { id: '$createdAt', title: 'Created', type: 'datetime' } + { id: 'name', title: 'Name', type: 'string', width: { min: 150 } }, + { id: 'type', title: 'Type', type: 'string', width: 125 }, + { id: 'value', title: 'Value', type: 'string', width: 250 }, + { id: 'ttl', title: 'TTL', type: 'integer', width: 100 }, + { id: 'priority', title: 'Priority', type: 'integer', width: 80, hide: true }, + { id: 'comment', title: 'Comment', type: 'string', width: { min: 180 } }, + { id: '$createdAt', title: 'Created', type: 'datetime', width: { min: 120 } } ]); export const recordTypes = [ @@ -53,7 +53,7 @@ export const recordTypes = [ { value: 'CAA', label: 'CAA', - helper: 'CAA records specify which certificate authorities are allowed to issue SSL certificates for your domain, helping to prevent unauthorized certificate issuance.' + helper: 'CAA records define which certificate authorities can issue SSL certificates for your domain. To avoid setup issues, make sure certainly.com is authorized.' }, { value: 'HTTPS', diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte index ee9fba69a..ab30b24b3 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte @@ -8,20 +8,27 @@ Layout, Popover, Table, - Typography + Typography, + Tooltip } from '@appwrite.io/pink-svelte'; - import { IconDotsHorizontal, IconPencil, IconTrash } from '@appwrite.io/pink-icons-svelte'; + import { + IconDotsHorizontal, + IconLockClosed, + IconPencil, + IconTrash + } from '@appwrite.io/pink-icons-svelte'; import { columns } from './store'; import DeleteRecordModal from './deleteRecordModal.svelte'; import EditRecordModal from './updateRecordModal.svelte'; - import type { DnsRecord } from '$lib/sdk/domains'; import DualTimeView from '$lib/components/dualTimeView.svelte'; + import type { PageData } from './$types'; + import type { Models } from '@appwrite.io/console'; - export let data; + export let data: PageData; let showEdit = false; let showDelete = false; - let selectedRecord: DnsRecord = null; + let selectedRecord: Models.DnsRecord = null; @@ -48,7 +55,15 @@ {record.type} {:else if column.id === 'value'} - + {@const isARecord = record.value === 'a.a.a.a'} + {#if isARecord} + +
+ Served by Appwrite +
+ {:else} + + {/if} {:else if column.id === 'ttl'} {record.ttl} @@ -58,7 +73,7 @@ {record?.priority ?? '-'} {:else if column.id === 'comment'} - + {record?.comment ?? '-'} {:else if column.id === '$createdAt'} @@ -68,44 +83,51 @@ {/each} - - { - e.preventDefault(); - toggle(e); - }}> - - + {#if record.lock} + + + DNS record is locked + + {:else} + + { + e.preventDefault(); + toggle(e); + }}> + + - - - { - e.preventDefault(); - selectedRecord = record; - showEdit = true; - toggle(e); - }}> - Update - - { - e.preventDefault(); - selectedRecord = record; - showDelete = true; - toggle(e); - }}> - Delete - - - - + + + { + e.preventDefault(); + selectedRecord = record; + showEdit = true; + toggle(e); + }}> + Update + + { + e.preventDefault(); + selectedRecord = record; + showDelete = true; + toggle(e); + }}> + Delete + + + + + {/if} diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/updateRecordModal.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/updateRecordModal.svelte index a559d79be..9155339ca 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/updateRecordModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/updateRecordModal.svelte @@ -13,15 +13,15 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { symmetricDifference } from '$lib/helpers/array'; import { deepClone } from '$lib/helpers/object'; - import type { DnsRecord } from '$lib/sdk/domains'; import { sdk } from '$lib/stores/sdk'; import { page } from '$app/state'; import { recordTypes } from './store'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; + import type { Models } from '@appwrite.io/console'; export let show = false; - export let selectedRecord: DnsRecord; + export let selectedRecord: Models.DnsRecord; let record = deepClone(selectedRecord); let error = ''; diff --git a/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte b/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte index 17183c1e9..a131eb5b2 100644 --- a/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte +++ b/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte @@ -1,7 +1,6 @@
@@ -53,8 +69,9 @@
- {domain.domain} + + {domain.domain} + {#if verified === false} - {:else} - + {:else if verified === true} + {/if} diff --git a/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte b/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte index 5f4853a3e..453cc79e0 100644 --- a/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte @@ -4,16 +4,16 @@ import { sdk } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import { invalidate } from '$app/navigation'; - import type { Domain } from '$lib/sdk/domains'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; import { Dependencies } from '$lib/constants'; import { Input, InteractiveText, Layout, Table, Typography } from '@appwrite.io/pink-svelte'; import { Link } from '$lib/elements'; import { consoleVariables } from '$routes/(console)/store'; + import type { Models } from '@appwrite.io/console'; export let show = false; - export let selectedDomain: Domain; - let nameservers = $consoleVariables?._APP_DOMAINS_NAMESERVERS.split(',') ?? [ + export let selectedDomain: Models.Domain; + const nameservers = $consoleVariables?._APP_DOMAINS_NAMESERVERS.split(',') ?? [ 'ns1.appwrite.io', 'ns2.appwrite.io' ]; @@ -23,21 +23,22 @@ try { const domain = await sdk.forConsole.domains.updateNameservers(selectedDomain.$id); show = false; - if (domain.nameservers === 'Appwrite') { + if (domain.nameservers.toLowerCase() === 'appwrite') { addNotification({ - type: 'error', + type: 'success', message: `${selectedDomain.domain} has been verified` }); } else { addNotification({ type: 'error', - message: `Domain verification failed. Please check your domain settings or try again later` + message: + 'Domain verification failed. Please check your domain settings or try again later' }); } await invalidate(Dependencies.DOMAINS); trackEvent(Submit.DomainUpdateVerification); } catch (e) { - error = e; + error = e.message; trackError(e, Submit.DomainUpdateVerification); } } diff --git a/src/routes/(console)/organization-[organization]/header.svelte b/src/routes/(console)/organization-[organization]/header.svelte index 8e847ee51..75f95a336 100644 --- a/src/routes/(console)/organization-[organization]/header.svelte +++ b/src/routes/(console)/organization-[organization]/header.svelte @@ -30,7 +30,7 @@ }); $: avatars = $members.memberships?.map((m) => m.userName || m.userEmail) ?? []; - $: organizationId = page.params.organization; + $: organizationId = $organization?.$id ?? page.params.organization; $: path = `${base}/organization-${organizationId}`; $: tabs = [ { @@ -45,7 +45,6 @@ event: 'domains', title: 'Domains', disabled: !isCloud - // disabled: !(isCloud && $canSeeDomains) //TODO: enable this before release }, { href: `${path}/members`, @@ -76,7 +75,7 @@ ].filter((tab) => !tab.disabled); -{#if $organization?.$id && !isStudio} +{#if $organization.$id && !isStudio} diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte index e943c7158..ce1d59ec8 100644 --- a/src/routes/(console)/organization-[organization]/members/+page.svelte +++ b/src/routes/(console)/organization-[organization]/members/+page.svelte @@ -8,12 +8,13 @@ import Upgrade from '$lib/components/roles/upgrade.svelte'; import { getRoleLabel } from '$lib/stores/billing'; import { addNotification } from '$lib/stores/notifications'; - import { newMemberModal, organization } from '$lib/stores/organization'; + import { currentPlan, newMemberModal, organization } from '$lib/stores/organization'; import { isOwner } from '$lib/stores/roles'; import { sdk } from '$lib/stores/sdk'; import type { Models } from '@appwrite.io/console'; import Delete from '../deleteMember.svelte'; import Edit from './edit.svelte'; + import { isCloud } from '$lib/system'; import { IconDotsHorizontal, IconInfo, @@ -69,7 +70,11 @@ Members - newMemberModal.set(true)} event="create_user" size="s"> + newMemberModal.set(true)} + disabled={isCloud ? !$currentPlan?.addons?.seats?.supported : false}> Invite @@ -101,7 +106,7 @@ 2FA - {#each data.organizationMembers.memberships as member, index} + {#each data.organizationMembers.memberships as member, index (member.$id)} @@ -136,15 +141,17 @@
- { - selectedMember = member; - showEdit = true; - showDropdown[index] = false; - }}> - Edit role - + {#if isCloud && $currentPlan?.supportsOrganizationRoles} + { + selectedMember = member; + showEdit = true; + showDropdown[index] = false; + }}> + Edit role + + {/if} {#if member.invited && !member.joined} { - const countryList = await sdk.forProject.locale.listCountries(); - const locale = await sdk.forProject.locale.get(); + /* use console sdk as project is not always available here. */ + const locale = await sdk.forConsole.locale.get(); + const countryList = await sdk.forConsole.locale.listCountries(); + if (locale.countryCode) { country = locale.countryCode; } diff --git a/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte b/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte index 4a40fc09a..e10085705 100644 --- a/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte +++ b/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte @@ -40,8 +40,10 @@ let error: string; onMount(async () => { - const countryList = await sdk.forProject.locale.listCountries(); - const locale = await sdk.forProject.locale.get(); + /* use console sdk as project is not always available here. */ + const locale = await sdk.forConsole.locale.get(); + const countryList = await sdk.forConsole.locale.listCountries(); + if (locale.countryCode) { country = locale.countryCode; } diff --git a/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte index ad4d75381..82b685a60 100644 --- a/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte +++ b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte @@ -17,7 +17,7 @@ import { Table, Tabs, Alert } from '@appwrite.io/pink-svelte'; import DeleteOrganizationEstimation from './deleteOrganizationEstimation.svelte'; import { onMount } from 'svelte'; - import type { EstimationDeleteOrganization, Invoice, InvoiceList } from '$lib/sdk/billing'; + import type { EstimationDeleteOrganization, InvoiceList } from '$lib/sdk/billing'; export let showDelete = false; export let invoices: InvoiceList; @@ -41,7 +41,7 @@ await goto(`${base}/account/organizations`); } else { await goto( - isStudio ? `${base}/account/organizations` : `${base}/onboarding/create-project` + isStudio ? `${base}/account/organizations` : `${base}/onboarding/create-organization` ); } await invalidate(Dependencies.ACCOUNT); diff --git a/src/routes/(console)/organization-[organization]/settings/invoicesTable.svelte b/src/routes/(console)/organization-[organization]/settings/invoicesTable.svelte index 93678a27d..84b7ca609 100644 --- a/src/routes/(console)/organization-[organization]/settings/invoicesTable.svelte +++ b/src/routes/(console)/organization-[organization]/settings/invoicesTable.svelte @@ -42,7 +42,7 @@ {/if} - {#each invoices as invoice, i} + {#each invoices as invoice (invoice.$id)} {@const status = invoice.status} diff --git a/src/routes/(console)/organization-[organization]/store.ts b/src/routes/(console)/organization-[organization]/store.ts index aae6830f4..56ea1a018 100644 --- a/src/routes/(console)/organization-[organization]/store.ts +++ b/src/routes/(console)/organization-[organization]/store.ts @@ -1,10 +1,9 @@ import { page } from '$app/stores'; -import type { Models } from '@appwrite.io/console'; -import { derived, writable } from 'svelte/store'; -import type { RegionList } from '$lib/sdk/billing'; +import { derived } from 'svelte/store'; import { sdk } from '$lib/stores/sdk'; +import type { Models } from '@appwrite.io/console'; +import { regions } from '$lib/stores/organization'; -export const regions = writable(undefined); export const regionFlagUrls = derived(regions, ($regions) => { if (!$regions?.regions?.length) return []; diff --git a/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte b/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte index 19fc2bf37..f3e44e97f 100644 --- a/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte +++ b/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte @@ -1,5 +1,5 @@ -{#if $organization?.$id && $organization?.status === teamStatusReadonly && $organization?.remarks === billingLimitOutstandingInvoice && $readOnly && !hideBillingHeaderRoutes.includes($page.url.pathname)} +{#if $organization?.$id && $organization?.status === teamStatusReadonly && $organization?.remarks === billingLimitOutstandingInvoice && $readOnly && !hideBillingHeaderRoutes.includes(page.url.pathname)} Your organization’s access to resources has been restricted due to unpaid invoices. diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts index 8ee61dcca..0debe2645 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts @@ -56,7 +56,7 @@ export const load: PageLoad = async ({ params, parent }) => { sdk.forConsole.billing.getOrganizationPlan(org.$id) ]); - const projectNames: { [key: string]: Models.Project } = {}; + const projects: { [key: string]: Models.Project } = {}; if (usage?.projects?.length > 0) { // in batches of 100 (the max number of values in a query) const requests = []; @@ -75,17 +75,17 @@ export const load: PageLoad = async ({ params, parent }) => { const responses = await Promise.all(requests); for (const response of responses) { for (const project of response.projects) { - projectNames[project.$id] = project; + projects[project.$id] = project; } } } return { - organizationUsage: usage, - projectNames, + plan, invoices, + projects, currentInvoice, organizationMembers, - plan + organizationUsage: usage }; }; diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte index 8cc16ff45..36be4abcc 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte @@ -6,6 +6,7 @@ import { onMount } from 'svelte'; import { Accordion, Table } from '@appwrite.io/pink-svelte'; import { base } from '$app/paths'; + import type { PageData } from './$types'; type Metric = | 'users' @@ -21,7 +22,7 @@ type DatabaseOperationMetric = Extract; - export let data; + export let data: PageData; export let projects: OrganizationUsage['projects']; export let metric: Metric | undefined = undefined; export let estimate: Estimate | undefined = undefined; @@ -37,9 +38,14 @@ } function getProjectUsageLink(projectId: string): string { - return `${base}/project-${projectId}/settings/usage`; + const region = data.projects[projectId]?.region ?? 'fra'; + return `${base}/project-${region}-${projectId}/settings/usage`; } + // function getProjectName(projectId: string): string { + // return data.projects[projectId]?.name ?? 'Unknown'; + // } + function groupByProject( metric: Metric | undefined, estimate?: Estimate, @@ -53,12 +59,14 @@ }> { const data = []; for (const project of projects) { + const projectId = project.projectId; + if (metric) { const usage = project[metric]; if (!usage) continue; data.push({ - projectId: project.projectId, + projectId, usage: usage ?? 0, estimate: estimate ? project[estimate] : undefined }); @@ -68,7 +76,7 @@ if (reads || writes) { data.push({ - projectId: project.projectId, + projectId, databasesReads: reads, databasesWrites: writes }); @@ -130,7 +138,7 @@ {#if !$canSeeProjects} - {data.projectNames[project.projectId]?.name ?? 'Unknown'} + {data.projects[project.projectId]?.name ?? 'Unknown'} {format(project.databasesReads ?? 0)} @@ -148,7 +156,7 @@ {:else} - {data.projectNames[project.projectId]?.name ?? 'Unknown'} + {data.projects[project.projectId]?.name ?? 'Unknown'} {format(project.databasesReads ?? 0)} diff --git a/src/routes/(console)/project-[project]/auth/templates/+page.svelte b/src/routes/(console)/project-[project]/auth/templates/+page.svelte deleted file mode 100644 index c97290b4d..000000000 --- a/src/routes/(console)/project-[project]/auth/templates/+page.svelte +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - {#if !data.project.smtpEnabled} - - Configure a custom SMTP server to enable custom email templates and prevent emails from - being labeled as spam. - - - {/if} - - - - Email templates - - Use templates to send and process account management emails. - - Learn more - - - - openEmail('verification')}> - - - Send a verification email to users that sign in with their email and - password. - - - - - { - e.preventDefault(); - openEmail('magicSession'); - }}> - - - Send an email to users that sign in with a magic URL. - - - - - { - e.preventDefault(); - openEmail('otpSession'); - }}> - - - Send an email to users that sign in with a email OTP. - - - - { - e.preventDefault(); - openEmail('recovery'); - }}> - - - Send a recovery email to users that forget their password. - - - { - e.preventDefault(); - openEmail('invitation'); - }}> - - - Send an invitation email to become a member of your project. - - - - { - e.preventDefault(); - openEmail('mfaChallenge'); - }}> - - - Send a two-factor authentication email to a user. - - - { - e.preventDefault(); - openEmail('sessionAlert'); - }}> - - - Send an email to users when a new session is created. - - - - - - - - - {#if isCloud && $currentPlan.emailBranding} - - {/if} - diff --git a/src/routes/(console)/project-[project]/auth/templates/+page.ts b/src/routes/(console)/project-[project]/auth/templates/+page.ts deleted file mode 100644 index e797770de..000000000 --- a/src/routes/(console)/project-[project]/auth/templates/+page.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { sdk } from '$lib/stores/sdk'; - -export const load = async () => { - const codes = await sdk.forProject.locale.listCodes(); - return { - localeCodes: codes.localeCodes - }; -}; diff --git a/src/routes/(console)/project-[project]/auth/templates/store.ts b/src/routes/(console)/project-[project]/auth/templates/store.ts deleted file mode 100644 index 3ddf494d3..000000000 --- a/src/routes/(console)/project-[project]/auth/templates/store.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { page } from '$app/stores'; -import type { Models } from '@appwrite.io/console'; -import { derived, writable } from 'svelte/store'; - -export const localeCodes = derived(page, ($page) => $page.data.localeCodes as Models.LocaleCode[]); - -export const emailTemplate = writable({ - type: null, - locale: null, - message: null, - senderName: '', - senderEmail: null, - replyTo: null, - subject: null -}); - -export const baseEmailTemplate = writable({ - type: null, - locale: null, - message: null, - senderName: null, - senderEmail: null, - replyTo: null, - subject: null -}); - -export const smsTemplate = writable({ - type: null, - locale: null, - message: null -}); -export const baseSmsTemplate = writable({ - type: null, - locale: null, - message: null -}); diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.ts b/src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.ts deleted file mode 100644 index 15b388871..000000000 --- a/src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { sdk } from '$lib/stores/sdk'; -import type { PageLoad } from './$types'; - -export const load: PageLoad = async ({ params }) => { - return { - memberships: await sdk.forProject.users.listMemberships(params.user) - }; -}; diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.svelte index ee7ba3e6b..e69de29bb 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.svelte +++ b/src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.svelte @@ -1,129 +0,0 @@ - - - - {#if data.sessions.total} - - - - - - Client - Location - IP - - - {#each data.sessions.sessions as session} - {@const browser = getBrowser(session.clientCode)} - - - - {#if session.clientName} -
- {#if browser} - {session.clientName} - {:else} - - {/if} -
-

- {session.clientName} - {session.clientVersion} on {session.osName} - {session.osVersion} -

- {:else} - -

Unknown

- {/if} - -
-
- - {#if session.countryCode !== '--'} - {session.countryName} - {:else} - Unknown - {/if} - - - {session.ip} - - - - -
- {/each} -
- {:else} - - - - {#if consoleProfile.hasAppwriteDocumentation} - - {/if} - - - - {/if} -
- - - diff --git a/src/routes/(console)/project-[project]/functions/create-function/+page.ts b/src/routes/(console)/project-[project]/functions/create-function/+page.ts deleted file mode 100644 index 935756a39..000000000 --- a/src/routes/(console)/project-[project]/functions/create-function/+page.ts +++ /dev/null @@ -1,12 +0,0 @@ -export const load = async ({ parent, url }) => { - const { templatesList, installations, runtimesList } = await parent(); - - return { - installations, - installation: installations.installations.find( - (installation) => installation.$id === url.searchParams.get('installation') - ), - runtimesList, - templatesList - }; -}; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.ts deleted file mode 100644 index e89c914b0..000000000 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { sdk } from '$lib/stores/sdk'; -import { Query } from '@appwrite.io/console'; -import { RuleTrigger, RuleType } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants'; - -export const load = async ({ parent, depends }) => { - const { function: func } = await parent(); - depends(Dependencies.DOMAINS, Dependencies.FUNCTION_DOMAINS); - - const [domains, installations] = await Promise.all([ - sdk.forProject.proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('trigger', RuleTrigger.MANUAL) - ]), - sdk.forProject.vcs.listInstallations() - ]); - - return { - func, - domains, - installations, - branches: - func?.installationId && func?.providerRepositoryId - ? await sdk.forProject.vcs.listRepositoryBranches( - func.installationId, - func.providerRepositoryId - ) - : undefined - }; -}; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts deleted file mode 100644 index dfaaa1a60..000000000 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { sdk } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants.js'; -import { isCloud } from '$lib/system'; -import type { Domain, DomainsList } from '$lib/sdk/domains.js'; - -export const load = async ({ parent, depends, params }) => { - depends(Dependencies.DOMAINS); - - let domain: Domain; - let domainsList: DomainsList; - if (isCloud) { - [domain, domainsList] = await Promise.all([ - sdk.forConsole.domains.get(params.domain), - sdk.forConsole.domains.list() - ]); - } - - return { - domain, - domainsList - }; -}; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte deleted file mode 100644 index ee525786a..000000000 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte +++ /dev/null @@ -1,169 +0,0 @@ - - - (open = false)} /> - - -
- - - Execution ID - - {selectedLog?.$id} - - - - - - - -
- {#if selectedLog} - - - - - - - Method - - - {selectedLog.requestMethod} - - - - - Status code - - - = 400 - ? 'error' - : selectedLog.responseStatusCode === 0 - ? undefined - : 'success'} /> - - - - - Status - - - -
- - -
- - {`Scheduled to execute on ${toLocaleDateTime(selectedLog.scheduledAt)}`} - -
-
- - - - Triggered by - - - {capitalize(selectedLog.trigger)} - - - - - - Duration - - - {calculateTime(selectedLog.duration)} - - - - - - Created - - - {capitalize(timeFromNow(selectedLog.$createdAt))} - - -
- - - Path - -
- -
-
-
-
- - - - - - -
- {/if} -
diff --git a/src/routes/(console)/project-[project]/messaging/providers/create.svelte b/src/routes/(console)/project-[project]/messaging/providers/create.svelte deleted file mode 100644 index 57c6fd29b..000000000 --- a/src/routes/(console)/project-[project]/messaging/providers/create.svelte +++ /dev/null @@ -1,242 +0,0 @@ - - - -
- -
- -
-
- -
- - - -
-
- - - - Need a hand? - - {#if providers[$providerType].providers[$provider].needAHand} - {@const needAHand = providers[$providerType].providers[$provider].needAHand} - - - {#each needAHand as p} -

- {@html p} -

- {/each} -
-
- {/if} - - { - $newMemberModal = true; - }} - title="Invite a team member" - icon={IconUserGroup} /> -
-
-
-
- {#if $newMemberModal} - - {/if} -
diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte deleted file mode 100644 index 0d327972d..000000000 --- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte +++ /dev/null @@ -1,243 +0,0 @@ - - -
- - Settings - Configure the settings to enable {displayName} to send {message}, or (newMemberModal = true)}>invite a team member to complete the - provider settings. - - - {#if ready} - - {/if} - - - -
- -
-
-
-
- - diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/step4.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/step4.svelte deleted file mode 100644 index 96821680e..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/step4.svelte +++ /dev/null @@ -1,19 +0,0 @@ - - - - All set -

- {#if isFirstProject} - Congratulations on adding the first platform to your project! Start exploring by - creating users, adding a database to your project, or uploading files to a bucket. - {:else} - Congratulations on adding another platform to your project! Start building by adding a - database, uploading files to a bucket and more via your dashboard. - {/if} -

-
diff --git a/src/routes/(console)/project-[project]/settings/domains/add-domain/+page.ts b/src/routes/(console)/project-[project]/settings/domains/add-domain/+page.ts deleted file mode 100644 index cd583fe6b..000000000 --- a/src/routes/(console)/project-[project]/settings/domains/add-domain/+page.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Query } from '@appwrite.io/console'; -import { sdk } from '$lib/stores/sdk'; -import { RuleTrigger, RuleType } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants.js'; - -export const load = async ({ depends }) => { - depends(Dependencies.DOMAINS); - - const [rules] = await Promise.all([ - sdk.forProject.proxy.listRules([ - Query.equal('type', RuleType.API), - Query.equal('trigger', RuleTrigger.MANUAL) - ]) - ]); - - return { - rules - }; -}; diff --git a/src/routes/(console)/project-[project]/settings/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[project]/settings/domains/add-domain/verify-[domain]/+page.ts deleted file mode 100644 index 6e84864d1..000000000 --- a/src/routes/(console)/project-[project]/settings/domains/add-domain/verify-[domain]/+page.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { sdk } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants.js'; -import { isCloud } from '$lib/system'; -import type { Domain, DomainsList } from '$lib/sdk/domains.js'; - -export const load = async ({ depends, params }) => { - depends(Dependencies.DOMAINS); - - let domain: Domain; - let domainsList: DomainsList; - if (isCloud) { - [domain, domainsList] = await Promise.all([ - sdk.forConsole.domains.get(params.domain), - sdk.forConsole.domains.list() - ]); - } - - return { - domain, - domainsList - }; -}; diff --git a/src/routes/(console)/project-[project]/settings/migrations/(import)/step1.svelte b/src/routes/(console)/project-[project]/settings/migrations/(import)/step1.svelte deleted file mode 100644 index badd138cf..000000000 --- a/src/routes/(console)/project-[project]/settings/migrations/(import)/step1.svelte +++ /dev/null @@ -1,141 +0,0 @@ - - - - Source - - Select a source platform with the project you want to migrate. - Learn about which platforms are supported. - -
- {#each Object.entries(providers) as [key, value]} - - {/each} -
- - {#if $provider.provider === 'appwrite'} - - - - {:else if $provider.provider === 'firebase'} -
- -
- {:else if $provider.provider === 'supabase'} -

Postgres credentials

- - - - - -

Supabase credentials

- - - - {:else if $provider.provider === 'nhost'} - - - - - - - {/if} -
diff --git a/src/routes/(console)/project-[project]/settings/migrations/(import)/step2.svelte b/src/routes/(console)/project-[project]/settings/migrations/(import)/step2.svelte deleted file mode 100644 index a78648131..000000000 --- a/src/routes/(console)/project-[project]/settings/migrations/(import)/step2.svelte +++ /dev/null @@ -1,22 +0,0 @@ - - - - Resources - - Select the resources you need to migrate to Appwrite. Some resources can be migrated, but - with limitations. - Learn about which resources are supported. - - - diff --git a/src/routes/(console)/project-[project]/settings/migrations/(import)/wizard.svelte b/src/routes/(console)/project-[project]/settings/migrations/(import)/wizard.svelte deleted file mode 100644 index dae2b15a6..000000000 --- a/src/routes/(console)/project-[project]/settings/migrations/(import)/wizard.svelte +++ /dev/null @@ -1,101 +0,0 @@ - - - diff --git a/src/routes/(console)/project-[project]/sites/+page.svelte b/src/routes/(console)/project-[project]/sites/+page.svelte deleted file mode 100644 index 6e0ab1832..000000000 --- a/src/routes/(console)/project-[project]/sites/+page.svelte +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - {#if $canWriteSites} - - {/if} - - - {#if data.siteList.total} - {#if data.view === View.Grid} - - {:else} - - {/if} - - {:else if data.search} - - {:else} - (show = true)}> - - {/if} - - - diff --git a/src/routes/(console)/project-[project]/sites/create-site/+layout.ts b/src/routes/(console)/project-[project]/sites/create-site/+layout.ts deleted file mode 100644 index 30593d956..000000000 --- a/src/routes/(console)/project-[project]/sites/create-site/+layout.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { sdk } from '$lib/stores/sdk'; - -export const load = async () => { - const [installations, frameworks] = await Promise.all([ - sdk.forProject.vcs.listInstallations(), - sdk.forProject.sites.listFrameworks() - ]); - return { - installations, - frameworks - }; -}; diff --git a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.ts b/src/routes/(console)/project-[project]/sites/create-site/finish/+page.ts deleted file mode 100644 index 3fff8af30..000000000 --- a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { RuleType, sdk } from '$lib/stores/sdk'; -import { error } from '@sveltejs/kit'; -import { Query } from '@appwrite.io/console'; -import { Dependencies } from '$lib/constants'; -import { DeploymentResourceType } from '$lib/stores/sdk'; - -export const load = async ({ url, depends }) => { - depends(Dependencies.SITE); - if (!url.searchParams.has('site')) error(404, 'Deployment is not optional'); - const siteId = url.searchParams.get('site'); - const site = await sdk.forProject.sites.get(siteId); - const proxyRuleList = await sdk.forProject.proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', siteId), - Query.equal('deploymentId', site.deploymentId) - ]); - return { - site, - deployment: await sdk.forProject.sites.getDeployment(siteId, site.deploymentId), - proxyRuleList - }; -}; diff --git a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.ts b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.ts deleted file mode 100644 index d5a966f74..000000000 --- a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { sdk } from '$lib/stores/sdk'; - -export const load = async ({ parent }) => { - const { frameworks } = await parent(); - - return { - frameworks, - template: await sdk.forProject.sites.getTemplate('starter-for-js') - }; -}; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/+layout.ts b/src/routes/(console)/project-[project]/sites/site-[site]/+layout.ts deleted file mode 100644 index 84bc20673..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/+layout.ts +++ /dev/null @@ -1,20 +0,0 @@ -import Breadcrumbs from './breadcrumbs.svelte'; -import Header from './header.svelte'; -import { Dependencies } from '$lib/constants'; -import { sdk } from '$lib/stores/sdk'; -import { error } from '@sveltejs/kit'; - -export const load = async ({ depends, params }) => { - depends(Dependencies.SITE); - try { - const [site] = await Promise.all([sdk.forProject.sites.get(params.site)]); - - return { - site, - header: Header, - breadcrumbs: Breadcrumbs - }; - } catch (e) { - error(e.code, e.message); - } -}; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts b/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts deleted file mode 100644 index 1aebb9875..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { sdk } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants'; -import { Query } from '@appwrite.io/console'; -import { RuleType } from '$lib/stores/sdk'; -import { DeploymentResourceType } from '$lib/stores/sdk'; - -export const load = async ({ params, depends, parent }) => { - depends(Dependencies.SITE); - depends(Dependencies.SITES_DOMAINS); - const { site } = await parent(); - - const [deploymentList, prodReadyDeployments, proxyRuleList] = await Promise.all([ - sdk.forProject.sites.listDeployments(params.site, [Query.limit(4), Query.orderDesc('')]), - sdk.forProject.sites.listDeployments(params.site, [ - Query.equal('status', 'ready'), - Query.equal('activate', true), - Query.orderDesc('') - ]), - sdk.forProject.proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', site.$id), - Query.equal('deploymentId', site.deploymentId), - Query.orderDesc('') - ]) - ]); - - const deployment = deploymentList?.total - ? await sdk.forProject.sites.getDeployment(params.site, site.deploymentId) - : null; - return { - site, - deploymentList, - deployment, - proxyRuleList, - prodReadyDeployments, - hasProdReadyDeployments: - prodReadyDeployments?.deployments?.filter((d) => d?.$id !== deployment?.$id).length > 0 - }; -}; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.ts b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.ts deleted file mode 100644 index 76275be7a..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Query } from '@appwrite.io/console'; -import { sdk } from '$lib/stores/sdk'; -import { RuleTrigger, RuleType } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants.js'; - -export const load = async ({ parent, depends }) => { - const { site } = await parent(); - depends(Dependencies.DOMAINS, Dependencies.SITES_DOMAINS); - - const [rules, installations] = await Promise.all([ - sdk.forProject.proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('trigger', RuleTrigger.MANUAL) - ]), - sdk.forProject.vcs.listInstallations() - ]); - - return { - site, - rules, - installations, - branches: - site?.installationId && site?.providerRepositoryId - ? await sdk.forProject.vcs.listRepositoryBranches( - site.installationId, - site.providerRepositoryId - ) - : undefined - }; -}; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts deleted file mode 100644 index db8caef3a..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { sdk } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants.js'; -import { isCloud } from '$lib/system'; -import type { Domain, DomainsList } from '$lib/sdk/domains.js'; - -export const load = async ({ parent, depends, params }) => { - const { site } = await parent(); - depends(Dependencies.DOMAINS); - - let domain: Domain; - let domainsList: DomainsList; - if (isCloud) { - [domain, domainsList] = await Promise.all([ - sdk.forConsole.domains.get(params.domain), - sdk.forConsole.domains.list() - ]); - } - - return { - site, - domain, - domainsList - }; -}; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte deleted file mode 100644 index 7026fbd02..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte +++ /dev/null @@ -1,135 +0,0 @@ - - - (open = false)} /> - - -
- - - Log ID - - {selectedLog?.$id} - - - - - - - -
- {#if selectedLog} - - - - - - - - Method - - - {selectedLog.requestMethod} - - - - - Status code - - - = 400 - ? 'error' - : 'success'} /> - - - - - Duration - - - {calculateTime(selectedLog.duration)} - - - - - Created - - - {capitalize(timeFromNow(selectedLog.$createdAt))} - - - - - - - - Path - -
- -
-
-
-
- - - - - - -
- {/if} -
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/table.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/table.svelte deleted file mode 100644 index d87008b87..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/table.svelte +++ /dev/null @@ -1,62 +0,0 @@ - - - - - {#each filteredColumns as { id, title }} - {title} - {/each} - - {#each logs.executions as log} - { - e.stopPropagation(); - openSheet = true; - selectedLogId = log.$id; - }}> - {#each filteredColumns as column} - - {#if column.id === '$id'} - {#key column.id} - {log.$id} - {/key} - {:else if column.id === 'requestMethod'} - - {log.requestMethod} - - {:else if column.id === 'responseStatusCode'} -
- = 400 ? 'error' : 'success'} - content={log.responseStatusCode.toString()} /> -
- {:else if column.id === 'requestPath'} - - {log.requestPath} - - {:else if column.id === '$createdAt'} - - {/if} -
- {/each} -
- {/each} -
- - diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte deleted file mode 100644 index 8f13ac33c..000000000 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte +++ /dev/null @@ -1,141 +0,0 @@ - - - - Use the token-based URL below to access this file securely. - - {#if error} - - Something went wrong, could not generate the URL. - - {:else} - {@const tokenUrl = codeSnippets[selectedTab]} - - - {#each ['Preview', 'View', 'Download'] as cat} - (selectedTab = cat)} - active={selectedTab === cat}> - {cat} - - {/each} - - - - {getMoreInfo()} - - {#if !token.expire} - - This token doesn't expire. Be cautious when sharing links. - - {/if} - - - {/if} - - - - diff --git a/src/routes/(console)/project-[project]/+error.svelte b/src/routes/(console)/project-[region]-[project]/+error.svelte similarity index 100% rename from src/routes/(console)/project-[project]/+error.svelte rename to src/routes/(console)/project-[region]-[project]/+error.svelte diff --git a/src/routes/(console)/project-[project]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/+layout.svelte similarity index 73% rename from src/routes/(console)/project-[project]/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/+layout.svelte index cda6f63ec..b20527e89 100644 --- a/src/routes/(console)/project-[project]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/+layout.svelte @@ -1,6 +1,6 @@ - + {provider.name} OAuth2 settings -

+

To use {provider.name} authentication in your application, first fill in this form. For more info you can

URI

+ value={`${getApiEndpoint(page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} /> diff --git a/src/routes/(console)/project-[project]/auth/(providers)/mainOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte similarity index 93% rename from src/routes/(console)/project-[project]/auth/(providers)/mainOAuth.svelte rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte index b2b425924..1e318f3ce 100644 --- a/src/routes/(console)/project-[project]/auth/(providers)/mainOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte @@ -2,12 +2,12 @@ import { page } from '$app/state'; import { CopyInput, Modal } from '$lib/components'; import { Button, InputPassword, InputSwitch, InputText } from '$lib/elements/forms'; - import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; import type { Models } from '@appwrite.io/console'; import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; import { Link, Alert } from '@appwrite.io/pink-svelte'; + import { getApiEndpoint } from '$lib/stores/sdk'; const projectId = page.params.project; @@ -68,7 +68,7 @@

URI

+ value={`${getApiEndpoint(page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/(console)/project-[project]/auth/(providers)/microsoftOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/microsoftOAuth.svelte similarity index 94% rename from src/routes/(console)/project-[project]/auth/(providers)/microsoftOAuth.svelte rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/microsoftOAuth.svelte index 04dd375a5..3d874ab27 100644 --- a/src/routes/(console)/project-[project]/auth/(providers)/microsoftOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/microsoftOAuth.svelte @@ -3,10 +3,10 @@ import { CopyInput, Modal } from '$lib/components'; import { Button, InputPassword, InputSwitch, InputText } from '$lib/elements/forms'; import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; - import { sdk } from '$lib/stores/sdk'; + import { getApiEndpoint } from '$lib/stores/sdk'; + import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; - import type { Models } from '@appwrite.io/console'; import { Alert } from '@appwrite.io/pink-svelte'; const projectId = page.params.project; @@ -75,7 +75,7 @@

URI

+ value={`${getApiEndpoint(page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/(console)/project-[project]/auth/(providers)/oidcOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/oidcOAuth.svelte similarity index 92% rename from src/routes/(console)/project-[project]/auth/(providers)/oidcOAuth.svelte rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/oidcOAuth.svelte index 5c7615255..394c9fcf9 100644 --- a/src/routes/(console)/project-[project]/auth/(providers)/oidcOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/oidcOAuth.svelte @@ -3,10 +3,10 @@ import { CopyInput, Modal } from '$lib/components'; import { Button, InputPassword, InputSwitch, InputText } from '$lib/elements/forms'; import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; - import { sdk } from '$lib/stores/sdk'; + import { getApiEndpoint } from '$lib/stores/sdk'; + import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; - import type { Models } from '@appwrite.io/console'; import { Alert } from '@appwrite.io/pink-svelte'; const projectId = page.params.project; @@ -65,9 +65,8 @@ : provider.secret; - - {provider.name} OAuth2 settings -

+ +

To use {provider.name} authentication in your application, first fill in this form. For more info you can

URI

+ value={`${getApiEndpoint(page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} /> diff --git a/src/routes/(console)/project-[project]/auth/(providers)/oktaOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/oktaOAuth.svelte similarity index 94% rename from src/routes/(console)/project-[project]/auth/(providers)/oktaOAuth.svelte rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/oktaOAuth.svelte index bce050d49..9df850423 100644 --- a/src/routes/(console)/project-[project]/auth/(providers)/oktaOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/oktaOAuth.svelte @@ -3,7 +3,7 @@ import { CopyInput, Modal } from '$lib/components'; import { Button, InputPassword, InputSwitch, InputText } from '$lib/elements/forms'; import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; - import { sdk } from '$lib/stores/sdk'; + import { getApiEndpoint } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; import type { Models } from '@appwrite.io/console'; @@ -85,7 +85,7 @@

URI

+ value={`${getApiEndpoint(page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/(console)/project-[project]/auth/+layout.svelte b/src/routes/(console)/project-[region]-[project]/auth/+layout.svelte similarity index 85% rename from src/routes/(console)/project-[project]/auth/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/auth/+layout.svelte index 03963cdd1..674167aa3 100644 --- a/src/routes/(console)/project-[project]/auth/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/+layout.svelte @@ -17,7 +17,7 @@ label: 'Create user', callback: async () => { if (!page.url.pathname.endsWith('auth')) { - await goto(`${base}/project-${$project.$id}/auth`); + await goto(`${base}/project-${$project.region}-${$project.$id}/auth`); } showCreateUser.set(true); }, @@ -31,7 +31,7 @@ label: 'Create team', callback: async () => { if (!page.url.pathname.endsWith('teams')) { - await goto(`${base}/project-${$project.$id}/auth/teams`); + await goto(`${base}/project-${$project.region}-${$project.$id}/auth/teams`); } showCreateTeam.set(true); }, @@ -46,7 +46,7 @@ label: 'Go to teams', keys: ['g', 't'], callback() { - goto(`${base}/project-${$project.$id}/auth/teams`); + goto(`${base}/project-${$project.region}-${$project.$id}/auth/teams`); }, group: 'navigation', rank: 1, @@ -56,7 +56,7 @@ label: 'Go to usage', keys: ['g', 'u'], callback() { - goto(`${base}/project-${$project.$id}/auth/usage`); + goto(`${base}/project-${$project.region}-${$project.$id}/auth/usage`); }, group: 'navigation', rank: 1, @@ -66,7 +66,7 @@ label: 'Go to security', keys: ['g', 'e'], callback() { - goto(`${base}/project-${$project.$id}/auth/security`); + goto(`${base}/project-${$project.region}-${$project.$id}/auth/security`); }, group: 'navigation', rank: 1, @@ -76,7 +76,7 @@ label: 'Go to settings', keys: ['g', 's'], callback() { - goto(`${base}/project-${$project.$id}/auth/settings`); + goto(`${base}/project-${$project.region}-${$project.$id}/auth/settings`); }, group: 'navigation', rank: 1, diff --git a/src/routes/(console)/project-[project]/auth/+layout.ts b/src/routes/(console)/project-[region]-[project]/auth/+layout.ts similarity index 100% rename from src/routes/(console)/project-[project]/auth/+layout.ts rename to src/routes/(console)/project-[region]-[project]/auth/+layout.ts diff --git a/src/routes/(console)/project-[project]/auth/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/+page.svelte similarity index 94% rename from src/routes/(console)/project-[project]/auth/+page.svelte rename to src/routes/(console)/project-[region]-[project]/auth/+page.svelte index 7b22fa5c4..cd0f8295b 100644 --- a/src/routes/(console)/project-[project]/auth/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/+page.svelte @@ -19,7 +19,6 @@ import { Container } from '$lib/layout'; import type { Models } from '@appwrite.io/console'; import { writable } from 'svelte/store'; - import type { PageData } from './$types'; import Create from './createUser.svelte'; import { Badge, Icon, Table, Layout, Typography } from '@appwrite.io/pink-svelte'; import { Tag } from '@appwrite.io/pink-svelte'; @@ -30,9 +29,8 @@ import { View } from '$lib/helpers/load'; import { consoleProfile } from '$lib/system'; - export let data: PageData; + export let data; - const projectId = page.params.project; const columns = writable([ { id: '$id', title: 'User ID', type: 'string', width: 200 }, { id: 'name', title: 'Name', type: 'string', width: { min: 260 } }, @@ -50,7 +48,9 @@ ]); async function userCreated(event: CustomEvent>>) { - await goto(`${base}/project-${projectId}/auth/user-${event.detail.$id}`); + await goto( + `${base}/project-${page.params.region}-${page.params.project}/auth/user-${event.detail.$id}` + ); } @@ -76,7 +76,9 @@ {/each} {#each data.users.users as user} - + {#each $columns as { id } (id)} {#if id === '$id'} @@ -161,8 +163,10 @@ total={data.users.total} /> {:else if data.search} - + {:else} { +export const load: PageLoad = async ({ url, route, params }) => { const page = getPage(url); const search = getSearch(url); const limit = getLimit(url, route, PAGE_LIMIT); @@ -20,9 +20,8 @@ export const load: PageLoad = async ({ url, route }) => { limit, search, page, - users: await sdk.forProject.users.list( - [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], - search - ) + users: await sdk + .forProject(params.region, params.project) + .users.list([Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search) }; }; diff --git a/src/routes/(console)/project-[project]/auth/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/auth/breadcrumbs.svelte similarity index 76% rename from src/routes/(console)/project-[project]/auth/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/auth/breadcrumbs.svelte index 7fe41fa7c..db806d038 100644 --- a/src/routes/(console)/project-[project]/auth/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/breadcrumbs.svelte @@ -10,11 +10,11 @@ title: $organization?.name }, { - href: `${base}/project-${$project?.$id}`, + href: `${base}/project-${$project.region}-${$project?.$id}`, title: $project?.name }, { - href: `${base}/project-${$project?.$id}/auth`, + href: `${base}/project-${$project.region}-${$project?.$id}/auth`, title: 'Auth' } ]; diff --git a/src/routes/(console)/project-[project]/auth/createTeam.svelte b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte similarity index 91% rename from src/routes/(console)/project-[project]/auth/createTeam.svelte rename to src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte index 0f3d87ad9..dc7bd0cdc 100644 --- a/src/routes/(console)/project-[project]/auth/createTeam.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte @@ -1,4 +1,5 @@ @@ -55,7 +55,7 @@ {#each data.teams.teams as team} + href={`${base}/project-${region}-${project}/auth/teams/team-${team.$id}`}> @@ -79,7 +79,7 @@ total={data.teams.total} /> {:else if data.search} - diff --git a/src/routes/(console)/project-[project]/auth/teams/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts similarity index 67% rename from src/routes/(console)/project-[project]/auth/teams/+page.ts rename to src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts index 869168532..3f9e01793 100644 --- a/src/routes/(console)/project-[project]/auth/teams/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts @@ -4,7 +4,7 @@ import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ url, route }) => { +export const load: PageLoad = async ({ url, route, params }) => { const page = getPage(url); const search = getSearch(url); const limit = getLimit(url, route, PAGE_LIMIT); @@ -15,9 +15,8 @@ export const load: PageLoad = async ({ url, route }) => { limit, search, page, - teams: await sdk.forProject.teams.list( - [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], - search - ) + teams: await sdk + .forProject(params.region, params.project) + .teams.list([Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search) }; }; diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.svelte similarity index 100% rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.svelte diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts similarity index 84% rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.ts rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts index 6aabf0760..1134e2cf8 100644 --- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts @@ -11,7 +11,7 @@ export const load: LayoutLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - team: await sdk.forProject.teams.get(params.team) + team: await sdk.forProject(params.region, params.project).teams.get(params.team) }; } catch (e) { error(e.code, e.message); diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+page.svelte similarity index 100% rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+page.svelte diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.svelte similarity index 100% rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.svelte rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.svelte diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts similarity index 75% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts index bf12dffa4..7b33b57e8 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts @@ -12,9 +12,8 @@ export const load: PageLoad = async ({ params, url, route }) => { return { offset, limit, - logs: await sdk.forProject.messaging.listTopicLogs(params.topic, [ - Query.limit(limit), - Query.offset(offset) - ]) + logs: await sdk + .forProject(params.region, params.project) + .teams.listLogs(params.team, [Query.limit(limit), Query.offset(offset)]) }; }; diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/breadcrumbs.svelte similarity index 65% rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/breadcrumbs.svelte index 3a0eada37..3605cca75 100644 --- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/breadcrumbs.svelte @@ -1,5 +1,6 @@ + + + + + {#if !data.project.smtpEnabled} + + Configure a custom SMTP server to enable custom email templates and prevent emails from + being labeled as spam. + + + {/if} + + + + Email templates + + Use templates to send and process account management emails. + + Learn more + + + + {#each templates as section (section.key)} + event.detail && toggleAccordion(section.key)}> + + {section.description} + + + + {/each} + + + + + + + {#if isCloud && $currentPlan.emailBranding} + + {/if} + diff --git a/src/routes/(console)/project-[region]-[project]/auth/templates/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/templates/+page.ts new file mode 100644 index 000000000..e759c57b4 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/auth/templates/+page.ts @@ -0,0 +1,8 @@ +import { sdk } from '$lib/stores/sdk'; + +export const load = async ({ params }) => { + const codes = await sdk.forProject(params.region, params.project).locale.listCodes(); + return { + localeCodes: codes.localeCodes + }; +}; diff --git a/src/routes/(console)/project-[project]/auth/templates/email-footer-dark.png b/src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-dark.png similarity index 100% rename from src/routes/(console)/project-[project]/auth/templates/email-footer-dark.png rename to src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-dark.png diff --git a/src/routes/(console)/project-[project]/auth/templates/email-footer-light.png b/src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-light.png similarity index 100% rename from src/routes/(console)/project-[project]/auth/templates/email-footer-light.png rename to src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-light.png diff --git a/src/routes/(console)/project-[project]/auth/templates/email-footer-mobile-dark.png b/src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-mobile-dark.png similarity index 100% rename from src/routes/(console)/project-[project]/auth/templates/email-footer-mobile-dark.png rename to src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-mobile-dark.png diff --git a/src/routes/(console)/project-[project]/auth/templates/email-footer-mobile-light.png b/src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-mobile-light.png similarity index 100% rename from src/routes/(console)/project-[project]/auth/templates/email-footer-mobile-light.png rename to src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-mobile-light.png diff --git a/src/routes/(console)/project-[project]/auth/templates/email2FATemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/email2FATemplate.svelte similarity index 90% rename from src/routes/(console)/project-[project]/auth/templates/email2FATemplate.svelte rename to src/routes/(console)/project-[region]-[project]/auth/templates/email2FATemplate.svelte index 225df1882..1f4d37a27 100644 --- a/src/routes/(console)/project-[project]/auth/templates/email2FATemplate.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/templates/email2FATemplate.svelte @@ -9,13 +9,15 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Layout, Card } from '@appwrite.io/pink-svelte'; - const projectId = page.params.project; + export let loading = false; + let locale = 'en'; - let loading = false; + let isUpdating = false; + const projectId = page.params.project; async function onLocaleChange() { const timeout = setTimeout(() => { - loading = true; + isUpdating = true; }, 1000); try { const template = await loadEmailTemplate(projectId, 'mfaChallenge', locale); @@ -30,7 +32,7 @@ }); } finally { clearTimeout(timeout); - loading = false; + isUpdating = false; } } @@ -38,7 +40,7 @@ - + {'{{user}}'} {'{{project}}'} {'{{otp}}'} diff --git a/src/routes/(console)/project-[project]/auth/templates/emailInviteTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailInviteTemplate.svelte similarity index 90% rename from src/routes/(console)/project-[project]/auth/templates/emailInviteTemplate.svelte rename to src/routes/(console)/project-[region]-[project]/auth/templates/emailInviteTemplate.svelte index d645ec80d..262deda4d 100644 --- a/src/routes/(console)/project-[project]/auth/templates/emailInviteTemplate.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/templates/emailInviteTemplate.svelte @@ -9,13 +9,15 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Layout, Card } from '@appwrite.io/pink-svelte'; - const projectId = page.params.project; + export let loading = false; + let locale = 'en'; - let loading = false; + let isUpdating = false; + const projectId = page.params.project; async function onLocaleChange() { const timeout = setTimeout(() => { - loading = true; + isUpdating = true; }, 1000); try { const template = await loadEmailTemplate(projectId, 'invitation', locale); @@ -30,7 +32,7 @@ }); } finally { clearTimeout(timeout); - loading = false; + isUpdating = false; } } @@ -38,7 +40,7 @@ - + {'{{team}}'} {'{{user}}'} {'{{project}}'} diff --git a/src/routes/(console)/project-[project]/auth/templates/emailMagicUrlTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailMagicUrlTemplate.svelte similarity index 90% rename from src/routes/(console)/project-[project]/auth/templates/emailMagicUrlTemplate.svelte rename to src/routes/(console)/project-[region]-[project]/auth/templates/emailMagicUrlTemplate.svelte index 56189ce42..25dddfd19 100644 --- a/src/routes/(console)/project-[project]/auth/templates/emailMagicUrlTemplate.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/templates/emailMagicUrlTemplate.svelte @@ -9,14 +9,15 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Layout, Card } from '@appwrite.io/pink-svelte'; - const projectId = page.params.project; + export let loading = false; let locale = 'en'; - let loading = false; + let isUpdating = false; + const projectId = page.params.project; async function onLocaleChange() { const timeout = setTimeout(() => { - loading = true; + isUpdating = true; }, 1000); try { const template = await loadEmailTemplate(projectId, 'magicSession', locale); @@ -32,7 +33,7 @@ } finally { clearTimeout(timeout); - loading = false; + isUpdating = false; } } @@ -40,7 +41,7 @@ - + {'{{user}}'} {'{{project}}'} {'{{redirect}}'} diff --git a/src/routes/(console)/project-[project]/auth/templates/emailRecoveryTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailRecoveryTemplate.svelte similarity index 90% rename from src/routes/(console)/project-[project]/auth/templates/emailRecoveryTemplate.svelte rename to src/routes/(console)/project-[region]-[project]/auth/templates/emailRecoveryTemplate.svelte index 44c8fae42..9230a8809 100644 --- a/src/routes/(console)/project-[project]/auth/templates/emailRecoveryTemplate.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/templates/emailRecoveryTemplate.svelte @@ -9,14 +9,15 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Layout, Card } from '@appwrite.io/pink-svelte'; - const projectId = page.params.project; + export let loading = false; let locale = 'en'; - let loading = false; + let isUpdating = false; + const projectId = page.params.project; async function onLocaleChange() { const timeout = setTimeout(() => { - loading = true; + isUpdating = true; }, 1000); try { const template = await loadEmailTemplate(projectId, 'recovery', locale); @@ -30,8 +31,8 @@ message: error.message }); } finally { + isUpdating = false; clearTimeout(timeout); - loading = false; } } @@ -39,7 +40,7 @@ - + {'{{user}}'} {'{{project}}'} {'{{redirect}}'} diff --git a/src/routes/(console)/project-[project]/auth/templates/emailSessionAlertTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailSessionAlertTemplate.svelte similarity index 91% rename from src/routes/(console)/project-[project]/auth/templates/emailSessionAlertTemplate.svelte rename to src/routes/(console)/project-[region]-[project]/auth/templates/emailSessionAlertTemplate.svelte index c474f1a74..e9e67c156 100644 --- a/src/routes/(console)/project-[project]/auth/templates/emailSessionAlertTemplate.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/templates/emailSessionAlertTemplate.svelte @@ -9,13 +9,15 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Layout, Card } from '@appwrite.io/pink-svelte'; - const projectId = page.params.project; + export let loading = false; + let locale = 'en'; - let loading = false; + let isUpdating = false; + const projectId = page.params.project; async function onLocaleChange() { const timeout = setTimeout(() => { - loading = true; + isUpdating = true; }, 1000); try { const template = await loadEmailTemplate(projectId, 'sessionalert', locale); @@ -30,7 +32,7 @@ }); } finally { clearTimeout(timeout); - loading = false; + isUpdating = false; } } @@ -38,7 +40,7 @@ - + {'{{user}}'} {'{{project}}'} {'{{device}}'} diff --git a/src/routes/(console)/project-[project]/auth/templates/emailSignature.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailSignature.svelte similarity index 84% rename from src/routes/(console)/project-[project]/auth/templates/emailSignature.svelte rename to src/routes/(console)/project-[region]-[project]/auth/templates/emailSignature.svelte index e99af4250..8885f086e 100644 --- a/src/routes/(console)/project-[project]/auth/templates/emailSignature.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/templates/emailSignature.svelte @@ -15,7 +15,7 @@ Enable or disable Appwrite branding in your email template signature. - +
{#if $app.themeInUse === 'dark'} @@ -33,25 +33,21 @@
{#if $app.themeInUse === 'dark'} Email Signature Example {:else} Email Signature Example {/if}
- Upgrade to edit email signature - Upgrade to a {nextTier} plan to enable or disable Appwrite branding in your emails. + Upgrade to remove Appwrite branding + Upgrade to a {nextTier} plan to remove the Appwrite branding from your emails.
+ {/if} + + {#if data.sessions.total} + + + Browser and device + Session + Location + IP + + + + {#each data.sessions.sessions as session} + {@const browser = getBrowser(session.clientCode)} + + +
+
+ {#if browser} + {session.clientName} + {:else} + + {/if} +
+

+ {session.clientName} + {session.clientVersion} on {session.osName} + {session.osVersion} +

+ {#if session.current} + current session + {/if} +
+
+ + {session.clientType} + {session.countryName} + {session.ip} + + + +
+ {/each} +
+
+ {:else} + +
+

No sessions available

+ +
+
+ {/if} + + + + diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.ts similarity index 66% rename from src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.ts rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.ts index 20a1e6f4e..9d69ecb88 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.ts @@ -6,6 +6,8 @@ export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.SESSIONS); return { - sessions: await sdk.forProject.users.listSessions(params.user) + sessions: await sdk + .forProject(params.region, params.project) + .users.listSessions(params.user) }; }; diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/store.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/auth/user-[user]/store.ts rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/store.ts diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte similarity index 97% rename from src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.svelte rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte index 087596e67..28cdbeec4 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte @@ -2,7 +2,6 @@ import { Button } from '$lib/elements/forms'; import { PaginationWithLimit, ViewSelector, EmptyFilter } from '$lib/components'; import { Container } from '$lib/layout'; - import type { PageData } from './$types'; import Table from './table.svelte'; import { Filters, hasPageQueries } from '$lib/components/filters'; import { columns } from './store'; @@ -11,7 +10,7 @@ import { Card, Empty, Icon, Popover, Tag } from '@appwrite.io/pink-svelte'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; - export let data: PageData; + export let data; let showAdd = false; diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts similarity index 75% rename from src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.ts rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts index bb0f4968c..c3dab9c6a 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts @@ -16,19 +16,21 @@ export const load: PageLoad = async ({ params, url, route, depends }) => { const parsedQueries = queryParamToMap(query || '[]'); queries.set(parsedQueries); - const targets = await sdk.forProject.users.listTargets(params.user, [ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ]); + const targets = await sdk + .forProject(params.region, params.project) + .users.listTargets(params.user, [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ]); const promisesById: Record> = {}; targets.targets.forEach((target) => { if (target.providerId && !promisesById[target.providerId]) { - promisesById[target.providerId] = sdk.forProject.messaging.getProvider( - target.providerId - ); + promisesById[target.providerId] = sdk + .forProject(params.region, params.project) + .messaging.getProvider(target.providerId); } }); diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/targets/create.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/create.svelte similarity index 91% rename from src/routes/(console)/project-[project]/auth/user-[user]/targets/create.svelte rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/create.svelte index 2da0e4af7..90cd57c6e 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/targets/create.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/create.svelte @@ -28,14 +28,16 @@ const create = async () => { try { - await sdk.forProject.users.createTarget( - page.params.user, - id ? id : ID.unique(), - providerType, - identifier, - providerId ?? undefined, - name ?? undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .users.createTarget( + page.params.user, + id ? id : ID.unique(), + providerType, + identifier, + providerId ?? undefined, + name ?? undefined + ); show = false; addNotification({ type: 'success', diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/targets/store.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/auth/user-[user]/targets/store.ts rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/store.ts diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/targets/table.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte similarity index 89% rename from src/routes/(console)/project-[project]/auth/user-[user]/targets/table.svelte rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte index 9457616aa..88bb909a5 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/targets/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte @@ -4,8 +4,8 @@ import type { PageData } from './$types'; import { columns } from './store'; import { toLocaleDateTime } from '$lib/helpers/date'; - import ProviderType from '$routes/(console)/project-[project]/messaging/providerType.svelte'; - import Provider from '$routes/(console)/project-[project]/messaging/provider.svelte'; + import ProviderType from '$routes/(console)/project-[region]-[project]/messaging/providerType.svelte'; + import Provider from '$routes/(console)/project-[region]-[project]/messaging/provider.svelte'; import { sdk } from '$lib/stores/sdk'; import { page } from '$app/state'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; @@ -25,7 +25,9 @@ showDelete = false; const promises = selectedIds.map((id) => - sdk.forProject.users.deleteTarget(page.params.user, id) + sdk + .forProject(page.params.region, page.params.project) + .users.deleteTarget(page.params.user, id) ); try { @@ -96,7 +98,7 @@ - {selectedIds.length > 1 ? 'subscribers' : 'subscriber'} + {selectedIds.length > 1 ? 'targets' : 'target'} selected @@ -107,7 +109,7 @@ {/if} - + Are you sure you want to delete {selectedIds.length} {selectedIds.length > 1 ? 'targets' : 'target'}? diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updateEmail.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateEmail.svelte similarity index 89% rename from src/routes/(console)/project-[project]/auth/user-[user]/updateEmail.svelte rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateEmail.svelte index 3415c7a17..60be6fc0e 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/updateEmail.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateEmail.svelte @@ -8,15 +8,19 @@ import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { user } from './store'; + import { page } from '$app/state'; let userEmail: string = null; + onMount(async () => { userEmail ??= $user.email; }); async function updateEmail() { try { - await sdk.forProject.users.updateEmail($user.$id, userEmail); + await sdk + .forProject(page.params.region, page.params.project) + .users.updateEmail($user.$id, userEmail); await invalidate(Dependencies.USER); addNotification({ message: 'Email has been updated', diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updateLabels.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateLabels.svelte similarity index 95% rename from src/routes/(console)/project-[project]/auth/user-[user]/updateLabels.svelte rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateLabels.svelte index dc50f44b5..7f9c2b2ab 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/updateLabels.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateLabels.svelte @@ -11,6 +11,7 @@ import { user } from './store'; import { Tag, Input, Layout, Icon } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; + import { page } from '$app/state'; const alphaNumericRegExp = /^[a-zA-Z0-9]+$/; let suggestedLabels = ['admin', 'premium', 'mvp']; @@ -23,7 +24,9 @@ async function updateLabels() { try { - await sdk.forProject.users.updateLabels($user.$id, labels); + await sdk + .forProject(page.params.region, page.params.project) + .users.updateLabels($user.$id, labels); await invalidate(Dependencies.USER); isDisabled = true; diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updateMfa.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateMfa.svelte similarity index 94% rename from src/routes/(console)/project-[project]/auth/user-[user]/updateMfa.svelte rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateMfa.svelte index 91611e90c..b94606987 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/updateMfa.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateMfa.svelte @@ -11,6 +11,7 @@ import { Dependencies } from '$lib/constants'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Card, Empty, Table } from '@appwrite.io/pink-svelte'; + import { page } from '$app/state'; let showDelete = false; let userMfa: boolean = null; @@ -21,7 +22,9 @@ async function updateMfa() { try { - await sdk.forProject.users.updateMfa($user.$id, userMfa); + await sdk + .forProject(page.params.region, page.params.project) + .users.updateMfa($user.$id, userMfa); await invalidate(Dependencies.USER); addNotification({ message: `Multi-factor authentication has been ${userMfa ? 'enabled' : 'disabled'}`, diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updateName.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateName.svelte similarity index 90% rename from src/routes/(console)/project-[project]/auth/user-[user]/updateName.svelte rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateName.svelte index 2df43c5bd..fdf428105 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/updateName.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateName.svelte @@ -8,6 +8,7 @@ import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { user } from './store'; + import { page } from '$app/state'; let userName: string = null; onMount(async () => { @@ -16,7 +17,9 @@ async function updateName() { try { - await sdk.forProject.users.updateName($user.$id, userName); + await sdk + .forProject(page.params.region, page.params.project) + .users.updateName($user.$id, userName); await invalidate(Dependencies.USER); addNotification({ message: 'Name has been updated', diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updatePassword.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePassword.svelte similarity index 88% rename from src/routes/(console)/project-[project]/auth/user-[user]/updatePassword.svelte rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePassword.svelte index d7a3f25d8..159c94186 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/updatePassword.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePassword.svelte @@ -5,12 +5,15 @@ import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; import { user } from './store'; + import { page } from '$app/state'; let newPassword: string = null; async function updatePassword() { try { - await sdk.forProject.users.updatePassword($user.$id, newPassword); + await sdk + .forProject(page.params.region, page.params.project) + .users.updatePassword($user.$id, newPassword); newPassword = null; addNotification({ message: 'Password has been updated', diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updatePhone.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePhone.svelte similarity index 90% rename from src/routes/(console)/project-[project]/auth/user-[user]/updatePhone.svelte rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePhone.svelte index 55bf616f6..567e1e9a3 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/updatePhone.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePhone.svelte @@ -8,6 +8,7 @@ import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { user } from './store'; + import { page } from '$app/state'; let userPhone: string = null; onMount(async () => { @@ -16,7 +17,9 @@ async function updatePhone() { try { - await sdk.forProject.users.updatePhone($user.$id, userPhone); + await sdk + .forProject(page.params.region, page.params.project) + .users.updatePhone($user.$id, userPhone); await invalidate(Dependencies.USER); addNotification({ message: 'Phone has been updated', diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updatePrefs.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePrefs.svelte similarity index 95% rename from src/routes/(console)/project-[project]/auth/user-[user]/updatePrefs.svelte rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePrefs.svelte index 999266ad2..09084666c 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/updatePrefs.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePrefs.svelte @@ -10,6 +10,7 @@ import { user } from './store'; import { Icon, Layout } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; + import { page } from '$app/state'; $: if (prefs) { if (JSON.stringify(prefs) !== JSON.stringify(Object.entries($user.prefs))) { @@ -33,7 +34,9 @@ try { let updatedPrefs = Object.fromEntries(prefs); - await sdk.forProject.users.updatePrefs($user.$id, updatedPrefs); + await sdk + .forProject(page.params.region, page.params.project) + .users.updatePrefs($user.$id, updatedPrefs); await invalidate(Dependencies.USER); arePrefsDisabled = true; diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte similarity index 92% rename from src/routes/(console)/project-[project]/auth/user-[user]/updateStatus.svelte rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte index 21ef73f81..229109f94 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte @@ -1,5 +1,6 @@ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts similarity index 74% rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.ts rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts index 0e59e5d0e..52d9e65c9 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts @@ -23,19 +23,23 @@ export const load = async ({ params, url, route, depends, parent }) => { if (isCloud && backupsEnabled) { try { [backups, policies] = await Promise.all([ - sdk.forProject.backups.listArchives([ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc('$createdAt'), - Query.equal('resourceType', 'database'), - Query.equal('resourceId', params.database) - ]), + sdk + .forProject(params.region, params.project) + .backups.listArchives([ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc('$createdAt'), + Query.equal('resourceType', 'database'), + Query.equal('resourceId', params.database) + ]), - sdk.forProject.backups.listPolicies([ - Query.orderDesc('$createdAt'), - Query.equal('resourceType', 'database'), - Query.equal('resourceId', params.database) - ]) + sdk + .forProject(params.region, params.project) + .backups.listPolicies([ + Query.orderDesc('$createdAt'), + Query.equal('resourceType', 'database'), + Query.equal('resourceId', params.database) + ]) ]); } catch (e) { // ignore diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/components/Ellipse.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/components/Ellipse.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/components/Ellipse.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/components/Ellipse.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/createPolicy.svelte similarity index 99% rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/createPolicy.svelte index b1c812919..ca4dc48a9 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/createPolicy.svelte @@ -113,7 +113,7 @@ }); }; - $: customPolicyDescription = (policy: UserBackupPolicy) => { + const customPolicyDescription = (policy: UserBackupPolicy) => { return backupPolicyDescription( policy.plainTextFrequency, null, @@ -123,7 +123,7 @@ ); }; - $: formPolicyDescription = () => { + const formPolicyDescription = () => { return backupPolicyDescription( policyFrequency, selectedTime, diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/locked.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/locked.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/locked.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/locked.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte similarity index 98% rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte index d5cd43a1c..e4af56e16 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte @@ -9,7 +9,6 @@ import { Dependencies } from '$lib/constants'; import { parseExpression } from 'cron-parser'; import { toLocaleDateTime } from '$lib/helpers/date'; - import EmptyDark from '$lib/images/backups/backups-dark.png'; import EmptyLight from '$lib/images/backups/backups-light.png'; import type { BackupPolicy, BackupPolicyList } from '$lib/sdk/backups'; @@ -27,6 +26,7 @@ import { IconDotsHorizontal, IconPlus, IconTrash } from '@appwrite.io/pink-icons-svelte'; import { Confirm } from '$lib/components/index.js'; import Ellipse from './components/Ellipse.svelte'; + import { page } from '$app/state'; let showDelete = false; let selectedPolicy: BackupPolicy = null; @@ -39,7 +39,9 @@ async function deletePolicy() { try { - await sdk.forProject.backups.deletePolicy(selectedPolicy.$id); + await sdk + .forProject(page.params.region, page.params.project) + .backups.deletePolicy(selectedPolicy.$id); addNotification({ type: 'success', message: 'Backup policy has been deleted' diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/restoreModal.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/restoreModal.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/restoreModal.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/restoreModal.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/store.ts rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/store.ts diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte similarity index 96% rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte index e46b32475..1603ca8f4 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte @@ -41,6 +41,7 @@ import { capitalize } from '$lib/helpers/string'; import Ellipse from './components/Ellipse.svelte'; import Confirm from '$lib/components/confirm.svelte'; + import { page } from '$app/state'; export let data: PageData; @@ -77,7 +78,7 @@ const message = `${selectedBackups.length} backup${selectedBackups.length > 1 ? 's have been' : ''} deleted`; const promises = selectedBackups.map((archiveId) => - sdk.forProject.backups.deleteArchive(archiveId) + sdk.forProject(page.params.region, page.params.project).backups.deleteArchive(archiveId) ); try { @@ -106,12 +107,14 @@ } try { - await sdk.forProject.backups.createRestoration( - selectedBackup.$id, - ['databases'], - newDatabaseInfo.id ?? ID.unique(), - newDatabaseInfo.name - ); + await sdk + .forProject(page.params.region, page.params.project) + .backups.createRestoration( + selectedBackup.$id, + ['databases'], + newDatabaseInfo.id ?? ID.unique(), + newDatabaseInfo.name + ); addNotification({ type: 'success', message: 'Database restore initiated' diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/upgradeCard.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/upgradeCard.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/upgradeCard.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/upgradeCard.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte similarity index 67% rename from src/routes/(console)/project-[project]/databases/database-[database]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte index 02661e16c..e1f0459d4 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte @@ -11,15 +11,15 @@ title: $organization.name }, { - href: `${base}/project-${page.data.project.$id}`, + href: `${base}/project-${page.params.region}-${page.params.project}`, title: page.data.project.name }, { - href: `${base}/project-${page.data.project.$id}/databases`, + href: `${base}/project-${page.params.region}-${page.params.project}/databases`, title: 'Databases' }, { - href: `${base}/project-${page.data.project.$id}/databases/database-${$database.$id}`, + href: `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database.$id}`, title: $database.name } ]; diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte similarity index 71% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte index d7aa06cc7..d319f65c3 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte @@ -17,8 +17,8 @@ {#key page.params.collection} @@ -85,17 +110,19 @@ analyticsSource="database_documents" /> - + {#if showCsvImports} + + {/if} {#if !$isSmallViewport} - + { - selectedAttribute = attribute; + on:click={(event) => { + toggle(event); showEdit = true; + selectedAttribute = attribute; showDropdown[index] = false; }}> Update @@ -181,7 +183,8 @@ {#if !isRelationship(attribute)} { + on:click={(event) => { + toggle(event); selectedAttribute = attribute; showCreateIndex = true; showDropdown[index] = false; @@ -192,10 +195,11 @@ {#if attribute.status !== 'processing'} { - selectedAttribute = attribute; + on:click={(event) => { + toggle(event); showDelete = true; showDropdown[index] = false; + selectedAttribute = attribute; trackEvent(Click.DatabaseAttributeDelete); }}> Delete diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte similarity index 75% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte index 60b518afa..9959b7229 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte @@ -1,5 +1,6 @@ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte similarity index 73% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte index 62ed73df7..cb40c72c9 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte @@ -1,6 +1,7 @@ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte similarity index 87% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte index ab7aecd57..0d4cc50e1 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte @@ -19,11 +19,9 @@ let error: string; async function handleDelete() { try { - await sdk.forProject.databases.deleteAttribute( - databaseId, - $collection.$id, - selectedAttribute.key - ); + await sdk + .forProject(page.params.region, page.params.project) + .databases.deleteAttribute(databaseId, $collection.$id, selectedAttribute.key); await invalidate(Dependencies.COLLECTION); showDelete = false; addNotification({ @@ -32,7 +30,7 @@ }); trackEvent(Submit.AttributeDelete); await goto( - `${base}/project-${page.params.project}/databases/database-${databaseId}/collection-${page.params.collection}/attributes` + `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${page.params.collection}/attributes` ); } catch (e) { error = e.message; diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte similarity index 95% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte index dd4fbd74a..8b23bb11f 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte @@ -37,7 +37,7 @@ await invalidate(Dependencies.COLLECTION); if (!page.url.pathname.includes('attributes')) { await goto( - `${base}/project-${page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes` + `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes` ); } addNotification({ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte similarity index 74% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte index 804459fe3..07faa118f 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte similarity index 78% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte index 4de6895b1..2eed37bb1 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte @@ -1,4 +1,5 @@ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte similarity index 76% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte index e7a18ccc6..2480a2d97 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte @@ -1,6 +1,7 @@ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte similarity index 73% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte index 8f404997f..de97fccff 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte @@ -1,4 +1,5 @@ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte similarity index 71% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte index 133074fa5..da920f4e7 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte @@ -1,6 +1,8 @@ @@ -138,7 +159,7 @@ name="one" value="one" icon={IconArrowSmRight}> -

One Relation attribute within this collection

+ One Relation attribute within this collection -

- One Relation attribute within this collection and another within the related collection -

+ One Relation attribute within this collection and another within the related collection
- {#if way === 'two'} @@ -190,6 +208,7 @@ placeholder="Select a relation" options={relationshipType} disabled={editing} /> +
@@ -197,7 +216,7 @@ {#if data.twoWay} {'Two {:else} - {'One + {'One {/if} {data.key}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte similarity index 77% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte index 78a1c94a3..8bfc5e18a 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte @@ -1,4 +1,5 @@ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte similarity index 73% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte index e32cac4bd..4c9d6991e 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte @@ -1,6 +1,7 @@ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte similarity index 54% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte index 2e54f9fd6..2419b882b 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte @@ -1,7 +1,7 @@ @@ -35,7 +35,7 @@ + href={`${base}/project-${page.params.region}-${projectId}/databases/database-${databaseId}/collection-${collectionId}`}> {$doc?.$id} Document ID diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/settings/+page.svelte similarity index 68% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/settings/+page.svelte index f167392d3..fd24eb648 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/settings/+page.svelte @@ -1,19 +1,19 @@ @@ -59,6 +59,7 @@ Metadata +

Created: {toLocaleDateTime($doc.$createdAt)}

@@ -68,40 +69,43 @@ Permissions - A user requires appropriate permissions at either the collection level or - document level to access a document. If no permissions are configured, no user can - access the document - Learn more + +

+ A user requires appropriate permissions at either the collection level or + document level to access a document. If no permissions are configured, no user + can access the document + Learn more about database permissions. +

+ {#if $collection.documentSecurity} {#if showPermissionAlert} - (showPermissionAlert = false)}> + (showPermissionAlert = false)}> Document security is enabled

Users will be able to access this document if they have been granted either document or collection permissions.

-
+ {/if} {#if permissions} {/if} {:else} - + Document security is disabled

- If you want to assign document permissions. Go to Collection settings and enable document - security. Otherwise, only collection permissions will be used. + If you want to assign document permissions. Go to Collection settings and + enable document security. Otherwise, only collection permissions will be + used.

-
+ {/if}
@@ -116,7 +120,10 @@ Delete document - The document will be permanently deleted, including all the data within it. This action is irreversible. +

+ The document will be permanently deleted, including all the data within it. This action + is irreversible. +

diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/header.svelte similarity index 76% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/header.svelte index 6cb66e1da..37339b8c4 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/header.svelte @@ -8,9 +8,6 @@ import { collection } from './store'; import { isTabletViewport } from '$lib/stores/viewport'; - let projectId = $derived.by(() => { - return page.params.project; - }); let databaseId = $derived.by(() => { return page.params.database; }); @@ -19,7 +16,7 @@ }); let path = $derived.by(() => { - return `${base}/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}`; + return `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${collectionId}`; }); let tabs = $derived.by(() => { @@ -62,15 +59,17 @@ }); - - - - {$collection?.name} - - {#key $collection?.$id} - {$collection?.$id} - {/key} - +
+ + + + {$collection?.name} + + {#key $collection?.$id} + {$collection?.$id} + {/key} + {#each tabs as tab} diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte similarity index 96% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte index 99d742c3d..b5812ff55 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte @@ -72,7 +72,7 @@ } try { - await sdk.forProject.databases.createIndex( + await sdk.forProject(page.params.region, page.params.project).databases.createIndex( databaseId, $collection.$id, key, @@ -86,7 +86,7 @@ ]); goto( - `${base}/project-${page.params.project}/databases/database-${databaseId}/collection-${$collection.$id}/indexes` + `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${$collection.$id}/indexes` ); addNotification({ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte similarity index 88% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte index 5d52d97e6..1669fea99 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte @@ -18,11 +18,9 @@ async function handleDelete() { try { - await sdk.forProject.databases.deleteIndex( - databaseId, - $collection.$id, - selectedIndex.key - ); + await sdk + .forProject(page.params.region, page.params.project) + .databases.deleteIndex(databaseId, $collection.$id, selectedIndex.key); await invalidate(Dependencies.COLLECTION); showDelete = false; addNotification({ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte similarity index 91% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte index 6ca050ddf..aa90532f7 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte @@ -10,7 +10,6 @@ export let show = false; export let data: Partial[]; export let selectedRelationship: Models.AttributeRelationship = null; - const projectId = page.params.project; const databaseId = page.params.database; const limit = 10; @@ -43,7 +42,7 @@ {#each paginatedItems as doc} (show = false)}> {doc.$id} diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte similarity index 82% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte index 59bd9f240..dfd0e6548 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte @@ -17,7 +17,9 @@ async function handleDelete() { try { - await sdk.forProject.databases.deleteCollection(databaseId, $collection.$id); + await sdk + .forProject(page.params.region, page.params.project) + .databases.deleteCollection(databaseId, $collection.$id); await invalidate(Dependencies.DATABASE); showDelete = false; addNotification({ @@ -26,7 +28,7 @@ }); trackEvent(Submit.CollectionDelete); await goto( - `${base}/project-${page.params.project}/databases/database-${page.params.database}` + `${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}` ); } catch (e) { error = e.message; diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte similarity index 82% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte index 81c29727d..80351378c 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte @@ -20,14 +20,16 @@ async function updateName() { try { - await sdk.forProject.databases.updateCollection( - databaseId, - $collection.$id, - collectionName, - $collection.$permissions, - $collection.documentSecurity, - $collection.enabled - ); + await sdk + .forProject(page.params.region, page.params.project) + .databases.updateCollection( + databaseId, + $collection.$id, + collectionName, + $collection.$permissions, + $collection.documentSecurity, + $collection.enabled + ); await invalidate(Dependencies.COLLECTION); addNotification({ message: 'Name has been updated', diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte similarity index 85% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte index 16d39d490..f9b4e4bff 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte @@ -25,14 +25,16 @@ async function updatePermissions() { try { - await sdk.forProject.databases.updateCollection( - databaseId, - $collection.$id, - $collection.name, - collectionPermissions, - $collection.documentSecurity, - $collection.enabled - ); + await sdk + .forProject(page.params.region, page.params.project) + .databases.updateCollection( + databaseId, + $collection.$id, + $collection.name, + collectionPermissions, + $collection.documentSecurity, + $collection.enabled + ); await invalidate(Dependencies.COLLECTION); addNotification({ message: 'Permissions have been updated', diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte similarity index 84% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte index f155b6f40..5b4e83244 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte @@ -20,14 +20,16 @@ async function updateSecurity() { try { - await sdk.forProject.databases.updateCollection( - databaseId, - $collection.$id, - $collection.name, - $collection.$permissions, - collectionDocumentSecurity, - $collection.enabled - ); + await sdk + .forProject(page.params.region, page.params.project) + .databases.updateCollection( + databaseId, + $collection.$id, + $collection.name, + $collection.$permissions, + collectionDocumentSecurity, + $collection.enabled + ); await invalidate(Dependencies.COLLECTION); addNotification({ message: 'Security has been updated', diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte similarity index 83% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte index 12bc4a622..0089ecf9a 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte @@ -21,14 +21,16 @@ async function toggleCollection() { try { - await sdk.forProject.databases.updateCollection( - databaseId, - $collection.$id, - $collection.name, - $collection.$permissions, - $collection.documentSecurity, - enabled - ); + await sdk + .forProject(page.params.region, page.params.project) + .databases.updateCollection( + databaseId, + $collection.$id, + $collection.name, + $collection.$permissions, + $collection.documentSecurity, + enabled + ); await invalidate(Dependencies.COLLECTION); addNotification({ message: `${$collection.name} has been updated`, diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/store.ts rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte similarity index 92% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte index 202d23389..ae0809327 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte @@ -15,6 +15,7 @@ import { BottomSheet } from '$lib/components'; let data = $derived(page.data) as PageData; + let region = $derived(page.params.region); let project = $derived(page.params.project); let databaseId = $derived(page.params.database); let collectionId = $derived(page.params.collection); @@ -41,7 +42,7 @@
{data.database?.name} @@ -50,7 +51,7 @@ {#if data?.allCollections?.total}
+ + diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte similarity index 67% rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte index 40e6af73e..93f00b816 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte @@ -3,16 +3,15 @@ import { page } from '$app/state'; import { Usage } from '$lib/layout'; import Container from '$lib/layout/container.svelte'; - import type { PageData } from './$types'; - export let data: PageData; + export let data; $: total = data.documentsTotal; $: count = data.documents; { const period = isValueOfStringEnum(DatabaseUsageRange, params.period) ? params.period : DatabaseUsageRange.ThirtyDays; - return sdk.forProject.databases.getCollectionUsage(params.database, params.collection, period); + return sdk + .forProject(params.region, params.project) + .databases.getCollectionUsage(params.database, params.collection, period); }; diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte similarity index 91% rename from src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte index 5e1d77b0e..2e20d66cd 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte @@ -24,11 +24,9 @@ const create = async () => { error = null; try { - const collection = await sdk.forProject.databases.createCollection( - databaseId, - id ? id : ID.unique(), - name - ); + const collection = await sdk + .forProject(page.params.region, page.params.project) + .databases.createCollection(databaseId, id ? id : ID.unique(), name); showCreate = false; dispatch('created', collection); addNotification({ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/delete.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte similarity index 93% rename from src/routes/(console)/project-[project]/databases/database-[database]/delete.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte index 21c1e9316..ef7661522 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/delete.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte @@ -45,7 +45,9 @@ try { const queries = buildQueries(); - collections = await sdk.forProject.databases.listCollections(databaseId, queries); + collections = await sdk + .forProject(page.params.region, page.params.project) + .databases.listCollections(databaseId, queries); const collectionPromises = collections.collections.map(async (collection) => { return { @@ -65,13 +67,15 @@ const handleDelete = async () => { try { - await sdk.forProject.databases.delete(databaseId); + await sdk + .forProject(page.params.region, page.params.project) + .databases.delete(databaseId); showDelete = false; addNotification({ type: 'success', message: `${$database.name} has been deleted` }); - await goto(`${base}/project-${page.params.project}/databases`); + await goto(`${base}/project-${page.params.region}-${page.params.project}/databases`); trackEvent(Submit.DatabaseDelete); } catch (error) { addNotification({ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte similarity index 88% rename from src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte index a3ea156e8..822203307 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte @@ -18,7 +18,7 @@ event="collection"> {#each data.collections.collections as collection} + href={`${base}/project-${page.params.region}-${projectId}/databases/database-${databaseId}/collection-${collection.$id}`}> {collection.name} {#if !collection.enabled} diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte similarity index 88% rename from src/routes/(console)/project-[project]/databases/database-[database]/header.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte index 1cb81a36e..e220dba39 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte @@ -9,7 +9,7 @@ const projectId = page.params.project; const databaseId = page.params.database; - const path = `${base}/project-${projectId}/databases/database-${databaseId}`; + const path = `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}`; const tabs = [ { href: path, @@ -40,7 +40,7 @@ - + {$database.name} {$database.$id} diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte similarity index 93% rename from src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte index 88c8b2372..fc6dd0cd0 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte @@ -25,9 +25,9 @@ }); async function loadCollectionCount() { - const { total } = await sdk.forProject.databases.listCollections($database.$id, [ - Query.limit(1) - ]); + const { total } = await sdk + .forProject(page.params.region, page.params.project) + .databases.listCollections($database.$id, [Query.limit(1)]); return total; } @@ -39,7 +39,9 @@ async function updateName() { try { - await sdk.forProject.databases.update(page.params.database, databaseName); + await sdk + .forProject(page.params.region, page.params.project) + .databases.update(page.params.database, databaseName); await invalidate(Dependencies.DATABASE); addNotification({ message: 'Name has been updated', diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/databases/database-[database]/store.ts rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte similarity index 76% rename from src/routes/(console)/project-[project]/databases/database-[database]/string.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte index 4b09b5384..5f1f8c2b3 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/string.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte @@ -1,4 +1,5 @@ diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte similarity index 92% rename from src/routes/(console)/project-[project]/databases/database-[database]/table.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte index a7f0bbdc2..bab65963c 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte @@ -16,7 +16,6 @@ import Confirm from '$lib/components/confirm.svelte'; export let data: PageData; - const projectId = page.params.project; const databaseId = page.params.database; let selectedRows: string[] = []; @@ -27,7 +26,9 @@ showDelete = false; const promises = selectedRows.map((collectionId) => - sdk.forProject.databases.deleteCollection(databaseId, collectionId) + sdk + .forProject(page.params.region, page.params.project) + .databases.deleteCollection(databaseId, collectionId) ); try { await Promise.all(promises); @@ -60,7 +61,7 @@ + href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${collection.$id}`}> {#each $columns as column} {#if column.id === '$id'} diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte similarity index 85% rename from src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte index e1a2c2c58..2cf815d2e 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte @@ -3,9 +3,8 @@ import { page } from '$app/state'; import { Container, Usage, UsageMultiple } from '$lib/layout'; import { Layout } from '@appwrite.io/pink-svelte'; - import type { PageData } from './$types'; - export let data: PageData; + export let data; $: total = data.collectionsTotal; $: count = data.collections; @@ -20,7 +19,7 @@ { const period = isValueOfStringEnum(DatabaseUsageRange, params.period) ? params.period : DatabaseUsageRange.ThirtyDays; - return sdk.forProject.databases.getDatabaseUsage(params.database, period); + return sdk + .forProject(params.region, params.project) + .databases.getDatabaseUsage(params.database, period); }; diff --git a/src/routes/(console)/project-[project]/databases/grid.svelte b/src/routes/(console)/project-[region]-[project]/databases/grid.svelte similarity index 92% rename from src/routes/(console)/project-[project]/databases/grid.svelte rename to src/routes/(console)/project-[region]-[project]/databases/grid.svelte index 2045fcde8..cacfeba9c 100644 --- a/src/routes/(console)/project-[project]/databases/grid.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/grid.svelte @@ -16,7 +16,8 @@ event="database" service="databases"> {#each data.databases.databases as database} - + {database.name} {#if data.lastBackups && data.lastBackups[database.$id]} diff --git a/src/routes/(console)/project-[project]/databases/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/header.svelte similarity index 93% rename from src/routes/(console)/project-[project]/databases/header.svelte rename to src/routes/(console)/project-[region]-[project]/databases/header.svelte index ca6f5a2fd..06743ad14 100644 --- a/src/routes/(console)/project-[project]/databases/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/header.svelte @@ -8,7 +8,7 @@ import { isStudio } from '$lib/system'; const projectId = page.params.project; - const path = `${base}/project-${projectId}/databases`; + const path = `${base}/project-${page.params.region}-${projectId}/databases`; const tabs = [ { href: path, diff --git a/src/routes/(console)/project-[project]/databases/store.ts b/src/routes/(console)/project-[region]-[project]/databases/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/databases/store.ts rename to src/routes/(console)/project-[region]-[project]/databases/store.ts diff --git a/src/routes/(console)/project-[project]/databases/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/table.svelte similarity index 93% rename from src/routes/(console)/project-[project]/databases/table.svelte rename to src/routes/(console)/project-[region]-[project]/databases/table.svelte index 7d3728c1d..df80b3c35 100644 --- a/src/routes/(console)/project-[project]/databases/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/table.svelte @@ -3,12 +3,10 @@ import { page } from '$app/state'; import { Id } from '$lib/components'; import { toLocaleDateTime } from '$lib/helpers/date'; - import type { PageData } from './$types'; import { columns } from './store'; import { Tooltip, Table } from '@appwrite.io/pink-svelte'; - export let data: PageData; - const projectId = page.params.project; + export let data; function getPolicyDescription(cron: string): string { const [minute, hour, dayOfMonth, , dayOfWeek] = cron.split(' '); @@ -29,7 +27,7 @@ {#each data.databases.databases as database (database.$id)} + href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${database.$id}`}> {#each $columns as column} {#if column.id === '$id'} diff --git a/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.svelte similarity index 92% rename from src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.svelte index 41d32e5b0..5ff65052e 100644 --- a/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.svelte @@ -19,7 +19,7 @@ { ? params.period : DatabaseUsageRange.ThirtyDays; try { - return sdk.forProject.databases.getUsage(period); + return sdk.forProject(params.region, params.project).databases.getUsage(period); } catch (e) { error(e.code, e.message); } diff --git a/src/routes/(console)/project-[project]/functions/+layout.svelte b/src/routes/(console)/project-[region]-[project]/functions/+layout.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/functions/+layout.svelte diff --git a/src/routes/(console)/project-[project]/functions/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/+layout.ts similarity index 53% rename from src/routes/(console)/project-[project]/functions/+layout.ts rename to src/routes/(console)/project-[region]-[project]/functions/+layout.ts index 8d7b68a16..4cc6fe3d9 100644 --- a/src/routes/(console)/project-[project]/functions/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/+layout.ts @@ -5,14 +5,13 @@ import { Query } from '@appwrite.io/console'; import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; -export const load: LayoutLoad = async ({ depends }) => { +export const load: LayoutLoad = async ({ depends, params }) => { depends(Dependencies.FUNCTION_INSTALLATIONS); - const [runtimesList, installations, templatesList, specificationsList] = await Promise.all([ - sdk.forProject.functions.listRuntimes(), - sdk.forProject.vcs.listInstallations([Query.limit(100)]), - sdk.forProject.functions.listTemplates(undefined, undefined, 100), - sdk.forProject.functions.listSpecifications() + const [runtimesList, installations, specificationsList] = await Promise.all([ + sdk.forProject(params.region, params.project).functions.listRuntimes(), + sdk.forProject(params.region, params.project).vcs.listInstallations([Query.limit(100)]), + sdk.forProject(params.region, params.project).functions.listSpecifications() ]); return { @@ -20,7 +19,6 @@ export const load: LayoutLoad = async ({ depends }) => { breadcrumbs: Breadcrumbs, runtimesList, installations, - templatesList, specificationsList }; }; diff --git a/src/routes/(console)/project-[project]/functions/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/+page.svelte similarity index 80% rename from src/routes/(console)/project-[project]/functions/+page.svelte rename to src/routes/(console)/project-[region]-[project]/functions/+page.svelte index db6eb692d..0bc701817 100644 --- a/src/routes/(console)/project-[project]/functions/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/+page.svelte @@ -43,12 +43,14 @@ const template = page.url.searchParams.get('template'); const templateConfig = page.url.searchParams.get('templateConfig'); goto( - `${base}/project-${project}/functions/create-function/template-${template}?templateConfig=${templateConfig}` + `${base}/project-${page.params.region}-${project}/functions/create-function/template-${template}?templateConfig=${templateConfig}` ); break; } case 'cover': - goto(`${base}/project-${project}/functions/create-function`); + goto( + `${base}/project-${page.params.region}-${project}/functions/create-function` + ); break; } } @@ -61,7 +63,8 @@ $: $registerCommands([ { label: 'Create function', - callback: () => goto(`${base}/project-${project}/functions/create-function`), + callback: () => + goto(`${base}/project-${page.params.region}-${project}/functions/create-function`), keys: ['c'], disabled: $wizard.show || @@ -79,7 +82,7 @@ - @@ -92,9 +95,11 @@ event="functions" total={data.functions.total} service="functions" - on:click={() => goto(`${base}/project-${project}/functions/create-function`)}> + on:click={() => + goto(`${base}/project-${page.params.region}-${project}/functions/create-function`)}> {#each data.functions.functions as func (func.$id)} - + @@ -128,7 +133,9 @@ total={data.functions.total} /> {:else if data?.search} - @@ -138,6 +145,9 @@ allowCreate={$canWriteFunctions} href="https://appwrite.io/docs/products/functions" target="function" - on:click={() => goto(`${base}/project-${project}/functions/create-function`)} /> + on:click={() => + goto( + `${base}/project-${page.params.region}-${project}/functions/create-function` + )} /> {/if} diff --git a/src/routes/(console)/project-[project]/functions/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/+page.ts similarity index 60% rename from src/routes/(console)/project-[project]/functions/+page.ts rename to src/routes/(console)/project-[region]-[project]/functions/+page.ts index 8929f79ac..d3a6f4fb3 100644 --- a/src/routes/(console)/project-[project]/functions/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/+page.ts @@ -3,9 +3,8 @@ import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT, Dependencies } from '$lib/constants'; -export const load = async ({ url, depends, route, parent }) => { +export const load = async ({ url, depends, route, params }) => { depends(Dependencies.FUNCTIONS); - const { templatesList } = await parent(); const search = getSearch(url); const page = getPage(url); const limit = getLimit(url, route, CARD_LIMIT); @@ -14,11 +13,12 @@ export const load = async ({ url, depends, route, parent }) => { return { offset, limit, - functions: await sdk.forProject.functions.list( - [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], - search - ), - search, - templatesList + functions: await sdk + .forProject(params.region, params.project) + .functions.list( + [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], + search + ), + search }; }; diff --git a/src/routes/(console)/project-[project]/functions/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/functions/breadcrumbs.svelte similarity index 70% rename from src/routes/(console)/project-[project]/functions/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/functions/breadcrumbs.svelte index 680afb49c..0b6627d1e 100644 --- a/src/routes/(console)/project-[project]/functions/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/breadcrumbs.svelte @@ -1,5 +1,6 @@ diff --git a/src/routes/(console)/project-[project]/functions/create-function/(components)/details.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/(components)/details.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/create-function/(components)/details.svelte rename to src/routes/(console)/project-[region]-[project]/functions/create-function/(components)/details.svelte diff --git a/src/routes/(console)/project-[project]/functions/create-function/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte similarity index 91% rename from src/routes/(console)/project-[project]/functions/create-function/+page.svelte rename to src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte index 829fcdb15..e902c2856 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte @@ -5,14 +5,12 @@ import { Click, trackEvent } from '$lib/actions/analytics'; import type { Models } from '@appwrite.io/console'; import { isSelfHosted } from '$lib/system'; - import { consoleVariables } from '$routes/(console)/store'; import { afterNavigate, goto } from '$app/navigation'; import { installation, repository } from '$lib/stores/vcs'; import { Repositories } from '$lib/components/git'; import { Alert, Avatar, - Badge, Card, Divider, Icon, @@ -23,11 +21,12 @@ import Wizard from '$lib/layout/wizard.svelte'; import { Link } from '$lib/elements'; import { Button } from '$lib/elements/forms'; + import { regionalConsoleVariables } from '../../store'; export let data; - const isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true; - const wizardBase = `${base}/project-${page.params.project}/functions`; + const isVcsEnabled = $regionalConsoleVariables?._APP_VCS_ENABLED === true; + const wizardBase = `${base}/project-${page.params.region}-${page.params.project}/functions`; let previousPage: string = wizardBase; afterNavigate(({ from }) => { previousPage = from?.url?.pathname || previousPage; @@ -35,13 +34,11 @@ let selectedRepository: string; - const featuredTemplatesList = data.templatesList.templates + const featuredTemplates = data.templates .filter((template) => template.id !== 'starter') .slice(0, 4); - const starterTemplate = data.templatesList.templates.find( - (template) => template.id === 'starter' - ); + const starterTemplate = data.templates.find((template) => template.id === 'starter'); const baseRuntimesList = [ ...new Map( @@ -151,12 +148,12 @@ {runtimeDetail?.name} - {#if runtimeDetail?.name?.toLowerCase() === 'deno'} - - {/if} + + + + + + @@ -167,7 +164,7 @@ - {#each featuredTemplatesList as template} + {#each featuredTemplates as template} { + const [{ installations }, { templates }] = await Promise.all([ + parent(), + sdk + .forProject(params.region, params.project) + .functions.listTemplates(undefined, undefined, 100) + ]); + + return { + installation: installations.installations.find( + (installation) => installation.$id === url.searchParams.get('installation') + ), + templates: templates + }; +}; diff --git a/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte similarity index 61% rename from src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte rename to src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte index 77f88dd02..bd7f4106b 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte @@ -8,10 +8,9 @@ import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; import { Icon, Layout, Tooltip, Typography, Upload } from '@appwrite.io/pink-svelte'; - import { writable } from 'svelte/store'; + import { get, writable } from 'svelte/store'; import { ID, Runtime } from '@appwrite.io/console'; import type { Models } from '@appwrite.io/console'; - import { consoleVariables } from '$routes/(console)/store'; import Details from '../(components)/details.svelte'; import Aside from '../(components)/aside.svelte'; import { iconPath } from '$lib/stores/app'; @@ -19,16 +18,24 @@ import { IconInfo } from '@appwrite.io/pink-icons-svelte'; import Configuration from './configuration.svelte'; import { getIconFromRuntime } from '$lib/stores/runtimes'; - import { removeFile } from '$lib/helpers/files'; + import { regionalConsoleVariables } from '../../../store'; + import { InvalidFileType, removeFile } from '$lib/helpers/files'; + import { isCloud } from '$lib/system'; + import { humanFileSize } from '$lib/helpers/sizeConvertion'; + import { currentPlan } from '$lib/stores/organization'; export let data; + const iconFor = get(iconPath); + const runtimeOptions = data.runtimesList.runtimes.map((runtime) => { - return { - value: runtime.$id, - label: `${runtime.name} - ${runtime.version}`, - leadingHtml: `` - }; + const { $id: value, name, version, key } = runtime; + const label = `${name} - ${version}`; + const iconName = getIconFromRuntime(key); + const iconSrc = iconFor(iconName, 'color'); + const leadingHtml = `${iconName}`; + + return { value, label, leadingHtml }; }); const specificationOptions = data.specificationsList.specifications.map((size) => ({ @@ -55,58 +62,62 @@ async function create() { try { - const func = await sdk.forProject.functions.create( - id || ID.unique(), - name, - runtime, - roles?.length ? roles : undefined, - undefined, - undefined, - undefined, - true, - undefined, - entrypoint, - buildCommand, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - specification || undefined - ); + const func = await sdk + .forProject(page.params.region, page.params.project) + .functions.create( + id || ID.unique(), + name, + runtime, + roles?.length ? roles : undefined, + undefined, + undefined, + undefined, + true, + undefined, + entrypoint, + buildCommand, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + specification || undefined + ); // Add domain - await sdk.forProject.proxy.createFunctionRule( - `${ID.unique()}.${$consoleVariables._APP_DOMAIN_FUNCTIONS}`, - func.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.createFunctionRule( + `${ID.unique()}.${$regionalConsoleVariables._APP_DOMAIN_FUNCTIONS}`, + func.$id + ); //Add variables const promises = variables.map((variable) => - sdk.forProject.functions.createVariable( - func.$id, - variable.key, - variable.value, - variable?.secret ?? false - ) + sdk + .forProject(page.params.region, page.params.project) + .functions.createVariable( + func.$id, + variable.key, + variable.value, + variable?.secret ?? false + ) ); await Promise.all(promises); - await sdk.forProject.functions.createDeployment( - func.$id, - files[0], - true, - undefined, - undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.createDeployment(func.$id, files[0], true, undefined, undefined); trackEvent(Submit.FunctionCreate, { source: 'repository', runtime: runtime }); - await goto(`${base}/project-${page.params.project}/functions/function-${func.$id}`); + await goto( + `${base}/project-${page.params.region}-${page.params.project}/functions/function-${func.$id}` + ); invalidate(Dependencies.FUNCTION); } catch (e) { @@ -118,15 +129,44 @@ } } + function handleInvalid(e: CustomEvent) { + const reason = e.detail.reason; + if (reason === InvalidFileType.EXTENSION) { + addNotification({ + type: 'error', + message: 'Only .tar.gz files allowed' + }); + } else if (reason === InvalidFileType.SIZE) { + addNotification({ + type: 'error', + message: 'File size exceeds 10MB' + }); + } else { + addNotification({ + type: 'error', + message: 'Invalid file' + }); + } + } + $: filesList = files?.length ? Array.from(files).map((f) => { return { ...f, + name: f.name, + size: f.size, extension: f.type, removable: true }; }) : []; + + $: maxSize = + isCloud && $currentPlan + ? $currentPlan.deploymentSize * 1000000 + : $regionalConsoleVariables._APP_COMPUTE_SIZE_LIMIT; // already in MB + + $: readableMaxSize = humanFileSize(maxSize); @@ -136,7 +176,7 @@ @@ -150,8 +190,9 @@ bind:files title="Upload function" extensions={['gz', 'tar']} - maxSize={10000000} - required> + {maxSize} + required + on:invalid={handleInvalid}> Max file size 10MB + >Max file size: {readableMaxSize.value + + readableMaxSize.unit} {#if files?.length} - (files = removeFile(e.detail, files))} /> diff --git a/src/routes/(console)/project-[project]/functions/create-function/manual/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.ts similarity index 100% rename from src/routes/(console)/project-[project]/functions/create-function/manual/+page.ts rename to src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.ts diff --git a/src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/configuration.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte rename to src/routes/(console)/project-[region]-[project]/functions/create-function/manual/configuration.svelte diff --git a/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.svelte similarity index 71% rename from src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.svelte index 8233eb582..4414e0ddc 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.svelte @@ -13,7 +13,6 @@ import { ID, Runtime, VCSDeploymentType } from '@appwrite.io/console'; import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; - import { consoleVariables } from '$routes/(console)/store'; import Details from '../(components)/details.svelte'; import ProductionBranchFieldset from '$lib/components/git/productionBranchFieldset.svelte'; import Configuration from './configuration.svelte'; @@ -22,6 +21,7 @@ import { Dependencies } from '$lib/constants'; import RepoCard from './repoCard.svelte'; import { getIconFromRuntime } from '$lib/stores/runtimes'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let data; @@ -65,57 +65,62 @@ async function create() { try { - const func = await sdk.forProject.functions.create( - id || ID.unique(), - name, - runtime, - roles?.length ? roles : undefined, - undefined, - undefined, - undefined, - true, - undefined, - entrypoint, - buildCommand, - undefined, - $installation.$id, - $repository.id, - branch, - silentMode, - rootDir, - specification || undefined - ); + const func = await sdk + .forProject(page.params.region, page.params.project) + .functions.create( + id || ID.unique(), + name, + runtime, + roles?.length ? roles : undefined, + undefined, + undefined, + undefined, + true, + undefined, + entrypoint, + buildCommand, + undefined, + $installation.$id, + $repository.id, + branch, + silentMode, + rootDir, + specification || undefined + ); // Add domain - await sdk.forProject.proxy.createFunctionRule( - `${ID.unique()}.${$consoleVariables._APP_DOMAIN_FUNCTIONS}`, - func.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.createFunctionRule( + `${ID.unique()}.${$regionalConsoleVariables._APP_DOMAIN_FUNCTIONS}`, + func.$id + ); //Add variables const promises = variables.map((variable) => - sdk.forProject.functions.createVariable( - func.$id, - variable.key, - variable.value, - variable?.secret ?? false - ) + sdk + .forProject(page.params.region, page.params.project) + .functions.createVariable( + func.$id, + variable.key, + variable.value, + variable?.secret ?? false + ) ); await Promise.all(promises); - await sdk.forProject.functions.createVcsDeployment( - func.$id, - VCSDeploymentType.Branch, - branch, - true - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.createVcsDeployment(func.$id, VCSDeploymentType.Branch, branch, true); trackEvent(Submit.FunctionCreate, { source: 'repository', runtime: runtime }); - await goto(`${base}/project-${page.params.project}/functions/function-${func.$id}`); + await goto( + `${base}/project-${page.params.region}-${page.params.project}/functions/function-${func.$id}` + ); invalidate(Dependencies.FUNCTION); } catch (e) { @@ -135,7 +140,7 @@ diff --git a/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.ts similarity index 76% rename from src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/+page.ts rename to src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.ts index bd85e0a40..6b98ecef0 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.ts @@ -4,7 +4,9 @@ export const load = async ({ parent, params, url }) => { const { installations, runtimesList, specificationsList } = await parent(); const [repository] = await Promise.all([ - sdk.forProject.vcs.getRepository(url.searchParams.get('installation'), params.repository) + sdk + .forProject(params.region, params.project) + .vcs.getRepository(url.searchParams.get('installation'), params.repository) ]); return { diff --git a/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/configuration.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/configuration.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/configuration.svelte rename to src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/configuration.svelte diff --git a/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/repoCard.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/repoCard.svelte similarity index 86% rename from src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/repoCard.svelte rename to src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/repoCard.svelte index 4612fe685..a92459a25 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/repoCard.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/repoCard.svelte @@ -17,7 +17,9 @@ {repository?.organization}/{repository?.name} - diff --git a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte similarity index 80% rename from src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte index 62f0c459b..39646b906 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte @@ -22,7 +22,6 @@ Repositories, RepositoryBehaviour } from '$lib/components/git'; - import { consoleVariables } from '$routes/(console)/store'; import Details from '../(components)/details.svelte'; import Aside from '../(components)/aside.svelte'; import { iconPath } from '$lib/stores/app'; @@ -31,6 +30,7 @@ import RepoCard from './repoCard.svelte'; import { Dependencies } from '$lib/constants'; import { getIconFromRuntime } from '$lib/stores/runtimes'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let data; @@ -86,7 +86,7 @@ if (page.url.searchParams.has('runtime')) { runtime = page.url.searchParams.get('runtime') as Runtime; } else { - runtime = matchingRuntimes[0]; + runtime = matchingRuntimes[0] as Runtime; } } }); @@ -94,11 +94,9 @@ async function createRepository() { try { isCreatingRepository = true; - const repo = await sdk.forProject.vcs.createRepository( - $installation.$id, - repositoryName, - repositoryPrivate - ); + const repo = await sdk + .forProject(page.params.region, page.params.project) + .vcs.createRepository($installation.$id, repositoryName, repositoryPrivate); repository.set(repo); selectedRepository = repo.id; showConfig = true; @@ -123,52 +121,62 @@ try { const rt = data.template.runtimes.find((r) => r.name === runtime); - const func = await sdk.forProject.functions.create( - id || ID.unique(), - name, - runtime as Runtime, - data.template.permissions?.length ? data.template.permissions : undefined, - data.template.events?.length ? data.template.events : undefined, - data.template.cron || undefined, - data.template.timeout ? data.template.timeout : undefined, - undefined, - undefined, - entrypoint || rt?.entrypoint || undefined, - rt?.commands || undefined, - selectedScopes?.length ? selectedScopes : undefined, - connectBehaviour === 'later' ? undefined : $installation?.$id || undefined, - connectBehaviour === 'later' ? undefined : $repository?.id || undefined, - branch, - silentMode, - rootDir, - specification || undefined - ); + const func = await sdk + .forProject(page.params.region, page.params.project) + .functions.create( + id || ID.unique(), + name, + runtime as Runtime, + execute && data.template.permissions?.length + ? data.template.permissions + : undefined, + data.template.events?.length ? data.template.events : undefined, + data.template.cron || undefined, + data.template.timeout ? data.template.timeout : undefined, + undefined, + undefined, + entrypoint || rt?.entrypoint || undefined, + rt?.commands || undefined, + selectedScopes?.length ? selectedScopes : undefined, + connectBehaviour === 'later' ? undefined : $installation?.$id || undefined, + connectBehaviour === 'later' ? undefined : $repository?.id || undefined, + branch, + silentMode, + rootDir, + specification || undefined + ); // Add domain - await sdk.forProject.proxy.createFunctionRule( - `${ID.unique()}.${$consoleVariables._APP_DOMAIN_FUNCTIONS}`, - func.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.createFunctionRule( + `${ID.unique()}.${$regionalConsoleVariables._APP_DOMAIN_FUNCTIONS}`, + func.$id + ); // Add variables const promises = variables.map((variable) => - sdk.forProject.functions.createVariable( - func.$id, - variable.name, - variable.value, - variable?.secret ?? false - ) + sdk + .forProject(page.params.region, page.params.project) + .functions.createVariable( + func.$id, + variable.name, + variable.value, + variable?.secret ?? false + ) ); await Promise.all(promises); - await sdk.forProject.functions.createTemplateDeployment( - func.$id, - data.template.providerRepositoryId || undefined, - data.template.providerOwner || undefined, - rt?.providerRootDirectory || undefined, - data.template.providerVersion || undefined, - true - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.createTemplateDeployment( + func.$id, + data.template.providerRepositoryId || undefined, + data.template.providerOwner || undefined, + rt?.providerRootDirectory || undefined, + data.template.providerVersion || undefined, + true + ); trackEvent(Submit.FunctionCreate, { runtime: runtime, @@ -176,7 +184,9 @@ framework: data.template.name }); - await goto(`${base}/project-${page.params.project}/functions/function-${func.$id}`); + await goto( + `${base}/project-${page.params.region}-${page.params.project}/functions/function-${func.$id}` + ); invalidate(Dependencies.FUNCTION); } catch (e) { addNotification({ @@ -209,7 +219,7 @@ diff --git a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.ts similarity index 68% rename from src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.ts rename to src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.ts index e25ff7704..047a9521c 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.ts @@ -2,7 +2,9 @@ import { sdk } from '$lib/stores/sdk'; export const load = async ({ parent, params }) => { const { installations, runtimesList, specificationsList } = await parent(); - const template = await sdk.forProject.functions.getTemplate(params.template); + const template = await sdk + .forProject(params.region, params.project) + .functions.getTemplate(params.template); return { installations, diff --git a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/configuration.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/configuration.svelte similarity index 98% rename from src/routes/(console)/project-[project]/functions/create-function/template-[template]/configuration.svelte rename to src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/configuration.svelte index 2c8c0d5f3..34f815e6e 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/configuration.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/configuration.svelte @@ -21,8 +21,7 @@ import type { Component } from 'svelte'; import { getApiEndpoint } from '$lib/stores/sdk'; import { page } from '$app/state'; - import { project } from '$routes/(console)/project-[project]/store'; - import Root from '$lib/commandCenter/panels/root.svelte'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; export let variables: Partial[] = []; export let templateVariables: Models.TemplateVariable[] = []; diff --git a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/permissions.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/permissions.svelte similarity index 97% rename from src/routes/(console)/project-[project]/functions/create-function/template-[template]/permissions.svelte rename to src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/permissions.svelte index f17aae982..d512b628f 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/permissions.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/permissions.svelte @@ -15,8 +15,6 @@ checked: true }; }); - - $: console.log(selectedScopes);
diff --git a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/repoCard.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/repoCard.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/create-function/template-[template]/repoCard.svelte rename to src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/repoCard.svelte diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(components)/createActionMenu.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/createActionMenu.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/function-[function]/(components)/createActionMenu.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/createActionMenu.svelte diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(components)/deploymentCard.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte similarity index 98% rename from src/routes/(console)/project-[project]/functions/function-[function]/(components)/deploymentCard.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte index b131983ca..5d698c934 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(components)/deploymentCard.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte @@ -114,7 +114,7 @@ {:else} Only the active deployment has a domain. {/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(components)/downloadActionMenuItem.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/downloadActionMenuItem.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/function-[function]/(components)/downloadActionMenuItem.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/downloadActionMenuItem.svelte diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/activateModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/activateModal.svelte similarity index 83% rename from src/routes/(console)/project-[project]/functions/function-[function]/(modals)/activateModal.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/activateModal.svelte index 5ea77ed0a..af30c552f 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/activateModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/activateModal.svelte @@ -6,6 +6,7 @@ import { sdk } from '$lib/stores/sdk'; import type { Models } from '@appwrite.io/console'; import { createEventDispatcher } from 'svelte'; + import { page } from '$app/state'; export let showActivate = false; export let selectedDeployment: Models.Deployment = null; @@ -14,10 +15,13 @@ const handleSubmit = async () => { try { - await sdk.forProject.functions.updateFunctionDeployment( - selectedDeployment.resourceId, - selectedDeployment.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.updateFunctionDeployment( + selectedDeployment.resourceId, + selectedDeployment.$id + ); + showActivate = false; addNotification({ type: 'success', diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/cancelDeploymentModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/cancelDeploymentModal.svelte similarity index 83% rename from src/routes/(console)/project-[project]/functions/function-[function]/(modals)/cancelDeploymentModal.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/cancelDeploymentModal.svelte index 27cefad21..de7b64692 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/cancelDeploymentModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/cancelDeploymentModal.svelte @@ -6,6 +6,7 @@ import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; + import { page } from '$app/state'; import type { Models } from '@appwrite.io/console'; export let showCancel = false; @@ -13,10 +14,13 @@ async function handleSubmit() { try { - await sdk.forProject.functions.updateDeploymentStatus( - selectedDeployment.resourceId, - selectedDeployment.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.updateDeploymentStatus( + selectedDeployment.resourceId, + selectedDeployment.$id + ); + await invalidate(Dependencies.FUNCTION); showCancel = false; addNotification({ diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createCli.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createCli.svelte similarity index 76% rename from src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createCli.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createCli.svelte index bcc852e01..ae5cdc4c3 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createCli.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createCli.svelte @@ -3,13 +3,12 @@ import { Modal } from '$lib/components'; import { onMount } from 'svelte'; import { page } from '$app/state'; - import { func } from '../store'; import { Alert, Code, Layout, Tabs } from '@appwrite.io/pink-svelte'; import { Link } from '$lib/elements'; export let show = false; - let lang = 'js'; + // let lang = 'js'; let codeSnippets = {}; let os = 'unknown'; let category = 'Unix'; @@ -17,8 +16,8 @@ const functionId = page.params.function; onMount(() => { - lang = setLanguage($func.runtime); - codeSnippets = setCodeSnippets(lang); + // lang = setLanguage($func.runtime); + codeSnippets = setCodeSnippets(); os = navigator['userAgentData']?.platform || navigator?.platform || 'unknown'; if (os.includes('Win')) { @@ -30,29 +29,29 @@ } }); - function setLanguage(runtime: string) { - if (runtime.includes('node') || runtime.includes('deno')) { - return 'js'; - } else if (runtime.includes('php')) { - return 'php'; - } else if (runtime.includes('python')) { - return 'py'; - } else if (runtime.includes('dart')) { - return 'dart'; - } else if (runtime.includes('dotnet')) { - return 'cs'; - } else if (runtime.includes('ruby')) { - return 'rb'; - } else if (runtime.includes('swift')) { - return 'swift'; - } else if (runtime.includes('kotlin')) { - return 'kt'; - } else if (runtime.includes('java')) { - return 'java'; - } - } + // function setLanguage(runtime: string) { + // if (runtime.includes('node') || runtime.includes('deno')) { + // return 'js'; + // } else if (runtime.includes('php')) { + // return 'php'; + // } else if (runtime.includes('python')) { + // return 'py'; + // } else if (runtime.includes('dart')) { + // return 'dart'; + // } else if (runtime.includes('dotnet')) { + // return 'cs'; + // } else if (runtime.includes('ruby')) { + // return 'rb'; + // } else if (runtime.includes('swift')) { + // return 'swift'; + // } else if (runtime.includes('kotlin')) { + // return 'kt'; + // } else if (runtime.includes('java')) { + // return 'java'; + // } + // } - function setCodeSnippets(lang: string) { + function setCodeSnippets() { return { Unix: { code: `appwrite client --projectId="${page.params.project}" && \\ diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createGit.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createGit.svelte similarity index 73% rename from src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createGit.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createGit.svelte index b9c62c8d6..85048d4f3 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createGit.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createGit.svelte @@ -4,15 +4,16 @@ import { Repositories } from '$lib/components/git'; import { Dependencies } from '$lib/constants'; import { Link } from '$lib/elements'; - import { Button, InputCheckbox, InputSelect } from '$lib/elements/forms'; + import { Button, InputCheckbox } from '$lib/elements/forms'; import { timeFromNow } from '$lib/helpers/date'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; import { installation, repository, sortBranches } from '$lib/stores/vcs'; import { Runtime, VCSDeploymentType, type Models } from '@appwrite.io/console'; import { IconGithub } from '@appwrite.io/pink-icons-svelte'; - import { Icon, Layout, Skeleton, Typography } from '@appwrite.io/pink-svelte'; + import { Icon, Input, Layout, Skeleton, Typography } from '@appwrite.io/pink-svelte'; import { func } from '../store'; + import { page } from '$app/state'; export let show = false; @@ -40,16 +41,14 @@ try { await loadInstallations(); if (!$repository?.id && hasRepository) { - $repository = await sdk.forProject.vcs.getRepository( - $installation.$id, - $func.providerRepositoryId - ); + $repository = await sdk + .forProject(page.params.region, page.params.project) + .vcs.getRepository($installation.$id, $func.providerRepositoryId); } selectedRepository = $repository?.id; - const branchList = await sdk.forProject.vcs.listRepositoryBranches( - $installation.$id, - selectedRepository - ); + const branchList = await sdk + .forProject(page.params.region, page.params.project) + .vcs.listRepositoryBranches($installation.$id, selectedRepository); const sorted = sortBranches(branchList.branches); branch = sorted[0]?.name ?? null; @@ -59,50 +58,55 @@ } return sorted; - } catch (error) { - console.log(installations); - console.log(error); + } catch { + return; } } async function createDeployment() { try { if (!$func?.providerRepositoryId) { - await sdk.forProject.functions.update( - $func.$id, - $func.name, - $func.runtime as Runtime, - $func.execute || undefined, - $func.events || undefined, - $func.schedule || undefined, - $func.timeout || undefined, - $func.enabled || undefined, - $func.logging || undefined, - $func.entrypoint, - $func.commands || undefined, - $func.scopes || undefined, - $installation.$id || undefined, - selectedRepository || undefined, - branch || undefined, - undefined, - undefined, - undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + $func.$id, + $func.name, + $func.runtime as Runtime, + $func.execute || undefined, + $func.events || undefined, + $func.schedule || undefined, + $func.timeout || undefined, + $func.enabled || undefined, + $func.logging || undefined, + $func.entrypoint, + $func.commands || undefined, + $func.scopes || undefined, + $installation.$id || undefined, + selectedRepository || undefined, + branch || undefined, + undefined, + undefined, + undefined + ); } if (commit) { - await sdk.forProject.functions.createVcsDeployment( - $func.$id, - VCSDeploymentType.Commit, - commit, - activate - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.createVcsDeployment( + $func.$id, + VCSDeploymentType.Commit, + commit, + activate + ); } else if (branch) { - await sdk.forProject.functions.createVcsDeployment( - $func.$id, - VCSDeploymentType.Branch, - branch, - activate - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.createVcsDeployment( + $func.$id, + VCSDeploymentType.Branch, + branch, + activate + ); } show = false; invalidate(Dependencies.DEPLOYMENTS); @@ -117,7 +121,13 @@ } } - $: console.log($repository); + $: if (!show) { + error = ''; + branch = null; + commit = null; + activate = true; + hasRepository = !!$func?.providerRepositoryId; + } @@ -177,13 +187,12 @@ - { branch = event.detail.value; }} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createManual.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createManual.svelte similarity index 67% rename from src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createManual.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createManual.svelte index 6d7320309..6259d577c 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createManual.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createManual.svelte @@ -4,27 +4,35 @@ import { Modal } from '$lib/components'; import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; - import { removeFile } from '$lib/helpers/files'; + import { InvalidFileType, removeFile } from '$lib/helpers/files'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; import { Icon, Layout, Tooltip, Typography, Upload } from '@appwrite.io/pink-svelte'; import { func } from '../store'; + import { page } from '$app/state'; + import { consoleVariables } from '$routes/(console)/store'; + import { currentPlan } from '$lib/stores/organization'; + import { isCloud } from '$lib/system'; + import { humanFileSize } from '$lib/helpers/sizeConvertion'; export let show = false; let files: FileList; let error: string = ''; + $: maxSize = + isCloud && $currentPlan?.deploymentSize + ? $currentPlan.deploymentSize * 1000000 + : $consoleVariables._APP_COMPUTE_SIZE_LIMIT; // already in MB + + $: readableMaxSize = humanFileSize(maxSize); + async function create() { try { - await sdk.forProject.functions.createDeployment( - $func.$id, - files[0], - true, - undefined, - undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.createDeployment($func.$id, files[0], true, undefined, undefined); await invalidate(Dependencies.DEPLOYMENTS); files = undefined; show = false; @@ -39,10 +47,23 @@ } } + function handleInvalid(e: CustomEvent) { + const reason = e.detail.reason; + if (reason === InvalidFileType.EXTENSION) { + error = 'Only .tar.gz files allowed'; + } else if (reason === InvalidFileType.SIZE) { + error = 'File size exceeds 10MB'; + } else { + error = 'Invalid file'; + } + } + $: filesList = files?.length ? Array.from(files).map((f) => { return { ...f, + name: f.name, + size: f.size, extension: f.type, removable: true }; @@ -56,7 +77,12 @@ Upload a tar.gz file containing your function source code - + Only .tar.gz files allowed - Max file size 10MB + Max file size: {readableMaxSize.value + + readableMaxSize.unit} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/deleteModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/deleteModal.svelte similarity index 83% rename from src/routes/(console)/project-[project]/functions/function-[function]/(modals)/deleteModal.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/deleteModal.svelte index 04e46fd45..98287abd6 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/deleteModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/deleteModal.svelte @@ -5,6 +5,7 @@ import { Dependencies } from '$lib/constants'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; + import { page } from '$app/state'; import type { Models } from '@appwrite.io/console'; export let showDelete = false; @@ -13,10 +14,9 @@ async function handleSubmit() { try { - await sdk.forProject.functions.deleteDeployment( - selectedDeployment.resourceId, - selectedDeployment.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.deleteDeployment(selectedDeployment.resourceId, selectedDeployment.$id); await invalidate(Dependencies.FUNCTION); showDelete = false; addNotification({ diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/redeployModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/redeployModal.svelte similarity index 78% rename from src/routes/(console)/project-[project]/functions/function-[function]/(modals)/redeployModal.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/redeployModal.svelte index d4783ba73..6409b9f2b 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/redeployModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/redeployModal.svelte @@ -7,9 +7,9 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { goto, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; + import { page } from '$app/state'; import type { Models } from '@appwrite.io/console'; import { base } from '$app/paths'; - import { page } from '$app/state'; export let show = false; export let selectedDeployment: Models.Deployment = null; @@ -18,11 +18,14 @@ async function redeploy() { try { - const deployment = await sdk.forProject.functions.createDuplicateDeployment( - $func.$id, - selectedDeployment.$id, - selectedDeployment?.buildId || undefined - ); + const deployment = await sdk + .forProject(page.params.region, page.params.project) + .functions.createDuplicateDeployment( + $func.$id, + selectedDeployment.$id, + selectedDeployment?.buildId || undefined + ); + addNotification({ type: 'success', message: `Redeploying ${$func.name}` @@ -33,7 +36,7 @@ invalidate(Dependencies.DEPLOYMENTS); if (redirect) { goto( - `${base}/project-${page.params.project}/functions/function-${$func.$id}/deployments/deployment-${deployment.$id}` + `${base}/project-${page.params.region}-${page.params.project}/functions/function-${$func.$id}/deployment-${deployment.$id}` ); } show = false; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.svelte similarity index 59% rename from src/routes/(console)/project-[project]/functions/function-[function]/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.svelte index b3582ba4e..689ac01f0 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.svelte @@ -1,7 +1,7 @@ + + +

This deployment is ready but not yet live. Activate it to make it publicly accessible.

+ + + + +
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/breadcrumbs.svelte similarity index 64% rename from src/routes/(console)/project-[project]/functions/function-[function]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/breadcrumbs.svelte index 5b626d71d..83622b79a 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/breadcrumbs.svelte @@ -1,5 +1,6 @@ + + +

Are you sure you want to cancel this deployment?

+ + + + +
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/delete.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/delete.svelte new file mode 100644 index 000000000..98287abd6 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/delete.svelte @@ -0,0 +1,36 @@ + + + + Are you sure you want to delete this deployment? + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+layout.ts similarity index 100% rename from src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+layout.ts rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+layout.ts diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte similarity index 95% rename from src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte index 150851a95..7f64649ea 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte @@ -18,7 +18,6 @@ Icon, Layout, Logs, - Popover, Spinner, Typography } from '@appwrite.io/pink-svelte'; @@ -26,8 +25,7 @@ import { formatTimeDetailed } from '$lib/helpers/timeConversion'; import { timer } from '$lib/actions/timer'; import { app } from '$lib/stores/app'; - import { getOutputDownload, getSourceDownload, showCreateDeployment } from '../store'; - import { IconDotsHorizontal, IconRefresh, IconTerminal } from '@appwrite.io/pink-icons-svelte'; + import { IconDotsHorizontal, IconRefresh } from '@appwrite.io/pink-icons-svelte'; import { Menu } from '$lib/components/menu'; import { canWriteFunctions } from '$lib/stores/roles'; import { Click, trackEvent } from '$lib/actions/analytics'; @@ -118,7 +116,7 @@ {#if data.func.deploymentId === data.deployment.$id && data.deployment.status === 'ready'} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.ts similarity index 72% rename from src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.ts index 374b96fd6..ddecf66ae 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.ts @@ -6,10 +6,9 @@ export const load: PageLoad = async ({ params, depends, parent }) => { const { function: func } = await parent(); depends(Dependencies.DEPLOYMENT); - const deployment = await sdk.forProject.functions.getDeployment( - params.function, - params.deployment - ); + const deployment = await sdk + .forProject(params.region, params.project) + .functions.getDeployment(params.function, params.deployment); return { func, diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte similarity index 53% rename from src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte index 7b9ff99bf..785e7076b 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte @@ -1,7 +1,7 @@ - {#if data.domains.total} -
+ {#if data.proxyRules.total} +
+ total={data.proxyRules.total} /> {:else if data?.search} @@ -72,7 +72,7 @@ @@ -83,9 +83,9 @@ {#if showDelete} - + {/if} {#if showRetry} - + {/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts similarity index 60% rename from src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts index 8f39e94d8..50397306c 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts @@ -26,18 +26,20 @@ export const load: PageLoad = async ({ depends, params, url, route }) => { limit, query, search, - domains: await sdk.forProject.proxy.listRules( - [ - Query.equal('type', [RuleType.DEPLOYMENT, RuleType.REDIRECT]), - Query.equal('deploymentResourceType', DeploymentResourceType.FUNCTION), - Query.equal('deploymentResourceId', params.function), - Query.equal('trigger', RuleTrigger.MANUAL), - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ], - search || undefined - ) + proxyRules: await sdk + .forProject(params.region, params.project) + .proxy.listRules( + [ + Query.equal('type', [RuleType.DEPLOYMENT, RuleType.REDIRECT]), + Query.equal('deploymentResourceType', DeploymentResourceType.FUNCTION), + Query.equal('deploymentResourceId', params.function), + Query.equal('trigger', RuleTrigger.MANUAL), + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ], + search || undefined + ) }; }; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte similarity index 77% rename from src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte index e6fdb78f9..2c931b0a9 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte @@ -9,7 +9,6 @@ import { goto, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { sortBranches } from '$lib/stores/vcs'; - import { protocol } from '$routes/(console)/store'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; import { LabelCard } from '$lib/components'; import { Runtime, StatusCode, type Models } from '@appwrite.io/console'; @@ -18,8 +17,11 @@ import { onMount } from 'svelte'; import { ConnectRepoModal } from '$lib/components/git/index.js'; import { isValueOfStringEnum } from '$lib/helpers/types.js'; + import { isCloud } from '$lib/system'; + import { project, regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; + import { getApexDomain } from '$lib/helpers/tlds'; - const routeBase = `${base}/project-${page.params.project}/functions/function-${page.params.function}/domains`; + const routeBase = `${base}/project-${page.params.region}-${page.params.project}/functions/function-${page.params.function}/domains`; let { data } = $props(); @@ -29,8 +31,8 @@ let behaviour: 'REDIRECT' | 'BRANCH' | 'ACTIVE' = $state('ACTIVE'); let domainName = $state(''); let redirect: string = $state(null); - let statusCode = $state(307); let branch: string = $state(null); + let statusCode = $state(StatusCode.TemporaryRedirect307); onMount(() => { if ( @@ -45,32 +47,44 @@ }); async function addDomain() { + const apexDomain = getApexDomain(domainName); + let domain = data.domains?.domains.find((d) => d.domain === apexDomain); + + if (apexDomain && !domain && isCloud) { + try { + domain = await sdk.forConsole.domains.create($project.teamId, apexDomain); + } catch (error) { + addNotification({ + type: 'error', + message: error.message + }); + + return; + } + } + try { let rule: Models.ProxyRule; if (behaviour === 'BRANCH') { - rule = await sdk.forProject.proxy.createFunctionRule( - domainName, - page.params.function, - branch - ); + rule = await sdk + .forProject(page.params.region, page.params.project) + .proxy.createFunctionRule(domainName, page.params.function, branch); } else if (behaviour === 'REDIRECT') { - const sc = Object.values(StatusCode).find((code) => parseInt(code) === statusCode); - rule = await sdk.forProject.proxy.createRedirectRule( - domainName, - $protocol + redirect, - sc - ); + rule = await sdk + .forProject(page.params.region, page.params.project) + .proxy.createRedirectRule(domainName, $regionalProtocol + redirect, statusCode); } else if (behaviour === 'ACTIVE') { - rule = await sdk.forProject.proxy.createFunctionRule( - domainName, - page.params.function - ); + rule = await sdk + .forProject(page.params.region, page.params.project) + .proxy.createFunctionRule(domainName, page.params.function); } if (rule?.status === 'verified') { await goto(routeBase); await invalidate(Dependencies.FUNCTION_DOMAINS); } else { - await goto(`${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}`); + await goto( + `${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}&domain=${domain.$id}` + ); await invalidate(Dependencies.FUNCTION_DOMAINS); } } catch (error) { @@ -86,29 +100,31 @@ if (!isValueOfStringEnum(Runtime, data.func.runtime)) { throw new Error(`Invalid runtime: ${data.func.runtime}`); } - await sdk.forProject.functions.update( - data.func.$id, - data.func.name, - data.func.runtime as Runtime, - data.func.execute || undefined, - data.func.events || undefined, - data.func.schedule || undefined, - data.func.timeout || undefined, - data.func.enabled || undefined, - data.func.logging || undefined, - data.func.entrypoint, - data.func.commands || undefined, - data.func.scopes || undefined, - selectedInstallationId, - selectedRepository, - 'main', - undefined, - undefined, - undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + data.func.$id, + data.func.name, + data.func.runtime as Runtime, + data.func.execute || undefined, + data.func.events || undefined, + data.func.schedule || undefined, + data.func.timeout || undefined, + data.func.enabled || undefined, + data.func.logging || undefined, + data.func.entrypoint, + data.func.commands || undefined, + data.func.scopes || undefined, + selectedInstallationId, + selectedRepository, + 'main', + undefined, + undefined, + undefined + ); await invalidate(Dependencies.FUNCTION); - } catch (error) { - console.log(error); + } catch { + return; } } diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts new file mode 100644 index 000000000..5de7f51a8 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts @@ -0,0 +1,36 @@ +import { sdk } from '$lib/stores/sdk'; +import { Query } from '@appwrite.io/console'; +import { RuleTrigger, RuleType } from '$lib/stores/sdk'; +import { Dependencies } from '$lib/constants'; +import { isCloud } from '$lib/system'; + +export const load = async ({ parent, depends, params }) => { + const { function: func, organization } = await parent(); + depends(Dependencies.DOMAINS, Dependencies.FUNCTION_DOMAINS); + + const [rules, installations, domains] = await Promise.all([ + sdk + .forProject(params.region, params.project) + .proxy.listRules([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('trigger', RuleTrigger.MANUAL) + ]), + sdk.forProject(params.region, params.project).vcs.listInstallations(), + isCloud + ? sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]) + : Promise.resolve(null) + ]); + + return { + func, + rules, + domains, + installations, + branches: + func?.installationId && func?.providerRepositoryId + ? await sdk + .forProject(params.region, params.project) + .vcs.listRepositoryBranches(func.installationId, func.providerRepositoryId) + : undefined + }; +}; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte similarity index 69% rename from src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte index 16902325e..d8d044ef1 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte @@ -20,42 +20,57 @@ import Wizard from '$lib/layout/wizard.svelte'; import { base } from '$app/paths'; import { writable } from 'svelte/store'; - import { consoleVariables } from '$routes/(console)/store'; + import { isASubdomain } from '$lib/helpers/tlds'; import NameserverTable from '$lib/components/domains/nameserverTable.svelte'; import RecordTable from '$lib/components/domains/recordTable.svelte'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; let { data } = $props(); const ruleId = page.url.searchParams.get('rule'); - let isSubDomain = $derived(page.params.domain?.split('.')?.length >= 3); + const domainId = page.url.searchParams.get('domain'); + const isSubDomain = $derived.by(() => isASubdomain(page.params.domain)); - let selectedTab: 'cname' | 'nameserver' | 'a' | 'aaaa' = $state( - !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain - ? 'cname' - : !!$consoleVariables._APP_DOMAIN_TARGET_A - ? 'a' - : !!$consoleVariables._APP_DOMAIN_TARGET_AAAA - ? 'aaaa' - : 'nameserver' - ); - let verified = $state(false); + let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); + $effect(() => { + if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { + selectedTab = 'cname'; + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_A) { + selectedTab = 'a'; + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { + selectedTab = 'aaaa'; + } else { + selectedTab = 'nameserver'; + } + }); + let verified: boolean | undefined = $state(undefined); - let routeBase = `${base}/project-${page.params.project}/functions/function-${page.params.function}/domains`; + let routeBase = `${base}/project-${page.params.region}-${page.params.project}/functions/function-${page.params.function}/domains`; let isSubmitting = $state(writable(false)); async function verify() { const isNewDomain = - data.domainsList.domains.findIndex((rule) => rule.domain === page.params.domain) === -1; + data.domainsList.domains.find((rule) => rule.domain === page.params.domain) === + undefined; try { if (selectedTab !== 'nameserver') { - const ruleData = await sdk.forProject.proxy.updateRuleVerification(ruleId); + const ruleData = await sdk + .forProject(page.params.region, page.params.project) + .proxy.updateRuleVerification(ruleId); verified = ruleData.status === 'verified'; } else if (isNewDomain && isCloud) { const domainData = await sdk.forConsole.domains.create( $organization.$id, page.params.domain ); - verified = domainData.nameservers.toLocaleLowerCase() === 'appwrite'; + verified = domainData.nameservers.toLowerCase() === 'appwrite'; + } else if (!isNewDomain && isCloud) { + const domain = await sdk.forConsole.domains.updateNameservers(domainId); + verified = domain.nameservers.toLowerCase() === 'appwrite'; + if (!verified) + throw new Error( + 'Domain verification failed. Please check your domain settings or try again later' + ); } addNotification({ @@ -77,7 +92,7 @@ async function back() { if (ruleId) { - await sdk.forProject.proxy.deleteRule(ruleId); + await sdk.forProject(page.params.region, page.params.project).proxy.deleteRule(ruleId); } await goto(`${routeBase}/add-domain?domain=${page.params.domain}`); } @@ -107,7 +122,7 @@
- {#if isSubDomain && !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && $consoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} + {#if isSubDomain && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && $regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} (selectedTab = 'cname')} @@ -123,7 +138,7 @@ Nameservers {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} + {#if !isCloud && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_A && $regionalConsoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} (selectedTab = 'a')} @@ -131,7 +146,7 @@ A {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} + {#if !isCloud && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} (selectedTab = 'aaaa')} diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts new file mode 100644 index 000000000..8f49a7343 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts @@ -0,0 +1,18 @@ +import { sdk } from '$lib/stores/sdk'; +import { isCloud } from '$lib/system'; +import { Dependencies } from '$lib/constants.js'; +import { type Models, Query } from '@appwrite.io/console'; + +export const load = async ({ depends, parent }) => { + const { organization } = await parent(); + depends(Dependencies.DOMAINS); + + let domainsList: Models.DomainsList; + if (isCloud) { + domainsList = await sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]); + } + + return { + domainsList + }; +}; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/deleteDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/deleteDomainModal.svelte similarity index 85% rename from src/routes/(console)/project-[project]/functions/function-[function]/domains/deleteDomainModal.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/deleteDomainModal.svelte index cbfc54944..c5ce1db80 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/deleteDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/deleteDomainModal.svelte @@ -8,15 +8,19 @@ import { Dependencies } from '$lib/constants'; import { Confirm } from '$lib/components'; import { Typography } from '@appwrite.io/pink-svelte'; + import { page } from '$app/state'; export let show = false; - export let selectedDomain: Models.ProxyRule; - let confirm = false; + export let selectedProxyRule: Models.ProxyRule; + let error = ''; + let confirm = false; async function deleteDomain() { try { - await sdk.forProject.proxy.deleteRule(selectedDomain.$id); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.deleteRule(selectedProxyRule.$id); await invalidate(Dependencies.FUNCTION_DOMAINS); show = false; addNotification({ @@ -32,13 +36,13 @@ - {#if selectedDomain} + {#if selectedProxyRule} Are you sure you want to delete this domain? You will no longer be able to execute your function by visiting: - {selectedDomain.domain} + {selectedProxyRule.domain} {/if} - import { Copy } from '$lib/components'; import { Link } from '$lib/elements'; - import type { Domain } from '$lib/sdk/domains'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; - import { Badge, Layout, Typography, Table, Fieldset, Icon } from '@appwrite.io/pink-svelte'; + import { + Badge, + Layout, + Typography, + Table, + Fieldset, + Icon, + InteractiveText + } from '@appwrite.io/pink-svelte'; import type { Models } from '@appwrite.io/console'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; - export let domain: Domain | Models.ProxyRule; + export let proxyRule: Models.ProxyRule;
@@ -14,7 +21,7 @@ - {domain?.domain} + {proxyRule?.domain} @@ -31,10 +38,12 @@ CNAME - {domain?.domain} + {proxyRule?.domain} - {globalThis?.location?.origin} + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte similarity index 60% rename from src/routes/(console)/project-[project]/functions/function-[function]/domains/retryDomainModal.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte index 9e0d3eb62..5a4722e6a 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/retryDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte @@ -7,26 +7,28 @@ import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; import { Dependencies } from '$lib/constants'; import RecordsCard from './recordsCard.svelte'; - import type { Domain } from '$lib/sdk/domains'; import type { Models } from '@appwrite.io/console'; + import { page } from '$app/state'; export let show = false; - export let selectedDomain: Domain | Models.ProxyRule; + export let selectedProxyRule: Models.ProxyRule; let error = null; - async function retryDomain() { + async function retryProxyRule() { try { - await sdk.forProject.proxy.updateRuleVerification(selectedDomain.$id); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.updateRuleVerification(selectedProxyRule.$id); await invalidate(Dependencies.SITES_DOMAINS); show = false; addNotification({ type: 'success', - message: `${selectedDomain.domain} has been deleted` + message: `${selectedProxyRule.domain} has been verified` }); - trackEvent(Submit.DomainDelete); + trackEvent(Submit.DomainUpdateVerification); } catch (e) { - error = e; - trackError(e, Submit.DomainDelete); + error = e.message; + trackError(e, Submit.DomainUpdateVerification); } } @@ -35,9 +37,9 @@ } - - {#if selectedDomain} - + + {#if selectedProxyRule} + {/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/store.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/functions/function-[function]/domains/store.ts rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/store.ts diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte similarity index 62% rename from src/routes/(console)/project-[project]/functions/function-[function]/domains/table.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte index 4fe75d81a..8e0b98a04 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte @@ -2,7 +2,6 @@ import { Click, trackEvent } from '$lib/actions/analytics'; import { Link } from '$lib/elements'; import { Button } from '$lib/elements/forms'; - import { protocol } from '$routes/(console)/store'; import type { Models } from '@appwrite.io/console'; import { IconDotsHorizontal, IconRefresh, IconTrash } from '@appwrite.io/pink-icons-svelte'; import { @@ -17,16 +16,25 @@ import DeleteDomainModal from './deleteDomainModal.svelte'; import RetryDomainModal from './retryDomainModal.svelte'; import { columns } from './store'; + import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; let { - domains + proxyRules }: { - domains: Models.ProxyRuleList; + proxyRules: Models.ProxyRuleList; } = $props(); let showDelete = $state(false); let showRetry = $state(false); - let selectedDomain: Models.ProxyRule = $state(null); + let selectedProxyRule: Models.ProxyRule = $state(null); + + const proxyTarget = (proxy: Models.ProxyRule) => { + return proxy?.redirectUrl + ? 'Redirect to ' + proxy.redirectUrl + : proxy?.deploymentVcsProviderBranch + ? 'Deployed from ' + proxy.deploymentVcsProviderBranch + : 'Active deployment'; + }; @@ -38,29 +46,36 @@ {/each} - {#each domains.rules as domain} + {#each proxyRules.rules as proxyRule} {#each $columns as column} {#if column.id === 'domain'} - - - {domain.domain} - {#if domain.status !== 'verified'} - - {/if} - - + + + + {proxyRule.domain} + + + {#if proxyRule.status === 'verifying'} + + {:else if proxyRule.status !== 'verified'} + + {/if} + {:else if column.id === 'target'} - {domain?.redirectUrl - ? 'Redirect to ' + domain.redirectUrl - : domain?.deploymentVcsProviderBranch - ? 'Deployed from' + domain.deploymentVcsProviderBranch - : '-'} + {proxyTarget(proxyRule)} {/if} {/each} @@ -79,11 +94,11 @@ - {#if domain.status !== 'verified'} + {#if proxyRule.status !== 'verified' && proxyRule.status !== 'verifying'} { - selectedDomain = domain; + selectedProxyRule = proxyRule; showRetry = true; toggle(e); }}> @@ -94,7 +109,7 @@ status="danger" leadingIcon={IconTrash} on:click={(e) => { - selectedDomain = domain; + selectedProxyRule = proxyRule; showDelete = true; toggle(e); trackEvent(Click.DomainDeleteClick, { @@ -113,9 +128,9 @@ {#if showDelete} - + {/if} {#if showRetry} - + {/if} diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+layout.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+layout.svelte new file mode 100644 index 000000000..d7af62449 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+layout.svelte @@ -0,0 +1,19 @@ + + + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.svelte similarity index 86% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.svelte index 84f962e42..b3f43680e 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.svelte @@ -6,7 +6,7 @@ import { Container, ResponsiveContainerHeader } from '$lib/layout'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; import { base } from '$app/paths'; import { Icon, Tooltip } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; @@ -30,7 +30,7 @@
+
Create execution diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.ts similarity index 73% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.ts rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.ts index 6f2190057..30145b9de 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.ts @@ -22,11 +22,13 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) => limit, query, func, - executions: await sdk.forProject.functions.listExecutions(params.function, [ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ]) + executions: await sdk + .forProject(params.region, params.project) + .functions.listExecutions(params.function, [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ]) }; }; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/delete.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/delete.svelte similarity index 84% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/delete.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/delete.svelte index 4cbfac0e6..369b83ba2 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/delete.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/delete.svelte @@ -4,9 +4,10 @@ import { Dependencies } from '$lib/constants'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import type { Models } from '@appwrite.io/console'; + import { page } from '$app/state'; import { func } from '../store'; import Confirm from '$lib/components/confirm.svelte'; + import type { Models } from '@appwrite.io/console'; export let showDelete = false; export let selectedExecution: Models.Execution; @@ -15,7 +16,9 @@ async function handleSubmit() { try { - await sdk.forProject.functions.deleteExecution($func.$id, selectedExecution.$id); + await sdk + .forProject(page.params.region, page.params.project) + .functions.deleteExecution($func.$id, selectedExecution.$id); await invalidate(Dependencies.EXECUTIONS); showDelete = false; addNotification({ diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/+page.svelte similarity index 96% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/+page.svelte index a5647cbde..a1f7ceaeb 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/+page.svelte @@ -39,7 +39,7 @@ import Wizard from '$lib/layout/wizard.svelte'; import Aside from './aside.svelte'; - let previousPage: string = `${base}/project-${page.params.project}/functions/function-${page.params.function}/executions`; + let previousPage: string = `${base}/project-${page.params.region}-${page.params.project}/functions/function-${page.params.function}/executions`; afterNavigate(({ from }) => { previousPage = from?.url?.pathname || previousPage; @@ -93,17 +93,19 @@ headersObject[name] = value; } - await sdk.forProject.functions.createExecution( - func.$id, - body, - true, - path, - method, - headersObject, - isScheduled ? dateTime.toISOString() : undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.createExecution( + func.$id, + body, + true, + path, + method, + headersObject, + isScheduled ? dateTime.toISOString() : undefined + ); await goto( - `${base}/project-${page.params.project}/functions/function-${func.$id}/executions` + `${base}/project-${page.params.region}-${page.params.project}/functions/function-${func.$id}/executions` ); invalidate(Dependencies.EXECUTIONS); addNotification({ diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/+page.ts similarity index 71% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.ts rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/+page.ts index 7ee66a5a4..a05abb585 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/+page.ts @@ -9,10 +9,9 @@ export const load: PageLoad = async ({ params, depends, parent }) => { return { func: data.function, activeDeployment: data.function.deploymentId - ? await sdk.forProject.functions.getDeployment( - params.function, - data.function.deploymentId - ) + ? await sdk + .forProject(params.region, params.project) + .functions.getDeployment(params.function, data.function.deploymentId) : null, proxyRuleList: data.proxyRuleList }; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/aside.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/aside.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/aside.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/aside.svelte diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/sheet.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/sheet.svelte new file mode 100644 index 000000000..e31caff20 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/sheet.svelte @@ -0,0 +1,178 @@ + + + + +
+ +
+ + + Execution ID + + {selectedLog?.$id} + + + + + + + +
+ {#if selectedLog} + + + + + + + Method + + + {selectedLog.requestMethod} + + + + + Status code + + + = 400 + ? 'error' + : selectedLog.responseStatusCode === 0 + ? undefined + : 'success'} /> + + + + + Status + + + +
+ + +
+ + {`Scheduled to execute on ${toLocaleDateTime(selectedLog.scheduledAt)}`} + +
+
+ + + + Triggered by + + + {capitalize(selectedLog.trigger)} + + + + + + Duration + + + {calculateTime(selectedLog.duration)} + + + + + + Created + + + {capitalize(timeFromNow(selectedLog.$createdAt))} + + +
+ + + Path + +
+ +
+
+
+
+ + + + + + +
+ {/if} +
+
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/store.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/store.ts rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/store.ts diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte similarity index 52% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte index fdcc79864..f54637771 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte @@ -1,32 +1,78 @@ - + {#each columns as { id, title }} {title} {/each} - {#each logs.executions as log} + {#each executions.executions as log (log.$id)} { e.stopPropagation(); open = true; @@ -75,7 +121,7 @@ {:else if column.id === 'duration'} - {formatTimeDetailed(log.duration)} + {calculateTime(log.duration)} {/if} {/each} @@ -83,4 +129,33 @@ {/each} - + + +{#if selectedRows.length > 0} + + + + + {selectedRows.length > 1 ? 'executions' : 'execution'} + selected + + + + + + + +{/if} + + +

+ Are you sure you want to delete {selectedRows.length} + {selectedRows.length > 1 ? 'executions' : 'execution'}? +

+ +

This action is irreversible.

+
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/header.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/header.svelte similarity index 89% rename from src/routes/(console)/project-[project]/functions/function-[function]/header.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/header.svelte index 7c42c6e2b..465aae173 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/header.svelte @@ -9,7 +9,7 @@ const projectId = page.params.project; const functionId = page.params.function; - const path = `${base}/project-${projectId}/functions/function-${functionId}`; + const path = `${base}/project-${page.params.region}-${projectId}/functions/function-${functionId}`; const tabs = [ { href: path, @@ -45,7 +45,7 @@ - + {$func?.name} {#if $func?.$id} diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/redeployModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/redeployModal.svelte new file mode 100644 index 000000000..ddf24e799 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/redeployModal.svelte @@ -0,0 +1,61 @@ + + + +

+ Are you sure you want to redeploy {$func.name}? Redeploying may affect your + production code. +

+ + + + + +
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.svelte similarity index 86% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.svelte index 0d1468222..fb956a65f 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.svelte @@ -20,13 +20,16 @@ import UpdateBuildCommand from './updateBuildCommand.svelte'; import UpdateResourceLimits from './updateResourceLimits.svelte'; import { isCloud } from '$lib/system'; - import UpdateVariables from '$routes/(console)/project-[project]/updateVariables.svelte'; + import UpdateVariables from '$routes/(console)/project-[region]-[project]/updateVariables.svelte'; + import { page } from '$app/state'; export let data; let showAlert = true; const sdkCreateVariable = async (key: string, value: string, secret?: boolean) => { - await sdk.forProject.functions.createVariable(data.function.$id, key, value, secret); + await sdk + .forProject(page.params.region, page.params.project) + .functions.createVariable(data.function.$id, key, value, secret); await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.FUNCTION)]); }; @@ -36,18 +39,16 @@ value: string, secret?: boolean ) => { - await sdk.forProject.functions.updateVariable( - data.function.$id, - variableId, - key, - value, - secret - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.updateVariable(data.function.$id, variableId, key, value, secret); await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.FUNCTION)]); }; const sdkDeleteVariable = async (variableId: string) => { - await sdk.forProject.functions.deleteVariable(data.function.$id, variableId); + await sdk + .forProject(page.params.region, page.params.project) + .functions.deleteVariable(data.function.$id, variableId); await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.FUNCTION)]); }; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.ts similarity index 86% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.ts rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.ts index e4ec0997b..cfccabca9 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.ts @@ -8,8 +8,8 @@ export const load = async ({ params, depends, parent }) => { const { runtimesList, specificationsList } = await parent(); const [globalVariables, variables] = await Promise.all([ - sdk.forProject.projectApi.listVariables(), - sdk.forProject.functions.listVariables(params.function) + sdk.forProject(params.region, params.project).projectApi.listVariables(), + sdk.forProject(params.region, params.project).functions.listVariables(params.function) ]); // Conflicting variables first diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/dangerZone.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/dangerZone.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/dangerZone.svelte diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/deleteModal.svelte similarity index 86% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/deleteModal.svelte index 7141fd8ce..15dc40585 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/deleteModal.svelte @@ -17,13 +17,15 @@ const handleSubmit = async () => { try { - await sdk.forProject.functions.delete(projectFunction.$id); + await sdk + .forProject(page.params.region, page.params.project) + .functions.delete(projectFunction.$id); showDelete = false; addNotification({ type: 'success', message: `Function has been deleted` }); - await goto(`${base}/project-${page.params.project}/functions`); + await goto(`${base}/project-${page.params.region}-${page.params.project}/functions`); trackEvent(Submit.FunctionDelete); } catch (e) { error = e.message; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/disconnectRepo.svelte similarity index 71% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/disconnectRepo.svelte index bdffc5582..11424d98b 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/disconnectRepo.svelte @@ -23,25 +23,27 @@ if (!isValueOfStringEnum(Runtime, $func.runtime)) { throw new Error(`Invalid runtime: ${$func.runtime}`); } - await sdk.forProject.functions.update( - functionId, - $func.name, - $func.runtime, - $func.execute || undefined, - $func.events || undefined, - $func.schedule || undefined, - $func.timeout || undefined, - $func.enabled || undefined, - $func.logging || undefined, - $func.entrypoint, - $func.commands || undefined, - $func.scopes || undefined, - '', - '', - '', - true, - '' - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + functionId, + $func.name, + $func.runtime, + $func.execute || undefined, + $func.events || undefined, + $func.schedule || undefined, + $func.timeout || undefined, + $func.enabled || undefined, + $func.logging || undefined, + $func.entrypoint, + $func.commands || undefined, + $func.scopes || undefined, + '', + '', + '', + true, + '' + ); await invalidate(Dependencies.FUNCTION); dispatch('success'); addNotification({ diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/executeFunction.svelte similarity index 84% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/executeFunction.svelte index 20f3bc670..7155d476f 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/executeFunction.svelte @@ -2,9 +2,9 @@ import { base } from '$app/paths'; import { CardGrid, SvgIcon } from '$lib/components'; import { Button } from '$lib/elements/forms'; - import { timeFromNow, toLocaleDateTime } from '$lib/helpers/date'; - import { project } from '$routes/(console)/project-[project]/store'; - import { Layout, Tooltip, Typography } from '@appwrite.io/pink-svelte'; + import { toLocaleDateTime } from '$lib/helpers/date'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; + import { Layout, Typography } from '@appwrite.io/pink-svelte'; import { func } from '../store'; import { capitalize } from '$lib/helpers/string'; @@ -41,7 +41,7 @@ diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateBuildCommand.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateBuildCommand.svelte similarity index 66% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateBuildCommand.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateBuildCommand.svelte index 616259065..91c6eff22 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateBuildCommand.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateBuildCommand.svelte @@ -8,6 +8,7 @@ import { sdk } from '$lib/stores/sdk'; import { isValueOfStringEnum } from '$lib/helpers/types'; import { Runtime, type Models } from '@appwrite.io/console'; + import { page } from '$app/state'; export let func: Models.Function; let buildCommand = func.commands; @@ -17,25 +18,27 @@ if (!isValueOfStringEnum(Runtime, func.runtime)) { throw new Error(`Invalid runtime: ${func.runtime}`); } - await sdk.forProject.functions.update( - func.$id, - func.name, - func.runtime, - func.execute || undefined, - func.events || undefined, - func.schedule || undefined, - func.timeout || undefined, - func.enabled || undefined, - func.logging || undefined, - func.entrypoint || undefined, - buildCommand || undefined, - func.scopes || undefined, - func.installationId || undefined, - func.providerRepositoryId || undefined, - func.providerBranch || undefined, - func.providerSilentMode || undefined, - func.providerRootDirectory || undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + func.$id, + func.name, + func.runtime, + func.execute || undefined, + func.events || undefined, + func.schedule || undefined, + func.timeout || undefined, + func.enabled || undefined, + func.logging || undefined, + func.entrypoint || undefined, + buildCommand || undefined, + func.scopes || undefined, + func.installationId || undefined, + func.providerRepositoryId || undefined, + func.providerBranch || undefined, + func.providerSilentMode || undefined, + func.providerRootDirectory || undefined + ); await invalidate(Dependencies.FUNCTION); addNotification({ type: 'success', diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateEvents.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateEvents.svelte similarity index 82% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateEvents.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateEvents.svelte index 3357da64d..3e2677462 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateEvents.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateEvents.svelte @@ -29,26 +29,28 @@ if (!isValueOfStringEnum(Runtime, $func.runtime)) { throw new Error(`Invalid runtime: ${$func.runtime}`); } - await sdk.forProject.functions.update( - functionId, - $func.name, - $func.runtime, - $func.execute || undefined, - Array.from($eventSet), - $func.schedule || undefined, - $func.timeout || undefined, - $func.enabled || undefined, - $func.logging || undefined, - $func.entrypoint || undefined, - $func.commands || undefined, - $func.scopes || undefined, - $func.installationId || undefined, - $func.providerRepositoryId || undefined, - $func.providerBranch || undefined, - $func.providerSilentMode || undefined, - $func.providerRootDirectory || undefined, - $func.specification || undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + functionId, + $func.name, + $func.runtime, + $func.execute || undefined, + Array.from($eventSet), + $func.schedule || undefined, + $func.timeout || undefined, + $func.enabled || undefined, + $func.logging || undefined, + $func.entrypoint || undefined, + $func.commands || undefined, + $func.scopes || undefined, + $func.installationId || undefined, + $func.providerRepositoryId || undefined, + $func.providerBranch || undefined, + $func.providerSilentMode || undefined, + $func.providerRootDirectory || undefined, + $func.specification || undefined + ); await invalidate(Dependencies.FUNCTION); addNotification({ message: 'Events have been updated', diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateLogging.svelte similarity index 66% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateLogging.svelte index 11698e636..94e922790 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateLogging.svelte @@ -9,6 +9,7 @@ import { isValueOfStringEnum } from '$lib/helpers/types'; import { Runtime, type Models } from '@appwrite.io/console'; import { Typography } from '@appwrite.io/pink-svelte'; + import { page } from '$app/state'; export let func: Models.Function; let logging = func.logging; @@ -18,26 +19,28 @@ if (!isValueOfStringEnum(Runtime, func.runtime)) { throw new Error(`Invalid runtime: ${func.runtime}`); } - await sdk.forProject.functions.update( - func.$id, - func.name, - func.runtime, - func.execute || undefined, - func.events || undefined, - func.schedule || undefined, - func.timeout || undefined, - func.enabled || undefined, - logging, - func.entrypoint || undefined, - func.commands || undefined, - func.scopes || undefined, - func.installationId || undefined, - func.providerRepositoryId || undefined, - func.providerBranch || undefined, - func.providerSilentMode || undefined, - func.providerRootDirectory || undefined, - func.specification || undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + func.$id, + func.name, + func.runtime, + func.execute || undefined, + func.events || undefined, + func.schedule || undefined, + func.timeout || undefined, + func.enabled || undefined, + logging, + func.entrypoint || undefined, + func.commands || undefined, + func.scopes || undefined, + func.installationId || undefined, + func.providerRepositoryId || undefined, + func.providerBranch || undefined, + func.providerSilentMode || undefined, + func.providerRootDirectory || undefined, + func.specification || undefined + ); await invalidate(Dependencies.FUNCTION); addNotification({ type: 'success', diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateName.svelte similarity index 66% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateName.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateName.svelte index 84979a7be..01ae9f554 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateName.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateName.svelte @@ -24,26 +24,28 @@ if (!isValueOfStringEnum(Runtime, $func.runtime)) { throw new Error(`Invalid runtime: ${$func.runtime}`); } - await sdk.forProject.functions.update( - functionId, - functionName, - $func.runtime, - $func.execute || undefined, - $func.events || undefined, - $func.schedule || undefined, - $func.timeout || undefined, - $func.enabled || undefined, - $func.logging || undefined, - $func.entrypoint || undefined, - $func.commands || undefined, - $func.scopes || undefined, - $func.installationId || undefined, - $func.providerRepositoryId || undefined, - $func.providerBranch || undefined, - $func.providerSilentMode || undefined, - $func.providerRootDirectory || undefined, - $func.specification || undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + functionId, + functionName, + $func.runtime, + $func.execute || undefined, + $func.events || undefined, + $func.schedule || undefined, + $func.timeout || undefined, + $func.enabled || undefined, + $func.logging || undefined, + $func.entrypoint || undefined, + $func.commands || undefined, + $func.scopes || undefined, + $func.installationId || undefined, + $func.providerRepositoryId || undefined, + $func.providerBranch || undefined, + $func.providerSilentMode || undefined, + $func.providerRootDirectory || undefined, + $func.specification || undefined + ); await invalidate(Dependencies.FUNCTION); addNotification({ message: 'Name has been updated', diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updatePermissions.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updatePermissions.svelte similarity index 70% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updatePermissions.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updatePermissions.svelte index d7211e66b..82c2813a2 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updatePermissions.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updatePermissions.svelte @@ -29,26 +29,28 @@ if (!isValueOfStringEnum(Runtime, $func.runtime)) { throw new Error(`Invalid runtime: ${$func.runtime}`); } - await sdk.forProject.functions.update( - functionId, - $func.name, - $func.runtime, - permissions, - $func.events || undefined, - $func.schedule || undefined, - $func.timeout || undefined, - $func.enabled || undefined, - $func.logging || undefined, - $func.entrypoint || undefined, - $func.commands || undefined, - $func.scopes || undefined, - $func.installationId || undefined, - $func.providerRepositoryId || undefined, - $func.providerBranch || undefined, - $func.providerSilentMode || undefined, - $func.providerRootDirectory || undefined, - $func.specification || undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + functionId, + $func.name, + $func.runtime, + permissions, + $func.events || undefined, + $func.schedule || undefined, + $func.timeout || undefined, + $func.enabled || undefined, + $func.logging || undefined, + $func.entrypoint || undefined, + $func.commands || undefined, + $func.scopes || undefined, + $func.installationId || undefined, + $func.providerRepositoryId || undefined, + $func.providerBranch || undefined, + $func.providerSilentMode || undefined, + $func.providerRootDirectory || undefined, + $func.specification || undefined + ); await invalidate(Dependencies.FUNCTION); addNotification({ message: 'Permissions have been updated', diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRepository.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRepository.svelte similarity index 74% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRepository.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRepository.svelte index 5e3240fa0..e4192ecee 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRepository.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRepository.svelte @@ -9,7 +9,7 @@ import { Runtime, type Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import DisconnectRepo from './disconnectRepo.svelte'; - import { sortBranches } from '$lib/stores/vcs'; + import { installation, repository as repositoryStore, sortBranches } from '$lib/stores/vcs'; import { Empty, Fieldset, @@ -24,33 +24,39 @@ import { IconGithub } from '@appwrite.io/pink-icons-svelte'; import { ConnectGit, ConnectRepoModal, RepositoryCard } from '$lib/components/git'; import { isValueOfStringEnum } from '$lib/helpers/types'; + import { page } from '$app/state'; + import SelectRootModal from '$lib/components/git/selectRootModal.svelte'; export let func: Models.Function; export let installations: Models.InstallationList; let branchesList: Models.BranchList; - let selectedBranch: string; - let silentMode = false; - let selectedDir: string; + let selectedBranch = func?.providerBranch; + let silentMode = func?.providerSilentMode ?? false; + let selectedDir = func?.providerRootDirectory; let showDisconnect = false; let showConnectRepo = false; + let showSelectRoot = false; let repository: Models.ProviderRepository | null | false = false; onMount(() => { selectedBranch = func?.providerBranch; silentMode = func?.providerSilentMode ?? false; selectedDir = func?.providerRootDirectory; - + const inst = installations?.installations.find( + (installation) => installation.$id === func?.installationId + ); + installation.set(inst ?? installations?.installations[0]); loadRepository(); }); async function loadRepository() { try { if (func.installationId && func.providerRepositoryId) { - repository = await sdk.forProject.vcs.getRepository( - func.installationId, - func.providerRepositoryId - ); + repository = await sdk + .forProject(page.params.region, page.params.project) + .vcs.getRepository(func.installationId, func.providerRepositoryId); + repositoryStore.set(repository); } } catch (err) { console.warn(err); @@ -65,25 +71,27 @@ if (!isValueOfStringEnum(Runtime, func.runtime)) { throw new Error(`Invalid runtime: ${func.runtime}`); } - await sdk.forProject.functions.update( - func.$id, - func.name, - func.runtime, - func.execute || undefined, - func.events || undefined, - func.schedule || undefined, - func.timeout || undefined, - func.enabled || undefined, - func.logging || undefined, - func.entrypoint || undefined, - func.commands || undefined, - func.scopes || undefined, - func.installationId || undefined, - func.providerRepositoryId || undefined, - selectedBranch, - silentMode, - selectedDir - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + func.$id, + func.name, + func.runtime, + func.execute || undefined, + func.events || undefined, + func.schedule || undefined, + func.timeout || undefined, + func.enabled || undefined, + func.logging || undefined, + func.entrypoint || undefined, + func.commands || undefined, + func.scopes || undefined, + func.installationId || undefined, + func.providerRepositoryId || undefined, + selectedBranch, + silentMode, + selectedDir + ); await invalidate(Dependencies.FUNCTION); addNotification({ type: 'success', @@ -99,7 +107,9 @@ } } async function getBranches(installation: string, repo: string) { - branchesList = await sdk.forProject.vcs.listRepositoryBranches(installation, repo); + branchesList = await sdk + .forProject(page.params.region, page.params.project) + .vcs.listRepositoryBranches(installation, repo); branchesList.branches = sortBranches(branchesList.branches); selectedBranch = func?.providerBranch ?? branchesList.branches[0].name; @@ -119,29 +129,31 @@ if (!isValueOfStringEnum(Runtime, func.runtime)) { throw new Error(`Invalid runtime: ${func.runtime}`); } - await sdk.forProject.functions.update( - func.$id, - func.name, - func.runtime as Runtime, - func.execute || undefined, - func.events || undefined, - func.schedule || undefined, - func.timeout || undefined, - func.enabled || undefined, - func.logging || undefined, - func.entrypoint, - func.commands || undefined, - func.scopes || undefined, - selectedInstallationId, - selectedRepository, - 'main', - undefined, - undefined, - undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + func.$id, + func.name, + func.runtime as Runtime, + func.execute || undefined, + func.events || undefined, + func.schedule || undefined, + func.timeout || undefined, + func.enabled || undefined, + func.logging || undefined, + func.entrypoint, + func.commands || undefined, + func.scopes || undefined, + selectedInstallationId, + selectedRepository, + 'main', + undefined, + undefined, + undefined + ); await invalidate(Dependencies.FUNCTION); - } catch (error) { - console.log(error); + } catch { + return; } } @@ -216,7 +228,8 @@ label="Root directory" placeholder="Select directory" bind:value={selectedDir} /> - + {/if} +{#if showSelectRoot} + +{/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateResourceLimits.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateResourceLimits.svelte similarity index 75% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateResourceLimits.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateResourceLimits.svelte index d72598f8c..4f2993948 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateResourceLimits.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateResourceLimits.svelte @@ -13,6 +13,7 @@ import { upgradeURL } from '$lib/stores/billing'; import { isCloud } from '$lib/system'; import { organization } from '$lib/stores/organization'; + import { page } from '$app/state'; export let func: Models.Function; export let specs: Models.SpecificationList; @@ -23,25 +24,28 @@ if (!isValueOfStringEnum(Runtime, func.runtime)) { throw new Error(`Invalid runtime: ${func.runtime}`); } - await sdk.forProject.functions.update( - func.$id, - func.name, - func.runtime, - func.execute || undefined, - func.events || undefined, - func.schedule || undefined, - func.timeout || undefined, - func.enabled || undefined, - func.logging || undefined, - func.entrypoint || undefined, - func.commands || undefined, - func.scopes || undefined, - func.installationId || undefined, - func.providerRepositoryId || undefined, - func.providerBranch || undefined, - func.providerSilentMode || undefined, - func.providerRootDirectory || undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + func.$id, + func.name, + func.runtime, + func.execute || undefined, + func.events || undefined, + func.schedule || undefined, + func.timeout || undefined, + func.enabled || undefined, + func.logging || undefined, + func.entrypoint || undefined, + func.commands || undefined, + func.scopes || undefined, + func.installationId || undefined, + func.providerRepositoryId || undefined, + func.providerBranch || undefined, + func.providerSilentMode || undefined, + func.providerRootDirectory || undefined, + specification || undefined + ); await invalidate(Dependencies.FUNCTION); addNotification({ type: 'success', diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte similarity index 58% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte index b6d7340e9..a46c7cb8f 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte @@ -7,64 +7,49 @@ import { Button, Form, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import { onMount } from 'svelte'; import { func } from '../store'; import InputSelect from '$lib/elements/forms/inputSelect.svelte'; - import { specificationsList } from '$lib/stores/specifications'; import { isValueOfStringEnum } from '$lib/helpers/types'; import { Runtime, type Models } from '@appwrite.io/console'; import { Layout, Typography } from '@appwrite.io/pink-svelte'; import Link from '$lib/elements/link.svelte'; - export let runtimesList: Models.RuntimeList; const functionId = page.params.function; - let runtime: string = $func.runtime; - let entrypoint = $func.entrypoint; + export let runtimesList: Models.RuntimeList; + let { runtime, entrypoint } = $func; - let options = []; - let specificationOptions = []; - - onMount(async () => { - let allowedSpecifications = (await $specificationsList).specifications; - options = runtimesList.runtimes.map((runtime) => ({ - label: `${runtime.name} - ${runtime.version}`, - value: runtime.$id - })); - - specificationOptions = allowedSpecifications.map((size) => ({ - label: - `${size.cpus} CPU, ${size.memory} MB RAM` + - (!size.enabled ? ` (Upgrade to use this)` : ''), - value: size.slug, - disabled: !size.enabled - })); - }); + const options = runtimesList.runtimes.map((runtime) => ({ + label: `${runtime.name} - ${runtime.version}`, + value: runtime.$id + })); async function updateRuntime() { try { if (!isValueOfStringEnum(Runtime, runtime)) { throw new Error(`Invalid runtime: ${runtime}`); } - await sdk.forProject.functions.update( - functionId, - $func.name, - runtime, - $func.execute || undefined, - $func.events || undefined, - $func.schedule || undefined, - $func.timeout || undefined, - $func.enabled || undefined, - $func.logging || undefined, - entrypoint || undefined, - $func.commands || undefined, - $func.scopes || undefined, - $func.installationId || undefined, - $func.providerRepositoryId || undefined, - $func.providerBranch || undefined, - $func.providerSilentMode || undefined, - $func.providerRootDirectory || undefined, - $func.specification || undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + functionId, + $func.name, + runtime, + $func.execute || undefined, + $func.events || undefined, + $func.schedule || undefined, + $func.timeout || undefined, + $func.enabled || undefined, + $func.logging || undefined, + entrypoint || undefined, + $func.commands || undefined, + $func.scopes || undefined, + $func.installationId || undefined, + $func.providerRepositoryId || undefined, + $func.providerBranch || undefined, + $func.providerSilentMode || undefined, + $func.providerRootDirectory || undefined, + $func.specification || undefined + ); await invalidate(Dependencies.FUNCTION); addNotification({ message: 'Runtime settings have been updated', @@ -106,13 +91,7 @@ id="entrypoint" required placeholder="Enter entrypoint" - bind:value={$func.entrypoint} /> - + bind:value={entrypoint} />
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateSchedule.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateSchedule.svelte similarity index 69% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateSchedule.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateSchedule.svelte index 3935689e4..87b61c7cb 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateSchedule.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateSchedule.svelte @@ -29,27 +29,28 @@ // an error is shown if invalid. parseExpression(functionSchedule); - - await sdk.forProject.functions.update( - functionId, - $func.name, - $func.runtime, - $func.execute || undefined, - $func.events || undefined, - functionSchedule, - $func.timeout || undefined, - $func.enabled || undefined, - $func.logging || undefined, - $func.entrypoint || undefined, - $func.commands || undefined, - $func.scopes || undefined, - $func.installationId || undefined, - $func.providerRepositoryId || undefined, - $func.providerBranch || undefined, - $func.providerSilentMode || undefined, - $func.providerRootDirectory || undefined, - $func.specification || undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + functionId, + $func.name, + $func.runtime, + $func.execute || undefined, + $func.events || undefined, + functionSchedule, + $func.timeout || undefined, + $func.enabled || undefined, + $func.logging || undefined, + $func.entrypoint || undefined, + $func.commands || undefined, + $func.scopes || undefined, + $func.installationId || undefined, + $func.providerRepositoryId || undefined, + $func.providerBranch || undefined, + $func.providerSilentMode || undefined, + $func.providerRootDirectory || undefined, + $func.specification || undefined + ); await invalidate(Dependencies.FUNCTION); addNotification({ type: 'success', diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateScopes.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte similarity index 69% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateScopes.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte index fddfbde49..0442d0bc2 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateScopes.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte @@ -11,7 +11,7 @@ import { func } from '../store'; import { isValueOfStringEnum } from '$lib/helpers/types'; import { Runtime } from '@appwrite.io/console'; - import Scopes from '$routes/(console)/project-[project]/overview/keys/scopes.svelte'; + import Scopes from '$routes/(console)/project-[region]-[project]/overview/keys/scopes.svelte'; import { symmetricDifference } from '$lib/helpers/array'; import { Link } from '$lib/elements'; @@ -27,26 +27,28 @@ if (!isValueOfStringEnum(Runtime, $func.runtime)) { throw new Error(`Invalid runtime: ${$func.runtime}`); } - await sdk.forProject.functions.update( - functionId, - $func.name, - $func.runtime, - $func.execute || undefined, - $func.events || undefined, - $func.schedule || undefined, - $func.timeout || undefined, - $func.enabled || undefined, - $func.logging || undefined, - $func.entrypoint || undefined, - $func.commands || undefined, - functionScopes, - $func.installationId || undefined, - $func.providerRepositoryId || undefined, - $func.providerBranch || undefined, - $func.providerSilentMode || undefined, - $func.providerRootDirectory || undefined, - $func.specification || undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + functionId, + $func.name, + $func.runtime, + $func.execute || undefined, + $func.events || undefined, + $func.schedule || undefined, + $func.timeout || undefined, + $func.enabled || undefined, + $func.logging || undefined, + $func.entrypoint || undefined, + $func.commands || undefined, + functionScopes, + $func.installationId || undefined, + $func.providerRepositoryId || undefined, + $func.providerBranch || undefined, + $func.providerSilentMode || undefined, + $func.providerRootDirectory || undefined, + $func.specification || undefined + ); await invalidate(Dependencies.FUNCTION); addNotification({ type: 'success', diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateTimeout.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateTimeout.svelte similarity index 67% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateTimeout.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateTimeout.svelte index b0f778403..a7a60bcd8 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateTimeout.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateTimeout.svelte @@ -24,26 +24,28 @@ if (!isValueOfStringEnum(Runtime, $func.runtime)) { throw new Error(`Invalid runtime: ${$func.runtime}`); } - await sdk.forProject.functions.update( - functionId, - $func.name, - $func.runtime, - $func.execute || undefined, - $func.events || undefined, - $func.schedule || undefined, - timeout, - $func.enabled || undefined, - $func.logging || undefined, - $func.entrypoint || undefined, - $func.commands || undefined, - $func.scopes || undefined, - $func.installationId || undefined, - $func.providerRepositoryId || undefined, - $func.providerBranch || undefined, - $func.providerSilentMode || undefined, - $func.providerRootDirectory || undefined, - $func.specification || undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.update( + functionId, + $func.name, + $func.runtime, + $func.execute || undefined, + $func.events || undefined, + $func.schedule || undefined, + timeout, + $func.enabled || undefined, + $func.logging || undefined, + $func.entrypoint || undefined, + $func.commands || undefined, + $func.scopes || undefined, + $func.installationId || undefined, + $func.providerRepositoryId || undefined, + $func.providerBranch || undefined, + $func.providerSilentMode || undefined, + $func.providerRootDirectory || undefined, + $func.specification || undefined + ); await invalidate(Dependencies.FUNCTION); addNotification({ type: 'success', diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/store.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/store.ts similarity index 85% rename from src/routes/(console)/project-[project]/functions/function-[function]/store.ts rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/store.ts index 6bc48c3e1..3df9875a4 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/store.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/store.ts @@ -1,8 +1,8 @@ -import { page } from '$app/stores'; -import { derived, writable, type Writable } from 'svelte/store'; +import { derived, get, writable, type Writable } from 'svelte/store'; import { DeploymentDownloadType, type Models } from '@appwrite.io/console'; import type { Column } from '$lib/helpers/types'; import { sdk } from '$lib/stores/sdk'; +import { page } from '$app/stores'; export const func = derived(page, ($page) => $page.data.function as Models.Function); export const deploymentList = derived( @@ -144,20 +144,27 @@ export const columns = writable([ ]); export function getOutputDownload(funcId: string, deploymentId: string) { + const p = get(page); return ( - sdk.forProject.functions.getDeploymentDownload( - funcId, - deploymentId.toString(), - DeploymentDownloadType.Output - ) + '&mode=admin' + sdk + .forProject(p.params.region, p.params.project) + .functions.getDeploymentDownload( + funcId, + deploymentId.toString(), + DeploymentDownloadType.Output + ) + '&mode=admin' ); } export function getSourceDownload(funcId: string, deploymentId: string) { + const p = get(page); + return ( - sdk.forProject.functions.getDeploymentDownload( - funcId, - deploymentId.toString(), - DeploymentDownloadType.Source - ) + '&mode=admin' + sdk + .forProject(p.params.region, p.params.project) + .functions.getDeploymentDownload( + funcId, + deploymentId.toString(), + DeploymentDownloadType.Source + ) + '&mode=admin' ); } diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte similarity index 67% rename from src/routes/(console)/project-[project]/functions/function-[function]/table.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte index 8d7bfb90d..fdfdfdb14 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte @@ -1,5 +1,5 @@ - + {#each columns as { id, title }} @@ -58,7 +102,8 @@ {#each data.deploymentList.deployments as deployment (deployment.$id)} + id={deployment.$id} + href={`${base}/project-${page.params.region}-${page.params.project}/functions/function-${page.params.function}/deployment-${deployment.$id}`}> {#each columns as column} {#if column.id === '$id'} @@ -104,16 +149,18 @@ - { - selectedDeployment = deployment; - showRedeploy = true; - toggle(); - trackEvent(Click.FunctionsRedeployClick); - }}> - Redeploy - + {#if deployment.sourceSize !== 0} + { + selectedDeployment = deployment; + showRedeploy = true; + toggle(); + trackEvent(Click.FunctionsRedeployClick); + }}> + Redeploy + + {/if} {#if deployment.status === 'ready' && deployment.$id !== $func.deploymentId} {/if} + +{#if selectedRows.length > 0} + + + + + {selectedRows.length > 1 ? 'deployments' : 'deployment'} + selected + + + + + + + +{/if} + + +

+ Are you sure you want to delete {selectedRows.length} + {selectedRows.length > 1 ? 'deployments' : 'deployment'} from your function - + {$func.name}? +

+ +

This action is irreversible.

+
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.svelte similarity index 77% rename from src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.svelte index 2c25929b6..30c05dd10 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.svelte @@ -1,11 +1,10 @@ Console - Appwrite - + diff --git a/src/routes/(console)/project-[project]/messaging/+layout.svelte b/src/routes/(console)/project-[region]-[project]/messaging/+layout.svelte similarity index 91% rename from src/routes/(console)/project-[project]/messaging/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/+layout.svelte index b0e76eddf..f24af0b59 100644 --- a/src/routes/(console)/project-[project]/messaging/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/+layout.svelte @@ -32,7 +32,7 @@ label: 'Go to Topics', keys: ['g', 't'], callback() { - goto(`${base}/project-${$project.$id}/messaging/topics`); + goto(`${base}/project-${$project.region}-${$project.$id}/messaging/topics`); }, disabled: page.url.pathname.endsWith('topics') || page.url.pathname.includes('message-'), @@ -43,7 +43,7 @@ label: 'Go to Providers', keys: ['g', 'p'], callback() { - goto(`${base}/project-${$project.$id}/messaging/providers`); + goto(`${base}/project-${$project.region}-${$project.$id}/messaging/providers`); }, disabled: page.url.pathname.endsWith('providers') || page.url.pathname.includes('message-'), diff --git a/src/routes/(console)/project-[project]/messaging/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/+layout.ts similarity index 100% rename from src/routes/(console)/project-[project]/messaging/+layout.ts rename to src/routes/(console)/project-[region]-[project]/messaging/+layout.ts diff --git a/src/routes/(console)/project-[project]/messaging/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte similarity index 96% rename from src/routes/(console)/project-[project]/messaging/+page.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/+page.svelte index 4ba4b29da..eb9a46e4d 100644 --- a/src/routes/(console)/project-[project]/messaging/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte @@ -64,12 +64,13 @@ { id: 'deliveredAt', title: 'Delivered at', type: 'datetime', width: { min: 120 } } ]); + const region = page.params.region; const project = page.params.project; async function handleDelete() { showDelete = false; - const promises = selected.map((id) => sdk.forProject.messaging.delete(id)); + const promises = selected.map((id) => sdk.forProject(region, project).messaging.delete(id)); try { await Promise.all(promises); @@ -133,7 +134,7 @@ + href={`${base}/project-${region}-${project}/messaging/message-${message.$id}`}> {#each $columns as column (column.id)} {#if column.id === '$id'} @@ -212,7 +213,7 @@ - diff --git a/src/routes/(console)/project-[project]/messaging/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts similarity index 69% rename from src/routes/(console)/project-[project]/messaging/+page.ts rename to src/routes/(console)/project-[region]-[project]/messaging/+page.ts index 1e84dd190..0436e02e7 100644 --- a/src/routes/(console)/project-[project]/messaging/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts @@ -13,7 +13,7 @@ import { sdk } from '$lib/stores/sdk'; import { Query, type Models } from '@appwrite.io/console'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ depends, url, route }) => { +export const load: PageLoad = async ({ depends, url, route, params }) => { depends(Dependencies.MESSAGING_MESSAGES); const page = getPage(url); @@ -33,15 +33,17 @@ export const load: PageLoad = async ({ depends, url, route }) => { query, page, view, - messages: (await sdk.forProject.messaging.listMessages( - [ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ], - search || undefined - )) as { + messages: (await sdk + .forProject(params.region, params.project) + .messaging.listMessages( + [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ], + search || undefined + )) as { total: number; messages: (Models.Message & { data: Record })[]; // Add typing for message.data } diff --git a/src/routes/(console)/project-[project]/messaging/actions.svelte b/src/routes/(console)/project-[region]-[project]/messaging/actions.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/actions.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/actions.svelte diff --git a/src/routes/(console)/project-[project]/messaging/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/messaging/breadcrumbs.svelte similarity index 70% rename from src/routes/(console)/project-[project]/messaging/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/breadcrumbs.svelte index b3d6b6a09..8c5fe3210 100644 --- a/src/routes/(console)/project-[project]/messaging/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/breadcrumbs.svelte @@ -1,5 +1,6 @@ @@ -59,7 +58,9 @@ Sorry, we couldn't find '{data.search}'

There are no providers that match your search.

- diff --git a/src/routes/(console)/project-[project]/messaging/providers/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts similarity index 66% rename from src/routes/(console)/project-[project]/messaging/providers/+page.ts rename to src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts index 06efd872a..e8f6bf337 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts @@ -13,7 +13,7 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import { queries, queryParamToMap } from '$lib/components/filters'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ depends, url, route }) => { +export const load: PageLoad = async ({ depends, url, route, params }) => { depends(Dependencies.MESSAGING_PROVIDERS); const page = getPage(url); @@ -33,14 +33,16 @@ export const load: PageLoad = async ({ depends, url, route }) => { query, page, view, - providers: await sdk.forProject.messaging.listProviders( - [ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ], - search || undefined - ) + providers: await sdk + .forProject(params.region, params.project) + .messaging.listProviders( + [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ], + search || undefined + ) }; }; diff --git a/src/routes/(console)/project-[project]/messaging/providers/components/apple.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/components/apple.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/components/apple.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/components/apple.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/components/firebase.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/components/firebase.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/components/firebase.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/components/firebase.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/components/index.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/components/index.ts similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/components/index.ts rename to src/routes/(console)/project-[region]-[project]/messaging/providers/components/index.ts diff --git a/src/routes/(console)/project-[project]/messaging/providers/components/mailgun.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/components/mailgun.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/components/mailgun.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/components/mailgun.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/components/msg91.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/components/msg91.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/components/msg91.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/components/msg91.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/components/sendgrid.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/components/sendgrid.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/components/sendgrid.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/components/sendgrid.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/components/telesign.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/components/telesign.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/components/telesign.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/components/telesign.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/components/textmagic.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/components/textmagic.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/components/textmagic.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/components/textmagic.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/components/twilio.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/components/twilio.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/components/twilio.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/components/twilio.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/components/vonage.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/components/vonage.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/components/vonage.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/components/vonage.svelte diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte new file mode 100644 index 000000000..5b8cef881 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte @@ -0,0 +1,242 @@ + + + + + +
+ +
+
+ +
+ + + +
+ + + + + Need a hand? + + {#if providers[$providerType].providers[$provider].needAHand} + {@const needAHand = providers[$providerType].providers[$provider].needAHand} + + + {#each needAHand as p} +

+ {@html p} +

+ {/each} +
+
+ {/if} + + { + $newMemberModal = true; + }} + title="Invite a team member" + icon={IconUserGroup} /> +
+
+
+
+ {#if $newMemberModal} + + {/if} +
diff --git a/src/routes/(console)/project-[project]/messaging/providers/createProviderDropdown.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/createProviderDropdown.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/createProviderDropdown.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/createProviderDropdown.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/popoverContent.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/popoverContent.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/popoverContent.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/popoverContent.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.ts similarity index 75% rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.ts rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.ts index c0e35225a..480c7be2e 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.ts @@ -10,6 +10,8 @@ export const load: LayoutLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - provider: await sdk.forProject.messaging.getProvider(params.provider) + provider: await sdk + .forProject(params.region, params.project) + .messaging.getProvider(params.provider) }; }; diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+page.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+page.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte similarity index 61% rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte index 0d8b2c1c8..09e63d399 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte @@ -2,7 +2,7 @@ import { base } from '$app/paths'; import { Breadcrumbs } from '$lib/layout'; import { organization } from '$lib/stores/organization'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; import { provider } from './store'; $: breadcrumbs = [ @@ -11,15 +11,15 @@ title: $organization.name }, { - href: `${base}/project-${$project.$id}`, + href: `${base}/project-${$project.region}-${$project.$id}`, title: $project.name }, { - href: `${base}/project-${$project.$id}/messaging`, + href: `${base}/project-${$project.region}-${$project.$id}/messaging`, title: 'Messaging' }, { - href: `${base}/project-${$project.$id}/messaging/providers/provider-${$provider?.$id}`, + href: `${base}/project-${$project.region}-${$project.$id}/messaging/providers/provider-${$provider?.$id}`, title: $provider?.name } ]; diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/dangerZone.svelte similarity index 84% rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/dangerZone.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/dangerZone.svelte index 033c6a399..a5f725ed5 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/dangerZone.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/dangerZone.svelte @@ -1,24 +1,25 @@ diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte similarity index 80% rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte index 1d2344a40..cb0eb24a8 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte @@ -13,14 +13,18 @@ let error: string; const deleteProvider = async () => { try { - await sdk.forProject.messaging.deleteProvider($provider.$id); + await sdk + .forProject(page.params.region, page.params.project) + .messaging.deleteProvider($provider.$id); showDelete = false; addNotification({ type: 'success', message: `${$provider.name} has been deleted` }); trackEvent(Submit.MessagingProviderDelete); - await goto(`${base}/project-${page.params.project}/messaging/providers`); + await goto( + `${base}/project-${page.params.region}-${page.params.project}/messaging/providers` + ); } catch (e) { error = e.message; trackError(e, Submit.MessagingProviderDelete); diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/header.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/header.svelte similarity index 83% rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/header.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/header.svelte index 346837562..0c614a491 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/header.svelte @@ -10,7 +10,7 @@ - + {$provider?.name ? $provider?.name : '-'} {$provider?.$id} diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/store.ts rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/store.ts diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateName.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateName.svelte similarity index 56% rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateName.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateName.svelte index f44f90294..9c4170675 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateName.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateName.svelte @@ -9,6 +9,7 @@ import { trackEvent, Submit, trackError } from '$lib/actions/analytics'; import { Dependencies } from '$lib/constants'; import { addNotification } from '$lib/stores/notifications'; + import { page } from '$app/state'; let providerName: string = null; onMount(async () => { @@ -21,64 +22,54 @@ const providerId = $provider.$id; switch ($provider.provider) { case Providers.Twilio: - response = await sdk.forProject.messaging.updateTwilioProvider( - providerId, - providerName - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateTwilioProvider(providerId, providerName); break; case Providers.Msg91: - response = await sdk.forProject.messaging.updateMsg91Provider( - providerId, - providerName - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateMsg91Provider(providerId, providerName); break; case Providers.Telesign: - response = await sdk.forProject.messaging.updateTelesignProvider( - providerId, - providerName - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateTelesignProvider(providerId, providerName); break; case Providers.Textmagic: - response = await sdk.forProject.messaging.updateTextmagicProvider( - providerId, - providerName - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateTextmagicProvider(providerId, providerName); break; case Providers.Vonage: - response = await sdk.forProject.messaging.updateVonageProvider( - providerId, - providerName - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateVonageProvider(providerId, providerName); break; case Providers.Mailgun: - response = await sdk.forProject.messaging.updateMailgunProvider( - providerId, - providerName - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateMailgunProvider(providerId, providerName); break; case Providers.Sendgrid: - response = await sdk.forProject.messaging.updateSendgridProvider( - providerId, - providerName - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateSendgridProvider(providerId, providerName); break; case Providers.SMTP: - response = await sdk.forProject.messaging.updateSmtpProvider( - providerId, - providerName - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateSmtpProvider(providerId, providerName); break; case Providers.FCM: - response = await sdk.forProject.messaging.updateFcmProvider( - providerId, - providerName - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateFcmProvider(providerId, providerName); break; case Providers.APNS: - response = await sdk.forProject.messaging.updateApnsProvider( - providerId, - providerName - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateApnsProvider(providerId, providerName); break; } await invalidate(Dependencies.MESSAGING_PROVIDER); diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateSettings.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateSettings.svelte new file mode 100644 index 000000000..b902515a5 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateSettings.svelte @@ -0,0 +1,266 @@ + + +
+ + Settings + Configure the settings to enable {displayName} to send {message}, or (newMemberModal = true)}>invite a team member to complete + the provider settings. + + + {#if ready} + + {/if} + + + +
+ +
+
+
+ + + diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateStatus.svelte similarity index 56% rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateStatus.svelte index 80b1257b8..0ecc172d4 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateStatus.svelte @@ -12,6 +12,7 @@ import { provider as providerData } from './store'; import { Typography } from '@appwrite.io/pink-svelte'; import { getProviderText } from '../../helper'; + import { page } from '$app/state'; import { Layout } from '@appwrite.io/pink-svelte'; let enabled: boolean = null; @@ -26,88 +27,76 @@ const providerId = $providerData.$id; switch ($providerData.provider) { case Providers.Twilio: - response = await sdk.forProject.messaging.updateTwilioProvider( - providerId, - undefined, - enabled - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateTwilioProvider(providerId, undefined, enabled); break; case Providers.Msg91: - response = await sdk.forProject.messaging.updateMsg91Provider( - providerId, - undefined, - enabled - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateMsg91Provider(providerId, undefined, enabled); break; case Providers.Telesign: - response = await sdk.forProject.messaging.updateTelesignProvider( - providerId, - undefined, - enabled - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateTelesignProvider(providerId, undefined, enabled); break; case Providers.Textmagic: - response = await sdk.forProject.messaging.updateTextmagicProvider( - providerId, - undefined, - enabled - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateTextmagicProvider(providerId, undefined, enabled); break; case Providers.Vonage: - response = await sdk.forProject.messaging.updateVonageProvider( - providerId, - undefined, - enabled - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateVonageProvider(providerId, undefined, enabled); break; case Providers.Mailgun: - response = await sdk.forProject.messaging.updateMailgunProvider( - providerId, - undefined, - undefined, - undefined, - undefined, - enabled - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateMailgunProvider( + providerId, + undefined, + undefined, + undefined, + undefined, + enabled + ); break; case Providers.Sendgrid: - response = await sdk.forProject.messaging.updateSendgridProvider( - providerId, - undefined, - enabled - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateSendgridProvider(providerId, undefined, enabled); break; case Providers.SMTP: - response = await sdk.forProject.messaging.updateSmtpProvider( - providerId, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - enabled - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateSmtpProvider( + providerId, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + enabled + ); break; case Providers.FCM: - response = await sdk.forProject.messaging.updateFcmProvider( - providerId, - undefined, - enabled - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateFcmProvider(providerId, undefined, enabled); break; case Providers.APNS: - response = await sdk.forProject.messaging.updateApnsProvider( - providerId, - undefined, - enabled - ); + response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateApnsProvider(providerId, undefined, enabled); break; } await invalidate(Dependencies.MESSAGING_PROVIDER); diff --git a/src/routes/(console)/project-[project]/messaging/providers/settingsFormInput.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/settingsFormInput.svelte similarity index 80% rename from src/routes/(console)/project-[project]/messaging/providers/settingsFormInput.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/settingsFormInput.svelte index a32dafa17..35ba274ba 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/settingsFormInput.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/settingsFormInput.svelte @@ -2,7 +2,6 @@ import { InputDomain, InputEmail, - InputFile, InputSelect, InputPhone, InputSwitch, @@ -27,7 +26,8 @@ import TooltipPopover from './tooltipPopover.svelte'; import { Icon, Tooltip, Upload, Layout, Typography } from '@appwrite.io/pink-svelte'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; - import { removeFile } from '$lib/helpers/files'; + import { InvalidFileType, removeFile } from '$lib/helpers/files'; + import { addNotification } from '$lib/stores/notifications'; export let files: Record; @@ -56,6 +56,22 @@ image: input.popoverImage }; } + + function handleInvalid(e: CustomEvent) { + const reason = e.detail.reason; + + if (reason === InvalidFileType.EXTENSION) { + addNotification({ + type: 'error', + message: 'Only .json files allowed' + }); + } else { + addNotification({ + type: 'error', + message: 'Invalid file' + }); + } + } {#if input.type === 'text'} @@ -105,8 +121,10 @@ {:else if input.type === 'file'} @@ -126,18 +144,22 @@ {#if files[input.name]?.length} - (files[input.name] = removeFile(e.detail, files[input.name]))} /> + {#key files[input.name]} + { + return { + ...f, + name: f.name, + size: f.size, + extension: f.type, + removable: true + }; + }) + : []} + on:remove={(e) => (files[input.name] = removeFile(e.detail, files[input.name]))} /> + {/key} {/if} - - - - - - - - {:else if input.type === 'switch'} diff --git a/src/routes/(console)/project-[project]/messaging/providers/settingsFormList.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/settingsFormList.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/settingsFormList.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/settingsFormList.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/store.ts rename to src/routes/(console)/project-[region]-[project]/messaging/providers/store.ts diff --git a/src/routes/(console)/project-[project]/messaging/providers/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte similarity index 92% rename from src/routes/(console)/project-[project]/messaging/providers/table.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte index 22ebe1288..47f1b776e 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte @@ -6,7 +6,7 @@ import { addNotification } from '$lib/stores/notifications'; import type { PageData } from './$types'; import { columns } from './store'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; import Provider from '../provider.svelte'; import ProviderType from '../providerType.svelte'; import { invalidate } from '$app/navigation'; @@ -16,6 +16,7 @@ import { Badge, FloatingActionBar, Icon, Table, Typography } from '@appwrite.io/pink-svelte'; import { IconCheckCircle } from '@appwrite.io/pink-icons-svelte'; import Confirm from '$lib/components/confirm.svelte'; + import { page } from '$app/state'; export let data: PageData; @@ -26,7 +27,9 @@ async function handleDelete() { showDelete = false; - const promises = selectedIds.map((id) => sdk.forProject.messaging.deleteProvider(id)); + const promises = selectedIds.map((id) => + sdk.forProject(page.params.region, page.params.project).messaging.deleteProvider(id) + ); try { await Promise.all(promises); @@ -68,7 +71,7 @@ this={$canWriteProviders ? Table.Row.Link : Table.Row.Base} id={provider.$id} href={$canWriteProviders - ? `${base}/project-${$project.$id}/messaging/providers/provider-${provider.$id}` + ? `${base}/project-${$project.region}-${$project.$id}/messaging/providers/provider-${provider.$id}` : undefined} {root}> {#each $columns as column} diff --git a/src/routes/(console)/project-[project]/messaging/providers/tooltipPopover.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/tooltipPopover.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/tooltipPopover.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/tooltipPopover.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/wizard/provider.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/provider.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/wizard/provider.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/provider.svelte diff --git a/src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/settings.svelte similarity index 88% rename from src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/settings.svelte index 142450836..fb503a445 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/settings.svelte @@ -5,15 +5,6 @@ import { providerType, provider, providerParams } from './store'; import SettingsFormList from '../settingsFormList.svelte'; - import { MessagingProviderType } from '@appwrite.io/console'; - import { - Collapsible, - CollapsibleItem, - ClickableList, - ClickableListItem - } from '$lib/components'; - import { getProviderText } from '../../helper'; - let files: Record = {}; $: inputs = providers[$providerType].providers[$provider].configure; diff --git a/src/routes/(console)/project-[project]/messaging/providers/wizard/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/messaging/providers/wizard/store.ts rename to src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/store.ts diff --git a/src/routes/(console)/project-[project]/messaging/push-notification-preview-dark.svg b/src/routes/(console)/project-[region]-[project]/messaging/push-notification-preview-dark.svg similarity index 100% rename from src/routes/(console)/project-[project]/messaging/push-notification-preview-dark.svg rename to src/routes/(console)/project-[region]-[project]/messaging/push-notification-preview-dark.svg diff --git a/src/routes/(console)/project-[project]/messaging/push-notification-preview-light.svg b/src/routes/(console)/project-[region]-[project]/messaging/push-notification-preview-light.svg similarity index 100% rename from src/routes/(console)/project-[project]/messaging/push-notification-preview-light.svg rename to src/routes/(console)/project-[region]-[project]/messaging/push-notification-preview-light.svg diff --git a/src/routes/(console)/project-[project]/messaging/pushPhone.svelte b/src/routes/(console)/project-[region]-[project]/messaging/pushPhone.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/pushPhone.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/pushPhone.svelte diff --git a/src/routes/(console)/project-[project]/messaging/sms-preview-dark.svg b/src/routes/(console)/project-[region]-[project]/messaging/sms-preview-dark.svg similarity index 100% rename from src/routes/(console)/project-[project]/messaging/sms-preview-dark.svg rename to src/routes/(console)/project-[region]-[project]/messaging/sms-preview-dark.svg diff --git a/src/routes/(console)/project-[project]/messaging/sms-preview-light.svg b/src/routes/(console)/project-[region]-[project]/messaging/sms-preview-light.svg similarity index 100% rename from src/routes/(console)/project-[project]/messaging/sms-preview-light.svg rename to src/routes/(console)/project-[region]-[project]/messaging/sms-preview-light.svg diff --git a/src/routes/(console)/project-[project]/messaging/smsPhone.svelte b/src/routes/(console)/project-[region]-[project]/messaging/smsPhone.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/smsPhone.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/smsPhone.svelte diff --git a/src/routes/(console)/project-[project]/messaging/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/messaging/store.ts rename to src/routes/(console)/project-[region]-[project]/messaging/store.ts diff --git a/src/routes/(console)/project-[project]/messaging/topics/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte similarity index 92% rename from src/routes/(console)/project-[project]/messaging/topics/+page.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte index dae68a1c7..c8f5a49b2 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte @@ -28,6 +28,7 @@ export let data: PageData; + const region = page.params.region; const project = page.params.project; const columns = writable([ { id: '$id', title: 'Topic ID', type: 'string', width: 200 }, @@ -64,7 +65,9 @@ ]); const topicCreated = async (event: CustomEvent>>) => { - await goto(`${base}/project-${project}/messaging/topics/topic-${event.detail.$id}`); + await goto( + `${base}/project-${region}-${project}/messaging/topics/topic-${event.detail.$id}` + ); }; @@ -106,7 +109,9 @@ Sorry, we couldn't find '{data.search}'

There are no topics that match your search.

- diff --git a/src/routes/(console)/project-[project]/messaging/topics/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts similarity index 63% rename from src/routes/(console)/project-[project]/messaging/topics/+page.ts rename to src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts index a1503363c..8ae6d78f3 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts @@ -5,7 +5,7 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import { queryParamToMap, queries } from '$lib/components/filters'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ depends, url, route }) => { +export const load: PageLoad = async ({ depends, url, route, params }) => { depends(Dependencies.MESSAGING_TOPICS); const page = getPage(url); const search = getSearch(url); @@ -22,14 +22,16 @@ export const load: PageLoad = async ({ depends, url, route }) => { search, query, page, - topics: await sdk.forProject.messaging.listTopics( - [ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ], - search || undefined - ) + topics: await sdk + .forProject(params.region, params.project) + .messaging.listTopics( + [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ], + search || undefined + ) }; }; diff --git a/src/routes/(console)/project-[project]/messaging/topics/create.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte similarity index 90% rename from src/routes/(console)/project-[project]/messaging/topics/create.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte index b0c46582e..623b45a58 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/create.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte @@ -8,6 +8,7 @@ import { IconPencil } from '@appwrite.io/pink-icons-svelte'; import { Icon, Tag } from '@appwrite.io/pink-svelte'; import { createEventDispatcher } from 'svelte'; + import { page } from '$app/state'; export let showCreate = false; @@ -18,7 +19,9 @@ const create = async () => { try { - const topic = await sdk.forProject.messaging.createTopic(id ?? ID.unique(), name); + const topic = await sdk + .forProject(page.params.region, page.params.project) + .messaging.createTopic(id ?? ID.unique(), name); name = ''; showCreate = false; showCustomId = false; diff --git a/src/routes/(console)/project-[project]/messaging/topics/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/messaging/topics/store.ts rename to src/routes/(console)/project-[region]-[project]/messaging/topics/store.ts diff --git a/src/routes/(console)/project-[project]/messaging/topics/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte similarity index 93% rename from src/routes/(console)/project-[project]/messaging/topics/table.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte index 6b20e7662..6a99009d2 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte @@ -25,7 +25,9 @@ async function handleDelete() { showDelete = false; - const promises = selectedIds.map((id) => sdk.forProject.messaging.deleteTopic(id)); + const promises = selectedIds.map((id) => + sdk.forProject(page.params.region, page.params.project).messaging.deleteTopic(id) + ); try { await Promise.all(promises); @@ -60,7 +62,7 @@ + href={`${base}/project-${page.params.region}-${page.params.project}/messaging/topics/topic-${topic.$id}`}> {#each columns as column (column.id)} {#if column.id === '$id'} diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.svelte similarity index 69% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.svelte index 6a2909bfb..015c066ee 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.svelte @@ -3,7 +3,7 @@ import { base } from '$app/paths'; import { page } from '$app/state'; import { registerCommands } from '$lib/commandCenter'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; const topicId = page.params.topic; @@ -12,7 +12,7 @@ label: 'Go to Subscribers', callback() { goto( - `${base}/project-${$project.$id}/messaging/topics/topic-${topicId}/subscribers` + `${base}/project-${$project.region}-${$project.$id}/messaging/topics/topic-${topicId}/subscribers` ); }, keys: ['g', 's'], @@ -23,7 +23,9 @@ { label: 'Go to Activity', callback() { - goto(`${base}/project-${$project.$id}/messaging/topics/topic-${topicId}/activity`); + goto( + `${base}/project-${$project.region}-${$project.$id}/messaging/topics/topic-${topicId}/activity` + ); }, keys: ['g', 'a'], disabled: page.url.pathname.endsWith('activity'), @@ -33,7 +35,9 @@ { label: 'Go to Overview', callback() { - goto(`${base}/project-${$project.$id}/messaging/topics/topic-${topicId}`); + goto( + `${base}/project-${$project.region}-${$project.$id}/messaging/topics/topic-${topicId}` + ); }, keys: ['g', 'o'], disabled: page.url.pathname.endsWith(`topic-${topicId}`), diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.ts similarity index 80% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.ts rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.ts index 6b82ae854..595659ee3 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.ts @@ -10,6 +10,6 @@ export const load: LayoutLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - topic: await sdk.forProject.messaging.getTopic(params.topic) + topic: await sdk.forProject(params.region, params.project).messaging.getTopic(params.topic) }; }; diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte similarity index 91% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte index 37db1a1d3..11abad571 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte @@ -11,7 +11,6 @@ } from '$lib/components'; import { Container } from '$lib/layout'; import { ID, type Models } from '@appwrite.io/console'; - import type { PageData } from './$types'; import { sdk } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import { Click, Submit, trackError, trackEvent } from '$lib/actions/analytics'; @@ -26,10 +25,10 @@ import { writable } from 'svelte/store'; import type { Column } from '$lib/helpers/types'; import { base } from '$app/paths'; - import { Icon, Layout, Typography } from '@appwrite.io/pink-svelte'; + import { Icon, Layout } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; - export let data: PageData; + export let data; let showAdd = false; let subscribersByTargetId: Record = {}; const columns = writable([ @@ -58,11 +57,9 @@ (targetId) => !(targetId in subscribersByTargetId) ); const promises = targetIds.map(async (targetId) => { - const subscriber = await sdk.forProject.messaging.createSubscriber( - page.params.topic, - ID.unique(), - targetId - ); + const subscriber = await sdk + .forProject(page.params.region, page.params.project) + .messaging.createSubscriber(page.params.topic, ID.unique(), targetId); subscribersByTargetId[targetId] = subscriber; }); @@ -122,8 +119,7 @@ {:else} diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.ts similarity index 57% rename from src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.ts rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.ts index 3e0f841c5..d4b3e9cc8 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.ts @@ -1,38 +1,38 @@ -import { queries, queryParamToMap } from '$lib/components/filters'; -import { Dependencies, PAGE_LIMIT } from '$lib/constants'; -import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpers/load'; -import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; +import { sdk } from '$lib/stores/sdk'; +import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpers/load'; +import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; +import { queryParamToMap, queries } from '$lib/components/filters'; export const load: PageLoad = async ({ params, url, route, depends }) => { - depends(Dependencies.USER_IDENTITIES); + depends(Dependencies.MESSAGING_TOPIC_SUBSCRIBERS); const page = getPage(url); const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); - const query = getQuery(url); const search = getSearch(url); + const query = getQuery(url); const parsedQueries = queryParamToMap(query || '[]'); queries.set(parsedQueries); - const identities = await sdk.forProject.users.listIdentities( - [ - Query.equal('userId', params.user), - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ], - search - ); - return { offset, limit, - query, search, - identities + query, + subscribers: await sdk + .forProject(params.region, params.project) + .messaging.listSubscribers( + params.topic, + [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ], + search || undefined + ) }; }; diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.svelte diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts similarity index 73% rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.ts rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts index 4fb5bf0f9..933026955 100644 --- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts @@ -12,9 +12,8 @@ export const load: PageLoad = async ({ params, url, route }) => { return { offset, limit, - logs: await sdk.forProject.teams.listLogs(params.team, [ - Query.limit(limit), - Query.offset(offset) - ]) + logs: await sdk + .forProject(params.region, params.project) + .messaging.listTopicLogs(params.topic, [Query.limit(limit), Query.offset(offset)]) }; }; diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte similarity index 61% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte index d4aafa911..c71b0bd34 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte @@ -2,7 +2,7 @@ import { base } from '$app/paths'; import { Breadcrumbs } from '$lib/layout'; import { organization } from '$lib/stores/organization'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; import { topic } from './store'; $: breadcrumbs = [ @@ -11,15 +11,15 @@ title: $organization.name }, { - href: `${base}/project-${$project.$id}`, + href: `${base}/project-${$project.region}-${$project.$id}`, title: $project.name }, { - href: `${base}/project-${$project.$id}/messaging`, + href: `${base}/project-${$project.region}-${$project.$id}/messaging`, title: 'Messaging' }, { - href: `${base}/project-${$project.$id}/messaging/topics/topic-${$topic?.$id}`, + href: `${base}/project-${$project.region}-${$project.$id}/messaging/topics/topic-${$topic?.$id}`, title: $topic?.name } ]; diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte similarity index 80% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte index f3c96c6fb..192f6c07f 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte @@ -13,7 +13,9 @@ let error: string; const deleteTopic = async () => { try { - await sdk.forProject.messaging.deleteTopic($topic.$id); + await sdk + .forProject(page.params.region, page.params.project) + .messaging.deleteTopic($topic.$id); showDelete = false; addNotification({ @@ -21,7 +23,9 @@ message: `${$topic.name} has been deleted` }); trackEvent(Submit.MessagingTopicDelete); - await goto(`${base}/project-${page.params.project}/messaging/topics`); + await goto( + `${base}/project-${page.params.region}-${page.params.project}/messaging/topics` + ); } catch (e) { error = e.message; trackError(e, Submit.MessagingTopicDelete); diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/header.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/header.svelte similarity index 86% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/header.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/header.svelte index 41b102f4e..c0f0814f4 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/header.svelte @@ -9,7 +9,7 @@ const projectId = page.params.project; const topicId = page.params.topic; - const path = `${base}/project-${projectId}/messaging/topics/topic-${topicId}`; + const path = `${base}/project-${page.params.region}-${projectId}/messaging/topics/topic-${topicId}`; const tabs = [ { href: path, @@ -32,7 +32,7 @@ - + {$topic.name} {$topic.$id} diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/+page.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/+page.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/+page.svelte diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/dangerZone.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/dangerZone.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/dangerZone.svelte diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/details.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/details.svelte diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte similarity index 90% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte index e9d2587cf..007705655 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte @@ -8,14 +8,19 @@ import { Dependencies } from '$lib/constants'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; + import { page } from '$app/state'; let name: string = null; + onMount(async () => { name ??= $topic.name; }); + async function updateName() { try { - await sdk.forProject.messaging.updateTopic($topic.$id, name); + await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateTopic($topic.$id, name); await invalidate(Dependencies.MESSAGING_TOPIC); addNotification({ message: 'Name has been updated', diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte similarity index 93% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte index cbf5eac5b..38d2cfd71 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte @@ -23,7 +23,9 @@ async function updatePermissions() { try { - await sdk.forProject.messaging.updateTopic(topicId, undefined, permissions); + await sdk + .forProject(page.params.region, page.params.project) + .messaging.updateTopic(topicId, undefined, permissions); await invalidate(Dependencies.MESSAGING_TOPIC); addNotification({ message: 'Permissions have been updated', diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/store.ts rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/store.ts diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte similarity index 93% rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte index a6309dff8..63c8ff2f7 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte @@ -9,7 +9,7 @@ import type { PageData } from './$types'; import ProviderType from '../../providerType.svelte'; import { toLocaleDateTime } from '$lib/helpers/date'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; import { sdk } from '$lib/stores/sdk'; import { page } from '$app/state'; import { targetsById } from '../../store'; @@ -31,7 +31,9 @@ showDelete = false; async function deleteSubscriber(subscriberId: string) { - await sdk.forProject.messaging.deleteSubscriber(page.params.topic, subscriberId); + await sdk + .forProject(page.params.region, page.params.project) + .messaging.deleteSubscriber(page.params.topic, subscriberId); const { target } = subscribers[subscriberId]; const { [target.$id]: _, ...rest } = $targetsById; $targetsById = rest; @@ -82,7 +84,7 @@ + href={`${base}/project-${$project.region}-${$project.$id}/auth/user-${subscriber.target.userId}`}> {#each columns as column} {#if column.id === '$id'} diff --git a/src/routes/(console)/project-[project]/messaging/topicsModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte similarity index 96% rename from src/routes/(console)/project-[project]/messaging/topicsModal.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte index 369d49895..b5080fcd1 100644 --- a/src/routes/(console)/project-[project]/messaging/topicsModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte @@ -15,6 +15,7 @@ Typography } from '@appwrite.io/pink-svelte'; import { getProviderText } from './helper'; + import { page } from '$app/state'; export let providerType: MessagingProviderType; export let show: boolean; @@ -46,7 +47,9 @@ if (!show) return; const queries = [Query.limit(5), Query.offset(offset)]; - const response = await sdk.forProject.messaging.listTopics(queries, search || undefined); + const response = await sdk + .forProject(page.params.region, page.params.project) + .messaging.listTopics(queries, search || undefined); if (response.total !== 0) { switch (providerType) { diff --git a/src/routes/(console)/project-[project]/messaging/userTargetsModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte similarity index 97% rename from src/routes/(console)/project-[project]/messaging/userTargetsModal.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte index 048170deb..dbc58a0bb 100644 --- a/src/routes/(console)/project-[project]/messaging/userTargetsModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte @@ -7,6 +7,7 @@ import { Accordion, Badge, Card, Empty, Layout, Selector } from '@appwrite.io/pink-svelte'; import { getProviderText } from './helper'; import { Submit, trackEvent } from '$lib/actions/analytics'; + import { page } from '$app/state'; export let title: string; export let show: boolean; @@ -45,7 +46,9 @@ queries.push(Query.notEqual('phone', '')); } - const response = await sdk.forProject.users.list(queries, search || undefined); + const response = await sdk + .forProject(page.params.region, page.params.project) + .users.list(queries, search || undefined); totalResults = response.total; userResultsById = {}; diff --git a/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/emailFormList.svelte similarity index 95% rename from src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/emailFormList.svelte index aebef5103..5c1db90e1 100644 --- a/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/wizard/emailFormList.svelte @@ -15,6 +15,7 @@ import { ID, MessagingProviderType } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import { Submit, trackEvent } from '$lib/actions/analytics'; + import { page } from '$app/state'; let showCustomId = false; let showTest = false; @@ -22,11 +23,8 @@ let otherEmail = ''; async function sendTestEmail() { - const email = selected === 'self' ? $user.email : otherEmail; - console.log(email); - // TODO: replace with test method - sdk.forProject.messaging.createEmail( + sdk.forProject(page.params.region, page.params.project).messaging.createEmail( ID.unique(), $messageParams[MessagingProviderType.Email]?.subject || undefined, $messageParams[MessagingProviderType.Email]?.content || undefined, @@ -37,8 +35,7 @@ undefined, undefined, undefined, - $messageParams[MessagingProviderType.Email]?.html || false, - undefined + $messageParams[MessagingProviderType.Email]?.html || false ); } diff --git a/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/pushFormList.svelte similarity index 98% rename from src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/pushFormList.svelte index c3491a670..3a849dc70 100644 --- a/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/wizard/pushFormList.svelte @@ -45,6 +45,7 @@ import InputFilePicker from '$lib/elements/forms/inputFilePicker.svelte'; import { Icon } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; + import { page } from '$app/state'; let showCustomId = false; let showTest = false; @@ -58,11 +59,8 @@ }); async function sendTestMessage() { - const email = selected === 'self' ? $user.email : otherEmail; - console.log(email); - // TODO: replace with test method - sdk.forProject.messaging.createPush( + sdk.forProject(page.params.region, page.params.project).messaging.createPush( ID.unique(), $messageParams[MessagingProviderType.Push]?.title || undefined, $messageParams[MessagingProviderType.Push]?.body || undefined, diff --git a/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/smsFormList.svelte similarity index 96% rename from src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/smsFormList.svelte index 801b3daaf..8f6f940a6 100644 --- a/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/wizard/smsFormList.svelte @@ -8,6 +8,7 @@ import { ID, MessagingProviderType } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import SMSPhone from '../smsPhone.svelte'; + import { page } from '$app/state'; let showCustomId = false; let showTest = false; @@ -16,9 +17,7 @@ async function sendTestSMS() { // const email = selected === 'self' ? $user.email : otherEmail; - - // TODO: replace with test method - sdk.forProject.messaging.createSms( + sdk.forProject(page.params.region, page.params.project).messaging.createSms( ID.unique(), $messageParams[MessagingProviderType.Sms]?.content || undefined, $messageParams[MessagingProviderType.Sms]?.topics || [], diff --git a/src/routes/(console)/project-[project]/messaging/wizard/step1.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/step1.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/wizard/step1.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/step1.svelte diff --git a/src/routes/(console)/project-[project]/messaging/wizard/step2.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/step2.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/wizard/step2.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/step2.svelte diff --git a/src/routes/(console)/project-[project]/messaging/wizard/step3.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/step3.svelte similarity index 100% rename from src/routes/(console)/project-[project]/messaging/wizard/step3.svelte rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/step3.svelte diff --git a/src/routes/(console)/project-[project]/messaging/wizard/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/wizard/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/messaging/wizard/store.ts rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/store.ts diff --git a/src/routes/(console)/project-[project]/overview/(components)/checkbox.svelte b/src/routes/(console)/project-[region]-[project]/overview/(components)/checkbox.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/(components)/checkbox.svelte rename to src/routes/(console)/project-[region]-[project]/overview/(components)/checkbox.svelte diff --git a/src/routes/(console)/project-[project]/overview/(components)/create.svelte b/src/routes/(console)/project-[region]-[project]/overview/(components)/create.svelte similarity index 87% rename from src/routes/(console)/project-[project]/overview/(components)/create.svelte rename to src/routes/(console)/project-[region]-[project]/overview/(components)/create.svelte index a5ccdf3db..3378bfe09 100644 --- a/src/routes/(console)/project-[project]/overview/(components)/create.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/(components)/create.svelte @@ -1,10 +1,9 @@
@@ -74,23 +78,15 @@ Expiration date Set a date after which your {label} key will expire. - {#if isExpired} + {#if (isExpired || isExpiring) && showAlert} (alertsDismissed = true)} - title="Your {label} key has expired"> - For security reasons, we recommend you delete your expired key and create a new - one. - - {:else if isExpiring} - (alertsDismissed = true)} - title="Your {label} key is about to expire"> - Update the expiration date to keep the key active + title={`Your ${label} key ${isExpired ? 'has expired' : 'is about to expire'}`}> + Update the expiration date to keep the key active. {/if} - + diff --git a/src/routes/(console)/project-[project]/overview/+layout.svelte b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte similarity index 94% rename from src/routes/(console)/project-[project]/overview/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/overview/+layout.svelte index 69c4534ce..22229f063 100644 --- a/src/routes/(console)/project-[project]/overview/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte @@ -30,8 +30,7 @@ import { isSmallViewport } from '$lib/stores/viewport'; let period: UsagePeriods = '30d'; - $: projectId = page.params.project; - $: path = `${base}/project-${projectId}/overview`; + $: path = `${base}/project-${page.params.region}-${page.params.project}/overview`; onMount(handle); afterNavigate(handle); @@ -71,7 +70,7 @@ label: 'Create API Key', icon: IconPlus, callback() { - goto(`${base}/project-${projectId}/overview/keys/create`); + goto(`${path}/keys/create`); }, keys: ['c', 'k'], group: 'integrations', @@ -81,7 +80,7 @@ label: 'Create Dev Key', icon: IconPlus, callback() { - goto(`${base}/project-${projectId}/overview/dev-keys/create`); + goto(`${path}/dev-keys/create`); }, keys: ['c', 'd', 'k'], group: 'integrations', @@ -119,7 +118,7 @@
@@ -141,7 +140,7 @@
@@ -164,7 +163,7 @@
@@ -186,7 +185,7 @@
diff --git a/src/routes/(console)/project-[project]/overview/+layout.ts b/src/routes/(console)/project-[region]-[project]/overview/+layout.ts similarity index 100% rename from src/routes/(console)/project-[project]/overview/+layout.ts rename to src/routes/(console)/project-[region]-[project]/overview/+layout.ts diff --git a/src/routes/(console)/project-[project]/overview/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/+page.ts similarity index 62% rename from src/routes/(console)/project-[project]/overview/+page.ts rename to src/routes/(console)/project-[region]-[project]/overview/+page.ts index 8b3b6cca3..d53943a64 100644 --- a/src/routes/(console)/project-[project]/overview/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/+page.ts @@ -6,8 +6,8 @@ import { selectedTab } from './store'; export const load: PageLoad = async ({ params }) => { if (get(selectedTab) === 'keys') { - redirect(302, `${base}/project-${params.project}/overview/keys`); + redirect(302, `${base}/project-${params.region}-${params.project}/overview/keys`); } else { - redirect(302, `${base}/project-${params.project}/overview/platforms`); + redirect(302, `${base}/project-${params.region}-${params.project}/overview/platforms`); } }; diff --git a/src/routes/(console)/project-[project]/overview/assets/database-dark.png b/src/routes/(console)/project-[region]-[project]/overview/assets/database-dark.png similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/database-dark.png rename to src/routes/(console)/project-[region]-[project]/overview/assets/database-dark.png diff --git a/src/routes/(console)/project-[project]/overview/assets/database.png b/src/routes/(console)/project-[region]-[project]/overview/assets/database.png similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/database.png rename to src/routes/(console)/project-[region]-[project]/overview/assets/database.png diff --git a/src/routes/(console)/project-[project]/overview/assets/discord-dark.png b/src/routes/(console)/project-[region]-[project]/overview/assets/discord-dark.png similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/discord-dark.png rename to src/routes/(console)/project-[region]-[project]/overview/assets/discord-dark.png diff --git a/src/routes/(console)/project-[project]/overview/assets/discord.png b/src/routes/(console)/project-[region]-[project]/overview/assets/discord.png similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/discord.png rename to src/routes/(console)/project-[region]-[project]/overview/assets/discord.png diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-android-dark.svg b/src/routes/(console)/project-[region]-[project]/overview/assets/platform-android-dark.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/platform-android-dark.svg rename to src/routes/(console)/project-[region]-[project]/overview/assets/platform-android-dark.svg diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-android.svg b/src/routes/(console)/project-[region]-[project]/overview/assets/platform-android.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/platform-android.svg rename to src/routes/(console)/project-[region]-[project]/overview/assets/platform-android.svg diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-flutter-dark.svg b/src/routes/(console)/project-[region]-[project]/overview/assets/platform-flutter-dark.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/platform-flutter-dark.svg rename to src/routes/(console)/project-[region]-[project]/overview/assets/platform-flutter-dark.svg diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-flutter.svg b/src/routes/(console)/project-[region]-[project]/overview/assets/platform-flutter.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/platform-flutter.svg rename to src/routes/(console)/project-[region]-[project]/overview/assets/platform-flutter.svg diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-ios-dark.svg b/src/routes/(console)/project-[region]-[project]/overview/assets/platform-ios-dark.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/platform-ios-dark.svg rename to src/routes/(console)/project-[region]-[project]/overview/assets/platform-ios-dark.svg diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-ios.svg b/src/routes/(console)/project-[region]-[project]/overview/assets/platform-ios.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/platform-ios.svg rename to src/routes/(console)/project-[region]-[project]/overview/assets/platform-ios.svg diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-reactnative-dark.png b/src/routes/(console)/project-[region]-[project]/overview/assets/platform-reactnative-dark.png similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/platform-reactnative-dark.png rename to src/routes/(console)/project-[region]-[project]/overview/assets/platform-reactnative-dark.png diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-reactnative.png b/src/routes/(console)/project-[region]-[project]/overview/assets/platform-reactnative.png similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/platform-reactnative.png rename to src/routes/(console)/project-[region]-[project]/overview/assets/platform-reactnative.png diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-web-dark.png b/src/routes/(console)/project-[region]-[project]/overview/assets/platform-web-dark.png similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/platform-web-dark.png rename to src/routes/(console)/project-[region]-[project]/overview/assets/platform-web-dark.png diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-web.png b/src/routes/(console)/project-[region]-[project]/overview/assets/platform-web.png similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/platform-web.png rename to src/routes/(console)/project-[region]-[project]/overview/assets/platform-web.png diff --git a/src/routes/(console)/project-[project]/overview/assets/users-dark.svg b/src/routes/(console)/project-[region]-[project]/overview/assets/users-dark.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/users-dark.svg rename to src/routes/(console)/project-[region]-[project]/overview/assets/users-dark.svg diff --git a/src/routes/(console)/project-[project]/overview/assets/users.svg b/src/routes/(console)/project-[region]-[project]/overview/assets/users.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/assets/users.svg rename to src/routes/(console)/project-[region]-[project]/overview/assets/users.svg diff --git a/src/routes/(console)/project-[project]/overview/bandwidth.svelte b/src/routes/(console)/project-[region]-[project]/overview/bandwidth.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/bandwidth.svelte rename to src/routes/(console)/project-[region]-[project]/overview/bandwidth.svelte diff --git a/src/routes/(console)/project-[project]/overview/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/overview/breadcrumbs.svelte similarity index 79% rename from src/routes/(console)/project-[project]/overview/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/overview/breadcrumbs.svelte index fad7b3cbc..0cfaf93aa 100644 --- a/src/routes/(console)/project-[project]/overview/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/breadcrumbs.svelte @@ -1,5 +1,6 @@ diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/+page.ts similarity index 100% rename from src/routes/(console)/project-[project]/overview/dev-keys/+page.ts rename to src/routes/(console)/project-[region]-[project]/overview/dev-keys/+page.ts diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/[key]/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/+page.ts similarity index 100% rename from src/routes/(console)/project-[project]/overview/dev-keys/[key]/+page.ts rename to src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/+page.ts diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/[key]/+page@project-[project].svelte b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/+page@project-[region]-[project].svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/dev-keys/[key]/+page@project-[project].svelte rename to src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/+page@project-[region]-[project].svelte diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/[key]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/breadcrumbs.svelte similarity index 64% rename from src/routes/(console)/project-[project]/overview/dev-keys/[key]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/breadcrumbs.svelte index a1a2f9f7c..65cbd2fa1 100644 --- a/src/routes/(console)/project-[project]/overview/dev-keys/[key]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/breadcrumbs.svelte @@ -1,5 +1,6 @@ - + {$devKey?.name} diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/[key]/store.ts b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/overview/dev-keys/[key]/store.ts rename to src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/store.ts diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/action.svelte b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/action.svelte similarity index 86% rename from src/routes/(console)/project-[project]/overview/dev-keys/action.svelte rename to src/routes/(console)/project-[region]-[project]/overview/dev-keys/action.svelte index 306188b52..cf9287ef7 100644 --- a/src/routes/(console)/project-[project]/overview/dev-keys/action.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/action.svelte @@ -4,14 +4,14 @@ import { Icon, Modal, Layout } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; import { Form, InputText } from '$lib/elements/forms/index.js'; - import ExpirationInput from '../(components)/expirationInput.svelte'; + import { ExpirationInput } from '$lib/components'; import { sdk } from '$lib/stores/sdk'; import { goto } from '$app/navigation'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { base } from '$app/paths'; import { addNotification } from '$lib/stores/notifications'; import { page } from '$app/state'; - import { showDevKeysCreateModal } from '$routes/(console)/project-[project]/overview/store'; + import { showDevKeysCreateModal } from '$routes/(console)/project-[region]-[project]/overview/store'; let isSubmitting = false; let name = '', @@ -30,7 +30,9 @@ $showDevKeysCreateModal = false; trackEvent(Submit.DevKeyCreate); - await goto(`${base}/project-${projectId}/overview/dev-keys/${$id}`); + await goto( + `${base}/project-${page.params.region}-${page.params.project}/overview/dev-keys/${$id}` + ); addNotification({ message: `Dev key has been created`, type: 'success' @@ -56,7 +58,7 @@ - Test your app without rate limits and more detailed error messages. + Bypass Appwrite rate limits and CORS errors in your development environment. @@ -67,7 +69,7 @@ required bind:value={name} /> - + diff --git a/src/routes/(console)/project-[project]/overview/header.svelte b/src/routes/(console)/project-[region]-[project]/overview/header.svelte similarity index 90% rename from src/routes/(console)/project-[project]/overview/header.svelte rename to src/routes/(console)/project-[region]-[project]/overview/header.svelte index 773d04736..995b39366 100644 --- a/src/routes/(console)/project-[project]/overview/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/header.svelte @@ -1,6 +1,6 @@ {#if $canWriteKeys} - diff --git a/src/routes/(console)/project-[region]-[project]/overview/keys/checkbox.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/checkbox.svelte new file mode 100644 index 000000000..4e4553957 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/overview/keys/checkbox.svelte @@ -0,0 +1,19 @@ + + + diff --git a/src/routes/(console)/project-[project]/overview/keys/create/+page.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/create/+page.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/keys/create/+page.svelte rename to src/routes/(console)/project-[region]-[project]/overview/keys/create/+page.svelte diff --git a/src/routes/(console)/project-[project]/overview/keys/scopes.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/scopes.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/keys/scopes.svelte rename to src/routes/(console)/project-[region]-[project]/overview/keys/scopes.svelte diff --git a/src/routes/(console)/project-[project]/overview/onboard-1-dark-desktop.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-1-dark-desktop.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/onboard-1-dark-desktop.svg rename to src/routes/(console)/project-[region]-[project]/overview/onboard-1-dark-desktop.svg diff --git a/src/routes/(console)/project-[project]/overview/onboard-1-dark-mobile.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-1-dark-mobile.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/onboard-1-dark-mobile.svg rename to src/routes/(console)/project-[region]-[project]/overview/onboard-1-dark-mobile.svg diff --git a/src/routes/(console)/project-[project]/overview/onboard-1-light-desktop.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-1-light-desktop.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/onboard-1-light-desktop.svg rename to src/routes/(console)/project-[region]-[project]/overview/onboard-1-light-desktop.svg diff --git a/src/routes/(console)/project-[project]/overview/onboard-1-light-mobile.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-1-light-mobile.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/onboard-1-light-mobile.svg rename to src/routes/(console)/project-[region]-[project]/overview/onboard-1-light-mobile.svg diff --git a/src/routes/(console)/project-[project]/overview/onboard-2-dark-desktop.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-2-dark-desktop.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/onboard-2-dark-desktop.svg rename to src/routes/(console)/project-[region]-[project]/overview/onboard-2-dark-desktop.svg diff --git a/src/routes/(console)/project-[project]/overview/onboard-2-dark-mobile.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-2-dark-mobile.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/onboard-2-dark-mobile.svg rename to src/routes/(console)/project-[region]-[project]/overview/onboard-2-dark-mobile.svg diff --git a/src/routes/(console)/project-[project]/overview/onboard-2-light-desktop.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-2-light-desktop.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/onboard-2-light-desktop.svg rename to src/routes/(console)/project-[region]-[project]/overview/onboard-2-light-desktop.svg diff --git a/src/routes/(console)/project-[project]/overview/onboard-2-light-mobile.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-2-light-mobile.svg similarity index 100% rename from src/routes/(console)/project-[project]/overview/onboard-2-light-mobile.svg rename to src/routes/(console)/project-[region]-[project]/overview/onboard-2-light-mobile.svg diff --git a/src/routes/(console)/project-[project]/overview/onboard.svelte b/src/routes/(console)/project-[region]-[project]/overview/onboard.svelte similarity index 98% rename from src/routes/(console)/project-[project]/overview/onboard.svelte rename to src/routes/(console)/project-[region]-[project]/overview/onboard.svelte index 2e941e8c3..3a7d7d5a5 100644 --- a/src/routes/(console)/project-[project]/overview/onboard.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/onboard.svelte @@ -37,17 +37,17 @@ import { getPlatformInfo } from '$lib/helpers/platform'; import { Click, trackEvent } from '$lib/actions/analytics'; import { goto } from '$app/navigation'; + import { page } from '$app/state'; function createKey() { trackEvent(Click.KeyCreateClick, { source: 'onboarding' }); - goto(`${base}/project-${projectId}/overview/keys/create`, { + goto(`${base}/project-${page.params.region}-${page.params.project}/overview/keys/create`, { replaceState: true }); } - export let projectId: string; export let platforms: Models.Platform[] = []; export let pingCount = 0; @@ -393,7 +393,9 @@ { trackEvent(Click.OnboardingSetupDatabaseClick); - goto(`${base}/project-${projectId}/databases`); + goto( + `${base}/project-${page.params.region}-${page.params.project}/databases` + ); }} padding="s" > { trackEvent( Click.OnboardingAuthEmailPasswordClick @@ -496,7 +498,7 @@ { trackEvent( Click.OnboardingAuthOauth2Click @@ -504,7 +506,7 @@ }}>OAuth 2 { trackEvent( Click.OnboardingAuthAllMethodsClick diff --git a/src/routes/(console)/project-[project]/overview/platforms/+page.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.svelte similarity index 97% rename from src/routes/(console)/project-[project]/overview/platforms/+page.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/+page.svelte index 02c1c1638..178772dfd 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.svelte @@ -62,7 +62,6 @@ import { base } from '$app/paths'; import { page } from '$app/state'; import { Button } from '$lib/elements/forms'; - import type { PageData } from './$types'; import { canWritePlatforms } from '$lib/stores/roles'; import { setOverviewAction } from '../context'; import { @@ -86,7 +85,7 @@ import DualTimeView from '$lib/components/dualTimeView.svelte'; import { consoleProfile, isStudio } from '$lib/system'; - export let data: PageData; + export let data; enum PlatformTypes { 'apple-ios' = 'iOS', @@ -104,7 +103,7 @@ 'react-native-ios' = 'iOS', 'web' = 'Web' } - const path = `${base}/project-${page.params.project}/overview/platforms`; + const path = `${base}/project-${page.params.region}-${page.params.project}/overview/platforms`; function getPlatformInfo(platform: string): ComponentType { if (platform.includes('flutter')) { diff --git a/src/routes/(console)/project-[project]/overview/platforms/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.ts similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/+page.ts rename to src/routes/(console)/project-[region]-[project]/overview/platforms/+page.ts diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page.ts similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/+page.ts rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page.ts diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page@project-[region]-[project].svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page@project-[region]-[project].svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/android.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/android.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/android.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/android.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/appleIOS.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleIOS.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/appleIOS.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleIOS.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/appleMacOS.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleMacOS.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/appleMacOS.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleMacOS.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/appleTvOS.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleTvOS.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/appleTvOS.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleTvOS.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleWatchOS.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleWatchOS.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/breadcrumbs.svelte similarity index 69% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/breadcrumbs.svelte index c30a96d9a..bd2600d16 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/breadcrumbs.svelte @@ -11,15 +11,15 @@ title: $organization.name }, { - href: `${base}/project-${$project.$id}`, + href: `${base}/project-${$project.region}-${$project.$id}`, title: $project.name }, { - href: `${base}/project-${$project.$id}/overview/platforms`, + href: `${base}/project-${$project.region}-${$project.$id}/overview/platforms`, title: 'Platforms' }, { - href: `${base}/project-${$project.$id}/overview/platforms/${$platform.$id}`, + href: `${base}/project-${$project.region}-${$project.$id}/overview/platforms/${$platform.$id}`, title: $platform.name } ]; diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/delete.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/delete.svelte similarity index 92% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/delete.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/delete.svelte index 2d139fb41..dcc39086e 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/[platform]/delete.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/delete.svelte @@ -21,7 +21,7 @@ message: `${$platform.name} has been deleted` }); trackEvent(Submit.PlatformDelete); - await goto(`${base}/project-${$project.$id}/overview/platforms`); + await goto(`${base}/project-${$project.region}-${$project.$id}/overview/platforms`); } catch (e) { error = e.message; trackError(e, Submit.PlatformDelete); diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterAndroid.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterAndroid.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterIOS.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterIOS.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterIOS.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterIOS.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterLinux.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterLinux.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterLinux.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterLinux.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterMacOS.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterMacOS.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterWindows.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterWindows.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterWindows.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterWindows.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/header.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/header.svelte similarity index 78% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/header.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/header.svelte index 065764587..b52019a57 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/[platform]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/header.svelte @@ -9,7 +9,7 @@ - + {$platform?.name} diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/store.ts b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/store.ts rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/store.ts diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/web.svelte similarity index 94% rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/web.svelte index a1fdc9b10..9b7688de4 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/web.svelte @@ -8,7 +8,7 @@ import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; - import { hostnameRegex } from '$lib/helpers/string'; + import { extendedHostnameRegex } from '$lib/helpers/string'; let hostname: string = null; @@ -49,7 +49,7 @@ id="hostname" label="Hostname" bind:value={hostname} - pattern={hostnameRegex} + pattern={extendedHostnameRegex} patternError="Please enter a valid hostname" required placeholder="myapp.com" /> diff --git a/src/routes/(console)/project-[project]/overview/platforms/action.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/action.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/action.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/action.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/components/AngularFrameworkIcon.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/components/AngularFrameworkIcon.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/components/AngularFrameworkIcon.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/components/AngularFrameworkIcon.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/components/ConnectionLine.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/components/ConnectionLine.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/components/ConnectionLine.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/components/ConnectionLine.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/components/JavascriptFrameworkIcon.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/components/JavascriptFrameworkIcon.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/components/JavascriptFrameworkIcon.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/components/JavascriptFrameworkIcon.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/components/NextjsFrameworkIcon.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/components/NextjsFrameworkIcon.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/components/NextjsFrameworkIcon.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/components/NextjsFrameworkIcon.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/components/NoFrameworkIcon.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/components/NoFrameworkIcon.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/components/NoFrameworkIcon.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/components/NoFrameworkIcon.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/components/NuxtFrameworkIcon.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/components/NuxtFrameworkIcon.svelte similarity index 100% rename from src/routes/(console)/project-[project]/overview/platforms/components/NuxtFrameworkIcon.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/components/NuxtFrameworkIcon.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/components/OnboardingPlatformCard.svelte similarity index 96% rename from src/routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte rename to src/routes/(console)/project-[region]-[project]/overview/platforms/components/OnboardingPlatformCard.svelte index 446cc6f78..3b3105ab6 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/components/OnboardingPlatformCard.svelte @@ -1,5 +1,5 @@ diff --git a/src/routes/(console)/project-[project]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/+page.ts similarity index 64% rename from src/routes/(console)/project-[project]/settings/+page.ts rename to src/routes/(console)/project-[region]-[project]/settings/+page.ts index a9f2ac14a..e6f31e223 100644 --- a/src/routes/(console)/project-[project]/settings/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/+page.ts @@ -3,15 +3,17 @@ import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ depends, url }) => { +export const load: PageLoad = async ({ depends, url, params }) => { depends(Dependencies.PROJECT_VARIABLES); depends(Dependencies.PROJECT_INSTALLATIONS); const limit = PAGE_LIMIT; const offset = Number(url.searchParams.get('offset') ?? 0); const [variables, installations] = await Promise.all([ - sdk.forProject.projectApi.listVariables(), - sdk.forProject.vcs.listInstallations([Query.limit(limit), Query.offset(offset)]) + sdk.forProject(params.region, params.project).projectApi.listVariables(), + sdk + .forProject(params.region, params.project) + .vcs.listInstallations([Query.limit(limit), Query.offset(offset)]) ]); return { diff --git a/src/routes/(console)/project-[project]/settings/GitDisconnectModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/GitDisconnectModal.svelte similarity index 87% rename from src/routes/(console)/project-[project]/settings/GitDisconnectModal.svelte rename to src/routes/(console)/project-[region]-[project]/settings/GitDisconnectModal.svelte index a8b9dc1a3..c3e288fcf 100644 --- a/src/routes/(console)/project-[project]/settings/GitDisconnectModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/GitDisconnectModal.svelte @@ -10,13 +10,16 @@ import { toLocaleDateTime } from '$lib/helpers/date'; import { Icon, Layout, Typography } from '@appwrite.io/pink-svelte'; import { IconGlobeAlt, IconLightningBolt } from '@appwrite.io/pink-icons-svelte'; + import { page } from '$app/state'; export let showGitDisconnect: boolean; export let selectedInstallation: Models.Installation; async function handleSubmit() { try { - await sdk.forProject.vcs.deleteInstallation(selectedInstallation.$id); + await sdk + .forProject(page.params.region, page.params.project) + .vcs.deleteInstallation(selectedInstallation.$id); await invalidate(Dependencies.PROJECT_INSTALLATIONS); addNotification({ message: `${selectedInstallation.organization} has been disconnected from this project`, @@ -37,17 +40,21 @@ } async function loadFunctions() { - return await sdk.forProject.functions.list([ - Query.limit(100), - Query.equal('installationId', selectedInstallation.$id) - ]); + return await sdk + .forProject(page.params.region, page.params.project) + .functions.list([ + Query.limit(100), + Query.equal('installationId', selectedInstallation.$id) + ]); } async function loadSites() { - return await sdk.forProject.sites.list([ - Query.limit(100), - Query.equal('installationId', selectedInstallation.$id) - ]); + return await sdk + .forProject(page.params.region, page.params.project) + .sites.list([ + Query.limit(100), + Query.equal('installationId', selectedInstallation.$id) + ]); } diff --git a/src/routes/(console)/project-[project]/settings/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte similarity index 70% rename from src/routes/(console)/project-[project]/settings/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte index 0db760fa7..43332805b 100644 --- a/src/routes/(console)/project-[project]/settings/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte @@ -1,5 +1,6 @@ - +
- {#if isSubDomain && !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && $consoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} + {#if isSubDomain && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && $regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} (selectedTab = 'cname')} @@ -122,7 +138,7 @@ Nameservers {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} + {#if !isCloud && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_A && $regionalConsoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} (selectedTab = 'a')} @@ -130,7 +146,7 @@ A {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} + {#if !isCloud && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} (selectedTab = 'aaaa')} diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts new file mode 100644 index 000000000..8f49a7343 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts @@ -0,0 +1,18 @@ +import { sdk } from '$lib/stores/sdk'; +import { isCloud } from '$lib/system'; +import { Dependencies } from '$lib/constants.js'; +import { type Models, Query } from '@appwrite.io/console'; + +export const load = async ({ depends, parent }) => { + const { organization } = await parent(); + depends(Dependencies.DOMAINS); + + let domainsList: Models.DomainsList; + if (isCloud) { + domainsList = await sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]); + } + + return { + domainsList + }; +}; diff --git a/src/routes/(console)/project-[project]/settings/domains/deleteDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/deleteDomainModal.svelte similarity index 88% rename from src/routes/(console)/project-[project]/settings/domains/deleteDomainModal.svelte rename to src/routes/(console)/project-[region]-[project]/settings/domains/deleteDomainModal.svelte index e2e937ff6..1003a8fc2 100644 --- a/src/routes/(console)/project-[project]/settings/domains/deleteDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/deleteDomainModal.svelte @@ -7,6 +7,7 @@ import { Dependencies } from '$lib/constants'; import { Confirm } from '$lib/components'; import { Typography } from '@appwrite.io/pink-svelte'; + import { page } from '$app/state'; let { show = $bindable(), @@ -20,7 +21,9 @@ async function deleteDomain() { try { - await sdk.forProject.proxy.deleteRule(selectedDomain.$id); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.deleteRule(selectedDomain.$id); await invalidate(Dependencies.DOMAINS); show = false; addNotification({ diff --git a/src/routes/(console)/project-[project]/settings/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte similarity index 77% rename from src/routes/(console)/project-[project]/settings/domains/retryDomainModal.svelte rename to src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte index b5f451d85..2cd8c7a51 100644 --- a/src/routes/(console)/project-[project]/settings/domains/retryDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte @@ -8,6 +8,7 @@ import { Dependencies } from '$lib/constants'; import type { Models } from '@appwrite.io/console'; import CnameTable from '$lib/components/domains/cnameTable.svelte'; + import { page } from '$app/state'; let { show = $bindable(), @@ -20,17 +21,19 @@ async function retryDomain() { try { - await sdk.forProject.proxy.updateRuleVerification(selectedDomain.$id); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.updateRuleVerification(selectedDomain.$id); await invalidate(Dependencies.DOMAINS); show = false; addNotification({ type: 'success', - message: `${selectedDomain.domain} has been deleted` + message: `${selectedDomain.domain} has been verified` }); - trackEvent(Submit.DomainDelete); + trackEvent(Submit.DomainUpdateVerification); } catch (e) { - error = e; - trackError(e, Submit.DomainDelete); + error = e.message; + trackError(e, Submit.DomainUpdateVerification); } } diff --git a/src/routes/(console)/project-[project]/settings/domains/store.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/settings/domains/store.ts rename to src/routes/(console)/project-[region]-[project]/settings/domains/store.ts diff --git a/src/routes/(console)/project-[project]/settings/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte similarity index 76% rename from src/routes/(console)/project-[project]/settings/domains/table.svelte rename to src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte index 8529c72dc..70b5b62bf 100644 --- a/src/routes/(console)/project-[project]/settings/domains/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte @@ -2,7 +2,6 @@ import { Click, trackEvent } from '$lib/actions/analytics'; import { Link } from '$lib/elements'; import { Button } from '$lib/elements/forms'; - import { protocol } from '$routes/(console)/store'; import type { Models } from '@appwrite.io/console'; import { IconDotsHorizontal, IconRefresh, IconTrash } from '@appwrite.io/pink-icons-svelte'; import { @@ -17,6 +16,7 @@ import DeleteDomainModal from './deleteDomainModal.svelte'; import RetryDomainModal from './retryDomainModal.svelte'; import { columns } from './store'; + import { regionalProtocol } from '../../store'; let { domains @@ -43,18 +43,29 @@ {#each $columns as column} {#if column.id === 'domain'} - - - {domain.domain} - {#if domain.status !== 'verified'} - - {/if} - - + + + + {domain.domain} + + + {#if domain.status === 'verifying'} + + {:else if domain.status !== 'verified'} + + {/if} + {/if} {/each} @@ -73,7 +84,7 @@ - {#if domain.status !== 'verified'} + {#if domain.status !== 'verified' && domain.status !== 'verifiying'} { diff --git a/src/routes/(console)/project-[project]/settings/enableAllServices.svelte b/src/routes/(console)/project-[region]-[project]/settings/enableAllServices.svelte similarity index 100% rename from src/routes/(console)/project-[project]/settings/enableAllServices.svelte rename to src/routes/(console)/project-[region]-[project]/settings/enableAllServices.svelte diff --git a/src/routes/(console)/project-[project]/settings/header.svelte b/src/routes/(console)/project-[region]-[project]/settings/header.svelte similarity index 94% rename from src/routes/(console)/project-[project]/settings/header.svelte rename to src/routes/(console)/project-[region]-[project]/settings/header.svelte index 92569ce37..fa8375110 100644 --- a/src/routes/(console)/project-[project]/settings/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/header.svelte @@ -9,8 +9,7 @@ import { isCloud, isStudio } from '$lib/system'; import { Typography } from '@appwrite.io/pink-svelte'; - const projectId = page.params.project; - const path = `${base}/project-${projectId}/settings`; + const path = `${base}/project-${page.params.region}-${page.params.project}/settings`; const tabs: TabElement[] = [ { href: path, diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/credentials.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/credentials.svelte new file mode 100644 index 000000000..fb61190f4 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/credentials.svelte @@ -0,0 +1,165 @@ + + + + {#if $provider.provider === 'appwrite'} + + + + + + {:else if $provider.provider === 'firebase'} + + + + {:else if $provider.provider === 'supabase'} + + Postgres credentials + + + + + + + + + + Supabase credentials + + + + + + {:else if $provider.provider === 'nhost'} + + + + + + + + + {/if} + + + { + formSubmitted = true; + }}>Next + + diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/importReport.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/importReport.svelte new file mode 100644 index 000000000..e86559bae --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/importReport.svelte @@ -0,0 +1,112 @@ + + +{#if !formGroupChildren.length} +
+ +
+{:else} + + + {#each formGroupChildren as key} +
+ +
+ {/each} +
+
+{/if} diff --git a/src/routes/(console)/project-[project]/settings/migrations/(import)/index.ts b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/index.ts similarity index 100% rename from src/routes/(console)/project-[project]/settings/migrations/(import)/index.ts rename to src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/index.ts diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/wizard.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/wizard.svelte new file mode 100644 index 000000000..46aeae3ed --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/wizard.svelte @@ -0,0 +1,262 @@ + + + + + +
+ + {#if !showResources} + + Select a source platform with the project you want to migrate. + + Learn more. + + + + + {#each Object.entries(providers) as [key, platform]} + + {/each} + + + + + + {:else} + + + {capitalize($provider.provider)} + + + (showResources = !showResources)}> + Update + + + {/if} + +
+ + {#if showResources} +
+ + + +
+ {/if} +
+
+ + + + + Good to know + + + + + + + + Project settings are not imported + You will need to set service and project settings manually. + + + + + + + + + + Keep your organization plan's limits in mind + Make sure to have enough storage in your organization plan when importing files. + + + + + + {@const isFirebase = $provider.provider === 'firebase'} + + + + + + {isFirebase + ? 'Possible charges by Firebase' + : 'Transfer is free of charge'} + + + {#if isFirebase} + Appwrite does not impose charges for importing data, but please note + that Firebase may have its own pricing for this service + {:else} + You won't be charged for Appwrite bandwidth usage for importing data + {/if} + + + + + + + + { + showExitModal = true; + }}>Cancel + + Create + +
diff --git a/src/routes/(console)/project-[project]/settings/migrations/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte similarity index 90% rename from src/routes/(console)/project-[project]/settings/migrations/+page.svelte rename to src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte index f73714455..b404c4b3d 100644 --- a/src/routes/(console)/project-[project]/settings/migrations/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte @@ -6,7 +6,7 @@ import { Button } from '$lib/elements/forms'; import { isSameDay } from '$lib/helpers/date'; import { Container } from '$lib/layout'; - import { sdk } from '$lib/stores/sdk'; + import { realtime, sdk } from '$lib/stores/sdk'; import { GRACE_PERIOD_OVERRIDE, isSelfHosted } from '$lib/system'; import { onMount } from 'svelte'; import { project } from '../../store'; @@ -30,30 +30,21 @@ import { capitalize } from '$lib/helpers/string'; import DualTimeView from '$lib/components/dualTimeView.svelte'; import { Click, trackEvent } from '$lib/actions/analytics'; + import { page } from '$app/state'; export let data; - let migration: Models.Migration = null; let showExport = false; let showMigration = false; + let migration: Models.Migration = null; - const getStatus = (status: string) => { - if (status === 'failed') { - return 'failed'; - } else if (status === 'completed') { - return 'complete'; - } else if (status === 'processing') { - return 'processing'; - } - - return 'pending'; - }; - - onMount(async () => { - sdk.forConsole.client.subscribe(['project', 'console'], (response) => { - if (response.events.includes('migrations.*')) { - invalidate(Dependencies.MIGRATIONS); - } - }); + onMount(() => { + return realtime + .forProject(page.params.region, page.params.project) + .subscribe(['project', 'console'], (response) => { + if (response.events.includes('migrations.*')) { + invalidate(Dependencies.MIGRATIONS); + } + }); }); $: $registerCommands([ @@ -131,8 +122,25 @@ }; function showDetails(m: Models.Migration) { - showMigration = true; migration = m; + showMigration = true; + } + + function getTypedStatus(entry: Models.Migration) { + // migration > pending, processing, failed, completed + // status component = waiting, ready, processing, pending, failed, complete + switch (entry.status) { + case 'completed': + return 'complete'; + case 'processing': + return 'processing'; + case 'failed': + return 'failed'; + case 'pending': + return 'pending'; + default: + return 'waiting'; + } } @@ -162,7 +170,7 @@
{#each data.migrations as entry} - {@const status = getStatus(entry.status)} + {@const status = getTypedStatus(entry)} {#if isSameDay(new Date(), new Date(entry.$createdAt))} Today diff --git a/src/routes/(console)/project-[project]/settings/migrations/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.ts similarity index 81% rename from src/routes/(console)/project-[project]/settings/migrations/+page.ts rename to src/routes/(console)/project-[region]-[project]/settings/migrations/+page.ts index 6ce0dd60b..36b470e5c 100644 --- a/src/routes/(console)/project-[project]/settings/migrations/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.ts @@ -2,11 +2,11 @@ import { Dependencies } from '$lib/constants.js'; import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; -export async function load({ depends }) { +export async function load({ depends, params }) { depends(Dependencies.MIGRATIONS); try { - const { migrations } = await sdk.forProject.migrations.list([ + const { migrations } = await sdk.forProject(params.region, params.project).migrations.list([ // hides backups/restorations from migrations page. Query.equal('source', ['Appwrite', 'Firebase', 'NHost', 'Supabase']), Query.or([ diff --git a/src/routes/(console)/project-[project]/settings/migrations/details.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/details.svelte similarity index 57% rename from src/routes/(console)/project-[project]/settings/migrations/details.svelte rename to src/routes/(console)/project-[region]-[project]/settings/migrations/details.svelte index d26f39209..1add18f03 100644 --- a/src/routes/(console)/project-[project]/settings/migrations/details.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/details.svelte @@ -1,13 +1,24 @@ {#if tab === 'logs'} - + {:else if tab === 'details'} @@ -76,82 +88,64 @@ {#if Object.values(statusCounters).some(hasError)} - + There was an error migrating some of the project's entities. - + + {/if} {#if Object.keys(statusCounters).length} -
- {#each Object.keys(statusCounters) as entity} - {@const entityCounter = statusCounters[entity]} -
-
- {#if hasError(entityCounter)} - - {:else if isLoading(entityCounter)} -
- -
- {:else if hasSucceeded(entityCounter)} - - {:else} - - {/if} -
+ + + {#each Object.keys(statusCounters) as entity} + {@const entityCounter = statusCounters[entity]} + +
+ {#if hasError(entityCounter)} + + {:else if isLoading(entityCounter)} + + {:else if hasSucceeded(entityCounter)} + + {:else} + + {/if} +
-
- {total(Object.values(entityCounter)) > 1 - ? ResourcesFriendly[entity].plural - : ResourcesFriendly[entity].singular} - {totalItems(entityCounter)} -
-
- {/each} -
+
+ {total(Object.values(entityCounter)) > 1 + ? ResourcesFriendly[entity].plural + : ResourcesFriendly[entity].singular} + + {totalItems(entityCounter)} +
+ + {/each} + + {/if} {/if}
diff --git a/src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte similarity index 65% rename from src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte rename to src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte index 0f4658324..bbb1ebda7 100644 --- a/src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte @@ -1,16 +1,20 @@ - - API key creation - By initiating the transfer, an API key will be automatically generated in the background, which - you can delete after completion - + + + API key creation + By initiating the transfer, an API key will be automatically generated in the background, + which you can delete after completion + - { - if (!submitted) return; - handleInvalid(e); - }} /> + - -

Share your feedback: why our self-hosted solution works better for you

-

- We appreciate your continued support and we understand that our self-hosted solution - might better fit your needs. To help us improve our Cloud solution, please share why it - works better for you. Your feedback is important to us and we'll use it to make our - services better. -

-
- -
-
+ + + + Share your feedback: why our self-hosted solution works better for you + -
- You will be redirected to your self-hosted instance + We appreciate your continued support and we understand that our self-hosted solution + might better fit your needs. To help us improve our Cloud solution, please share why + it works better for you. Your feedback is important to us and we'll use it to make + our services better. - -
+ +
+
+
+ + + You will be redirected to your self-hosted instance + + +
diff --git a/src/routes/(console)/project-[project]/settings/migrations/stores.ts b/src/routes/(console)/project-[region]-[project]/settings/migrations/stores.ts similarity index 100% rename from src/routes/(console)/project-[project]/settings/migrations/stores.ts rename to src/routes/(console)/project-[region]-[project]/settings/migrations/stores.ts diff --git a/src/routes/(console)/project-[project]/settings/smtp/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/smtp/+page.svelte similarity index 98% rename from src/routes/(console)/project-[project]/settings/smtp/+page.svelte rename to src/routes/(console)/project-[region]-[project]/settings/smtp/+page.svelte index a18459f50..7df564ceb 100644 --- a/src/routes/(console)/project-[project]/settings/smtp/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/smtp/+page.svelte @@ -120,7 +120,8 @@ SMTP server You can customize the email service by providing your own SMTP server. View your email templates - here + here {#if $organization.billingPlan === BillingPlan.FREE} + import { goto } from '$app/navigation'; + import { base } from '$app/paths'; + import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; + import { Confirm } from '$lib/components'; + import { Button } from '$lib/elements/forms'; + import { addNotification } from '$lib/stores/notifications'; + import { sdk } from '$lib/stores/sdk'; + import { Typography } from '@appwrite.io/pink-svelte'; + import { project } from '../store'; + + export let show = false; + export let teamName: string; + export let teamId: string; + + const handleTransfer = async () => { + try { + await sdk.forConsole.projects.updateTeam($project.$id, teamId); + show = false; + addNotification({ + type: 'success', + message: `${$project.name} has been transferred to ${teamName}` + }); + trackEvent(Submit.ProjectUpdateTeam); + await goto(`${base}/organization-${teamId}`); + } catch (error) { + addNotification({ + type: 'error', + message: error.message + }); + trackError(error, Submit.ProjectUpdateTeam); + } + }; + + + + Are you sure you want to move {$project.name} to + {teamName}? + + Members who are not part of the destination organization must be invited to gain access to + this project. + + + + + + + diff --git a/src/routes/(console)/project-[project]/settings/updateInstallations.svelte b/src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte similarity index 96% rename from src/routes/(console)/project-[project]/settings/updateInstallations.svelte rename to src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte index 15be2f730..62aa81c07 100644 --- a/src/routes/(console)/project-[project]/settings/updateInstallations.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte @@ -7,7 +7,6 @@ import type { Models } from '@appwrite.io/console'; import GitDisconnectModal from './GitDisconnectModal.svelte'; import { isSelfHosted } from '$lib/system'; - import { consoleVariables } from '$routes/(console)/store'; import { ActionMenu, Alert, @@ -28,6 +27,7 @@ import { Click, trackEvent } from '$lib/actions/analytics'; import type { ComponentType } from 'svelte'; import { Link } from '$lib/elements'; + import { regionalConsoleVariables } from '../store'; export let total: number; export let limit: number; @@ -37,7 +37,7 @@ let showGitDisconnect = false; let showInstallationDropdown: boolean[] = []; let selectedInstallation: Models.Installation; - const isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true; + const isVcsEnabled = $regionalConsoleVariables?._APP_VCS_ENABLED === true; function getInstallationLink(installation: Models.Installation) { switch (installation.provider) { @@ -58,7 +58,9 @@ function configureGitHub() { const redirect = new URL(page.url); redirect.searchParams.append('alert', 'installation-updated'); - const target = new URL(`${sdk.forProject.client.config.endpoint}/vcs/github/authorize`); + const target = new URL( + `${sdk.forProject(page.params.region, page.params.project).client.config.endpoint}/vcs/github/authorize` + ); target.searchParams.set('project', page.params.project); target.searchParams.set('success', redirect.toString()); target.searchParams.set('failure', redirect.toString()); diff --git a/src/routes/(console)/project-[project]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte similarity index 90% rename from src/routes/(console)/project-[project]/settings/updateName.svelte rename to src/routes/(console)/project-[region]-[project]/settings/updateName.svelte index ddd43bdd7..af7f27d0d 100644 --- a/src/routes/(console)/project-[project]/settings/updateName.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte @@ -11,9 +11,7 @@ import { onMount } from 'svelte'; import { project } from '../store'; import { canWriteProjects } from '$lib/stores/roles'; - - const endpoint = sdk.forConsole.client.config.endpoint; - const projectId = page.params.project; + import { getProjectEndpoint } from '$lib/helpers/project'; let name: string = null; @@ -46,13 +44,13 @@ Access Appwrite services using this project's API Endpoint and Project ID. - + diff --git a/src/routes/(console)/project-[project]/settings/updateServices.svelte b/src/routes/(console)/project-[region]-[project]/settings/updateServices.svelte similarity index 100% rename from src/routes/(console)/project-[project]/settings/updateServices.svelte rename to src/routes/(console)/project-[region]-[project]/settings/updateServices.svelte diff --git a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte similarity index 99% rename from src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte index a00376dcc..81ee6ada9 100644 --- a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte @@ -14,10 +14,11 @@ import { getCountryName } from '$lib/helpers/diallingCodes.js'; import { Accordion, Icon, Layout, Link, Table, Typography } from '@appwrite.io/pink-svelte'; import { IconChartSquareBar } from '@appwrite.io/pink-icons-svelte'; + import { page } from '$app/state'; export let data; - $: baseRoute = `${base}/project-${data.project.$id}`; + $: baseRoute = `${base}/project-${page.params.region}-${page.params.project}`; $: network = data.usage.network; $: users = data.usage.users; $: usersTotal = data.usage.usersTotal; diff --git a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts similarity index 84% rename from src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.ts rename to src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts index 2cb455ae0..c432d29b8 100644 --- a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts @@ -1,11 +1,11 @@ import type { Aggregation, Invoice } from '$lib/sdk/billing'; import { accumulateUsage } from '$lib/sdk/usage'; -import { getSdkForProject, sdk } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - const { invoice, project } = params; + const { invoice, project, region } = params; const { organization } = await parent(); let startDate: string = organization.billingCurrentInvoiceDate; @@ -26,10 +26,7 @@ export const load: PageLoad = async ({ params, parent }) => { const [invoices, usage] = await Promise.all([ sdk.forConsole.billing.listInvoices(organization.$id, [Query.orderDesc('from')]), - /** - * Workaround because project id might not be populated yet. - */ - getSdkForProject(project).project.getUsage(startDate, endDate) + sdk.forProject(region, project).project.getUsage(startDate, endDate) ]); if (invoice) { diff --git a/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte similarity index 90% rename from src/routes/(console)/project-[project]/settings/webhooks/+page.svelte rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte index e83787f88..3d642cd9e 100644 --- a/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte @@ -22,8 +22,6 @@ let showFailed = false; let selectedWebhook: Models.Webhook; - const projectId = page.params.project; - $: $updateCommandGroupRanks({ webhooks: 20, domains: 10 }); @@ -36,7 +34,7 @@ {#if $canWriteWebhooks} - {#if !inCard} + {#if !inCard && selectedDeployment?.sourceSize !== 0} { diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[region]-[project]/sites/(components)/logs.svelte similarity index 100% rename from src/routes/(console)/project-[project]/sites/(components)/logs.svelte rename to src/routes/(console)/project-[region]-[project]/sites/(components)/logs.svelte diff --git a/src/routes/(console)/project-[project]/sites/(components)/logsTimer.svelte b/src/routes/(console)/project-[region]-[project]/sites/(components)/logsTimer.svelte similarity index 100% rename from src/routes/(console)/project-[project]/sites/(components)/logsTimer.svelte rename to src/routes/(console)/project-[region]-[project]/sites/(components)/logsTimer.svelte diff --git a/src/routes/(console)/project-[project]/sites/(components)/openOnMobileModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/(components)/openOnMobileModal.svelte similarity index 83% rename from src/routes/(console)/project-[project]/sites/(components)/openOnMobileModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/(components)/openOnMobileModal.svelte index 70af02974..928694053 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/openOnMobileModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/(components)/openOnMobileModal.svelte @@ -1,13 +1,14 @@ diff --git a/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte b/src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte similarity index 99% rename from src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte rename to src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte index a298df23c..f01665e55 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte @@ -29,7 +29,6 @@ export let variant: 'primary' | 'secondary' = 'primary'; let show = false; - const siteUrl = proxyRuleList.total > 0 ? proxyRuleList.rules[0].domain : undefined; $: totalSize = humanFileSize(deployment?.totalSize ?? 0); diff --git a/src/routes/(console)/project-[region]-[project]/sites/(images)/empty-sites-dark-mobile.svg b/src/routes/(console)/project-[region]-[project]/sites/(images)/empty-sites-dark-mobile.svg new file mode 100644 index 000000000..39c7917cf --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/sites/(images)/empty-sites-dark-mobile.svg @@ -0,0 +1,119 @@ + + +
+ + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/routes/(console)/project-[project]/sites/(images)/empty-sites-dark.svg b/src/routes/(console)/project-[region]-[project]/sites/(images)/empty-sites-dark.svg similarity index 100% rename from src/routes/(console)/project-[project]/sites/(images)/empty-sites-dark.svg rename to src/routes/(console)/project-[region]-[project]/sites/(images)/empty-sites-dark.svg diff --git a/src/routes/(console)/project-[region]-[project]/sites/(images)/empty-sites-light-mobile.svg b/src/routes/(console)/project-[region]-[project]/sites/(images)/empty-sites-light-mobile.svg new file mode 100644 index 000000000..8bd4b239e --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/sites/(images)/empty-sites-light-mobile.svg @@ -0,0 +1,157 @@ + + +
+ + + + +
+
+ + + + +
+
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/routes/(console)/project-[project]/sites/(images)/empty-sites-light.svg b/src/routes/(console)/project-[region]-[project]/sites/(images)/empty-sites-light.svg similarity index 100% rename from src/routes/(console)/project-[project]/sites/(images)/empty-sites-light.svg rename to src/routes/(console)/project-[region]-[project]/sites/(images)/empty-sites-light.svg diff --git a/src/routes/(console)/project-[project]/sites/(images)/repositoryDark.svg b/src/routes/(console)/project-[region]-[project]/sites/(images)/repositoryDark.svg similarity index 100% rename from src/routes/(console)/project-[project]/sites/(images)/repositoryDark.svg rename to src/routes/(console)/project-[region]-[project]/sites/(images)/repositoryDark.svg diff --git a/src/routes/(console)/project-[project]/sites/(images)/repositoryLight.svg b/src/routes/(console)/project-[region]-[project]/sites/(images)/repositoryLight.svg similarity index 100% rename from src/routes/(console)/project-[project]/sites/(images)/repositoryLight.svg rename to src/routes/(console)/project-[region]-[project]/sites/(images)/repositoryLight.svg diff --git a/src/routes/(console)/project-[project]/sites/(images)/templateDark.svg b/src/routes/(console)/project-[region]-[project]/sites/(images)/templateDark.svg similarity index 100% rename from src/routes/(console)/project-[project]/sites/(images)/templateDark.svg rename to src/routes/(console)/project-[region]-[project]/sites/(images)/templateDark.svg diff --git a/src/routes/(console)/project-[project]/sites/(images)/templateLight.svg b/src/routes/(console)/project-[region]-[project]/sites/(images)/templateLight.svg similarity index 100% rename from src/routes/(console)/project-[project]/sites/(images)/templateLight.svg rename to src/routes/(console)/project-[region]-[project]/sites/(images)/templateLight.svg diff --git a/src/routes/(console)/project-[project]/sites/+layout.svelte b/src/routes/(console)/project-[region]-[project]/sites/+layout.svelte similarity index 100% rename from src/routes/(console)/project-[project]/sites/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/sites/+layout.svelte diff --git a/src/routes/(console)/project-[project]/sites/+layout.ts b/src/routes/(console)/project-[region]-[project]/sites/+layout.ts similarity index 100% rename from src/routes/(console)/project-[project]/sites/+layout.ts rename to src/routes/(console)/project-[region]-[project]/sites/+layout.ts diff --git a/src/routes/(console)/project-[region]-[project]/sites/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/+page.svelte new file mode 100644 index 000000000..a933b669f --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/sites/+page.svelte @@ -0,0 +1,186 @@ + + + + {#if showSites} + + + + + + + {#if $canWriteSites} + + {/if} + + + {#if data.siteList.total} + {#if data.view === View.Grid} + + {:else} +
+ {/if} + + {:else if data.search} + + {:else} + (show = true)}> + + {/if} + {:else} + + + + + + {#if isOnWaitlist} + + You've successfully joined the Sites waitlist + + + + We can't wait for you to try out Sites on Cloud. You will get access + soon. + + {:else} + + + Appwrite Sites is in high demand + + +
+ + To ensure a smooth experience for everyone, we’re rolling out + access gradually. Join the waitlist and be one of the first to + deploy with Sites. + +
+ +
+ +
+
+ {/if} +
+
+
+ {/if} + + + diff --git a/src/routes/(console)/project-[project]/sites/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/+page.ts similarity index 51% rename from src/routes/(console)/project-[project]/sites/+page.ts rename to src/routes/(console)/project-[region]-[project]/sites/+page.ts index 445401849..afaf7b02d 100644 --- a/src/routes/(console)/project-[project]/sites/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/+page.ts @@ -2,8 +2,15 @@ import { Query } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, getSearch, getView, pageToOffset, View } from '$lib/helpers/load'; import { CARD_LIMIT, Dependencies } from '$lib/constants'; +import { APPWRITE_OFFICIALS_ORG, isCloud } from '$lib/system'; + +export const load = async ({ url, depends, route, params, parent }) => { + // don't load anything on cloud unless org is appwrite atm! + const { organization } = await parent(); + if (isCloud && organization?.$id !== APPWRITE_OFFICIALS_ORG) { + return; + } -export const load = async ({ url, depends, route }) => { depends(Dependencies.SITES); const page = getPage(url); @@ -12,10 +19,12 @@ export const load = async ({ url, depends, route }) => { const offset = pageToOffset(page, limit); const view = getView(url, route, View.Grid, View.Grid); - const siteList = await sdk.forProject.sites.list( - [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], - search || undefined - ); + const siteList = await sdk + .forProject(params.region, params.project) + .sites.list( + [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], + search || undefined + ); return { offset, diff --git a/src/routes/(console)/project-[project]/sites/activateDeploymentModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/activateDeploymentModal.svelte similarity index 87% rename from src/routes/(console)/project-[project]/sites/activateDeploymentModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/activateDeploymentModal.svelte index 74bcc6be0..fbf321e46 100644 --- a/src/routes/(console)/project-[project]/sites/activateDeploymentModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/activateDeploymentModal.svelte @@ -6,6 +6,7 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; + import { page } from '$app/state'; export let show = false; export let selectedDeploymentId: string; @@ -14,7 +15,9 @@ async function activate() { try { - await sdk.forProject.sites.updateSiteDeployment(siteId, selectedDeploymentId); + await sdk + .forProject(page.params.region, page.params.project) + .sites.updateSiteDeployment(siteId, selectedDeploymentId); addNotification({ type: 'success', message: `Deployment has been activated` diff --git a/src/routes/(console)/project-[project]/sites/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/sites/breadcrumbs.svelte similarity index 70% rename from src/routes/(console)/project-[project]/sites/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/sites/breadcrumbs.svelte index 3534a03a7..e9afbf4ff 100644 --- a/src/routes/(console)/project-[project]/sites/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/breadcrumbs.svelte @@ -1,5 +1,6 @@ @@ -93,12 +95,12 @@ id="installCommand" label="Install command" bind:value={installCommand} - placeholder={ssr?.installCommand} /> + placeholder={adapterData?.installCommand} /> @@ -107,12 +109,12 @@ id="buildCommand" label="Build command" bind:value={buildCommand} - placeholder={ssr?.buildCommand} /> + placeholder={adapterData?.buildCommand} /> @@ -121,12 +123,12 @@ id="outputDirectory" label="Output directory" bind:value={outputDirectory} - placeholder={ssr?.outputDirectory} /> + placeholder={adapterData?.outputDirectory} /> @@ -135,9 +137,6 @@ - - Environment variables - Set up environment variables to securely manage keys and settings for your project. diff --git a/src/routes/(console)/project-[project]/sites/create-site/createVariableModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/createVariableModal.svelte similarity index 96% rename from src/routes/(console)/project-[project]/sites/create-site/createVariableModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/createVariableModal.svelte index 217dfaee3..8dc28a966 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/createVariableModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/createVariableModal.svelte @@ -66,7 +66,9 @@ Set the environment variables or secret that will be passed to your site. Global variables - can be set in project settings. diff --git a/src/routes/(console)/project-[project]/sites/create-site/deleteVariableModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/deleteVariableModal.svelte similarity index 95% rename from src/routes/(console)/project-[project]/sites/create-site/deleteVariableModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/deleteVariableModal.svelte index dfbef69a6..e203b44f7 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/deleteVariableModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deleteVariableModal.svelte @@ -9,7 +9,6 @@ export let variables: Partial[] = []; function deleteVariable() { - console.log(variables, currentVariable); variables = variables.filter((v) => v.key !== currentVariable.key); variables = [...variables]; currentVariable = null; diff --git a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte similarity index 90% rename from src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte index a3b3acfc6..baa0e4e30 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte @@ -29,7 +29,7 @@ deployment = response.payload; if (response.payload.status === 'ready') { goto( - `${base}/project-${page.params.project}/sites/create-site/finish?site=${data.site.$id}` + `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/finish?site=${data.site.$id}` ); } } @@ -40,7 +40,7 @@ + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}`}> @@ -84,7 +84,7 @@ size="s" fullWidthMobile secondary - href={`${base}/project-${page.params.project}/sites/site-${data.site.$id}`}> + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}`}> Go to dashboard diff --git a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts similarity index 53% rename from src/routes/(console)/project-[project]/sites/create-site/deploying/+page.ts rename to src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts index 6b57c817a..239290177 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts @@ -12,15 +12,17 @@ export const load: PageLoad = async ({ url, depends, params }) => { const siteId = url.searchParams.get('site'); const deploymentId = url.searchParams.get('deployment'); const [site, deployment, proxyRuleList] = await Promise.all([ - sdk.forProject.sites.get(siteId), - sdk.forProject.sites.getDeployment(siteId, deploymentId), - sdk.forProject.proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', siteId), - Query.equal('deploymentId', deploymentId), - Query.equal('trigger', RuleTrigger.MANUAL) - ]) + sdk.forProject(params.region, params.project).sites.get(siteId), + sdk.forProject(params.region, params.project).sites.getDeployment(siteId, deploymentId), + sdk + .forProject(params.region, params.project) + .proxy.listRules([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', siteId), + Query.equal('deploymentId', deploymentId), + Query.equal('trigger', RuleTrigger.MANUAL) + ]) ]); return { @@ -28,7 +30,9 @@ export const load: PageLoad = async ({ url, depends, params }) => { deployment, proxyRuleList, repository: site?.installationId - ? await sdk.forProject.vcs.getRepository(site.installationId, site.providerRepositoryId) + ? await sdk + .forProject(params.region, params.project) + .vcs.getRepository(site.installationId, site.providerRepositoryId) : undefined }; }; diff --git a/src/routes/(console)/project-[project]/sites/create-site/details.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/details.svelte similarity index 100% rename from src/routes/(console)/project-[project]/sites/create-site/details.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/details.svelte diff --git a/src/routes/(console)/project-[project]/sites/create-site/domain.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/domain.svelte similarity index 90% rename from src/routes/(console)/project-[project]/sites/create-site/domain.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/domain.svelte index 397fdeeb1..0a6bcf5ed 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/domain.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/domain.svelte @@ -3,10 +3,10 @@ import Button from '$lib/elements/forms/button.svelte'; import { debounce } from '$lib/helpers/debounce'; import { sdk } from '$lib/stores/sdk'; - import { consoleVariables } from '$routes/(console)/store'; import { ConsoleResourceType } from '@appwrite.io/console'; import { Fieldset, Layout, Status, Typography } from '@appwrite.io/pink-svelte'; import { onMount } from 'svelte'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let domain: string; export let domainIsValid = true; @@ -35,7 +35,7 @@ } try { await sdk.forConsole.console.getResource( - `${value}.${$consoleVariables._APP_DOMAIN_SITES}`, + `${value}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, ConsoleResourceType.Rules ); domainStatus = 'complete'; @@ -60,7 +60,7 @@ - .{$consoleVariables._APP_DOMAIN_SITES} + .{$regionalConsoleVariables._APP_DOMAIN_SITES} diff --git a/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/check.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/(components)/check.svelte similarity index 100% rename from src/routes/(console)/project-[project]/sites/create-site/finish/(components)/check.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/finish/(components)/check.svelte diff --git a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte similarity index 84% rename from src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte index debe1a5d9..871611f73 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte @@ -10,18 +10,18 @@ import SiteCard from '../../(components)/siteCard.svelte'; import { onMount } from 'svelte'; import AddCollaboratorModal from '../../(components)/addCollaboratorModal.svelte'; - import { protocol } from '$routes/(console)/store'; import { Click, trackEvent } from '$lib/actions/analytics'; import { invalidate } from '$app/navigation'; import { sdk } from '$lib/stores/sdk'; import type { Adapter, BuildRuntime, Framework } from '@appwrite.io/console'; import { Dependencies } from '$lib/constants'; import { ConnectRepoModal } from '$lib/components/git'; + import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; export let data; - let showConnectRepositry = false; let showOpenOnMobile = false; + let showConnectRepository = false; let showInviteCollaborator = false; const siteURL = data.proxyRuleList.rules[0].domain; @@ -31,40 +31,44 @@ page.url.searchParams.has('connectRepo') && page.url.searchParams.get('connectRepo') === 'true' ) { - showConnectRepositry = true; + showConnectRepository = true; } }); async function connect(selectedInstallationId: string, selectedRepository: string) { try { - await sdk.forProject.sites.update( - data.site.$id, - data.site.name, - data.site.framework as Framework, - data.site.enabled, - data.site.logging || undefined, - data.site.timeout, - data.site.installCommand, - data.site.buildCommand, - data.site.outputDirectory, - data.site.buildRuntime as BuildRuntime, - data.site.adapter as Adapter, - data.site.fallbackFile, - selectedInstallationId, - selectedRepository, - 'main', - undefined, - undefined, - undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.update( + data.site.$id, + data.site.name, + data.site.framework as Framework, + data.site.enabled, + data.site.logging || undefined, + data.site.timeout, + data.site.installCommand, + data.site.buildCommand, + data.site.outputDirectory, + data.site.buildRuntime as BuildRuntime, + data.site.adapter as Adapter, + data.site.fallbackFile, + selectedInstallationId, + selectedRepository, + 'main', + undefined, + undefined, + undefined + ); invalidate(Dependencies.SITE); - } catch (error) { - console.log(error); + } catch { + return; } } - +
@@ -85,7 +89,7 @@ proxyRuleList={data.proxyRuleList} hideQRCode> - + @@ -102,7 +106,7 @@ (showConnectRepositry = true)}> + on:click={() => (showConnectRepository = true)}> + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}/domains`}> + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}`}> Go to dashboard -{#if showConnectRepositry} +{#if showConnectRepository} {/if} diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts new file mode 100644 index 000000000..cbd0c2d61 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts @@ -0,0 +1,27 @@ +import { RuleType, sdk } from '$lib/stores/sdk'; +import { error } from '@sveltejs/kit'; +import { Query } from '@appwrite.io/console'; +import { Dependencies } from '$lib/constants'; +import { DeploymentResourceType } from '$lib/stores/sdk'; + +export const load = async ({ url, depends, params }) => { + depends(Dependencies.SITE); + if (!url.searchParams.has('site')) error(404, 'Deployment is not optional'); + const siteId = url.searchParams.get('site'); + const site = await sdk.forProject(params.region, params.project).sites.get(siteId); + const proxyRuleList = await sdk + .forProject(params.region, params.project) + .proxy.listRules([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', siteId), + Query.equal('deploymentId', site.deploymentId) + ]); + return { + site, + deployment: await sdk + .forProject(params.region, params.project) + .sites.getDeployment(siteId, site.deploymentId), + proxyRuleList + }; +}; diff --git a/src/routes/(console)/project-[project]/sites/create-site/importSiteVariablesModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/importSiteVariablesModal.svelte similarity index 100% rename from src/routes/(console)/project-[project]/sites/create-site/importSiteVariablesModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/importSiteVariablesModal.svelte diff --git a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte similarity index 59% rename from src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte index 49c4262a7..0d9f1b58b 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte @@ -15,11 +15,16 @@ import type { Models } from '@appwrite.io/console'; import Configuration from '../configuration.svelte'; import { buildVerboseDomain } from '../store'; - import { project } from '$routes/(console)/project-[project]/store'; + import { + project, + regionalConsoleVariables + } from '$routes/(console)/project-[region]-[project]/store'; import { organization } from '$lib/stores/organization'; - import { consoleVariables } from '$routes/(console)/store'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; - import { removeFile } from '$lib/helpers/files'; + import { InvalidFileType, removeFile } from '$lib/helpers/files'; + import { humanFileSize } from '$lib/helpers/sizeConvertion'; + import { isCloud } from '$lib/system'; + import { currentPlan } from '$lib/stores/organization'; export let data; let showExitModal = false; @@ -29,7 +34,7 @@ let name = 'My website'; let id = ID.unique(); - let domain = id; + let domain = `${id}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`; let framework: Models.Framework = data.frameworks.frameworks?.find((f) => f.key === 'other') ?? data.frameworks.frameworks?.[0]; @@ -40,59 +45,80 @@ let variables: Partial[] = []; let files: FileList; + $: maxSize = + isCloud && $currentPlan + ? $currentPlan.deploymentSize * 1000000 + : $regionalConsoleVariables._APP_COMPUTE_SIZE_LIMIT; // already in MB + + $: readableMaxSize = humanFileSize(maxSize); + async function create() { try { - domain = await buildVerboseDomain(name, $organization.name, $project.name, id); + domain = await buildVerboseDomain( + $regionalConsoleVariables._APP_DOMAIN_SITES, + name, + $organization.name, + $project.name, + id + ); const fr = Object.values(Framework).find((f) => f === framework.key); const buildRuntime = Object.values(BuildRuntime).find( (f) => f === framework.buildRuntime ); - let site = await sdk.forProject.sites.create( - id || ID.unique(), - name, - fr, - buildRuntime, - undefined, - undefined, - undefined, - installCommand || undefined, - buildCommand || undefined, - outputDirectory || undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined - ); + let site = await sdk + .forProject(page.params.region, page.params.project) + .sites.create( + id || ID.unique(), + name, + fr, + buildRuntime, + undefined, + undefined, + undefined, + installCommand || undefined, + buildCommand || undefined, + outputDirectory || undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined + ); // Add domain - await sdk.forProject.proxy.createSiteRule( - `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, - site.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.createSiteRule( + `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, + site.$id + ); //Add variables const promises = variables.map((variable) => - sdk.forProject.sites.createVariable( - site.$id, - variable.key, - variable.value, - variable?.secret ?? false - ) + sdk + .forProject(page.params.region, page.params.project) + .sites.createVariable( + site.$id, + variable.key, + variable.value, + variable?.secret ?? false + ) ); await Promise.all(promises); - const deployment = await sdk.forProject.sites.createDeployment( - site.$id, - files[0], - true, - installCommand || undefined, - buildCommand || undefined, - outputDirectory || undefined - ); + const deployment = await sdk + .forProject(page.params.region, page.params.project) + .sites.createDeployment( + site.$id, + files[0], + true, + installCommand || undefined, + buildCommand || undefined, + outputDirectory || undefined + ); trackEvent(Submit.SiteCreate, { source: 'manual', @@ -100,7 +126,7 @@ }); await goto( - `${base}/project-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}` + `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}` ); } catch (e) { addNotification({ @@ -111,17 +137,37 @@ } } + function handleInvalid(e: CustomEvent) { + const reason = e.detail.reason; + if (reason === InvalidFileType.EXTENSION) { + addNotification({ + type: 'error', + message: 'Only .tar.gz files allowed' + }); + } else if (reason === InvalidFileType.SIZE) { + addNotification({ + type: 'error', + message: 'File size exceeds 10MB' + }); + } else { + addNotification({ + type: 'error', + message: 'Invalid file' + }); + } + } + $: filesList = files?.length ? Array.from(files).map((f) => { return { ...f, + name: f.name, + size: f.size, extension: f.type, removable: true }; }) : []; - - $: console.log(files); @@ -131,7 +177,7 @@ @@ -139,7 +185,12 @@ Upload a tar.gz containing your site source code - + Max file size 10MB + >Max file size: {readableMaxSize.value + + readableMaxSize.unit} diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.ts new file mode 100644 index 000000000..0d16bd7bb --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.ts @@ -0,0 +1,12 @@ +import { sdk } from '$lib/stores/sdk'; + +export const load = async ({ parent, params }) => { + const { frameworks } = await parent(); + + return { + frameworks, + template: await sdk + .forProject(params.region, params.project) + .sites.getTemplate('starter-for-js') + }; +}; diff --git a/src/routes/(console)/project-[project]/sites/create-site/manual/aside.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/aside.svelte similarity index 88% rename from src/routes/(console)/project-[project]/sites/create-site/manual/aside.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/manual/aside.svelte index 35b0bc8d9..a3e99a5bc 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/manual/aside.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/aside.svelte @@ -29,7 +29,7 @@ diff --git a/src/routes/(console)/project-[project]/sites/create-site/repositories/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/+page.svelte similarity index 87% rename from src/routes/(console)/project-[project]/sites/create-site/repositories/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/+page.svelte index c89960343..776ec0c39 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/repositories/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/+page.svelte @@ -20,12 +20,15 @@ from: 'cover' }); repository.set(e); - const target = `${base}/project-${page.params.project}/sites/create-site/repositories/repository-${e.id}?installation=${$installation.$id}`; + const target = `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/repositories/repository-${e.id}?installation=${$installation.$id}`; goto(target); } - + {#if !!data?.installations?.total}
{:else} diff --git a/src/routes/(console)/project-[project]/sites/create-site/repositories/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/+page.ts similarity index 100% rename from src/routes/(console)/project-[project]/sites/create-site/repositories/+page.ts rename to src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/+page.ts diff --git a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte similarity index 72% rename from src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte index d7d20d2da..a061a490f 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte @@ -25,8 +25,8 @@ import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import Configuration from '../../configuration.svelte'; - import { consoleVariables } from '$routes/(console)/store'; import Domain from '../../domain.svelte'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let data; let showExitModal = false; @@ -58,12 +58,14 @@ async function detectFramework() { try { - const response = await sdk.forProject.vcs.createRepositoryDetection( - $installation.$id, - data.repository.id, - VCSDetectionType.Framework, - rootDir - ); + const response = await sdk + .forProject(page.params.region, page.params.project) + .vcs.createRepositoryDetection( + $installation.$id, + data.repository.id, + VCSDetectionType.Framework, + rootDir + ); framework = data.frameworks.frameworks.find((f) => f.key === response.framework); adapter = framework?.adapters[0]; installCommand = adapter?.installCommand; @@ -92,49 +94,52 @@ const buildRuntime = Object.values(BuildRuntime).find( (f) => f === framework.buildRuntime ); - let site = await sdk.forProject.sites.create( - id || ID.unique(), - name, - fr, - buildRuntime, - undefined, - undefined, - undefined, - installCommand, - buildCommand, - outputDirectory, - undefined, - data.installation.$id, - undefined, - data.repository.id, - branch, - silentMode, - rootDir - ); + let site = await sdk + .forProject(page.params.region, page.params.project) + .sites.create( + id || ID.unique(), + name, + fr, + buildRuntime, + undefined, + undefined, + undefined, + installCommand, + buildCommand, + outputDirectory, + undefined, + data.installation.$id, + undefined, + data.repository.id, + branch, + silentMode, + rootDir + ); // Add domain - await sdk.forProject.proxy.createSiteRule( - `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, - site.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.createSiteRule( + `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, + site.$id + ); //Add variables const promises = variables.map((variable) => - sdk.forProject.sites.createVariable( - site.$id, - variable.key, - variable.value, - variable?.secret ?? false - ) + sdk + .forProject(page.params.region, page.params.project) + .sites.createVariable( + site.$id, + variable.key, + variable.value, + variable?.secret ?? false + ) ); await Promise.all(promises); - const deployment = await sdk.forProject.sites.createVcsDeployment( - site.$id, - VCSDeploymentType.Branch, - branch, - true - ); + const deployment = await sdk + .forProject(page.params.region, page.params.project) + .sites.createVcsDeployment(site.$id, VCSDeploymentType.Branch, branch, true); trackEvent(Submit.SiteCreate, { source: 'repository', @@ -142,7 +147,7 @@ }); await goto( - `${base}/project-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}` + `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}` ); } catch (e) { addNotification({ @@ -161,7 +166,7 @@ @@ -179,7 +184,7 @@ diff --git a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts similarity index 66% rename from src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.ts rename to src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts index e988e000b..f5607d122 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts @@ -3,13 +3,16 @@ import { ID } from '@appwrite.io/console'; import { buildVerboseDomain } from '../../store'; export const load = async ({ parent, params, url }) => { - const { installations, frameworks, project, organization, consoleVariables } = await parent(); + const { installations, frameworks, project, organization, regionalConsoleVariables } = + await parent(); const [repository] = await Promise.all([ - sdk.forProject.vcs.getRepository(url.searchParams.get('installation'), params.repository) + sdk + .forProject(params.region, params.project) + .vcs.getRepository(url.searchParams.get('installation'), params.repository) ]); const domain = await buildVerboseDomain( - consoleVariables._APP_DOMAIN_SITES, + regionalConsoleVariables._APP_DOMAIN_SITES, repository.name, organization.name, project.name, diff --git a/src/routes/(console)/project-[project]/sites/create-site/secretVariableModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/secretVariableModal.svelte similarity index 100% rename from src/routes/(console)/project-[project]/sites/create-site/secretVariableModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/secretVariableModal.svelte diff --git a/src/routes/(console)/project-[project]/sites/create-site/store.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/store.ts similarity index 98% rename from src/routes/(console)/project-[project]/sites/create-site/store.ts rename to src/routes/(console)/project-[region]-[project]/sites/create-site/store.ts index 35557ba75..9f866d869 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/store.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/store.ts @@ -45,4 +45,6 @@ export async function buildVerboseDomain( if (await checkDomain(domain, apex)) { return domain; } + + return ID.unique(); } diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte similarity index 89% rename from src/routes/(console)/project-[project]/sites/create-site/templates/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte index fcf9802fb..a3fc998a2 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/templates/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte @@ -13,6 +13,8 @@ export let data; + let offset = 0; + function applyFilter(filter: string, value: string, event: CustomEvent) { const target = new URL(page.url); if (event?.detail) { @@ -31,7 +33,10 @@ previous.forEach((n) => target.searchParams.append(filter, n)); } target.searchParams.delete('page'); - goto(target.toString()); + offset = 0; + goto(target.toString(), { + noScroll: true + }); } let searchText = page.url.searchParams.get('search') ?? ''; @@ -47,7 +52,9 @@ } url.searchParams.delete('page'); - goto(url.toString(), { keepFocus: true }); + offset = 0; + + goto(url.toString(), { keepFocus: true, noScroll: true }); }, 250); function applySearch(event: CustomEvent) { @@ -59,10 +66,12 @@ searchText = ''; const target = new URL(page.url); target.search = ''; - goto(target.toString()); + goto(target.toString(), { + noScroll: true + }); } - $: isChecked = (useCase: string) => { + const isChecked = (useCase: string) => { return page.url.searchParams .getAll('useCase') .some((param) => param.toLowerCase() === useCase.toLowerCase()); @@ -74,7 +83,7 @@ {#if data.templates?.length > 0} - + {#snippet children(paginatedItems: typeof data.templates)} {#each paginatedItems as template (template.name)} @@ -133,7 +148,7 @@ {/if} diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts similarity index 90% rename from src/routes/(console)/project-[project]/sites/create-site/templates/+page.ts rename to src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts index 487ac79a9..61239bca1 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/templates/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts @@ -1,14 +1,16 @@ import { sdk } from '$lib/stores/sdk'; -import { getSearch, getView, View } from '$lib/helpers/load'; +import { getSearch } from '$lib/helpers/load'; -export const load = async ({ url, route }) => { +export const load = async ({ url, params }) => { const search = getSearch(url); const filter = { useCases: url.searchParams.getAll('useCase'), frameworks: url.searchParams.getAll('framework') }; - const siteTemplatesList = await sdk.forProject.sites.listTemplates(undefined, undefined, 100); + const siteTemplatesList = await sdk + .forProject(params.region, params.project) + .sites.listTemplates(undefined, undefined, 100); const [frameworksSet, useCasesSet] = siteTemplatesList.templates.reduce( ([fr, uc], next) => { diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte similarity index 81% rename from src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte index 504558b94..4ad7bd998 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte @@ -24,7 +24,7 @@ import Details from '../../details.svelte'; import Configuration from './configuration.svelte'; import Aside from '../../aside.svelte'; - import { Adapter, BuildRuntime, Framework, ID } from '@appwrite.io/console'; + import { Adapter, BuildRuntime, Framework, ID, type Models } from '@appwrite.io/console'; import { ConnectBehaviour, NewRepository, @@ -32,11 +32,11 @@ Repositories, RepositoryBehaviour } from '$lib/components/git'; - import { app, iconPath } from '$lib/stores/app'; - import { consoleVariables } from '$routes/(console)/store'; - import { connectGitHub } from '$lib/stores/git'; import Domain from '../../domain.svelte'; + import { app, iconPath } from '$lib/stores/app'; + import { connectGitHub } from '$lib/stores/git'; import { getFrameworkIcon } from '$lib/stores/sites'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let data; @@ -56,12 +56,12 @@ let rootDir = './'; let connectBehaviour: 'now' | 'later' = 'now'; let repositoryBehaviour: 'new' | 'existing' = 'new'; - let repositoryName = undefined; + let repositoryName: string = undefined; let repositoryPrivate = true; let selectedInstallationId = ''; let selectedRepository = ''; let showSiteConfig = false; - let variables = []; + let variables: Partial[] = []; let silentMode = false; onMount(async () => { @@ -74,11 +74,9 @@ async function createRepository() { try { isCreatingRepository = true; - const repo = await sdk.forProject.vcs.createRepository( - $installation.$id, - repositoryName, - repositoryPrivate - ); + const repo = await sdk + .forProject(page.params.region, page.params.project) + .vcs.createRepository($installation.$id, repositoryName, repositoryPrivate); repository.set(repo); selectedRepository = repo.id; showSiteConfig = true; @@ -111,51 +109,61 @@ const buildRuntime = Object.values(BuildRuntime).find( (f) => f === framework.buildRuntime ); - let site = await sdk.forProject.sites.create( - id || ID.unique(), - name, - fr, - buildRuntime, - undefined, - undefined, - undefined, - framework.installCommand, - framework.buildCommand, - framework.outputDirectory, - framework.adapter as unknown as Adapter, - connectBehaviour === 'later' ? undefined : selectedInstallationId || undefined, - framework?.fallbackFile || undefined, - selectedRepository || undefined, - branch || undefined, - selectedRepository ? silentMode : undefined, - rootDir || undefined - ); + let site = await sdk + .forProject(page.params.region, page.params.project) + .sites.create( + id || ID.unique(), + name, + fr, + buildRuntime, + undefined, + undefined, + undefined, + framework.installCommand, + framework.buildCommand, + framework.outputDirectory, + framework.adapter as unknown as Adapter, + connectBehaviour === 'later' + ? undefined + : selectedInstallationId || undefined, + framework?.fallbackFile || undefined, + selectedRepository || undefined, + branch || undefined, + selectedRepository ? silentMode : undefined, + rootDir || undefined + ); // Add domain - await sdk.forProject.proxy.createSiteRule( - `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, - site.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.createSiteRule( + `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, + site.$id + ); //Add variables const promises = variables.map((variable) => - sdk.forProject.sites.createVariable( - site.$id, - variable.name, - variable.value, - variable?.secret ?? false - ) + sdk + .forProject(page.params.region, page.params.project) + .sites.createVariable( + site.$id, + variable.name, + variable.value, + variable?.secret ?? false + ) ); await Promise.all(promises); - const deployment = await sdk.forProject.sites.createTemplateDeployment( - site.$id, - data.template.providerRepositoryId || undefined, - data.template.providerOwner || undefined, - framework.providerRootDirectory || undefined, - data.template.providerVersion || undefined, - true - ); + const deployment = await sdk + .forProject(page.params.region, page.params.project) + .sites.createTemplateDeployment( + site.$id, + data.template.providerRepositoryId || undefined, + data.template.providerOwner || undefined, + framework.providerRootDirectory || undefined, + data.template.providerVersion || undefined, + true + ); trackEvent(Submit.SiteCreate, { source: 'template', @@ -164,10 +172,9 @@ }); await goto( - `${base}/project-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}` + `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}` ); } catch (e) { - console.log(e); addNotification({ type: 'error', message: e.message @@ -194,7 +201,7 @@ diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts similarity index 59% rename from src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.ts rename to src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts index f8feef8b1..d8fd8c41a 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts @@ -1,12 +1,15 @@ import { sdk } from '$lib/stores/sdk'; -import { buildVerboseDomain } from '../../store.js'; import { ID } from '@appwrite.io/console'; +import { buildVerboseDomain } from '../../store.js'; export const load = async ({ parent, params }) => { - const { installations, frameworks, project, organization, consoleVariables } = await parent(); - const template = await sdk.forProject.sites.getTemplate(params.template); + const { installations, frameworks, project, organization, regionalConsoleVariables } = + await parent(); + const template = await sdk + .forProject(params.region, params.project) + .sites.getTemplate(params.template); const domain = await buildVerboseDomain( - consoleVariables._APP_DOMAIN_SITES, + regionalConsoleVariables._APP_DOMAIN_SITES, template.name, organization.name, project.name, diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/configuration.svelte similarity index 98% rename from src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/configuration.svelte index 1d50a71e3..188476e97 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/configuration.svelte @@ -21,7 +21,7 @@ import { type Component } from 'svelte'; import { getApiEndpoint } from '$lib/stores/sdk'; import { page } from '$app/state'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; export let variables: Partial[] = []; export let templateVariables: Models.TemplateVariable[] = []; diff --git a/src/routes/(console)/project-[project]/sites/create-site/updateVariableModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/updateVariableModal.svelte similarity index 94% rename from src/routes/(console)/project-[project]/sites/create-site/updateVariableModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/updateVariableModal.svelte index b8acfdcb9..c678007f9 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/updateVariableModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/updateVariableModal.svelte @@ -42,7 +42,8 @@ Update the environment variable for your site. Global variables can be set in project settingsproject settings. diff --git a/src/routes/(console)/project-[project]/sites/create-site/variableEditorModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/variableEditorModal.svelte similarity index 100% rename from src/routes/(console)/project-[project]/sites/create-site/variableEditorModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/create-site/variableEditorModal.svelte diff --git a/src/routes/(console)/project-[project]/sites/createSiteModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/createSiteModal.svelte similarity index 88% rename from src/routes/(console)/project-[project]/sites/createSiteModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/createSiteModal.svelte index 8451816fe..635d712ec 100644 --- a/src/routes/(console)/project-[project]/sites/createSiteModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/createSiteModal.svelte @@ -20,7 +20,7 @@ variant="secondary" padding="xs" radius="s" - href={`${base}/project-${page.params.project}/sites/create-site/templates`}> + href={`${base}/project-${page.params.region}-${page.params.project}/sites/create-site/templates`}> + href={`${base}/project-${page.params.region}-${page.params.project}/sites/create-site/repositories`}> Or simply drag and drop your files to create a site + href={`${base}/project-${page.params.region}-${page.params.project}/sites/create-site/manual`}> manually. diff --git a/src/routes/(console)/project-[project]/sites/grid.svelte b/src/routes/(console)/project-[region]-[project]/sites/grid.svelte similarity index 94% rename from src/routes/(console)/project-[project]/sites/grid.svelte rename to src/routes/(console)/project-[region]-[project]/sites/grid.svelte index 0d1bc20dd..59effbc6d 100644 --- a/src/routes/(console)/project-[project]/sites/grid.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/grid.svelte @@ -42,7 +42,7 @@ {#each siteList.sites as site (site.$id)} + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${site.$id}/deployments/deployment-${site.latestDeploymentId}`}> View logs diff --git a/src/routes/(console)/project-[project]/sites/header.svelte b/src/routes/(console)/project-[region]-[project]/sites/header.svelte similarity index 92% rename from src/routes/(console)/project-[project]/sites/header.svelte rename to src/routes/(console)/project-[region]-[project]/sites/header.svelte index ba8f41e1d..7b2b50e6c 100644 --- a/src/routes/(console)/project-[project]/sites/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/header.svelte @@ -7,8 +7,7 @@ import { Typography } from '@appwrite.io/pink-svelte'; import { isStudio } from '$lib/system'; - $: projectId = page.params.project; - $: path = `${base}/project-${projectId}/sites`; + $: path = `${base}/project-${page.params.region}-${page.params.project}/sites`; $: tabs = [ { href: path, diff --git a/src/routes/(console)/project-[project]/sites/redeployModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/redeployModal.svelte similarity index 83% rename from src/routes/(console)/project-[project]/sites/redeployModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/redeployModal.svelte index 9f43a1e67..38cc53400 100644 --- a/src/routes/(console)/project-[project]/sites/redeployModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/redeployModal.svelte @@ -18,22 +18,21 @@ async function redeploy() { try { - const deployment = await sdk.forProject.sites.createDuplicateDeployment( - site.$id, - selectedDeploymentId - ); + const deployment = await sdk + .forProject(page.params.region, page.params.project) + .sites.createDuplicateDeployment(site.$id, selectedDeploymentId); + + trackEvent(Submit.SiteRedeploy); + await invalidate(Dependencies.SITE); + await invalidate(Dependencies.DEPLOYMENTS); + show = false; addNotification({ type: 'success', message: `Redeploying ${site.name}` }); - trackEvent(Submit.SiteRedeploy); - - await invalidate(Dependencies.SITE); - await invalidate(Dependencies.DEPLOYMENTS); - show = false; if (redirect) { await goto( - `${base}/project-${page.params.project}/sites/site-${site.$id}/deployments/deployment-${deployment.$id}` + `${base}/project-${page.params.region}-${page.params.project}/sites/site-${site.$id}/deployments/deployment-${deployment.$id}` ); } } catch (e) { diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.svelte similarity index 100% rename from src/routes/(console)/project-[project]/sites/site-[site]/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.svelte diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts new file mode 100644 index 000000000..5ac8edfa3 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts @@ -0,0 +1,30 @@ +import Breadcrumbs from './breadcrumbs.svelte'; +import Header from './header.svelte'; +import { Dependencies } from '$lib/constants'; +import { sdk } from '$lib/stores/sdk'; +import { error, redirect } from '@sveltejs/kit'; +import { APPWRITE_OFFICIALS_ORG, isCloud } from '$lib/system'; +import { base } from '$app/paths'; + +export const load = async ({ depends, params, parent }) => { + // don't load anything on cloud unless org is appwrite atm! + const { organization } = await parent(); + if (isCloud && organization?.$id !== APPWRITE_OFFICIALS_ORG) { + redirect(307, `${base}/project-${params.region}-${params.project}/sites`); + } + + depends(Dependencies.SITE); + try { + const [site] = await Promise.all([ + sdk.forProject(params.region, params.project).sites.get(params.site) + ]); + + return { + site, + header: Header, + breadcrumbs: Breadcrumbs + }; + } catch (e) { + error(e.code, e.message); + } +}; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.svelte similarity index 93% rename from src/routes/(console)/project-[project]/sites/site-[site]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.svelte index db9f66152..97ea0bf4c 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.svelte @@ -5,7 +5,6 @@ import DomainsOverview from './domainsOverview.svelte'; import DeploymentsOverview from './deploymentsOverview.svelte'; import { Button } from '$lib/elements/forms'; - import { protocol } from '$routes/(console)/store'; import InstantRollbackDomain from './instantRollbackModal.svelte'; import { app } from '$lib/stores/app'; import { sdk } from '$lib/stores/sdk'; @@ -14,6 +13,7 @@ import { onMount } from 'svelte'; import { page } from '$app/state'; import { base } from '$app/paths'; + import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; export let data; let showRollback = false; @@ -25,11 +25,6 @@ } }); }); - - // $: console.log(data.site); - $: console.log(data.deployment); - $: console.log(data.deploymentList); - // $: console.log(data.proxyRuleList); @@ -40,7 +35,7 @@ {#if data.proxyRuleList.total} {/if} diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts new file mode 100644 index 000000000..82fd60f63 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts @@ -0,0 +1,48 @@ +import { sdk } from '$lib/stores/sdk'; +import { Dependencies } from '$lib/constants'; +import { Query } from '@appwrite.io/console'; +import { RuleType } from '$lib/stores/sdk'; +import { DeploymentResourceType } from '$lib/stores/sdk'; + +export const load = async ({ params, depends, parent }) => { + depends(Dependencies.SITE); + depends(Dependencies.SITES_DOMAINS); + const { site } = await parent(); + + const [deploymentList, prodReadyDeployments, proxyRuleList] = await Promise.all([ + sdk + .forProject(params.region, params.project) + .sites.listDeployments(params.site, [Query.limit(4), Query.orderDesc('')]), + sdk + .forProject(params.region, params.project) + .sites.listDeployments(params.site, [ + Query.equal('status', 'ready'), + Query.equal('activate', true), + Query.orderDesc('') + ]), + sdk + .forProject(params.region, params.project) + .proxy.listRules([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', site.$id), + Query.equal('deploymentId', site.deploymentId), + Query.orderDesc('') + ]) + ]); + + const deployment = deploymentList?.total + ? await sdk + .forProject(params.region, params.project) + .sites.getDeployment(params.site, site.deploymentId) + : null; + return { + site, + deploymentList, + deployment, + proxyRuleList, + prodReadyDeployments, + hasProdReadyDeployments: + prodReadyDeployments?.deployments?.filter((d) => d?.$id !== deployment?.$id).length > 0 + }; +}; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/breadcrumbs.svelte similarity index 68% rename from src/routes/(console)/project-[project]/sites/site-[site]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/breadcrumbs.svelte index 7f87c157d..28d1faace 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/breadcrumbs.svelte @@ -11,15 +11,15 @@ title: $organization?.name }, { - href: `${base}/project-${$project?.$id}`, + href: `${base}/project-${page.params.region}-${page.params.project}`, title: $project?.name }, { - href: `${base}/project-${$project?.$id}/sites`, + href: `${base}/project-${page.params.region}-${page.params.project}/sites`, title: 'Sites' }, { - href: `${base}/project-${$project?.$id}/sites/site-${page.params.site}`, + href: `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}`, title: page.params.site } ]; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+layout.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+layout.svelte similarity index 75% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+layout.svelte index 9fff3aebf..84d14d4cc 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+layout.svelte @@ -12,7 +12,7 @@ import { IconList, IconPlus, IconSearch } from '@appwrite.io/pink-icons-svelte'; onMount(() => { - let previousStatus = null; + let previousStatus: string = null; return sdk.forConsole.client.subscribe('console', (message) => { if (previousStatus === message.payload.status) { return; @@ -26,7 +26,6 @@ if (message.events.includes('sites.*.deployments.*.update')) { invalidate(Dependencies.DEPLOYMENTS); invalidate(Dependencies.SITE); - console.log(message); return; } if (message.events.includes('sites.*.deployments.*.delete')) { @@ -42,7 +41,9 @@ label: 'Create deployment', async callback() { if (!page.url.pathname.endsWith(page.params.site)) { - await goto(`${base}/project-${$project.$id}/sites/site-${page.params.site}`); + await goto( + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}` + ); } }, keys: page.url.pathname.endsWith(page.params.site) ? ['c'] : ['c', 'd'], @@ -54,7 +55,7 @@ label: 'Permissions', async callback() { await goto( - `${base}/project-${$project.$id}/sites/site-${page.params.site}/settings#permissions` + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}/settings#permissions` ); scrollBy({ top: -100 }); }, @@ -67,7 +68,7 @@ label: 'Variables', async callback() { await goto( - `${base}/project-${$project.$id}/sites/site-${page.params.site}/settings#variables` + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}/settings#variables` ); }, icon: IconList, @@ -77,7 +78,9 @@ { label: 'Go to deployments', callback() { - goto(`${base}/project-${$project.$id}/sites/site-${page.params.site}/deployments`); + goto( + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}/deployments` + ); }, keys: ['g', 'd'], group: 'navigation', @@ -87,7 +90,9 @@ { label: 'Go to usage', callback() { - goto(`${base}/project-${$project.$id}/sites/site-${page.params.site}/usage`); + goto( + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}/usage` + ); }, keys: ['g', 'u'], group: 'navigation', @@ -97,7 +102,9 @@ { label: 'Go to logs', callback() { - goto(`${base}/project-${$project.$id}/sites/site-${page.params.site}/logs`); + goto( + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}/logs` + ); }, keys: ['g', 'e'], group: 'navigation', @@ -107,7 +114,9 @@ { label: 'Go to settings', callback() { - goto(`${base}/project-${$project.$id}/sites/site-${page.params.site}/settings`); + goto( + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}/settings` + ); }, keys: ['g', 's'], group: 'navigation', diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte similarity index 69% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte index 84bf92f15..f49af0544 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte @@ -1,10 +1,10 @@ + {#if data?.activeDeployment && !data.site.live && showAlert} + {@const latestDeployment = data.deploymentList.deployments[0]} + {#if latestDeployment?.status === 'failed' || latestDeployment?.status === 'ready'} + (showAlert = false)}> + Some configuration changes are not live yet. Redeploy your site to apply latest + changes. + + + + + {:else} + (showAlert = false)}> + Some configuration changes are not live yet. Your site is redeploying — changes + will be applied once the build is complete. + + {/if} + {/if} + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts similarity index 65% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.ts rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts index ac0d0eecf..097387117 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts @@ -16,13 +16,15 @@ export const load = async ({ params, depends, url, route, parent }) => { queries.set(parsedQueries); const [deploymentList, installations] = await Promise.all([ - sdk.forProject.sites.listDeployments(params.site, [ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ]), - sdk.forProject.vcs.listInstallations() + sdk + .forProject(params.region, params.project) + .sites.listDeployments(params.site, [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ]), + sdk.forProject(params.region, params.project).vcs.listInstallations() ]); return { @@ -32,7 +34,9 @@ export const load = async ({ params, depends, url, route, parent }) => { deploymentList, activeDeployment: site.deploymentId && deploymentList?.total - ? await sdk.forProject.sites.getDeployment(params.site, site.deploymentId) + ? await sdk + .forProject(params.region, params.project) + .sites.getDeployment(params.site, site.deploymentId) : null, installations }; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte similarity index 82% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte index d3308394f..b29155bc5 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte @@ -1,5 +1,6 @@ @@ -182,13 +192,12 @@ - { branch = event.detail.value; }} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte similarity index 69% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte index 559a252d4..3930d56c7 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte @@ -3,12 +3,16 @@ import { Modal } from '$lib/components'; import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; - import { removeFile } from '$lib/helpers/files'; + import { InvalidFileType, removeFile } from '$lib/helpers/files'; import { addNotification } from '$lib/stores/notifications'; import { uploader } from '$lib/stores/uploader'; import type { Models } from '@appwrite.io/console'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; import { Icon, Layout, Tooltip, Typography, Upload } from '@appwrite.io/pink-svelte'; + import { isCloud } from '$lib/system'; + import { currentPlan } from '$lib/stores/organization'; + import { consoleVariables } from '$routes/(console)/store'; + import { humanFileSize } from '$lib/helpers/sizeConvertion'; export let show = false; export let site: Models.Site; @@ -16,6 +20,13 @@ let files: FileList; let error: string = ''; + $: maxSize = + isCloud && $currentPlan + ? $currentPlan.deploymentSize * 1000000 + : $consoleVariables._APP_COMPUTE_SIZE_LIMIT; // already in MB + + $: readableMaxSize = humanFileSize(maxSize); + async function createDeployment() { try { uploader.uploadSiteDeployment(site.$id, files[0]); @@ -25,11 +36,19 @@ message: 'Deployment upload started', type: 'success' }); - } catch (error) { - addNotification({ - message: error.message, - type: 'error' - }); + } catch (e) { + error = e.message; + } + } + + function handleInvalid(e: CustomEvent) { + const reason = e.detail.reason; + if (reason === InvalidFileType.EXTENSION) { + error = 'Only .tar.gz files allowed'; + } else if (reason === InvalidFileType.SIZE) { + error = 'File size exceeds 10MB'; + } else { + error = 'Invalid file'; } } @@ -37,6 +56,8 @@ ? Array.from(files).map((f) => { return { ...f, + name: f.name, + size: f.size, extension: f.type, removable: true }; @@ -50,7 +71,12 @@ Upload a tar.gz file containing your site source code - + Only .tar.gz files allowed - Max file size 10MB + Max file size: {readableMaxSize.value + + readableMaxSize.unit} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte similarity index 85% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte index d7aac811d..2d92f64d9 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte @@ -18,14 +18,13 @@ async function handleSubmit() { try { - await sdk.forProject.sites.deleteDeployment( - selectedDeployment.resourceId, - selectedDeployment.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.deleteDeployment(selectedDeployment.resourceId, selectedDeployment.$id); await invalidate(Dependencies.SITE); if (page.url.href.includes(`deployment-${selectedDeployment.$id}`)) { await goto( - `${base}/project-${page.params.project}/sites/site-${page.params.site}/deployments` + `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/deployments` ); } showDelete = false; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+layout.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+layout.ts similarity index 100% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+layout.ts rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+layout.ts diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte similarity index 90% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte index dc50e9d1f..82db52688 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte @@ -12,13 +12,13 @@ import CancelDeploymentModal from '../cancelDeploymentModal.svelte'; import RedeployModal from '../../../redeployModal.svelte'; import ActivateDeploymentModal from '../../../activateDeploymentModal.svelte'; - import { protocol } from '$routes/(console)/store'; import { Accordion } from '@appwrite.io/pink-svelte'; import { capitalize } from '$lib/helpers/string'; import LogsTimer from '../../../(components)/logsTimer.svelte'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { page } from '$app/state'; + import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; let { data } = $props(); @@ -29,8 +29,8 @@ let showDelete = $state(false); let showCancel = $state(false); - onMount(async () => { - sdk.forConsole.client.subscribe( + onMount(() => { + return sdk.forConsole.client.subscribe( 'console', async (response: RealtimeResponseEvent) => { if ( @@ -38,7 +38,7 @@ `sites.${page.params.site}.deployments.${page.params.deployment}.update` ) ) { - invalidate(Dependencies.DEPLOYMENTS); + await invalidate(Dependencies.DEPLOYMENT); } } ); @@ -49,7 +49,9 @@ {#if deployment?.status === 'ready' && data.proxyRuleList?.total} - {/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts similarity index 52% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts index 8fe126903..44d1e0a2c 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts @@ -11,13 +11,17 @@ export const load: PageLoad = async ({ params, depends, parent }) => { const { site } = await parent(); const [deployment, proxyRuleList] = await Promise.all([ - sdk.forProject.sites.getDeployment(params.site, params.deployment), - sdk.forProject.proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('deploymentId', params.deployment), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', params.site) - ]) + sdk + .forProject(params.region, params.project) + .sites.getDeployment(params.site, params.deployment), + sdk + .forProject(params.region, params.project) + .proxy.listRules([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('deploymentId', params.deployment), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', params.site) + ]) ]); return { diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/breadcrumbs.svelte similarity index 56% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/breadcrumbs.svelte index be4301090..801ab7f80 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/breadcrumbs.svelte @@ -11,23 +11,23 @@ title: $organization?.name }, { - href: `${base}/project-${$project?.$id}`, + href: `${base}/project-${page.params.region}-${page.params.project}`, title: $project?.name }, { - href: `${base}/project-${$project?.$id}/sites`, + href: `${base}/project-${page.params.region}-${page.params.project}/sites`, title: 'Sites' }, { - href: `${base}/project-${$project?.$id}/sites/site-${page.params.site}`, + href: `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}`, title: page.params.site }, { - href: `${base}/project-${$project?.$id}/sites/site-${page.params.site}/deployments`, + href: `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/deployments`, title: 'Deployments' }, { - href: `${base}/project-${$project?.$id}/sites/site-${page.params.site}/deployments/deployment-${page.params.deployment}`, + href: `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/deployments/deployment-${page.params.deployment}`, title: page.params.deployment } ]; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/header.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/header.svelte similarity index 77% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/header.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/header.svelte index ea0e5376c..3210838fa 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/header.svelte @@ -9,7 +9,7 @@ + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/deployments`}> Deployment {$deployment.$id} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/store.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/store.ts rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/store.ts diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte similarity index 90% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte index 7e93abd7c..614b3f7c2 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte @@ -18,7 +18,7 @@ ]; let range = SiteUsageRange.ThirtyDays; - let metrics = [ + let metrics: { id: string; value: string | null; description: string }[] = [ { id: 'buildsTotal', value: null, @@ -55,15 +55,18 @@ }); async function fetchUsage() { + metrics = metrics.map((metric) => { + metric.value = null; + + return metric; + }); + // Add timeout to make it look nicer setTimeout(async () => { - metrics.forEach((metric) => { - metric.value = null; - }); - metrics = metrics; - try { - const usage = await sdk.forProject.sites.getUsage(page.params.site, range); + const usage = await sdk + .forProject(page.params.region, page.params.project) + .sites.getUsage(page.params.site, range); metrics = metrics.map((metric) => { if (metric.id === 'buildsStorageTotal') { const size = humanFileSize(usage[metric.id]); @@ -82,12 +85,10 @@ } return metric; }); - metrics = metrics; - console.log(usage); - } catch (error) { - console.log(error); + } catch { + return; } - }, 800); + }, 500); } diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/store.ts diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte similarity index 60% rename from src/routes/(console)/project-[project]/sites/site-[site]/deployments/table.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte index a56b2ae60..fc380e684 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte @@ -1,5 +1,5 @@ - + {#each $columns as { id, title }} @@ -37,10 +77,11 @@ {/each} - {#each data.deploymentList.deployments as deployment} + {#each data.deploymentList.deployments as deployment (deployment.$id)} + id={deployment.$id} + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/deployments/deployment-${deployment.$id}`}> {#each $columns as column} {#if column.id === '$id'} @@ -102,9 +143,40 @@ bind:show={showRedeploy} site={data.site} /> {/if} + {#if selectedDeployment && showActivate} {/if} + +{#if selectedRows.length > 0} + + + + + {selectedRows.length > 1 ? 'deployments' : 'deployment'} + selected + + + + + + + +{/if} + + +

+ Are you sure you want to delete {selectedRows.length} + {selectedRows.length > 1 ? 'deployments' : 'deployment'} from your site - + {$site.name}? +

+ +

This action is irreversible.

+
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte similarity index 87% rename from src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte index e44848416..96a5091eb 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte @@ -38,17 +38,21 @@
{#if deploymentList?.total} + {@const hasAuthor = deploymentList.deployments.some((d) => d?.providerCommitAuthor)} @@ -59,10 +63,10 @@ Updated - {#each deploymentList?.deployments as deployment} + {#each deploymentList?.deployments as deployment (deployment.$id)} + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/deployments/deployment-${deployment.$id}`}> {deployment.$id} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte similarity index 80% rename from src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte index 50fbd7359..8e4d4c3e7 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte @@ -18,7 +18,7 @@ - {#if data.domains.total} -
+ {#if data.proxyRules.total} +
+ total={data.proxyRules.total} /> {:else if data?.search} - - - + {:else} @@ -66,7 +64,7 @@ diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts similarity index 53% rename from src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.ts rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts index 8373a6b69..88ec63f09 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts @@ -22,21 +22,23 @@ export const load = async ({ params, depends, url, route }) => { limit, query, search, - domains: await sdk.forProject.proxy.listRules( - [ - Query.or([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('type', RuleType.REDIRECT) - ]), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', params.site), - Query.equal('trigger', RuleTrigger.MANUAL), - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ], - search || undefined - ) + proxyRules: await sdk + .forProject(params.region, params.project) + .proxy.listRules( + [ + Query.or([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('type', RuleType.REDIRECT) + ]), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', params.site), + Query.equal('trigger', RuleTrigger.MANUAL), + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ], + search || undefined + ) }; }; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte similarity index 75% rename from src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte index 277d4b8bf..0bb99fee4 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte @@ -9,22 +9,24 @@ import { goto, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { sortBranches } from '$lib/stores/vcs'; - import { protocol } from '$routes/(console)/store'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; import { LabelCard } from '$lib/components'; import { Adapter, BuildRuntime, Framework, - StatusCode, - type Models + type Models, + StatusCode } from '@appwrite.io/console'; import { statusCodeOptions } from '$lib/stores/domains'; import { writable } from 'svelte/store'; import { onMount } from 'svelte'; import { ConnectRepoModal } from '$lib/components/git/index.js'; + import { project, regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; + import { isCloud } from '$lib/system'; + import { getApexDomain } from '$lib/helpers/tlds'; - const routeBase = `${base}/project-${page.params.project}/sites/site-${page.params.site}/domains`; + const routeBase = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains`; let { data } = $props(); @@ -34,8 +36,8 @@ let behaviour: 'REDIRECT' | 'BRANCH' | 'ACTIVE' = $state('ACTIVE'); let domainName = $state(''); let redirect: string = $state(null); - let statusCode = $state(307); let branch: string = $state(null); + let statusCode = $state(StatusCode.TemporaryRedirect307); onMount(() => { if ( @@ -50,23 +52,35 @@ }); async function addDomain() { + const apexDomain = getApexDomain(domainName); + let domain = data.domains?.domains.find((d) => d.domain === apexDomain); + + if (apexDomain && !domain && isCloud) { + try { + domain = await sdk.forConsole.domains.create($project.teamId, apexDomain); + } catch (error) { + addNotification({ + type: 'error', + message: error.message + }); + return; + } + } + try { let rule: Models.ProxyRule; if (behaviour === 'BRANCH') { - rule = await sdk.forProject.proxy.createSiteRule( - domainName, - page.params.site, - branch - ); + rule = await sdk + .forProject(page.params.region, page.params.project) + .proxy.createSiteRule(domainName, page.params.site, branch); } else if (behaviour === 'REDIRECT') { - const sc = Object.values(StatusCode).find((code) => parseInt(code) === statusCode); - rule = await sdk.forProject.proxy.createRedirectRule( - domainName, - $protocol + redirect, - sc - ); + rule = await sdk + .forProject(page.params.region, page.params.project) + .proxy.createRedirectRule(domainName, $regionalProtocol + redirect, statusCode); } else if (behaviour === 'ACTIVE') { - rule = await sdk.forProject.proxy.createSiteRule(domainName, page.params.site); + rule = await sdk + .forProject(page.params.region, page.params.project) + .proxy.createSiteRule(domainName, page.params.site); } if (rule?.status === 'verified') { await goto(routeBase); @@ -85,29 +99,31 @@ async function connect(selectedInstallationId: string, selectedRepository: string) { try { - await sdk.forProject.sites.update( - data.site.$id, - data.site.name, - data.site.framework as Framework, - data.site.enabled, - data.site.logging || undefined, - data.site.timeout, - data.site.installCommand, - data.site.buildCommand, - data.site.outputDirectory, - data.site.buildRuntime as BuildRuntime, - data.site.adapter as Adapter, - data.site.fallbackFile, - selectedInstallationId, - selectedRepository, - 'main', - undefined, - undefined, - undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.update( + data.site.$id, + data.site.name, + data.site.framework as Framework, + data.site.enabled, + data.site.logging || undefined, + data.site.timeout, + data.site.installCommand, + data.site.buildCommand, + data.site.outputDirectory, + data.site.buildRuntime as BuildRuntime, + data.site.adapter as Adapter, + data.site.fallbackFile, + selectedInstallationId, + selectedRepository, + 'main', + undefined, + undefined, + undefined + ); invalidate(Dependencies.SITE); - } catch (error) { - console.log(error); + } catch { + return; } } @@ -157,13 +173,16 @@ value: branch.name }))} - + on:select={(event) => { + branch = event.detail.value; + }} + {options} /> {#if !data.branches?.total} No branches found in the selected repository. Create a diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts new file mode 100644 index 000000000..ef6239640 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts @@ -0,0 +1,36 @@ +import { Query } from '@appwrite.io/console'; +import { sdk } from '$lib/stores/sdk'; +import { RuleTrigger, RuleType } from '$lib/stores/sdk'; +import { Dependencies } from '$lib/constants.js'; +import { isCloud } from '$lib/system'; + +export const load = async ({ parent, depends, params }) => { + const { site, organization } = await parent(); + depends(Dependencies.DOMAINS, Dependencies.SITES_DOMAINS); + + const [rules, installations, domains] = await Promise.all([ + sdk + .forProject(params.region, params.project) + .proxy.listRules([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('trigger', RuleTrigger.MANUAL) + ]), + sdk.forProject(params.region, params.project).vcs.listInstallations(), + isCloud + ? sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]) + : Promise.resolve(null) + ]); + + return { + site, + rules, + domains, + installations, + branches: + site?.installationId && site?.providerRepositoryId + ? await sdk + .forProject(params.region, params.project) + .vcs.listRepositoryBranches(site.installationId, site.providerRepositoryId) + : undefined + }; +}; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte similarity index 71% rename from src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte index f11d13849..51ebc1552 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte @@ -20,27 +20,33 @@ import Wizard from '$lib/layout/wizard.svelte'; import { base } from '$app/paths'; import { writable } from 'svelte/store'; - import { consoleVariables } from '$routes/(console)/store'; - import NameserverTable from '$lib/components/domains/nameserverTable.svelte'; + import { isASubdomain } from '$lib/helpers/tlds'; import RecordTable from '$lib/components/domains/recordTable.svelte'; + import NameserverTable from '$lib/components/domains/nameserverTable.svelte'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; let { data } = $props(); const ruleId = page.url.searchParams.get('rule'); - let isSubDomain = $derived(page.params.domain?.split('.')?.length >= 3); + const isSubDomain = $derived.by(() => isASubdomain(page.params.domain)); + + let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); + + $effect(() => { + if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { + selectedTab = 'cname'; + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_A) { + selectedTab = 'a'; + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { + selectedTab = 'aaaa'; + } else { + selectedTab = 'nameserver'; + } + }); - let selectedTab: 'cname' | 'nameserver' | 'a' | 'aaaa' = $state( - !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain - ? 'cname' - : !!$consoleVariables._APP_DOMAIN_TARGET_A - ? 'a' - : !!$consoleVariables._APP_DOMAIN_TARGET_AAAA - ? 'aaaa' - : 'nameserver' - ); let verified = $state(false); - let routeBase = `${base}/project-${page.params.project}/sites/site-${page.params.site}/domains`; + let routeBase = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains`; let isSubmitting = $state(writable(false)); async function verify() { @@ -48,14 +54,22 @@ data.domainsList.domains.findIndex((rule) => rule.domain === page.params.domain) === -1; try { if (selectedTab !== 'nameserver') { - const ruleData = await sdk.forProject.proxy.updateRuleVerification(ruleId); + const ruleData = await sdk + .forProject(page.params.region, page.params.project) + .proxy.updateRuleVerification(ruleId); verified = ruleData.status === 'verified'; + throw new Error( + 'Domain verification failed. Please check your domain settings or try again later' + ); } else if (isNewDomain && isCloud) { const domainData = await sdk.forConsole.domains.create( $organization.$id, page.params.domain ); - verified = domainData.nameservers.toLocaleLowerCase() === 'appwrite'; + verified = domainData.nameservers.toLowerCase() === 'appwrite'; + throw new Error( + 'Domain verification failed. Please check your domain settings or try again later' + ); } addNotification({ @@ -77,7 +91,7 @@ async function back() { if (ruleId) { - await sdk.forProject.proxy.deleteRule(ruleId); + await sdk.forProject(page.params.region, page.params.project).proxy.deleteRule(ruleId); } await goto(`${routeBase}/add-domain?domain=${page.params.domain}`); } @@ -107,7 +121,7 @@
- {#if isSubDomain && !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && $consoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} + {#if isSubDomain && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && $regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} (selectedTab = 'cname')} @@ -123,7 +137,7 @@ Nameservers {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} + {#if !isCloud && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_A && $regionalConsoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} (selectedTab = 'a')} @@ -131,7 +145,7 @@ A {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} + {#if !isCloud && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} (selectedTab = 'aaaa')} @@ -145,7 +159,11 @@ {#if selectedTab === 'nameserver'} {:else} - + {/if} diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts new file mode 100644 index 000000000..e56bf02b9 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts @@ -0,0 +1,19 @@ +import { sdk } from '$lib/stores/sdk'; +import { isCloud } from '$lib/system'; +import { Dependencies } from '$lib/constants.js'; +import { type Models, Query } from '@appwrite.io/console'; + +export const load = async ({ parent, depends }) => { + const { site, organization } = await parent(); + depends(Dependencies.SITES_DOMAINS); + + let domainsList: Models.DomainsList; + if (isCloud) { + domainsList = await sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]); + } + + return { + site, + domainsList + }; +}; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte similarity index 84% rename from src/routes/(console)/project-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte index 686250451..fa23726b0 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte @@ -6,11 +6,11 @@ import { invalidate } from '$app/navigation'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; import { Dependencies } from '$lib/constants'; - import { consoleVariables } from '$routes/(console)/store'; import { page } from '$app/state'; import { Layout, Status, Typography } from '@appwrite.io/pink-svelte'; import { ConsoleResourceType, ID } from '@appwrite.io/console'; import { debounce } from '$lib/helpers/debounce'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let show = false; @@ -18,13 +18,15 @@ let domain = baseDomain; let domainStatus: 'complete' | 'failed' | 'pending' = 'complete'; - let error = null; + let error: string = null; async function onSubmit() { try { - await sdk.forProject.proxy.createSiteRule( - `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, - page.params.site - ); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.createSiteRule( + `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, + page.params.site + ); await invalidate(Dependencies.SITES_DOMAINS); show = false; @@ -34,7 +36,7 @@ }); trackEvent(Submit.DomainCreate); } catch (e) { - error = e; + error = e.message; trackError(e, Submit.DomainCreate); } } @@ -57,7 +59,7 @@ } try { await sdk.forConsole.console.getResource( - `${value}.${$consoleVariables._APP_DOMAIN_SITES}`, + `${value}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, ConsoleResourceType.Rules ); domainStatus = 'complete'; @@ -89,7 +91,7 @@ - .{$consoleVariables._APP_DOMAIN_SITES} + .{$regionalConsoleVariables._APP_DOMAIN_SITES} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/deleteDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte similarity index 81% rename from src/routes/(console)/project-[project]/sites/site-[site]/domains/deleteDomainModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte index 3b2657c63..dcb2fdeac 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/deleteDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte @@ -7,20 +7,23 @@ import { Dependencies } from '$lib/constants'; import { Confirm } from '$lib/components'; import { Typography } from '@appwrite.io/pink-svelte'; + import { page } from '$app/state'; let { show = $bindable(), - selectedDomain + selectedProxyRule }: { show: boolean; - selectedDomain: Models.ProxyRule; + selectedProxyRule: Models.ProxyRule; } = $props(); let error: string = $state(null); async function deleteDomain() { try { - await sdk.forProject.proxy.deleteRule(selectedDomain.$id); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.deleteRule(selectedProxyRule.$id); await invalidate(Dependencies.SITES_DOMAINS); show = false; addNotification({ @@ -36,13 +39,13 @@ - {#if selectedDomain} + {#if selectedProxyRule} Are you sure you want to delete this domain? You will no longer be able to view your site by visiting: - {selectedDomain.domain} + {selectedProxyRule.domain} {/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte similarity index 59% rename from src/routes/(console)/project-[project]/sites/site-[site]/domains/retryDomainModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte index 2eb893de3..37089a4da 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/retryDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte @@ -8,50 +8,56 @@ import { Dependencies } from '$lib/constants'; import type { Models } from '@appwrite.io/console'; import { Divider, Tabs } from '@appwrite.io/pink-svelte'; - import { consoleVariables } from '$routes/(console)/store'; import { isCloud } from '$lib/system'; import { page } from '$app/state'; + import { isASubdomain } from '$lib/helpers/tlds'; import NameserverTable from '$lib/components/domains/nameserverTable.svelte'; import RecordTable from '$lib/components/domains/recordTable.svelte'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; let { show = $bindable(false), - selectedDomain + selectedProxyRule }: { show: boolean; - selectedDomain: Models.ProxyRule; + selectedProxyRule: Models.ProxyRule; } = $props(); - let isSubDomain = $derived.by(() => - selectedDomain?.domain?.length ? selectedDomain?.domain?.split('.')?.length >= 3 : false - ); - let selectedTab: 'cname' | 'nameserver' | 'a' | 'aaaa' = $state( - !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain - ? 'cname' - : !!$consoleVariables._APP_DOMAIN_TARGET_A - ? 'a' - : !!$consoleVariables._APP_DOMAIN_TARGET_AAAA - ? 'aaaa' - : 'nameserver' - ); + const isSubDomain = $derived.by(() => isASubdomain(selectedProxyRule?.domain)); + + let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); + + $effect(() => { + if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { + selectedTab = 'cname'; + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_A) { + selectedTab = 'a'; + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { + selectedTab = 'aaaa'; + } else { + selectedTab = 'nameserver'; + } + }); let verified = $state(false); let error = $state(null); async function retryDomain() { try { - const domain = await sdk.forProject.proxy.updateRuleVerification(selectedDomain.$id); + const domain = await sdk + .forProject(page.params.region, page.params.project) + .proxy.updateRuleVerification(selectedProxyRule.$id); await invalidate(Dependencies.SITES_DOMAINS); verified = domain.status === 'verified'; show = false; addNotification({ type: 'success', - message: `${selectedDomain.domain} has been deleted` + message: `${selectedProxyRule.domain} has been verified` }); - trackEvent(Submit.DomainDelete); + trackEvent(Submit.DomainUpdateVerification); } catch (e) { - error = e; - trackError(e, Submit.DomainDelete); + error = e.message; + trackError(e, Submit.DomainUpdateVerification); } } @@ -65,7 +71,7 @@
- {#if isSubDomain && !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && $consoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} + {#if isSubDomain && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && $regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} (selectedTab = 'cname')} @@ -81,7 +87,7 @@ Nameservers {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} + {#if !isCloud && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_A && $regionalConsoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} (selectedTab = 'a')} @@ -89,7 +95,7 @@ A {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} + {#if !isCloud && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} (selectedTab = 'aaaa')} @@ -101,9 +107,13 @@
{#if selectedTab === 'nameserver'} - + {:else} - + {/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/store.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/sites/site-[site]/domains/store.ts rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/store.ts diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte similarity index 62% rename from src/routes/(console)/project-[project]/sites/site-[site]/domains/table.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte index 4fe75d81a..6e0c889f4 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte @@ -2,7 +2,6 @@ import { Click, trackEvent } from '$lib/actions/analytics'; import { Link } from '$lib/elements'; import { Button } from '$lib/elements/forms'; - import { protocol } from '$routes/(console)/store'; import type { Models } from '@appwrite.io/console'; import { IconDotsHorizontal, IconRefresh, IconTrash } from '@appwrite.io/pink-icons-svelte'; import { @@ -17,16 +16,25 @@ import DeleteDomainModal from './deleteDomainModal.svelte'; import RetryDomainModal from './retryDomainModal.svelte'; import { columns } from './store'; + import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; let { - domains + proxyRules }: { - domains: Models.ProxyRuleList; + proxyRules: Models.ProxyRuleList; } = $props(); let showDelete = $state(false); let showRetry = $state(false); - let selectedDomain: Models.ProxyRule = $state(null); + let selectedProxyRule: Models.ProxyRule = $state(null); + + const proxyTarget = (proxy: Models.ProxyRule) => { + return proxy?.redirectUrl + ? 'Redirect to ' + proxy.redirectUrl + : proxy?.deploymentVcsProviderBranch + ? 'Deployed from ' + proxy.deploymentVcsProviderBranch + : 'Active deployment'; + }; @@ -38,29 +46,37 @@ {/each} - {#each domains.rules as domain} + {#each proxyRules.rules as rule} {#each $columns as column} {#if column.id === 'domain'} - - - {domain.domain} - {#if domain.status !== 'verified'} - - {/if} - - + + + + {rule.domain} + + + + {#if rule.status === 'verifying'} + + {:else if rule.status !== 'verified'} + + {/if} + {:else if column.id === 'target'} - {domain?.redirectUrl - ? 'Redirect to ' + domain.redirectUrl - : domain?.deploymentVcsProviderBranch - ? 'Deployed from' + domain.deploymentVcsProviderBranch - : '-'} + {proxyTarget(rule)} {/if} {/each} @@ -79,11 +95,11 @@ - {#if domain.status !== 'verified'} + {#if rule.status !== 'verified' && rule.status !== 'verifying'} { - selectedDomain = domain; + selectedProxyRule = rule; showRetry = true; toggle(e); }}> @@ -94,7 +110,7 @@ status="danger" leadingIcon={IconTrash} on:click={(e) => { - selectedDomain = domain; + selectedProxyRule = rule; showDelete = true; toggle(e); trackEvent(Click.DomainDeleteClick, { @@ -113,9 +129,9 @@ {#if showDelete} - + {/if} {#if showRetry} - + {/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domainsOverview.svelte similarity index 92% rename from src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/domainsOverview.svelte index 526f8f0d2..550052aa3 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domainsOverview.svelte @@ -5,13 +5,13 @@ import OpenOnMobileModal from '../(components)/openOnMobileModal.svelte'; import { timeFromNow } from '$lib/helpers/date'; import { IconQrcode } from '@appwrite.io/pink-icons-svelte'; - import { protocol } from '$routes/(console)/store'; import { type Models } from '@appwrite.io/console'; import { Link } from '$lib/elements'; import { Button } from '$lib/elements/forms'; import { Card, Trim } from '$lib/components'; import { Click, trackEvent } from '$lib/actions/analytics'; import { RuleTrigger } from '$lib/stores/sdk'; + import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; export let proxyRuleList: Models.ProxyRuleList; @@ -31,7 +31,7 @@
@@ -57,7 +57,7 @@ source: 'sites_domain_overview' }); }} - href={`${base}/project-${page.params.project}/sites/site-${page.params.site}/domains/add-domain`}> + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains/add-domain`}> Add domain
@@ -75,7 +75,7 @@ diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/header.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/header.svelte similarity index 85% rename from src/routes/(console)/project-[project]/sites/site-[site]/header.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/header.svelte index 43aeb8c1f..44a68d3d5 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/header.svelte @@ -6,8 +6,7 @@ import { Cover, CoverTitle } from '$lib/layout'; import { site } from './store'; - $: projectId = page.params.project; - $: path = `${base}/project-${projectId}/sites/site-${page.params.site}`; + $: path = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}`; $: tabs = [ { href: path, @@ -44,7 +43,8 @@ - {$site.name} + {$site.name} {$site?.$id} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/instantRollbackModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/instantRollbackModal.svelte similarity index 97% rename from src/routes/(console)/project-[project]/sites/site-[site]/instantRollbackModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/instantRollbackModal.svelte index 11cc67ff9..a07ef1502 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/instantRollbackModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/instantRollbackModal.svelte @@ -13,6 +13,7 @@ import { timeFromNow, toLocaleDateTime } from '$lib/helpers/date'; import { capitalize } from '$lib/helpers/string'; import { calculateSize } from '$lib/helpers/sizeConvertion'; + import { page } from '$app/state'; export let show = false; export let deployment: Models.Deployment; @@ -24,10 +25,9 @@ async function handleSubmit() { try { - await sdk.forProject.sites.updateSiteDeployment( - selectedDeployment.resourceId, - selectedDeployment.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.updateSiteDeployment(selectedDeployment.resourceId, selectedDeployment.$id); await invalidate(Dependencies.SITE); show = false; addNotification({ diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/+page.svelte similarity index 85% rename from src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/+page.svelte index 4cf56ad45..c7a97e15d 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/+page.svelte @@ -1,21 +1,17 @@ + + + +
+ +
+ + + Log ID + + {selectedLog?.$id} + + + + + + + +
+ {#if selectedLog} + + + + + + + + Method + + + {selectedLog.requestMethod} + + + + + Status code + + + = 400 + ? 'error' + : 'success'} /> + + + + + Duration + + + {calculateTime(selectedLog.duration)} + + + + + Created + + + {capitalize(timeFromNow(selectedLog.$createdAt))} + + + + + + + + Path + +
+ +
+
+
+
+ + + + + + +
+ {/if} +
+
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/store.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/store.ts similarity index 97% rename from src/routes/(console)/project-[project]/sites/site-[site]/logs/store.ts rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/store.ts index 386ebfbf0..605ad603d 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/store.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/store.ts @@ -65,6 +65,7 @@ export const columns = writable([ { id: 'duration', title: 'Duration', + width: { min: 80, max: 200 }, type: 'integer', format: 'integer', elements: [ @@ -80,9 +81,7 @@ export const columns = writable([ value: 30, label: 'more than 30 seconds' } - ], - filter: false, - exclude: true + ] }, { id: '$createdAt', diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/table.svelte new file mode 100644 index 000000000..eefe0aa0b --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/table.svelte @@ -0,0 +1,128 @@ + + + + + {#each filteredColumns as { id, title }} + {title} + {/each} + + {#each logs.executions as log (log.$id)} + { + e.stopPropagation(); + openSheet = true; + selectedLogId = log.$id; + }}> + {#each filteredColumns as column} + + {#if column.id === '$id'} + {#key column.id} + {log.$id} + {/key} + {:else if column.id === 'requestMethod'} + + {log.requestMethod} + + {:else if column.id === 'duration'} + {calculateTime(log.duration)} + {:else if column.id === 'responseStatusCode'} +
+ = 400 ? 'error' : 'success'} + content={log.responseStatusCode.toString()} /> +
+ {:else if column.id === 'requestPath'} + + {log.requestPath} + + {:else if column.id === '$createdAt'} + + {/if} +
+ {/each} +
+ {/each} +
+ + + +{#if selectedRows.length > 0} + + + + + {selectedRows.length > 1 ? 'logs' : 'log'} + selected + + + + + + + +{/if} + + +

+ Are you sure you want to delete {selectedRows.length} + {selectedRows.length > 1 ? 'logs' : 'log'}? +

+ +

This action is irreversible.

+
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte similarity index 81% rename from src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte index bab722d9f..b809abd7b 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte @@ -14,13 +14,15 @@ import { showConnectRepo } from './store'; import { isCloud } from '$lib/system'; import UpdateResourceLimits from './updateResourceLimits.svelte'; - import UpdateVariables from '$routes/(console)/project-[project]/updateVariables.svelte'; + import UpdateVariables from '$routes/(console)/project-[region]-[project]/updateVariables.svelte'; import UpdateLogging from './updateLogging.svelte'; export let data; const sdkCreateVariable = async (key: string, value: string, secret: boolean) => { - await sdk.forProject.sites.createVariable(page.params.site, key, value, secret); + await sdk + .forProject(page.params.region, page.params.project) + .sites.createVariable(page.params.site, key, value, secret); await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.SITE)]); }; @@ -30,12 +32,16 @@ value: string, secret: boolean ) => { - await sdk.forProject.sites.updateVariable(page.params.site, variableId, key, value, secret); + await sdk + .forProject(page.params.region, page.params.project) + .sites.updateVariable(page.params.site, variableId, key, value, secret); await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.SITE)]); }; const sdkDeleteVariable = async (variableId: string) => { - await sdk.forProject.sites.deleteVariable(page.params.site, variableId); + await sdk + .forProject(page.params.region, page.params.project) + .sites.deleteVariable(page.params.site, variableId); await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.SITE)]); }; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts similarity index 74% rename from src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.ts rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts index 3a46b9873..240a854f1 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts @@ -8,11 +8,11 @@ export const load = async ({ params, depends, parent }) => { const [globalVariables, variables, frameworks, installations, specificationsList] = await Promise.all([ - sdk.forProject.projectApi.listVariables(), - sdk.forProject.sites.listVariables(params.site), - sdk.forProject.sites.listFrameworks(), - sdk.forProject.vcs.listInstallations(), - sdk.forProject.sites.listSpecifications() + sdk.forProject(params.region, params.project).projectApi.listVariables(), + sdk.forProject(params.region, params.project).sites.listVariables(params.site), + sdk.forProject(params.region, params.project).sites.listFrameworks(), + sdk.forProject(params.region, params.project).vcs.listInstallations(), + sdk.forProject(params.region, params.project).sites.listSpecifications() ]); // Conflicting variables first diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/dangerZone.svelte similarity index 100% rename from src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/dangerZone.svelte diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/deleteModal.svelte similarity index 85% rename from src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/deleteModal.svelte index 1715b309a..a702286fd 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/deleteModal.svelte @@ -14,13 +14,13 @@ let error: string; const handleSubmit = async () => { try { - await sdk.forProject.sites.delete(site.$id); + await sdk.forProject(page.params.region, page.params.project).sites.delete(site.$id); showDelete = false; addNotification({ type: 'success', message: `Site has been deleted` }); - await goto(`${base}/project-${page.params.project}/sites`); + await goto(`${base}/project-${page.params.region}-${page.params.project}/sites`); trackEvent(Submit.SiteDelete); } catch (e) { error = e.message; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/disconnectRepo.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/disconnectRepo.svelte similarity index 64% rename from src/routes/(console)/project-[project]/sites/site-[site]/settings/disconnectRepo.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/disconnectRepo.svelte index 64d653c8b..430650dc9 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/disconnectRepo.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/disconnectRepo.svelte @@ -1,5 +1,6 @@ @@ -196,16 +234,10 @@ id="installCommand" label="Install command" bind:value={installCommand} - placeholder={frameworkAdapterData?.installCommand} /> + placeholder={frameworkAdapterData?.installCommand || + 'Enter install command'} /> -
@@ -214,15 +246,9 @@ id="buildCommand" label="Build command" bind:value={buildCommand} - placeholder={frameworkAdapterData?.buildCommand} /> -
@@ -231,15 +257,9 @@ id="outputDirectory" label="Output directory" bind:value={outputDirectory} - placeholder={frameworkAdapterData?.outputDirectory} /> -
@@ -264,7 +284,7 @@ - + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateLogging.svelte similarity index 62% rename from src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte rename to src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateLogging.svelte index 82eb20b2e..e3e66b659 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateLogging.svelte @@ -1,5 +1,6 @@ { ? params.period : SiteUsageRange.ThirtyDays; try { - return sdk.forProject.sites.listUsage(period); + return sdk.forProject(params.region, params.project).sites.getUsage(params.site, period); } catch (e) { error(e.code, e.message); } diff --git a/src/routes/(console)/project-[project]/sites/sitesActionMenu.svelte b/src/routes/(console)/project-[region]-[project]/sites/sitesActionMenu.svelte similarity index 87% rename from src/routes/(console)/project-[project]/sites/sitesActionMenu.svelte rename to src/routes/(console)/project-[region]-[project]/sites/sitesActionMenu.svelte index 37504b7ed..a4697694b 100644 --- a/src/routes/(console)/project-[project]/sites/sitesActionMenu.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/sitesActionMenu.svelte @@ -40,12 +40,12 @@ Add collaborator Domains Settings diff --git a/src/routes/(console)/project-[project]/sites/store.ts b/src/routes/(console)/project-[region]-[project]/sites/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/sites/store.ts rename to src/routes/(console)/project-[region]-[project]/sites/store.ts diff --git a/src/routes/(console)/project-[project]/sites/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/table.svelte similarity index 95% rename from src/routes/(console)/project-[project]/sites/table.svelte rename to src/routes/(console)/project-[region]-[project]/sites/table.svelte index c8a808187..680c82d38 100644 --- a/src/routes/(console)/project-[project]/sites/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/table.svelte @@ -33,7 +33,7 @@ {#each siteList.sites as site} + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${site.$id}`}> {#each $columns as column} {#if column.id === 'name'} @@ -69,7 +69,7 @@ Last deployment failed {timeFromNow( site.latestDeploymentCreatedAt )}. + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${site.$id}/deployments/deployment-${site.latestDeploymentId}`}> View logs diff --git a/src/routes/(console)/project-[project]/sites/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/usage/[[period]]/+page.svelte similarity index 81% rename from src/routes/(console)/project-[project]/sites/usage/[[period]]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/sites/usage/[[period]]/+page.svelte index 63fc6bb36..4dec5a14e 100644 --- a/src/routes/(console)/project-[project]/sites/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/usage/[[period]]/+page.svelte @@ -6,13 +6,11 @@ export let data; $: total = data.deploymentsTotal; $: count = data.deployments; - - $: console.log(data); { ? params.period : SiteUsageRange.ThirtyDays; try { - return sdk.forProject.sites.getUsage(params.site, period); + return sdk.forProject(params.region, params.project).sites.listUsage(period); } catch (e) { error(e.code, e.message); } diff --git a/src/routes/(console)/project-[project]/storage/+layout.svelte b/src/routes/(console)/project-[region]-[project]/storage/+layout.svelte similarity index 89% rename from src/routes/(console)/project-[project]/storage/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/storage/+layout.svelte index 5a184f681..ef7b3773d 100644 --- a/src/routes/(console)/project-[project]/storage/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/+layout.svelte @@ -14,7 +14,7 @@ label: 'Create bucket', callback: () => { if (!page.url.pathname.endsWith('storage')) { - goto(`${base}/project-${$project.$id}/storage`); + goto(`${base}/project-${$project.region}-${$project.$id}/storage`); } $showCreateBucket = true; }, @@ -26,7 +26,7 @@ { label: 'Go to usage', callback() { - goto(`${base}/project-${$project.$id}/storage/usage`); + goto(`${base}/project-${$project.region}-${$project.$id}/storage/usage`); }, keys: ['g', 'u'], disabled: page.url.pathname.endsWith('usage') || page.url.pathname.includes('bucket-'), diff --git a/src/routes/(console)/project-[project]/storage/+layout.ts b/src/routes/(console)/project-[region]-[project]/storage/+layout.ts similarity index 100% rename from src/routes/(console)/project-[project]/storage/+layout.ts rename to src/routes/(console)/project-[region]-[project]/storage/+layout.ts diff --git a/src/routes/(console)/project-[project]/storage/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/+page.svelte similarity index 94% rename from src/routes/(console)/project-[project]/storage/+page.svelte rename to src/routes/(console)/project-[region]-[project]/storage/+page.svelte index db145e480..f9b8ce486 100644 --- a/src/routes/(console)/project-[project]/storage/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/+page.svelte @@ -11,7 +11,6 @@ import { page } from '$app/state'; import type { Models } from '@appwrite.io/console'; import { writable } from 'svelte/store'; - import type { PageData } from './$types'; import { canWriteBuckets } from '$lib/stores/roles'; import { Icon, Layout } from '@appwrite.io/pink-svelte'; import { Button } from '$lib/elements/forms'; @@ -22,13 +21,15 @@ import { IconPlus } from '@appwrite.io/pink-icons-svelte'; import { consoleProfile } from '$lib/system'; - export let data: PageData; + export let data; const project = page.params.project; async function bucketCreated(event: CustomEvent) { showCreateBucket.set(false); - await goto(`${base}/project-${project}/storage/bucket-${event.detail.$id}`); + await goto( + `${base}/project-${page.params.region}-${project}/storage/bucket-${event.detail.$id}` + ); } diff --git a/src/routes/(console)/project-[project]/storage/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/+page.ts similarity index 64% rename from src/routes/(console)/project-[project]/storage/+page.ts rename to src/routes/(console)/project-[region]-[project]/storage/+page.ts index b5f1eb030..61cb3d856 100644 --- a/src/routes/(console)/project-[project]/storage/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/+page.ts @@ -4,7 +4,7 @@ import { getLimit, getPage, getSearch, getView, pageToOffset, View } from '$lib/ import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ url, route }) => { +export const load: PageLoad = async ({ url, route, params }) => { const page = getPage(url); const search = getSearch(url); const view = getView(url, route, View.Grid); @@ -16,9 +16,11 @@ export const load: PageLoad = async ({ url, route }) => { limit, view, search, - buckets: await sdk.forProject.storage.listBuckets( - [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], - search || undefined - ) + buckets: await sdk + .forProject(params.region, params.project) + .storage.listBuckets( + [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], + search || undefined + ) }; }; diff --git a/src/routes/(console)/project-[project]/storage/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/storage/breadcrumbs.svelte similarity index 76% rename from src/routes/(console)/project-[project]/storage/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/storage/breadcrumbs.svelte index acdceadec..8f5fca263 100644 --- a/src/routes/(console)/project-[project]/storage/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/breadcrumbs.svelte @@ -10,11 +10,11 @@ title: $organization.name }, { - href: `${base}/project-${$project.$id}`, + href: `${base}/project-${$project.region}-${$project.$id}`, title: $project.name }, { - href: `${base}/project-${$project.$id}/storage`, + href: `${base}/project-${$project.region}-${$project.$id}/storage`, title: 'Storage' } ]; diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.svelte similarity index 73% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.svelte index c75e58544..5988aa94c 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.svelte @@ -18,7 +18,9 @@ label: 'Create file', async callback() { if (!page.url.pathname.endsWith($bucket.$id)) { - goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/create`); + goto( + `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/create` + ); } }, keys: page.url.pathname.endsWith($bucket.$id) ? ['c'] : ['c', 'f'], @@ -29,7 +31,7 @@ label: 'Permissions', async callback() { await goto( - `${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings#permissions` + `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/settings#permissions` ); scrollBy({ top: -100 }); }, @@ -41,7 +43,7 @@ label: 'Extensions', async callback() { await goto( - `${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings#extensions` + `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/settings#extensions` ); }, group: 'buckets', @@ -52,7 +54,7 @@ label: 'File security', async callback() { await goto( - `${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings#file-security` + `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/settings#file-security` ); scrollBy({ top: -100 }); }, @@ -63,7 +65,9 @@ { label: 'Go to files', callback() { - goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}`); + goto( + `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}` + ); }, disabled: page.url.pathname.endsWith($bucket.$id), keys: ['g', 'f'], @@ -73,7 +77,9 @@ { label: 'Go to usage', callback() { - goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/usage`); + goto( + `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/usage` + ); }, disabled: page.url.pathname.endsWith('usage'), keys: ['g', 'u'], @@ -83,7 +89,9 @@ { label: 'Go to settings', callback() { - goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings`); + goto( + `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/settings` + ); }, disabled: page.url.pathname.endsWith('settings') || !$canWriteBuckets, keys: ['g', 's'], diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts similarity index 78% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.ts rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts index 85e862d89..3de7dc104 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts @@ -12,7 +12,9 @@ export const load: LayoutLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - bucket: await sdk.forProject.storage.getBucket(params.bucket) + bucket: await sdk + .forProject(params.region, params.project) + .storage.getBucket(params.bucket) }; } catch (e) { error(e.code, e.message); diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte similarity index 90% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte index 298c6ce92..859cf529c 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte @@ -29,13 +29,14 @@ let showDelete = false; let selectedFile: Models.File = null; - const projectId = page.params.project; const bucketId = page.params.bucket; function getPreview(fileId: string) { return ( - sdk.forProject.storage.getFilePreview(bucketId, fileId, 128, 128).toString() + - '&mode=admin' + sdk + .forProject(page.params.region, page.params.project) + .storage.getFilePreview(bucketId, fileId, 128, 128) + .toString() + '&mode=admin' ); } @@ -47,7 +48,9 @@ async function deleteFile(file: Models.File) { try { - await sdk.forProject.storage.deleteFile(file.bucketId, file.$id); + await sdk + .forProject(page.params.region, page.params.project) + .storage.deleteFile(file.bucketId, file.$id); await invalidate(Dependencies.FILES); await uploader.removeFile(file); trackEvent(Submit.FileDelete); @@ -92,7 +95,7 @@ @@ -218,11 +221,11 @@ { + href="https://appwrite.io/docs/products/storage/upload-download" + on:click={() => goto( - `${base}/project-${page.params.project}/storage/bucket-${page.params.bucket}/create` - ); - }} /> + `${base}/project-${page.params.region}-${page.params.project}/storage/bucket-${page.params.bucket}/create` + )} /> {/if} diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts similarity index 77% rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.ts rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts index 9d146924c..5c1076987 100644 --- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts @@ -5,22 +5,24 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, depends, url, route }) => { - depends(Dependencies.MEMBERSHIPS); - - const teamId = params.team; + depends(Dependencies.FILES); const page = getPage(url); const search = getSearch(url); const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); - return { - offset, - search, - limit, - memberships: await sdk.forProject.teams.listMemberships( - teamId, + const files = await sdk + .forProject(params.region, params.project) + .storage.listFiles( + params.bucket, [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search - ) + ); + + return { + offset, + limit, + search, + files }; }; diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/breadcrumbs.svelte similarity index 64% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/breadcrumbs.svelte index dc28fe8a6..0e159506c 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/breadcrumbs.svelte @@ -1,5 +1,6 @@ @@ -88,7 +110,7 @@ size.value )}{size.unit}. You can adjust it in your
bucket settings. @@ -96,7 +118,8 @@ + extensions={data.bucket.allowedFileExtensions} + on:invalid={handleInvalid}> Drag and drop files here or click to upload @@ -105,6 +128,8 @@ files={Array.from(files).map((f) => { return { ...f, + name: f.name, + size: f.size, extension: f.type, removable: true }; diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteBucket.svelte similarity index 82% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteBucket.svelte index 71e233374..b7053609b 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteBucket.svelte @@ -13,13 +13,15 @@ let error: string; const onSubmit = async () => { try { - await sdk.forProject.storage.deleteBucket($bucket.$id); + await sdk + .forProject(page.params.region, page.params.project) + .storage.deleteBucket($bucket.$id); showDelete = false; addNotification({ type: 'success', message: `${$bucket.name} has been deleted` }); - await goto(`${base}/project-${page.params.project}/storage`); + await goto(`${base}/project-${page.params.region}-${page.params.project}/storage`); trackEvent(Submit.BucketDelete); } catch (e) { error = e.message; diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteFile.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteFile.svelte similarity index 84% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteFile.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteFile.svelte index 71c2bbefa..944a12b11 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteFile.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteFile.svelte @@ -3,8 +3,9 @@ import Confirm from '$lib/components/confirm.svelte'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import type { Models } from '@appwrite.io/console'; import { createEventDispatcher } from 'svelte'; + import { page } from '$app/state'; + import type { Models } from '@appwrite.io/console'; export let file: Models.File; export let showDelete = false; @@ -13,7 +14,9 @@ const onSubmit = async () => { try { - await sdk.forProject.storage.deleteFile(file.bucketId, file.$id); + await sdk + .forProject(page.params.region, page.params.project) + .storage.deleteFile(file.bucketId, file.$id); showDelete = false; dispatch('deleted', file); addNotification({ diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.svelte similarity index 100% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.svelte diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts similarity index 65% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts index a848f7981..e198256ae 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts @@ -13,8 +13,12 @@ export const load: LayoutLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - tokens: await sdk.forProject.tokens.list(params.bucket, params.file), - file: await sdk.forProject.storage.getFile(params.bucket, params.file) + file: await sdk + .forProject(params.region, params.project) + .storage.getFile(params.bucket, params.file), + tokens: await sdk + .forProject(params.region, params.project) + .tokens.list(params.bucket, params.file) }; } catch (e) { error(e.code, e.message); diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte similarity index 54% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte index f0521bbd3..56f178098 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -3,7 +3,7 @@ import { Container } from '$lib/layout'; import { Button } from '$lib/elements/forms'; import { columns, file, tokens } from './store'; - import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date'; + import { diffDays, toLocaleDate, toLocaleDateTime } from '$lib/helpers/date'; import { sdk } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import { calculateSize } from '$lib/helpers/sizeConvertion'; @@ -15,29 +15,27 @@ import { Dependencies } from '$lib/constants'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; import { bucket } from '../store'; + import { page } from '$app/state'; import { ActionMenu, Alert, + Badge, Button as PinkButton, - InteractiveText, Layout, Icon, - Popover, Table, Typography } from '@appwrite.io/pink-svelte'; import { - IconChevronRight, IconDotsHorizontal, IconDuplicate, - IconKey, IconPencil, IconPlus, IconTrash } from '@appwrite.io/pink-icons-svelte'; import FileTokensCopyUrl from './fileTokensCopyUrl.svelte'; import ManageFileTokenModal, { cleanFormattedDate } from './manageFileToken.svelte'; - import { type Models, Permission, Role } from '@appwrite.io/console'; + import { type Models } from '@appwrite.io/console'; import { isSmallViewport } from '$lib/stores/viewport'; import { Menu } from '$lib/components/menu'; @@ -50,15 +48,18 @@ let showManageToken = false; let tokenDeleteMode = false; let showCopyUrlModal = false; - let tokenPermissionsMode = false; let selectedFileToken: Models.ResourceToken | null = null; const getPreview = (fileId: string) => - sdk.forProject.storage.getFilePreview($file.bucketId, fileId, 640, 300).toString() + - '&mode=admin'; - + sdk + .forProject(page.params.region, page.params.project) + .storage.getFilePreview($file.bucketId, fileId, 640, 300) + .toString() + '&mode=admin'; const getView = (fileId: string) => - sdk.forProject.storage.getFileView($file.bucketId, fileId).toString() + '&mode=admin'; + sdk + .forProject(page.params.region, page.params.project) + .storage.getFileView($file.bucketId, fileId) + .toString() + '&mode=admin'; $: if (filePermissions) { arePermsDisabled = !symmetricDifference(filePermissions, $file.$permissions).length; @@ -66,19 +67,18 @@ function downloadFile() { return ( - sdk.forProject.storage.getFileDownload($file.bucketId, $file.$id).toString() + - '&mode=admin' + sdk + .forProject(page.params.region, page.params.project) + .storage.getFileDownload($file.bucketId, $file.$id) + .toString() + '&mode=admin' ); } async function updatePermissions() { try { - await sdk.forProject.storage.updateFile( - $file.bucketId, - $file.$id, - $file.name, - filePermissions - ); + await sdk + .forProject(page.params.region, page.params.project) + .storage.updateFile($file.bucketId, $file.$id, $file.name, filePermissions); await invalidate(Dependencies.FILE); arePermsDisabled = true; addNotification({ @@ -99,7 +99,7 @@ async function deleteFileToken(token: Models.ResourceToken) { try { - await sdk.forProject.tokens.delete(token.$id); + await sdk.forProject(page.params.region, page.params.project).tokens.delete(token.$id); await invalidate(Dependencies.FILE_TOKENS); addNotification({ message: 'File token deleted', @@ -119,9 +119,9 @@ async function createFileToken(expiry: string) { try { - await sdk.forProject.tokens.createFileToken($file.bucketId, $file.$id, expiry, [ - Permission.read(Role.any()) - ]); + await sdk + .forProject(page.params.region, page.params.project) + .tokens.createFileToken($file.bucketId, $file.$id, expiry); await invalidate(Dependencies.FILE_TOKENS); addNotification({ @@ -142,11 +142,9 @@ async function updateFileToken(fileToken: Models.ResourceToken) { try { - await sdk.forProject.tokens.update( - selectedFileToken.$id, - fileToken.expire ? fileToken.expire : null, - fileToken.$permissions - ); + await sdk + .forProject(page.params.region, page.params.project) + .tokens.update(selectedFileToken.$id, fileToken.expire ? fileToken.expire : null); await invalidate(Dependencies.FILE_TOKENS); addNotification({ message: 'File token updated', @@ -164,21 +162,18 @@ } } - function getPermissionGroups(permissions: string[]): string { - const map = { - read: 'Read', - update: 'Update', - delete: 'Delete' + function getExpiryDetails(token: Models.ResourceToken): { + status: 'success' | 'warning' | 'error' | null; + message: string | null; + } { + if (token.expire === '') token.expire = null; + const isExpired = token.expire !== null && new Date(token.expire) < new Date(); + const isExpiring = token.expire && diffDays(new Date(), new Date(token.expire)) < 14; + + return { + status: isExpired ? 'error' : isExpiring ? 'warning' : null, + message: isExpired ? 'Expired' : isExpiring ? 'Expires soon' : null }; - - const groups = permissions.reduce((set, perm) => { - const match = perm.match(/^(\w+)\(/); - const key = match?.[1]; - if (key && map[key]) set.add(map[key]); - return set; - }, new Set()); - - return [...groups].join(', '); } onMount(async () => { @@ -213,7 +208,10 @@
-

Filename: {$file.name}

+

+ Filename: + {$file.name} +

MIME type: {$file.mimeType}

Size: {calculateSize($file.sizeOriginal)}

Created: {toLocaleDate($file.$createdAt)}

@@ -232,120 +230,105 @@ -
- - File tokens - Use tokens to provide public access to the file. - - {#if $tokens.total} - - - + + File tokens + Use tokens to provide public access to the file. + + {#if $tokens.total} + + + - - - {#each $columns as { id, title } (id)} - {title} - {/each} - + + + {#each $columns as { id, title } (id)} + {title} + {/each} + - {#each $tokens.tokens as token} - - {toLocaleDate(token.$createdAt)} + {#each $tokens.tokens as token} + + {toLocaleDate(token.$createdAt)} - {token.expire - ? cleanFormattedDate(token.expire) - : 'never'} + + + {@const expiration = getExpiryDetails(token)} + {token.expire ? cleanFormattedDate(token.expire) : 'Never'} - {token.accessedAt - ? cleanFormattedDate(token.accessedAt, true) - : 'never'} - - - {#if token.$permissions.length} - - {getPermissionGroups(token.$permissions)} - - {:else} - none + {#if expiration.status} + {/if} - + + - - - - - - + {token.accessedAt + ? cleanFormattedDate(token.accessedAt, true) + : 'Never'} - - - - { - toggle(e); - showCopyUrlModal = true; - selectedFileToken = token; - }} - leadingIcon={IconDuplicate}> - Copy URL - - + + + + + + + + + + { - toggle(e); - showManageToken = true; + on:click={() => { + toggle(); + showCopyUrlModal = true; selectedFileToken = token; - }}> - Edit expiry - - { - toggle(e); - showManageToken = true; - tokenPermissionsMode = true; - selectedFileToken = token; - }}> - Edit Permissions - - { - toggle(e); - tokenDeleteMode = true; - showManageToken = true; - selectedFileToken = token; - }}> - Delete + }} + leadingIcon={IconDuplicate}> + Copy URL - - - - - - {/each} - - {:else} - (showManageToken = true)} - >Create new file token - {/if} - - -
- + { + toggle(); + showManageToken = true; + selectedFileToken = token; + }}> + Edit expiry + + { + toggle(); + tokenDeleteMode = true; + showManageToken = true; + selectedFileToken = token; + }}> + Delete + + + + + + + + {/each} + + {:else} + (showManageToken = true)}>Create new file token + {/if} + + Permissions Assign read or write permissions at the bucket level or file level. If bucket level permissions @@ -410,15 +393,8 @@ bind:show={showManageToken} bind:isDelete={tokenDeleteMode} bind:fileToken={selectedFileToken} - bind:isUpdatePermissions={tokenPermissionsMode} on:created={({ detail: expiry }) => createFileToken(expiry)} on:updated={({ detail: token }) => updateFileToken(token)} on:deleted={async () => await deleteFileToken(selectedFileToken)} /> - - diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte similarity index 54% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte index 45bd9c355..e002ee332 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte @@ -1,7 +1,7 @@ + + + {@const tokenUrl = tabContents[selectedTab]} + Use the token-based URL below to access this file securely. + + + + {#each ['Preview', 'View', 'Download'] as cat} + (selectedTab = cat)} + active={selectedTab === cat}> + {cat} + + {/each} + + + + {getMoreInfo()} + + {#if !token.expire} + + This token doesn't expire. Be cautious when sharing links. + + {/if} + + + + + + + diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/header.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/header.svelte similarity index 80% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/header.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/header.svelte index 48ad4dda2..27c261285 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/header.svelte @@ -11,7 +11,8 @@ - + {$file?.name} {$file?.$id} diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte similarity index 79% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte index 461855545..bf5846d9d 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte @@ -13,27 +13,26 @@ import { createEventDispatcher } from 'svelte'; import { Link } from '@appwrite.io/pink-svelte'; import { type Models } from '@appwrite.io/console'; + import { Confirm, ExpirationInput, Modal } from '$lib/components'; import { Permissions } from '$lib/components/permissions'; import { Confirm, Modal } from '$lib/components'; - import ExpirationInput from '$routes/(console)/project-[project]/overview/(components)/expirationInput.svelte'; export let show = false; export let isDelete = false; - export let isUpdatePermissions = false; export let fileToken: Models.ResourceToken | null = null; - let expire = null; + $: expire = fileToken?.expire ?? null; const dispatch = createEventDispatcher(); - function close() { + function close(): void { show = false; expire = null; isDelete = false; fileToken = null; } - function handleFileToken() { + function handleFileToken(): void { if (isDelete) { dispatch('deleted'); } else { @@ -45,6 +44,10 @@ close(); } + function getModalTitle(): string { + return `${fileToken ? 'Edit' : 'Create'} token${fileToken ? ' expiry' : ''}`; + } + $: if (!show) { close(); } @@ -68,27 +71,24 @@

{:else} - + {#if fileToken} {@const formattedDate = cleanFormattedDate(fileToken.$createdAt)} - Edit the expiry of the file token created on {formattedDate} + Edit the expiry of the file token created on {formattedDate}. {:else} Create a file token to grant access to a file. + Learn more. {/if} - {#if isUpdatePermissions} - - {:else} - - {/if} + diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts similarity index 66% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts index 8042caf2a..dd1432428 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts @@ -7,15 +7,9 @@ export const file = derived(page, ($page) => $page.data.file as Models.File); export const tokens = derived(page, ($page) => $page.data.tokens as Models.ResourceTokenList); -/** - * Caches JWTs in memory by `token.$id` to avoid regenerating them on each URL copy. - */ -export const cachedJwts = writable>(new Map()); - export const columns = writable([ { id: 'created', title: 'Created', type: 'datetime', width: 200 }, - { id: 'expiry', title: 'Expiration', type: 'datetime', width: 200 }, + { id: 'expire', title: 'Expiration', type: 'datetime', width: 200 }, { id: 'last_accessed', title: 'Last accessed', type: 'datetime', width: 200 }, - { id: 'permissions', title: 'Permissions', type: 'string', width: 200 }, { id: 'actions', title: '', type: 'string', width: 60 } ]); diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/header.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/header.svelte similarity index 88% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/header.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/header.svelte index 2f48b8cb9..5bdf52183 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/header.svelte @@ -9,7 +9,7 @@ const projectId = page.params.project; const bucketId = page.params.bucket; - const path = `${base}/project-${projectId}/storage/bucket-${bucketId}`; + const path = `${base}/project-${page.params.region}-${projectId}/storage/bucket-${bucketId}`; const tabs = [ { href: path, @@ -34,7 +34,7 @@ - + {$bucket?.name} {#if $bucket?.$id} diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte similarity index 96% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte index 44d3d37d4..07c8a40e8 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte @@ -22,18 +22,20 @@ } try { - await sdk.forProject.storage.updateBucket( - values.$id, - values.name, - values.$permissions, - values.fileSecurity, - values.enabled, - values.maximumFileSize, - values.allowedFileExtensions, - values.compression, - values.encryption, - values.antivirus - ); + await sdk + .forProject(page.params.region, page.params.project) + .storage.updateBucket( + values.$id, + values.name, + values.$permissions, + values.fileSecurity, + values.enabled, + values.maximumFileSize, + values.allowedFileExtensions, + values.compression, + values.encryption, + values.antivirus + ); await invalidate(Dependencies.BUCKET); @@ -88,6 +90,7 @@ import { Icon, Layout, Link, Selector, Tag, Typography } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; import { Click } from '$lib/actions/analytics'; + import { page } from '$app/state'; export let data: PageData; diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte similarity index 98% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte index 78611e19e..62bbb8c4b 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte @@ -20,7 +20,7 @@ const options = units.map((v) => ({ label: v.name, value: v.name })); $: selectedUnit = $unit; - $: maxValue = function formMaxFileSize() { + const maxValue = function formMaxFileSize() { return (service * 1000 * 1000) / units.find((unit) => unit.name === selectedUnit).value; }; diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/store.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/store.ts rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/store.ts diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte similarity index 73% rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte index 17083052e..3c39c5f9e 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte @@ -2,9 +2,8 @@ import { base } from '$app/paths'; import { page } from '$app/state'; import { Container, Usage } from '$lib/layout'; - import type { PageData } from './$types'; - export let data: PageData; + export let data; $: filesTotal = data.filesTotal; $: files = data.files; $: transformationsTotal = data.imageTransformationsTotal; @@ -13,7 +12,7 @@ { const period = isValueOfStringEnum(StorageUsageRange, params.period) ? params.period : StorageUsageRange.ThirtyDays; - const response = (await sdk.forProject.storage.getBucketUsage( - params.bucket, - period - )) as unknown as Models.UsageBuckets; + + const response = (await sdk + .forProject(params.region, params.project) + .storage.getBucketUsage(params.bucket, period)) as unknown as Models.UsageBuckets; return { filesTotal: response.filesTotal, diff --git a/src/routes/(console)/project-[project]/storage/create.svelte b/src/routes/(console)/project-[region]-[project]/storage/create.svelte similarity index 90% rename from src/routes/(console)/project-[project]/storage/create.svelte rename to src/routes/(console)/project-[region]-[project]/storage/create.svelte index 86ba9fa8a..fcb3ca65f 100644 --- a/src/routes/(console)/project-[project]/storage/create.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/create.svelte @@ -8,6 +8,7 @@ import { IconPencil } from '@appwrite.io/pink-icons-svelte'; import { Icon, Tag } from '@appwrite.io/pink-svelte'; import { createEventDispatcher } from 'svelte'; + import { page } from '$app/state'; export let showCreate = false; @@ -20,7 +21,9 @@ const create = async () => { try { - const bucket = await sdk.forProject.storage.createBucket(id ? id : ID.unique(), name); + const bucket = await sdk + .forProject(page.params.region, page.params.project) + .storage.createBucket(id ? id : ID.unique(), name); showCreate = false; dispatch('created', bucket); addNotification({ diff --git a/src/routes/(console)/project-[project]/storage/grid.svelte b/src/routes/(console)/project-[region]-[project]/storage/grid.svelte similarity index 92% rename from src/routes/(console)/project-[project]/storage/grid.svelte rename to src/routes/(console)/project-[region]-[project]/storage/grid.svelte index 6d6fffae5..dbdc549a3 100644 --- a/src/routes/(console)/project-[project]/storage/grid.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/grid.svelte @@ -9,6 +9,7 @@ export let data: PageData; export let showCreate = false; + const region = page.params.region; const project = page.params.project; @@ -20,7 +21,7 @@ service="buckets" on:click={() => (showCreate = true)}> {#each data.buckets.buckets as bucket} - + {bucket.name} {#if !bucket.enabled} diff --git a/src/routes/(console)/project-[project]/storage/header.svelte b/src/routes/(console)/project-[region]-[project]/storage/header.svelte similarity index 91% rename from src/routes/(console)/project-[project]/storage/header.svelte rename to src/routes/(console)/project-[region]-[project]/storage/header.svelte index de16106d2..2b78392ee 100644 --- a/src/routes/(console)/project-[project]/storage/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/header.svelte @@ -7,8 +7,7 @@ import { Typography } from '@appwrite.io/pink-svelte'; import { isStudio } from '$lib/system'; - const projectId = page.params.project; - const path = `${base}/project-${projectId}/storage`; + const path = `${base}/project-${page.params.region}-${page.params.project}/storage`; const tabs = [ { href: path, diff --git a/src/routes/(console)/project-[project]/storage/store.ts b/src/routes/(console)/project-[region]-[project]/storage/store.ts similarity index 100% rename from src/routes/(console)/project-[project]/storage/store.ts rename to src/routes/(console)/project-[region]-[project]/storage/store.ts diff --git a/src/routes/(console)/project-[project]/storage/table.svelte b/src/routes/(console)/project-[region]-[project]/storage/table.svelte similarity index 89% rename from src/routes/(console)/project-[project]/storage/table.svelte rename to src/routes/(console)/project-[region]-[project]/storage/table.svelte index aec41eba4..accff4d00 100644 --- a/src/routes/(console)/project-[project]/storage/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/table.svelte @@ -8,7 +8,6 @@ import { Table } from '@appwrite.io/pink-svelte'; export let data: PageData; - const projectId = page.params.project; @@ -18,7 +17,9 @@ {/each} {#each data.buckets.buckets as bucket (bucket.$id)} - + {#each $columns as column} {#if column.id === '$id'} diff --git a/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.svelte similarity index 81% rename from src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte rename to src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.svelte index 333d54979..659277fbd 100644 --- a/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.svelte @@ -10,7 +10,7 @@ { const period = isValueOfStringEnum(StorageUsageRange, params.period) ? params.period : StorageUsageRange.ThirtyDays; - return sdk.forProject.storage.getUsage(period); + return sdk.forProject(params.region, params.project).storage.getUsage(period); } catch (e) { error(e.code, e.message); } diff --git a/src/routes/(console)/project-[project]/store.ts b/src/routes/(console)/project-[region]-[project]/store.ts similarity index 56% rename from src/routes/(console)/project-[project]/store.ts rename to src/routes/(console)/project-[region]-[project]/store.ts index 58b43c36f..a9a73451e 100644 --- a/src/routes/(console)/project-[project]/store.ts +++ b/src/routes/(console)/project-[region]-[project]/store.ts @@ -1,17 +1,49 @@ -import { page } from '$app/stores'; import type { Models } from '@appwrite.io/console'; import type { BarSeriesOption } from 'echarts/charts'; -import { derived, writable } from 'svelte/store'; +import { derived, get, writable } from 'svelte/store'; +import { regions } from '$lib/stores/organization'; +import { page } from '$app/stores'; export const project = derived( page, ($page) => $page.data.project as Models.Project & { region?: string } ); + +export const projectRegion = derived(project, ($project) => { + const availableRegions = get(regions); + // region is marked as nullable above. + if (!availableRegions || !availableRegions.regions || !$project || !$project.region) + return null; + + return availableRegions.regions.find((region) => { + return $project.region === region.$id; + }); +}); + export const onboarding = derived( project, ($project) => $project?.platforms?.length === 0 && $project?.keys?.length === 0 ); +/** + * Region-aware version of `consoleVariables`, scoped to the project's assigned region. + * + * Falls back to the default `consoleVariables` if regional data is unavailable, just `edge-case` things. + */ +export const regionalConsoleVariables = derived( + page, + ($page) => + ($page.data.regionalConsoleVariables ?? + $page.data.consoleVariables) as Models.ConsoleVariables +); + +/** + * Protocol based on regional console variables. + */ +export const regionalProtocol = derived(regionalConsoleVariables, ($vars) => + $vars?._APP_OPTIONS_FORCE_HTTPS === 'enabled' ? 'https://' : 'http://' +); + function createStats() { const { subscribe, set, update } = writable>(new Map()); diff --git a/src/routes/(console)/project-[project]/updateVariables.svelte b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte similarity index 88% rename from src/routes/(console)/project-[project]/updateVariables.svelte rename to src/routes/(console)/project-[region]-[project]/updateVariables.svelte index 0b695cd55..edbf38d87 100644 --- a/src/routes/(console)/project-[project]/updateVariables.svelte +++ b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte @@ -8,7 +8,7 @@ import { Click, Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Dependencies } from '$lib/constants'; import { addNotification } from '$lib/stores/notifications'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; import PromoteVariableModal from './promoteVariableModal.svelte'; import CreateVariable from './createVariableModal.svelte'; import RawVariableEditor from './rawVariableEditor.svelte'; @@ -69,7 +69,6 @@ async function handleVariableCreated(event: CustomEvent) { const variables = event.detail; - console.log(variables); try { const promises = variables.map((variable) => sdkCreateVariable(variable.key, variable.value, variable?.secret || false) @@ -115,7 +114,6 @@ } async function handleVariableSecret(event: CustomEvent) { const variable = event.detail; - console.log(variable); try { await sdkUpdateVariable(variable.$id, variable.key, variable.value, variable.secret); selectedVar = null; @@ -165,33 +163,33 @@ const isConflicting = globalVariable !== undefined; if (isConflicting) { - await sdk.forProject.projectApi.deleteVariable(globalVariable.$id); - await sdk.forProject.projectApi.createVariable( - variable.key, - variable.value, - variable.secret - ); + await sdk + .forProject(page.params.region, page.params.project) + .projectApi.deleteVariable(globalVariable.$id); + await sdk + .forProject(page.params.region, page.params.project) + .projectApi.createVariable(variable.key, variable.value, variable.secret); if (product === 'site') { - await sdk.forProject.sites.deleteVariable(variable.resourceId, variable.$id); + await sdk + .forProject(page.params.region, page.params.project) + .sites.deleteVariable(variable.resourceId, variable.$id); } else { - await sdk.forProject.functions.deleteVariable( - variable.resourceId, - variable.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.deleteVariable(variable.resourceId, variable.$id); } } else { - await sdk.forProject.projectApi.createVariable( - variable.key, - variable.value, - variable.secret - ); + await sdk + .forProject(page.params.region, page.params.project) + .projectApi.createVariable(variable.key, variable.value, variable.secret); if (product === 'site') { - await sdk.forProject.sites.deleteVariable(variable.resourceId, variable.$id); + await sdk + .forProject(page.params.region, page.params.project) + .sites.deleteVariable(variable.resourceId, variable.$id); } else { - await sdk.forProject.functions.deleteVariable( - variable.resourceId, - variable.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .functions.deleteVariable(variable.resourceId, variable.$id); } } @@ -210,7 +208,10 @@ message: `Variable has been ${isConflicting ? 'overwritten' : 'promoted'}. You can find it in the project settings.`, buttons: [ { - method: () => goto(`${base}/project-${page.params.project}/settings`), + method: () => + goto( + `${base}/project-${page.params.region}-${page.params.project}/settings` + ), name: 'Go to settings' } ] @@ -250,7 +251,8 @@ within your project. {:else} Set the environment variables or secret keys that will be passed to your {product}. Global - variables can be found in + variables can be found in project settings. {/if} @@ -300,7 +302,7 @@ {/if} a naming conflict with a global variable. View global variables in project settings + { + selectedVar = variable; + showUpdate = true; + toggle(e); + }}> + Update + {#if !variable.secret} - { - selectedVar = variable; - showUpdate = true; - toggle(e); - }}> - Update - { diff --git a/src/routes/(console)/project-[project]/updateVariablesModal.svelte b/src/routes/(console)/project-[region]-[project]/updateVariablesModal.svelte similarity index 94% rename from src/routes/(console)/project-[project]/updateVariablesModal.svelte rename to src/routes/(console)/project-[region]-[project]/updateVariablesModal.svelte index 7bde8a3ac..58e6026c0 100644 --- a/src/routes/(console)/project-[project]/updateVariablesModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/updateVariablesModal.svelte @@ -54,7 +54,7 @@ {#if !isGlobal} When there is a naming conflict with a global variable in your + href={`${base}/project-${$project.region}-${$project.$id}/settings/variables`}> project settings and a {product} environment variable, the global variable will be ignored. @@ -76,6 +76,7 @@ diff --git a/src/routes/(console)/project-[project]/uploadVariablesModal.svelte b/src/routes/(console)/project-[region]-[project]/uploadVariablesModal.svelte similarity index 100% rename from src/routes/(console)/project-[project]/uploadVariablesModal.svelte rename to src/routes/(console)/project-[region]-[project]/uploadVariablesModal.svelte diff --git a/src/routes/(console)/regions.ts b/src/routes/(console)/regions.ts new file mode 100644 index 000000000..9f84dd430 --- /dev/null +++ b/src/routes/(console)/regions.ts @@ -0,0 +1,32 @@ +import { get } from 'svelte/store'; +import { sdk } from '$lib/stores/sdk'; +import { isCloud } from '$lib/system'; +import { regions } from '$lib/stores/organization'; + +let lastLoadedOrganization = null; + +/** + * Loads available regions for a given organization. + * + * Prevents unnecessary API calls if the regions are already loaded for the same organization. + */ +export async function loadAvailableRegions(orgId: string): Promise { + if (!isCloud || !orgId) return; + + try { + const storedRegions = get(regions); + + if (storedRegions.regions && lastLoadedOrganization === orgId) { + // already loaded for this organization, fast path return. + return; + } + + // TODO: @itznotabug, @torstendittmann we need a better way for this! + const availableRegions = await sdk.forConsole.billing.listRegions(orgId); + regions.set(availableRegions); + + lastLoadedOrganization = orgId; + } catch (error) { + console.error(`Failed to load regions for teamId: ${orgId}`, error); + } +} diff --git a/src/routes/(console)/wizard/feedback/step1.svelte b/src/routes/(console)/wizard/feedback/step1.svelte index 2528d5ac8..4d2cac840 100644 --- a/src/routes/(console)/wizard/feedback/step1.svelte +++ b/src/routes/(console)/wizard/feedback/step1.svelte @@ -10,7 +10,7 @@ import { organization } from '$lib/stores/organization'; import { addNotification } from '$lib/stores/notifications'; import { page } from '$app/state'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; $: $selectedFeedback = feedbackOptions.find((option) => option.type === $feedback.type); diff --git a/src/routes/(public)/(guest)/register/+page.svelte b/src/routes/(public)/(guest)/register/+page.svelte index 2c3be6384..4d1159698 100644 --- a/src/routes/(public)/(guest)/register/+page.svelte +++ b/src/routes/(public)/(guest)/register/+page.svelte @@ -33,22 +33,18 @@ await sdk.forConsole.account.create(ID.unique(), mail, pass, name ?? ''); await sdk.forConsole.account.createEmailPasswordSession(mail, pass); - if ($redirectTo) { - window.location.href = $redirectTo; - return; - } - - await invalidate(Dependencies.ACCOUNT); trackEvent(Submit.AccountCreate, { campaign_name: data?.couponData?.code }); + if (data?.couponData?.code) { await goto(`${base}/apply-credit?code=${data?.couponData?.code}`); return; - } - if (data?.campaign) { + } else if (data?.campaign?.$id) { await goto(`${base}/apply-credit?campaign=${data.campaign.$id}`); return; - } - if (page.url.searchParams) { + } else if ($redirectTo) { + window.location.href = $redirectTo; + return; + } else if (page.url.searchParams) { const redirect = page.url.searchParams.get('redirect'); page.url.searchParams.delete('redirect'); if (redirect) { @@ -61,6 +57,8 @@ } else { await goto(base); } + + await invalidate(Dependencies.ACCOUNT); } catch (error) { disabled = false; addNotification({ diff --git a/src/routes/(public)/auth/preview/+page.svelte b/src/routes/(public)/auth/preview/+page.svelte index 0bb62f30d..576f712ed 100644 --- a/src/routes/(public)/auth/preview/+page.svelte +++ b/src/routes/(public)/auth/preview/+page.svelte @@ -15,8 +15,7 @@ await sdk.forConsole.projects.get(projectId); const jwt = await sdk.forConsole.account.createJWT(); window.location.href = `${origin}/_appwrite/authorize?jwt=${jwt.jwt}&path=${path}`; - } catch (error) { - console.log(error); + } catch { goto( `${base}/auth/preview/access?origin=${origin}&path=${path}&projectId=${projectId}` ); diff --git a/src/routes/(public)/auth/preview/+page.ts b/src/routes/(public)/auth/preview/+page.ts index 833ddee54..3692dbfc7 100644 --- a/src/routes/(public)/auth/preview/+page.ts +++ b/src/routes/(public)/auth/preview/+page.ts @@ -4,13 +4,10 @@ import { redirect } from '@sveltejs/kit'; export const load = async ({ parent, url }) => { const { account } = await parent(); - console.log(url); - // const params = new URLSearchParams(window.location.search); - const projectId = url.searchParams.get('projectId'); const origin = url.searchParams.get('origin'); const path = url.searchParams.get('path'); - console.log(projectId); + if (!account) { redirect( 303, diff --git a/src/routes/(public)/auth/preview/access/+page.svelte b/src/routes/(public)/auth/preview/access/+page.svelte index f69f3783f..568442923 100644 --- a/src/routes/(public)/auth/preview/access/+page.svelte +++ b/src/routes/(public)/auth/preview/access/+page.svelte @@ -102,12 +102,6 @@ await register(); } } - - async function requestAccess() { - //TODO: Implement request access - } - - $: console.log(data); {#if $app.themeInUse === 'dark'} diff --git a/src/routes/(public)/card/+layout.svelte b/src/routes/(public)/card/+layout.svelte index eaebf310b..b795ff5b0 100644 --- a/src/routes/(public)/card/+layout.svelte +++ b/src/routes/(public)/card/+layout.svelte @@ -1,20 +1,9 @@ -
diff --git a/src/routes/(public)/hackathon/+layout.svelte b/src/routes/(public)/hackathon/+layout.svelte index eaebf310b..b795ff5b0 100644 --- a/src/routes/(public)/hackathon/+layout.svelte +++ b/src/routes/(public)/hackathon/+layout.svelte @@ -1,20 +1,9 @@ -
diff --git a/src/routes/(public)/template-[template]/+layout.svelte b/src/routes/(public)/template-[template]/+layout.svelte index 9ca526e9c..24b88068c 100644 --- a/src/routes/(public)/template-[template]/+layout.svelte +++ b/src/routes/(public)/template-[template]/+layout.svelte @@ -1,6 +1,5 @@ diff --git a/src/routes/(public)/template-[template]/+page.svelte b/src/routes/(public)/template-[template]/+page.svelte index 3b22eafdf..33d4d6ed6 100644 --- a/src/routes/(public)/template-[template]/+page.svelte +++ b/src/routes/(public)/template-[template]/+page.svelte @@ -4,15 +4,14 @@ import CustomId from '$lib/components/customId.svelte'; import { SvgIcon } from '$lib/components/index.js'; import { Button, Form, InputSelect } from '$lib/elements/forms'; - import { getFlagUrl } from '$lib/helpers/flag.js'; - import type { AllowedRegions, Region as RegionType } from '$lib/sdk/billing.js'; + import type { AllowedRegions } from '$lib/sdk/billing.js'; import { app } from '$lib/stores/app'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; import { getFrameworkIcon } from '$lib/stores/sites.js'; import { isCloud } from '$lib/system'; import { ID, OAuthProvider, Query, type Models, Region } from '@appwrite.io/console'; - import { IconGithub, IconPencil, IconPlus, IconPlusSm } from '@appwrite.io/pink-icons-svelte'; + import { IconGithub, IconPencil, IconPlusSm } from '@appwrite.io/pink-icons-svelte'; import { Card, Divider, @@ -23,6 +22,7 @@ Tag, Typography } from '@appwrite.io/pink-svelte'; + import { filterRegions } from '$lib/helpers/regions'; let { data } = $props(); @@ -34,28 +34,9 @@ let projectName = $state(); let showCustomId = $state(false); let region = $state(); - let regions = $state>([]); + let regions = $state>([]); let id = $state(); - function getRegions() { - return regions - .filter((region) => region.$id !== 'default') - .sort((regionA, regionB) => { - if (regionA.disabled && !regionB.disabled) { - return 1; - } - return regionA.name > regionB.name ? 1 : -1; - }) - .map((region) => { - return { - label: region.name, - value: region.$id, - leadingHtml: `Region flag`, - disabled: region.disabled - }; - }); - } - function isSiteTemplate( template: Models.TemplateFunction | Models.TemplateSite, product: 'site' | 'function' @@ -80,11 +61,11 @@ selectedProject = projects?.total ? projects.projects[0].$id : null; } - function generateUrl() { + function generateUrl(project: Models.Project) { if (isSiteTemplate(data.template, data.product)) { - return `${base}/project-${selectedProject}/sites/create-site/templates/template-${data.template.key}`; + return `${base}/project-${project.region}-${project.$id}/sites/create-site/templates/template-${data.template.key}`; } else { - return `${base}/project-${selectedProject}/functions/create-function/templates/template-${data.template.name}`; + return `${base}/project-${project.region}-${project.$id}/functions/create-function/templates/template-${data.template.name}`; } } @@ -95,7 +76,7 @@ id ?? ID.unique(), projectName, selectedOrg, - isCloud ? (region as Region) : Region.Default + isCloud ? (region as Region) : undefined ); trackEvent(Submit.ProjectCreate, { customId: !!id, @@ -105,7 +86,7 @@ selectedProject = p.$id; - window.location.href = generateUrl(); + window.location.href = generateUrl(p); } catch (e) { trackError(e, Submit.ProjectCreate); addNotification({ @@ -114,7 +95,8 @@ }); } } else { - window.location.href = generateUrl(); + const project = projects.projects.find((p) => p.$id === selectedProject); + window.location.href = generateUrl(project); } } @@ -242,7 +224,7 @@ required bind:value={region} placeholder="Select a region" - options={getRegions()} + options={filterRegions(regions)} label="Region" /> Region cannot be changed after creation diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 29d8a760e..15197b0d6 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -328,14 +328,14 @@ input[type='radio'], input[type='checkbox']:not([class='switch']), input[type='switchbox'] { - .theme-dark &:not(:checked) { + .theme-dark &:not(:checked):not(:disabled) { background-color: transparent; /* take whatever color is behind */ border: 1px solid var(--color-mid-neutral-70, #56565c); } } input[type='checkbox'][class='switch'] { - .theme-dark &:not(:checked) { + .theme-dark &:not(:checked):not(:disabled) { background-color: var(--color-mid-neutral-70, #56565c); } } diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 6e42a690e..78d86d2e4 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -28,13 +28,11 @@ export const load: LayoutLoad = async ({ depends, url, route }) => { } if (account) { - const organizations = !isCloud - ? await sdk.forConsole.teams.list() - : await sdk.forConsole.billing.listOrganization(); - return { - account, - organizations + account: account, + organizations: !isCloud + ? await sdk.forConsole.teams.list() + : await sdk.forConsole.billing.listOrganization() }; } diff --git a/src/routes/+page.ts b/src/routes/+page.ts index 2b0edfaf3..763ce7bb8 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -31,10 +31,12 @@ const userVisitedEducationPage = (): boolean => { export const load: PageLoad = async ({ parent, url }) => { const { organizations, account } = await parent(); + const isApplyingCredit = url.pathname.includes('apply-credit'); + if (userVisitedEducationPage()) { await handleGithubEducationMembership(account.name, account.email); redirect(303, base); - } else if (organizations.total) { + } else if (organizations.total && !isApplyingCredit) { const teamId = account.prefs.organization ?? organizations.teams[0].$id; if (!teamId) { redirect(303, `${base}/account/organizations${url.search}`); @@ -45,7 +47,7 @@ export const load: PageLoad = async ({ parent, url }) => { `${base}/organization-${teamId}${url.search}` ); } - } else { + } else if (!isApplyingCredit) { redirect( 303, isStudio diff --git a/src/service-worker.ts b/src/service-worker.ts index b34bc0445..23f5988aa 100644 --- a/src/service-worker.ts +++ b/src/service-worker.ts @@ -3,88 +3,23 @@ /// /// -import { build, files, version, base } from '$service-worker'; +import { build, files } from '$service-worker'; const sw = self as unknown as ServiceWorkerGlobalScope; -// Create a unique cache name for this deployment -const CACHE = `cache-${version}`; - const ASSETS = [ ...build, // the app itself ...files // everything in `static` ]; +// Preload all assets sw.addEventListener('install', (event) => { - // Create a new cache and add all files to it - async function addFilesToCache() { - const cache = await caches.open(CACHE); - await cache.addAll(ASSETS); - } - - // Check if the page URL does not match the exclusion path - const shouldCache = !location.pathname.startsWith(`${base}/auth`); - if (shouldCache) { - event.waitUntil(addFilesToCache()); - } + event.waitUntil(Promise.allSettled(ASSETS.map((asset) => fetch(asset)))); }); +// Clean up all old caches left by previous service workers sw.addEventListener('activate', (event) => { - // Remove previous cached data from disk - async function deleteOldCaches() { - for (const key of await caches.keys()) { - if (key !== CACHE) await caches.delete(key); - } - } - - event.waitUntil(deleteOldCaches()); -}); - -sw.addEventListener('fetch', (event) => { - // ignore POST requests etc - if (event.request.method !== 'GET') return; - - async function respond() { - const url = new URL(event.request.url); - const cache = await caches.open(CACHE); - - // `build`/`files` can always be served from the cache - if (ASSETS.includes(url.pathname)) { - const response = await cache.match(url.pathname); - - if (response) { - return response; - } - } - - // for everything else, try the network first, but - // fall back to the cache if we're offline - try { - const response = await fetch(event.request); - - // if we're offline, fetch can return a value that is not a Response - // instead of throwing - and we can't pass this non-Response to respondWith - if (!(response instanceof Response)) { - throw new Error('invalid response from fetch'); - } - - if (response.status === 200) { - cache.put(event.request, response.clone()); - } - - return response; - } catch (err) { - const response = await cache.match(event.request); - - if (response) { - return response; - } - - // if there's no cache, then just error out - // as there is nothing we can do to respond to this request - throw err; - } - } - - event.respondWith(respond()); + event.waitUntil( + caches.keys().then((keys) => Promise.all(keys.map((key) => caches.delete(key)))) + ); }); diff --git a/static/legal/dpa.pdf b/static/legal/dpa.pdf index 41a3d0b42..554d12bb2 100644 Binary files a/static/legal/dpa.pdf and b/static/legal/dpa.pdf differ diff --git a/tsconfig.json b/tsconfig.json index 8f29ac22a..900ee4e39 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,6 +9,9 @@ "skipLibCheck": true, "sourceMap": true, "strict": false, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true, "moduleResolution": "bundler" } } diff --git a/vitest-setup-client.ts b/vitest-setup-client.ts index a6d211c31..88edcb458 100644 --- a/vitest-setup-client.ts +++ b/vitest-setup-client.ts @@ -16,15 +16,21 @@ Object.defineProperty(window, 'matchMedia', { }); beforeAll(() => { + vi.mock('$app/environment', () => ({ + dev: true, + building: true, + browser: true, + page: { + params: { + project: 'tests', + region: 'tests' + } + } + })); vi.mock('$app/navigation', () => ({ goto: vi.fn(), beforeNavigate: vi.fn() })); - vi.mock('$app/environment', () => ({ - dev: true, - browser: true, - building: true - })); vi.mock('$env/static/public', () => import.meta.env); vi.mock('$env/dynamic/public', () => ({ env: import.meta.env