diff --git a/src/lib/charts/echarts.svelte b/src/lib/charts/echarts.svelte index deeec5c7b..87486c07d 100644 --- a/src/lib/charts/echarts.svelte +++ b/src/lib/charts/echarts.svelte @@ -112,7 +112,6 @@ } }; const handleResize = () => { - console.log('test'); if (timeoutId == undefined) { timeoutId = setTimeout(() => { if (myChart && !myChart.isDisposed()) { diff --git a/src/routes/console/[project]/databases/__layout.svelte b/src/routes/console/[project]/databases/__layout.svelte index c37fd922b..a37df5709 100644 --- a/src/routes/console/[project]/databases/__layout.svelte +++ b/src/routes/console/[project]/databases/__layout.svelte @@ -1,14 +1,21 @@ diff --git a/src/routes/console/[project]/databases/database/[database]/__layout.svelte b/src/routes/console/[project]/databases/database/[database]/__layout.svelte index 1b7682cf4..a705c2474 100644 --- a/src/routes/console/[project]/databases/database/[database]/__layout.svelte +++ b/src/routes/console/[project]/databases/database/[database]/__layout.svelte @@ -1,41 +1,45 @@ @@ -43,4 +47,6 @@ Appwrite - Database - +{#if $database} + +{/if} diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/__layout.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/__layout.svelte index 4b7a58e9c..0ef91aa44 100644 --- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/__layout.svelte +++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/__layout.svelte @@ -1,8 +1,9 @@ diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/__layout.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/__layout.svelte index c68b90515..c58a7f33b 100644 --- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/__layout.svelte +++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/__layout.svelte @@ -1,42 +1,44 @@ diff --git a/src/routes/console/[project]/functions/__layout.svelte b/src/routes/console/[project]/functions/__layout.svelte index 1629e0607..d8f745cbd 100644 --- a/src/routes/console/[project]/functions/__layout.svelte +++ b/src/routes/console/[project]/functions/__layout.svelte @@ -1,14 +1,22 @@ diff --git a/src/routes/console/[project]/functions/function/[function]/__layout.svelte b/src/routes/console/[project]/functions/function/[function]/__layout.svelte index fd329efa3..0783dc947 100644 --- a/src/routes/console/[project]/functions/function/[function]/__layout.svelte +++ b/src/routes/console/[project]/functions/function/[function]/__layout.svelte @@ -1,48 +1,51 @@ {#if $func} diff --git a/src/routes/console/[project]/keys/__layout.svelte b/src/routes/console/[project]/keys/__layout.svelte index 2475bb602..5a9b9d233 100644 --- a/src/routes/console/[project]/keys/__layout.svelte +++ b/src/routes/console/[project]/keys/__layout.svelte @@ -1,14 +1,22 @@ diff --git a/src/routes/console/[project]/settings/__layout.svelte b/src/routes/console/[project]/settings/__layout.svelte index 10a835043..63dae541c 100644 --- a/src/routes/console/[project]/settings/__layout.svelte +++ b/src/routes/console/[project]/settings/__layout.svelte @@ -1,32 +1,41 @@ diff --git a/src/routes/console/[project]/storage/__layout.svelte b/src/routes/console/[project]/storage/__layout.svelte index 679549794..38b1b9942 100644 --- a/src/routes/console/[project]/storage/__layout.svelte +++ b/src/routes/console/[project]/storage/__layout.svelte @@ -1,24 +1,33 @@ diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/__layout.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/__layout.svelte index 1e206cf67..5b75513fd 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/__layout.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/__layout.svelte @@ -1,44 +1,45 @@ diff --git a/src/routes/console/[project]/users/__layout.svelte b/src/routes/console/[project]/users/__layout.svelte index c99a08d64..b8a2c562d 100644 --- a/src/routes/console/[project]/users/__layout.svelte +++ b/src/routes/console/[project]/users/__layout.svelte @@ -1,36 +1,44 @@ diff --git a/src/routes/console/[project]/users/_mainOAuth.svelte b/src/routes/console/[project]/users/_mainOAuth.svelte index 3ab1daee0..5e0f2e8bc 100644 --- a/src/routes/console/[project]/users/_mainOAuth.svelte +++ b/src/routes/console/[project]/users/_mainOAuth.svelte @@ -18,13 +18,12 @@ const projectId = $page.params.project; const update = async () => { try { - const oauth = await sdkForConsole.projects.updateOAuth2( + await sdkForConsole.projects.updateOAuth2( projectId, provider.name.toLowerCase(), provider.id, provider.secret ); - console.log(oauth); showModal = false; } catch (error) { addNotification({ diff --git a/src/routes/console/[project]/users/teams/[team]/__layout.svelte b/src/routes/console/[project]/users/teams/[team]/__layout.svelte index d490c2bbc..b8bdf5c46 100644 --- a/src/routes/console/[project]/users/teams/[team]/__layout.svelte +++ b/src/routes/console/[project]/users/teams/[team]/__layout.svelte @@ -4,43 +4,45 @@ import { base } from '$app/paths'; import { tabs, title, backButton, copyData } from '$lib/stores/layout'; import { team } from './store'; + import { afterNavigate } from '$app/navigation'; + import { onMount } from 'svelte'; const teamId = $page.params.team; const path = `users/teams/${teamId}`; - $: { - if (browser) { - team.load(teamId); - } - } + onMount(handle); + afterNavigate(handle); - $: { - if ($team.response) { + async function handle() { + if ($team?.response?.$id !== teamId) { + await team.load(teamId); + title.set($team.response.name); + } else if ($team.response) { title.set($team.response.name); } + + backButton.set(`${base}/console/${$page.params.project}/users/teams`); + + copyData.set({ + text: 'Team ID', + value: teamId + }); + + tabs.set([ + { + href: path, + title: 'Overview' + }, + { + href: `${path}/members`, + title: 'Members' + }, + { + href: `${path}/activity`, + title: 'Activity' + } + ]); } - - backButton.set(`${base}/console/${$page.params.project}/users/teams`); - - copyData.set({ - text: 'Team ID', - value: teamId - }); - - tabs.set([ - { - href: path, - title: 'Overview' - }, - { - href: `${path}/members`, - title: 'Members' - }, - { - href: `${path}/activity`, - title: 'Activity' - } - ]); diff --git a/src/routes/console/[project]/users/user/[user]/__layout.svelte b/src/routes/console/[project]/users/user/[user]/__layout.svelte index bdd8331c7..55a19c81c 100644 --- a/src/routes/console/[project]/users/user/[user]/__layout.svelte +++ b/src/routes/console/[project]/users/user/[user]/__layout.svelte @@ -1,50 +1,51 @@ diff --git a/src/routes/console/[project]/users/user/[user]/sessions.svelte b/src/routes/console/[project]/users/user/[user]/sessions.svelte index bfa785ac8..f84368b86 100644 --- a/src/routes/console/[project]/users/user/[user]/sessions.svelte +++ b/src/routes/console/[project]/users/user/[user]/sessions.svelte @@ -22,7 +22,6 @@ let selectedSessionId: string = null; const limit = 5; - console.log('asd'); const request = sdkForProject.users.getSessions($page.params.user); //TODO: replace session.expire with "last activity" diff --git a/svelte.config.js b/svelte.config.js index aa89a993d..5daa15d15 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -11,8 +11,16 @@ const config = { paths: { base: '' }, + vite: { + optimizeDeps: { + include: ['echarts'] + }, + ssr: { + noExternal: ['echarts'] + } + }, prerender: { - default: true + default: false } } };