From 90dd9dfced4a3b1c55852b8fef7da32d98bf26d3 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Sat, 26 Mar 2022 14:27:12 +0300 Subject: [PATCH] add base url option --- src/lib/layout/header.svelte | 3 ++- src/lib/layout/navigation.svelte | 14 ++++++-------- src/routes/__layout.svelte | 3 ++- src/routes/console/@me.svelte | 3 ++- .../console/[project]/database/__layout.svelte | 6 ++++-- .../console/[project]/database/_tabs.svelte | 6 ++++-- .../collection/[collection]/__layout.svelte | 3 ++- .../collection/[collection]/_tabs.svelte | 4 +++- .../[collection]/document/@create.svelte | 5 +++-- .../document/[document]/__layout.svelte | 3 ++- .../document/[document]/_tabs.svelte | 4 +++- .../collection/[collection]/index.svelte | 9 ++++++--- .../console/[project]/database/index.svelte | 5 +++-- .../[project]/functions/__layout.svelte | 4 +++- .../console/[project]/functions/_tabs.svelte | 4 +++- .../function/[function]/__layout.svelte | 3 ++- .../functions/function/[function]/_tabs.svelte | 4 +++- .../functions/function/[function]/index.svelte | 3 ++- .../console/[project]/functions/index.svelte | 6 +++++- src/routes/console/[project]/index.svelte | 7 ++++--- .../console/[project]/keys/__layout.svelte | 4 +++- src/routes/console/[project]/keys/index.svelte | 4 +++- .../[project]/keys/key/[key]/index.svelte | 3 ++- .../console/[project]/settings/__layout.svelte | 4 +++- .../console/[project]/settings/_tabs.svelte | 4 +++- .../console/[project]/storage/__layout.svelte | 6 ++++-- .../console/[project]/storage/_tabs.svelte | 10 ++++++---- .../storage/bucket/[bucket]/__layout.svelte | 3 ++- .../storage/bucket/[bucket]/_tabs.svelte | 4 +++- .../console/[project]/storage/index.svelte | 8 ++++++-- .../console/[project]/users/__layout.svelte | 4 +++- .../console/[project]/users/_tabs.svelte | 18 ++++++++++-------- .../console/[project]/users/index.svelte | 8 ++++++-- .../console/[project]/users/teams.svelte | 8 ++++++-- .../users/teams/[team]/__layout.svelte | 4 +++- .../[project]/users/teams/[team]/_tabs.svelte | 4 +++- .../[project]/users/teams/[team]/index.svelte | 3 ++- .../users/user/[user]/__layout.svelte | 3 ++- .../[project]/users/user/[user]/_tabs.svelte | 4 +++- .../[project]/users/user/[user]/index.svelte | 3 ++- .../console/[project]/webhooks/__layout.svelte | 4 +++- .../console/[project]/webhooks/index.svelte | 4 +++- src/routes/console/__layout.reset.svelte | 3 ++- src/routes/console/index.svelte | 5 +++-- src/routes/index.svelte | 4 +++- src/routes/login.svelte | 5 +++-- src/routes/register.svelte | 5 +++-- svelte.config.js | 3 +++ 48 files changed, 162 insertions(+), 79 deletions(-) diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte index a4f7cc177..6d45b72e6 100644 --- a/src/lib/layout/header.svelte +++ b/src/lib/layout/header.svelte @@ -1,5 +1,6 @@
-
+ diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index 640b20d54..f43a6ce67 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -9,6 +9,7 @@ import { user } from '$lib/stores/user'; import { onMount } from 'svelte'; import Notifications from '$lib/layout/notifications.svelte'; + import { base } from '$app/paths'; onMount(async () => { try { @@ -17,7 +18,7 @@ } if (!$page.url.pathname.startsWith('/console')) { - await goto('/console'); + await goto(`${base}/console`); } } catch (error) { console.error(error); diff --git a/src/routes/console/@me.svelte b/src/routes/console/@me.svelte index e81a25fc5..bd5c57146 100644 --- a/src/routes/console/@me.svelte +++ b/src/routes/console/@me.svelte @@ -1,5 +1,6 @@
    diff --git a/src/routes/console/[project]/database/collection/[collection]/document/@create.svelte b/src/routes/console/[project]/database/collection/[collection]/document/@create.svelte index ae780592e..40764c754 100644 --- a/src/routes/console/[project]/database/collection/[collection]/document/@create.svelte +++ b/src/routes/console/[project]/database/collection/[collection]/document/@create.svelte @@ -11,6 +11,7 @@ import { goto } from '$app/navigation'; import InputCustomId from '$lib/elements/forms/inputCustomId.svelte'; import { Container, Cover } from '$lib/layout'; + import { base } from '$app/paths'; $: projectId = $page.params.project; @@ -40,7 +41,7 @@ type: 'success' }); await goto( - `/console/${projectId}/database/collection/${created.$collection}/document/${created.$id}` + `${base}/console/${projectId}/database/collection/${created.$collection}/document/${created.$id}` ); } catch (error) { addNotification({ @@ -56,7 +57,7 @@ {#if $doc && $collection} - + Collection - {$collection.name}

    Create Document

    diff --git a/src/routes/console/[project]/database/collection/[collection]/document/[document]/__layout.svelte b/src/routes/console/[project]/database/collection/[collection]/document/[document]/__layout.svelte index 3e014bdbb..593c6e9fa 100644 --- a/src/routes/console/[project]/database/collection/[collection]/document/[document]/__layout.svelte +++ b/src/routes/console/[project]/database/collection/[collection]/document/[document]/__layout.svelte @@ -1,5 +1,6 @@
      diff --git a/src/routes/console/[project]/database/collection/[collection]/index.svelte b/src/routes/console/[project]/database/collection/[collection]/index.svelte index c6c9fafbf..da84f1887 100644 --- a/src/routes/console/[project]/database/collection/[collection]/index.svelte +++ b/src/routes/console/[project]/database/collection/[collection]/index.svelte @@ -13,6 +13,7 @@ import { collection } from './store'; import { Container } from '$lib/layout'; import { Button } from '$lib/elements/forms'; + import { base } from '$app/paths'; let offset = 0; @@ -46,7 +47,7 @@ {#each columns as column} {document[column.key] ?? 'n/a'} @@ -64,8 +65,10 @@ Add your first document to get started. {/if} - + Create Document + {/await} diff --git a/src/routes/console/[project]/database/index.svelte b/src/routes/console/[project]/database/index.svelte index 9e864eec5..2aff0e443 100644 --- a/src/routes/console/[project]/database/index.svelte +++ b/src/routes/console/[project]/database/index.svelte @@ -7,6 +7,7 @@ import { goto } from '$app/navigation'; import type { Models } from 'src/sdk'; import { Container } from '$lib/layout'; + import { base } from '$app/paths'; let search = ''; let showCreate = false; @@ -15,7 +16,7 @@ const limit = 25; const project = $page.params.project; const collectionCreated = async (event: CustomEvent) => { - await goto(`/console/${project}/database/collection/${event.detail.$id}`); + await goto(`${base}/console/${project}/database/collection/${event.detail.$id}`); }; $: request = sdkForProject.database.listCollections(search, limit, offset); @@ -35,7 +36,7 @@ {#each response.collections as collection} {/each} diff --git a/src/routes/console/[project]/functions/__layout.svelte b/src/routes/console/[project]/functions/__layout.svelte index c88b9d7d4..e362515c3 100644 --- a/src/routes/console/[project]/functions/__layout.svelte +++ b/src/routes/console/[project]/functions/__layout.svelte @@ -1,4 +1,6 @@
        diff --git a/src/routes/console/[project]/functions/function/[function]/index.svelte b/src/routes/console/[project]/functions/function/[function]/index.svelte index be255b786..5190996e8 100644 --- a/src/routes/console/[project]/functions/function/[function]/index.svelte +++ b/src/routes/console/[project]/functions/function/[function]/index.svelte @@ -15,6 +15,7 @@ import { func } from './store'; import { Container } from '$lib/layout'; import Create from './_create.svelte'; + import { base } from '$app/paths'; let search = ''; let showCreate = false; @@ -57,7 +58,7 @@ {deployment.$id} diff --git a/src/routes/console/[project]/functions/index.svelte b/src/routes/console/[project]/functions/index.svelte index 2d4253983..44e97c191 100644 --- a/src/routes/console/[project]/functions/index.svelte +++ b/src/routes/console/[project]/functions/index.svelte @@ -5,6 +5,7 @@ import { Card, Empty, Pagination, Tile, Tiles } from '$lib/components'; import Create from './_create.svelte'; import { Container } from '$lib/layout'; + import { base } from '$app/paths'; let search = ''; let showCreate = false; @@ -29,7 +30,10 @@ {#if response.total} {#each response.functions as func} - + {/each} diff --git a/src/routes/console/[project]/index.svelte b/src/routes/console/[project]/index.svelte index 1aabf3d68..cdb4a3b88 100644 --- a/src/routes/console/[project]/index.svelte +++ b/src/routes/console/[project]/index.svelte @@ -8,6 +8,7 @@ import { Line } from '$lib/charts'; import { page } from '$app/stores'; import { toLocaleDate } from '$lib/helpers/date'; + import { base } from '$app/paths'; let addPlatform = false; let range: '24h' | '30d' | '90d' = '30d'; @@ -24,19 +25,19 @@ {$project.name}
        • - +
        • - +
        • - + diff --git a/src/routes/console/[project]/keys/__layout.svelte b/src/routes/console/[project]/keys/__layout.svelte index 1a6a90e9f..40f241b04 100644 --- a/src/routes/console/[project]/keys/__layout.svelte +++ b/src/routes/console/[project]/keys/__layout.svelte @@ -1,4 +1,6 @@ diff --git a/src/routes/console/[project]/settings/__layout.svelte b/src/routes/console/[project]/settings/__layout.svelte index 2a1b81658..ea26026c8 100644 --- a/src/routes/console/[project]/settings/__layout.svelte +++ b/src/routes/console/[project]/settings/__layout.svelte @@ -1,4 +1,6 @@
            diff --git a/src/routes/console/[project]/storage/__layout.svelte b/src/routes/console/[project]/storage/__layout.svelte index 7c4b8a9b0..6dc82d10b 100644 --- a/src/routes/console/[project]/storage/__layout.svelte +++ b/src/routes/console/[project]/storage/__layout.svelte @@ -1,4 +1,6 @@
              diff --git a/src/routes/console/[project]/storage/index.svelte b/src/routes/console/[project]/storage/index.svelte index 0591680aa..82d1c4055 100644 --- a/src/routes/console/[project]/storage/index.svelte +++ b/src/routes/console/[project]/storage/index.svelte @@ -7,6 +7,7 @@ import type { Models } from 'src/sdk'; import Create from './_create.svelte'; import { Container } from '$lib/layout'; + import { base } from '$app/paths'; let search = ''; let showCreate = false; @@ -16,7 +17,7 @@ const project = $page.params.project; const bucketCreated = async (event: CustomEvent) => { showCreate = false; - await goto(`/console/${project}/storage/bucket/${event.detail.$id}`); + await goto(`${base}/console/${project}/storage/bucket/${event.detail.$id}`); }; $: request = sdkForProject.storage.listBuckets(search, limit, offset); @@ -35,7 +36,10 @@ {#if response.total} {#each response.buckets as bucket} - + {/each} diff --git a/src/routes/console/[project]/users/__layout.svelte b/src/routes/console/[project]/users/__layout.svelte index c9761af4a..85c4ae711 100644 --- a/src/routes/console/[project]/users/__layout.svelte +++ b/src/routes/console/[project]/users/__layout.svelte @@ -1,4 +1,6 @@
                diff --git a/src/routes/console/[project]/users/teams/[team]/index.svelte b/src/routes/console/[project]/users/teams/[team]/index.svelte index dfa16cdb3..a7a0010cf 100644 --- a/src/routes/console/[project]/users/teams/[team]/index.svelte +++ b/src/routes/console/[project]/users/teams/[team]/index.svelte @@ -1,5 +1,6 @@
                  diff --git a/src/routes/console/[project]/users/user/[user]/index.svelte b/src/routes/console/[project]/users/user/[user]/index.svelte index ce01a3498..7f6164314 100644 --- a/src/routes/console/[project]/users/user/[user]/index.svelte +++ b/src/routes/console/[project]/users/user/[user]/index.svelte @@ -1,5 +1,6 @@ @@ -49,7 +50,7 @@

                  {organization.name}

                  {#each organization.projects as project} - + {/each} diff --git a/src/routes/index.svelte b/src/routes/index.svelte index e26fcf953..5b73cb6b6 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -1,6 +1,8 @@ diff --git a/src/routes/login.svelte b/src/routes/login.svelte index 42393c537..75078ea56 100644 --- a/src/routes/login.svelte +++ b/src/routes/login.svelte @@ -1,5 +1,6 @@