From 9424b8c080c5c33df57b9108139ff0048fb5112f Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 8 Nov 2022 09:53:39 +0100 Subject: [PATCH 1/2] refactor: change authentication to auth route --- README.md | 2 +- src/lib/layout/navigation.svelte | 38 +++++++++---------- src/lib/stores/oauth-providers.ts | 12 +++--- .../account/sessions/[[page]]/+page.svelte | 2 +- .../{authentication => auth}/+layout.svelte | 0 .../{authentication => auth}/+layout.ts | 0 .../[[page]]/+page.svelte | 10 ++--- .../[[page]]/+page.ts | 0 .../_appleOAuth.svelte | 0 .../_auth0OAuth.svelte | 0 .../_createTeam.svelte | 0 .../_createUser.svelte | 0 .../_mainOAuth.svelte | 0 .../_microsoftOAuth.svelte | 0 .../_oktaOAuth.svelte | 0 .../breadcrumbs.svelte | 2 +- .../{authentication => auth}/header.svelte | 2 +- .../security/+page.svelte | 0 .../settings/+page.svelte | 0 .../teams/[[page]]/+page.svelte | 12 ++---- .../teams/[[page]]/+page.ts | 0 .../teams/team-[team]/+layout.svelte | 0 .../teams/team-[team]/+layout.ts | 0 .../teams/team-[team]/+page.svelte | 0 .../activity/[[page]]/+page.svelte | 2 +- .../team-[team]/activity/[[page]]/+page.ts | 0 .../teams/team-[team]/breadcrumbs.svelte | 4 +- .../teams/team-[team]/createMembership.svelte | 2 +- .../teams/team-[team]/deleteMembership.svelte | 2 +- .../teams/team-[team]/deleteTeam.svelte | 2 +- .../teams/team-[team]/header.svelte | 4 +- .../team-[team]/members/[[page]]/+page.svelte | 10 ++--- .../team-[team]/members/[[page]]/+page.ts | 0 .../teams/team-[team]/store.ts | 0 .../usage/[[period]]/+page.svelte | 2 +- .../usage/[[period]]/+page.ts | 0 .../user-[user]/+layout.svelte | 0 .../user-[user]/+layout.ts | 0 .../user-[user]/+page.svelte | 0 .../activity/[[page]]/+page.svelte | 2 +- .../user-[user]/activity/[[page]]/+page.ts | 0 .../user-[user]/breadcrumbs.svelte | 4 +- .../user-[user]/deleteAllMemberships.svelte | 2 +- .../user-[user]/deleteAllSessions.svelte | 0 .../user-[user]/deleteMembership.svelte | 2 +- .../user-[user]/deleteSession.svelte | 0 .../user-[user]/deleteUser.svelte | 2 +- .../user-[user]/header.svelte | 4 +- .../memberships/[[page]]/+page.svelte | 4 +- .../user-[user]/memberships/[[page]]/+page.ts | 0 .../sessions/[[page]]/+page.svelte | 2 +- .../user-[user]/sessions/[[page]]/+page.ts | 0 .../user-[user]/store.ts | 0 .../document-[document]/document.svelte | 2 +- .../function-[function]/[[page]]/+page.svelte | 29 +++++++------- .../project-[project]/overview/+layout.svelte | 2 +- 56 files changed, 78 insertions(+), 85 deletions(-) rename src/routes/console/project-[project]/{authentication => auth}/+layout.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/+layout.ts (100%) rename src/routes/console/project-[project]/{authentication => auth}/[[page]]/+page.svelte (95%) rename src/routes/console/project-[project]/{authentication => auth}/[[page]]/+page.ts (100%) rename src/routes/console/project-[project]/{authentication => auth}/_appleOAuth.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/_auth0OAuth.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/_createTeam.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/_createUser.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/_mainOAuth.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/_microsoftOAuth.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/_oktaOAuth.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/breadcrumbs.svelte (88%) rename src/routes/console/project-[project]/{authentication => auth}/header.svelte (94%) rename src/routes/console/project-[project]/{authentication => auth}/security/+page.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/settings/+page.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/teams/[[page]]/+page.svelte (93%) rename src/routes/console/project-[project]/{authentication => auth}/teams/[[page]]/+page.ts (100%) rename src/routes/console/project-[project]/{authentication => auth}/teams/team-[team]/+layout.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/teams/team-[team]/+layout.ts (100%) rename src/routes/console/project-[project]/{authentication => auth}/teams/team-[team]/+page.svelte (100%) rename src/routes/console/project-[project]/{authentication/user-[user] => auth/teams/team-[team]}/activity/[[page]]/+page.svelte (69%) rename src/routes/console/project-[project]/{authentication => auth}/teams/team-[team]/activity/[[page]]/+page.ts (100%) rename src/routes/console/project-[project]/{authentication => auth}/teams/team-[team]/breadcrumbs.svelte (79%) rename src/routes/console/project-[project]/{authentication => auth}/teams/team-[team]/createMembership.svelte (96%) rename src/routes/console/project-[project]/{authentication => auth}/teams/team-[team]/deleteMembership.svelte (96%) rename src/routes/console/project-[project]/{authentication => auth}/teams/team-[team]/deleteTeam.svelte (97%) rename src/routes/console/project-[project]/{authentication => auth}/teams/team-[team]/header.svelte (88%) rename src/routes/console/project-[project]/{authentication => auth}/teams/team-[team]/members/[[page]]/+page.svelte (94%) rename src/routes/console/project-[project]/{authentication => auth}/teams/team-[team]/members/[[page]]/+page.ts (100%) rename src/routes/console/project-[project]/{authentication => auth}/teams/team-[team]/store.ts (100%) rename src/routes/console/project-[project]/{authentication => auth}/usage/[[period]]/+page.svelte (91%) rename src/routes/console/project-[project]/{authentication => auth}/usage/[[period]]/+page.ts (100%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/+layout.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/+layout.ts (100%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/+page.svelte (100%) rename src/routes/console/project-[project]/{authentication/teams/team-[team] => auth/user-[user]}/activity/[[page]]/+page.svelte (68%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/activity/[[page]]/+page.ts (100%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/breadcrumbs.svelte (79%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/deleteAllMemberships.svelte (97%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/deleteAllSessions.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/deleteMembership.svelte (96%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/deleteSession.svelte (100%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/deleteUser.svelte (98%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/header.svelte (89%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/memberships/[[page]]/+page.svelte (95%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/memberships/[[page]]/+page.ts (100%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/sessions/[[page]]/+page.svelte (97%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/sessions/[[page]]/+page.ts (100%) rename src/routes/console/project-[project]/{authentication => auth}/user-[user]/store.ts (100%) diff --git a/README.md b/README.md index 76f82ba16..16063cf7e 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,7 @@ Adding a new dependency should have vital value on the product with minimum poss │ │ │ │ ├── _create.svelte // Component to Create collections │ │ │ │ └── index.svelte // Entrypoint for "/console/[PROJECT_ID]/database" │ │ │ ├── storage // Storage Service "/console/[PROJECT]/storage" -│ │ │ └── authentication // Users Service "/console/[PROJECT]/authentication" +│ │ │ └── auth // Users Service "/console/[PROJECT]/auth" │ │ └──... │ ├── login.svelte // Component for Login "/console/login" │ └── register.svelte // Component for Register "/console/register" diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index be56f170f..ccb13b282 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -31,6 +31,15 @@ Overview +
  • + + +
  • Databases
  • -
  • - - -
  • -
  • - - -
  • Functions
  • +
  • + + +
  • diff --git a/src/lib/stores/oauth-providers.ts b/src/lib/stores/oauth-providers.ts index 64b254b00..997641024 100644 --- a/src/lib/stores/oauth-providers.ts +++ b/src/lib/stores/oauth-providers.ts @@ -1,11 +1,11 @@ import { writable } from 'svelte/store'; import type { Models } from '@aw-labs/appwrite-console'; import type { SvelteComponent } from 'svelte'; -import Apple from '../../routes/console/project-[project]/authentication/_appleOAuth.svelte'; -import Microsoft from '../../routes/console/project-[project]/authentication/_microsoftOAuth.svelte'; -import Okta from '../../routes/console/project-[project]/authentication/_oktaOAuth.svelte'; -import Auth0 from '../../routes/console/project-[project]/authentication/_auth0OAuth.svelte'; -import Main from '../../routes/console/project-[project]/authentication/_mainOAuth.svelte'; +import Apple from '../../routes/console/project-[project]/auth/_appleOAuth.svelte'; +import Microsoft from '../../routes/console/project-[project]/auth/_microsoftOAuth.svelte'; +import Okta from '../../routes/console/project-[project]/auth/_oktaOAuth.svelte'; +import Auth0 from '../../routes/console/project-[project]/auth/_auth0OAuth.svelte'; +import Main from '../../routes/console/project-[project]/auth/_mainOAuth.svelte'; export type Provider = Models.Provider & { icon: string; @@ -105,7 +105,7 @@ const setProviders = (project: Models.Project): Provider[] => { docs = 'https://developers.tradeshift.com/docs/api'; break; case 'twitch': - docs = 'https://dev.twitch.tv/docs/authentication'; + docs = 'https://dev.twitch.tv/docs/auth'; break; case 'wordpress': docs = 'https://developer.wordpress.com/docs/oauth2/'; diff --git a/src/routes/console/account/sessions/[[page]]/+page.svelte b/src/routes/console/account/sessions/[[page]]/+page.svelte index 032cf2f61..9d52e08d4 100644 --- a/src/routes/console/account/sessions/[[page]]/+page.svelte +++ b/src/routes/console/account/sessions/[[page]]/+page.svelte @@ -108,7 +108,7 @@ diff --git a/src/routes/console/project-[project]/authentication/+layout.svelte b/src/routes/console/project-[project]/auth/+layout.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/+layout.svelte rename to src/routes/console/project-[project]/auth/+layout.svelte diff --git a/src/routes/console/project-[project]/authentication/+layout.ts b/src/routes/console/project-[project]/auth/+layout.ts similarity index 100% rename from src/routes/console/project-[project]/authentication/+layout.ts rename to src/routes/console/project-[project]/auth/+layout.ts diff --git a/src/routes/console/project-[project]/authentication/[[page]]/+page.svelte b/src/routes/console/project-[project]/auth/[[page]]/+page.svelte similarity index 95% rename from src/routes/console/project-[project]/authentication/[[page]]/+page.svelte rename to src/routes/console/project-[project]/auth/[[page]]/+page.svelte index fcf8df955..19d9715ff 100644 --- a/src/routes/console/project-[project]/authentication/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/auth/[[page]]/+page.svelte @@ -34,7 +34,7 @@ let showCreate = false; const projectId = $page.params.project; const userCreated = async (event: CustomEvent>>) => { - await goto(`${base}/console/project-${projectId}/authentication/user-${event.detail.$id}`); + await goto(`${base}/console/project-${projectId}/auth/user-${event.detail.$id}`); }; @@ -65,7 +65,7 @@ {#each data.users.users as user} + href={`${base}/console/project-${projectId}/auth/user-${user.$id}`}>
    {#if user.email || user.phone} @@ -126,7 +126,7 @@ offset={data.offset} limit={PAGE_LIMIT} sum={data.users.total} - path={`/console/project-${projectId}/authentication`} /> + path={`/console/project-${projectId}/auth`} />
    {:else if data.search} @@ -134,9 +134,7 @@ Sorry, we couldn't find '{data.search}'

    There are no users that match your search.

    - +
    {:else} (showCreate = true)}> diff --git a/src/routes/console/project-[project]/authentication/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/[[page]]/+page.ts similarity index 100% rename from src/routes/console/project-[project]/authentication/[[page]]/+page.ts rename to src/routes/console/project-[project]/auth/[[page]]/+page.ts diff --git a/src/routes/console/project-[project]/authentication/_appleOAuth.svelte b/src/routes/console/project-[project]/auth/_appleOAuth.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/_appleOAuth.svelte rename to src/routes/console/project-[project]/auth/_appleOAuth.svelte diff --git a/src/routes/console/project-[project]/authentication/_auth0OAuth.svelte b/src/routes/console/project-[project]/auth/_auth0OAuth.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/_auth0OAuth.svelte rename to src/routes/console/project-[project]/auth/_auth0OAuth.svelte diff --git a/src/routes/console/project-[project]/authentication/_createTeam.svelte b/src/routes/console/project-[project]/auth/_createTeam.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/_createTeam.svelte rename to src/routes/console/project-[project]/auth/_createTeam.svelte diff --git a/src/routes/console/project-[project]/authentication/_createUser.svelte b/src/routes/console/project-[project]/auth/_createUser.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/_createUser.svelte rename to src/routes/console/project-[project]/auth/_createUser.svelte diff --git a/src/routes/console/project-[project]/authentication/_mainOAuth.svelte b/src/routes/console/project-[project]/auth/_mainOAuth.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/_mainOAuth.svelte rename to src/routes/console/project-[project]/auth/_mainOAuth.svelte diff --git a/src/routes/console/project-[project]/authentication/_microsoftOAuth.svelte b/src/routes/console/project-[project]/auth/_microsoftOAuth.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/_microsoftOAuth.svelte rename to src/routes/console/project-[project]/auth/_microsoftOAuth.svelte diff --git a/src/routes/console/project-[project]/authentication/_oktaOAuth.svelte b/src/routes/console/project-[project]/auth/_oktaOAuth.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/_oktaOAuth.svelte rename to src/routes/console/project-[project]/auth/_oktaOAuth.svelte diff --git a/src/routes/console/project-[project]/authentication/breadcrumbs.svelte b/src/routes/console/project-[project]/auth/breadcrumbs.svelte similarity index 88% rename from src/routes/console/project-[project]/authentication/breadcrumbs.svelte rename to src/routes/console/project-[project]/auth/breadcrumbs.svelte index 5163709a8..655b7b565 100644 --- a/src/routes/console/project-[project]/authentication/breadcrumbs.svelte +++ b/src/routes/console/project-[project]/auth/breadcrumbs.svelte @@ -13,7 +13,7 @@ title: $project?.name }, { - href: `/console/project-${$project?.$id}/authentication`, + href: `/console/project-${$project?.$id}/auth`, title: 'Authentication' } ]; diff --git a/src/routes/console/project-[project]/authentication/header.svelte b/src/routes/console/project-[project]/auth/header.svelte similarity index 94% rename from src/routes/console/project-[project]/authentication/header.svelte rename to src/routes/console/project-[project]/auth/header.svelte index 5b2b0d868..03664881c 100644 --- a/src/routes/console/project-[project]/authentication/header.svelte +++ b/src/routes/console/project-[project]/auth/header.svelte @@ -5,7 +5,7 @@ import { Cover, CoverTitle } from '$lib/layout'; const projectId = $page.params.project; - const path = `/console/project-${projectId}/authentication`; + const path = `/console/project-${projectId}/auth`; const tabs = [ { href: path, diff --git a/src/routes/console/project-[project]/authentication/security/+page.svelte b/src/routes/console/project-[project]/auth/security/+page.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/security/+page.svelte rename to src/routes/console/project-[project]/auth/security/+page.svelte diff --git a/src/routes/console/project-[project]/authentication/settings/+page.svelte b/src/routes/console/project-[project]/auth/settings/+page.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/settings/+page.svelte rename to src/routes/console/project-[project]/auth/settings/+page.svelte diff --git a/src/routes/console/project-[project]/authentication/teams/[[page]]/+page.svelte b/src/routes/console/project-[project]/auth/teams/[[page]]/+page.svelte similarity index 93% rename from src/routes/console/project-[project]/authentication/teams/[[page]]/+page.svelte rename to src/routes/console/project-[project]/auth/teams/[[page]]/+page.svelte index 051408f2f..a7ad34c1f 100644 --- a/src/routes/console/project-[project]/authentication/teams/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/[[page]]/+page.svelte @@ -27,9 +27,7 @@ const project = $page.params.project; const teamCreated = async (event: CustomEvent) => { - await goto( - `${base}/console/project-${project}/authentication/teams/team-${event.detail.$id}` - ); + await goto(`${base}/console/project-${project}/auth/teams/team-${event.detail.$id}`); }; @@ -58,7 +56,7 @@ {#each data.teams.teams as team} + href={`${base}/console/project-${project}/auth/teams/team-${team.$id}`}>
    @@ -77,7 +75,7 @@

    Total results: {data.teams.total}

    @@ -87,9 +85,7 @@ Sorry, we couldn’t find ‘{data.search}’

    There are no teams that match your search.

    - diff --git a/src/routes/console/project-[project]/authentication/teams/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts similarity index 100% rename from src/routes/console/project-[project]/authentication/teams/[[page]]/+page.ts rename to src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/+layout.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/+layout.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/teams/team-[team]/+layout.svelte rename to src/routes/console/project-[project]/auth/teams/team-[team]/+layout.svelte diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/+layout.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/+layout.ts similarity index 100% rename from src/routes/console/project-[project]/authentication/teams/team-[team]/+layout.ts rename to src/routes/console/project-[project]/auth/teams/team-[team]/+layout.ts diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/teams/team-[team]/+page.svelte rename to src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte diff --git a/src/routes/console/project-[project]/authentication/user-[user]/activity/[[page]]/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.svelte similarity index 69% rename from src/routes/console/project-[project]/authentication/user-[user]/activity/[[page]]/+page.svelte rename to src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.svelte index 529766497..3647857fd 100644 --- a/src/routes/console/project-[project]/authentication/user-[user]/activity/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.svelte @@ -4,7 +4,7 @@ import { Activity } from '$lib/layout'; export let data: PageData; - const path = `/console/project-${$page.params.project}/authentication/user-${$page.params.user}/activity`; + const path = `/console/project-${$page.params.project}/auth/teams/team-${$page.params.team}/activity`; diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/activity/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.ts similarity index 100% rename from src/routes/console/project-[project]/authentication/teams/team-[team]/activity/[[page]]/+page.ts rename to src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.ts diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/breadcrumbs.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte similarity index 79% rename from src/routes/console/project-[project]/authentication/teams/team-[team]/breadcrumbs.svelte rename to src/routes/console/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte index aded4517b..18789e08b 100644 --- a/src/routes/console/project-[project]/authentication/teams/team-[team]/breadcrumbs.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte @@ -14,11 +14,11 @@ title: $project?.name }, { - href: `/console/project-${$project?.$id}/authentication`, + href: `/console/project-${$project?.$id}/auth`, title: 'Authentication' }, { - href: `/console/project-${$project?.$id}/authentication/teams-${$team?.$id}`, + href: `/console/project-${$project?.$id}/auth/teams-${$team?.$id}`, title: $team?.name } ]; diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/createMembership.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte similarity index 96% rename from src/routes/console/project-[project]/authentication/teams/team-[team]/createMembership.svelte rename to src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte index 155c41180..ef46c7d5f 100644 --- a/src/routes/console/project-[project]/authentication/teams/team-[team]/createMembership.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte @@ -15,7 +15,7 @@ let error: string; const create = async () => { - const url = `${$page.url.origin}/console/project-${$page.params.project}/authentication/teams-${$page.params.team}/members`; + const url = `${$page.url.origin}/console/project-${$page.params.project}/auth/teams-${$page.params.team}/members`; try { const user = await sdkForProject.teams.createMembership( diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/deleteMembership.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte similarity index 96% rename from src/routes/console/project-[project]/authentication/teams/team-[team]/deleteMembership.svelte rename to src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte index 30c91e5fc..039c4f3a3 100644 --- a/src/routes/console/project-[project]/authentication/teams/team-[team]/deleteMembership.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte @@ -23,7 +23,7 @@ showDelete = false; dispatch('deleted'); await goto( - `${base}/console/project-${$page.params.project}/authentication/teams/team-${selectedMembership.teamId}/members` + `${base}/console/project-${$page.params.project}/auth/teams/team-${selectedMembership.teamId}/members` ); } catch (error) { addNotification({ diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/deleteTeam.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte similarity index 97% rename from src/routes/console/project-[project]/authentication/teams/team-[team]/deleteTeam.svelte rename to src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte index 5447d9162..2a79abc62 100644 --- a/src/routes/console/project-[project]/authentication/teams/team-[team]/deleteTeam.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte @@ -15,7 +15,7 @@ try { await sdkForProject.teams.delete(team.$id); showDelete = false; - await goto(`${base}/console/project-${$page.params.project}/authentication/teams`); + await goto(`${base}/console/project-${$page.params.project}/auth/teams`); } catch (error) { addNotification({ type: 'error', diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/header.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/header.svelte similarity index 88% rename from src/routes/console/project-[project]/authentication/teams/team-[team]/header.svelte rename to src/routes/console/project-[project]/auth/teams/team-[team]/header.svelte index b908cb5f7..536b9880d 100644 --- a/src/routes/console/project-[project]/authentication/teams/team-[team]/header.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/header.svelte @@ -8,7 +8,7 @@ const projectId = $page.params.project; const teamId = $page.params.team; - const path = `/console/project-${projectId}/authentication/teams/team-${teamId}`; + const path = `/console/project-${projectId}/auth/teams/team-${teamId}`; const tabs = [ { href: path, @@ -29,7 +29,7 @@ - + {$team?.name} diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/members/[[page]]/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.svelte similarity index 94% rename from src/routes/console/project-[project]/authentication/teams/team-[team]/members/[[page]]/+page.svelte rename to src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.svelte index d72dff9ba..adb982e96 100644 --- a/src/routes/console/project-[project]/authentication/teams/team-[team]/members/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.svelte @@ -29,9 +29,7 @@ const project = $page.params.project; async function memberCreated(event: CustomEvent) { - await goto( - `${base}/console/project-${project}/authentication/teams-${event.detail.teamId}/members` - ); + await goto(`${base}/console/project-${project}/auth/teams-${event.detail.teamId}/members`); } @@ -53,7 +51,7 @@ {#each data.memberships.memberships as membership} + href={`${base}/console/project-${project}/auth/user-${membership.userId}`}>
    @@ -83,7 +81,7 @@

    Total results: {data.memberships.total}

    @@ -95,7 +93,7 @@ {:else} diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/members/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts similarity index 100% rename from src/routes/console/project-[project]/authentication/teams/team-[team]/members/[[page]]/+page.ts rename to src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/store.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/store.ts similarity index 100% rename from src/routes/console/project-[project]/authentication/teams/team-[team]/store.ts rename to src/routes/console/project-[project]/auth/teams/team-[team]/store.ts diff --git a/src/routes/console/project-[project]/authentication/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte similarity index 91% rename from src/routes/console/project-[project]/authentication/usage/[[period]]/+page.svelte rename to src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte index db2b7c9f1..879419d72 100644 --- a/src/routes/console/project-[project]/authentication/usage/[[period]]/+page.svelte +++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte @@ -14,7 +14,7 @@ diff --git a/src/routes/console/project-[project]/authentication/user-[user]/activity/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/user-[user]/activity/[[page]]/+page.ts similarity index 100% rename from src/routes/console/project-[project]/authentication/user-[user]/activity/[[page]]/+page.ts rename to src/routes/console/project-[project]/auth/user-[user]/activity/[[page]]/+page.ts diff --git a/src/routes/console/project-[project]/authentication/user-[user]/breadcrumbs.svelte b/src/routes/console/project-[project]/auth/user-[user]/breadcrumbs.svelte similarity index 79% rename from src/routes/console/project-[project]/authentication/user-[user]/breadcrumbs.svelte rename to src/routes/console/project-[project]/auth/user-[user]/breadcrumbs.svelte index 3f590af6b..424e7b533 100644 --- a/src/routes/console/project-[project]/authentication/user-[user]/breadcrumbs.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/breadcrumbs.svelte @@ -14,11 +14,11 @@ title: $project?.name }, { - href: `/console/project-${$project?.$id}/authentication`, + href: `/console/project-${$project?.$id}/auth`, title: 'Authentication' }, { - href: `/console/project-${$project?.$id}/authentication/user-${$user?.$id}`, + href: `/console/project-${$project?.$id}/auth/user-${$user?.$id}`, title: $user?.name } ]; diff --git a/src/routes/console/project-[project]/authentication/user-[user]/deleteAllMemberships.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteAllMemberships.svelte similarity index 97% rename from src/routes/console/project-[project]/authentication/user-[user]/deleteAllMemberships.svelte rename to src/routes/console/project-[project]/auth/user-[user]/deleteAllMemberships.svelte index 58a522966..ff508e4ab 100644 --- a/src/routes/console/project-[project]/authentication/user-[user]/deleteAllMemberships.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteAllMemberships.svelte @@ -19,7 +19,7 @@ message: `All memberships have been deleted` }); await goto( - `${base}/console/project-${$page.params.project}/authentication/${$user.$id}/membeships` + `${base}/console/project-${$page.params.project}/auth/${$user.$id}/membeships` ); } catch (error) { addNotification({ diff --git a/src/routes/console/project-[project]/authentication/user-[user]/deleteAllSessions.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/user-[user]/deleteAllSessions.svelte rename to src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte diff --git a/src/routes/console/project-[project]/authentication/user-[user]/deleteMembership.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte similarity index 96% rename from src/routes/console/project-[project]/authentication/user-[user]/deleteMembership.svelte rename to src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte index e5d48a753..eec7bd042 100644 --- a/src/routes/console/project-[project]/authentication/user-[user]/deleteMembership.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte @@ -26,7 +26,7 @@ message: `Membership has been deleted` }); await goto( - `${base}/console/project-${$page.params.project}/authentication/user-${selectedMembership.userId}/memberships` + `${base}/console/project-${$page.params.project}/auth/user-${selectedMembership.userId}/memberships` ); } catch (error) { addNotification({ diff --git a/src/routes/console/project-[project]/authentication/user-[user]/deleteSession.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte similarity index 100% rename from src/routes/console/project-[project]/authentication/user-[user]/deleteSession.svelte rename to src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte diff --git a/src/routes/console/project-[project]/authentication/user-[user]/deleteUser.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte similarity index 98% rename from src/routes/console/project-[project]/authentication/user-[user]/deleteUser.svelte rename to src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte index 737db2113..bfec8cbed 100644 --- a/src/routes/console/project-[project]/authentication/user-[user]/deleteUser.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte @@ -19,7 +19,7 @@ type: 'success', message: `${$user.name ? $user.name : 'User'} has been deleted` }); - await goto(`${base}/console/project-${$page.params.project}/authentication`); + await goto(`${base}/console/project-${$page.params.project}/auth`); } catch (error) { addNotification({ type: 'error', diff --git a/src/routes/console/project-[project]/authentication/user-[user]/header.svelte b/src/routes/console/project-[project]/auth/user-[user]/header.svelte similarity index 89% rename from src/routes/console/project-[project]/authentication/user-[user]/header.svelte rename to src/routes/console/project-[project]/auth/user-[user]/header.svelte index a930cc71b..0c1fa6e19 100644 --- a/src/routes/console/project-[project]/authentication/user-[user]/header.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/header.svelte @@ -8,7 +8,7 @@ const projectId = $page.params.project; const userId = $page.params.user; - const path = `/console/project-${projectId}/authentication/user-${userId}`; + const path = `/console/project-${projectId}/auth/user-${userId}`; const tabs = [ { href: path, @@ -32,7 +32,7 @@ - + {$user.name ? $user.name : '-'} diff --git a/src/routes/console/project-[project]/authentication/user-[user]/memberships/[[page]]/+page.svelte b/src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.svelte similarity index 95% rename from src/routes/console/project-[project]/authentication/user-[user]/memberships/[[page]]/+page.svelte rename to src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.svelte index fdaee9d8f..81abfff91 100644 --- a/src/routes/console/project-[project]/authentication/user-[user]/memberships/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.svelte @@ -43,7 +43,7 @@ {#each data.memberships.memberships as membership} + href={`${base}/console/project-${project}/auth/teams/team-${membership.teamId}`}>
    @@ -72,7 +72,7 @@ {/if} diff --git a/src/routes/console/project-[project]/authentication/user-[user]/memberships/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.ts similarity index 100% rename from src/routes/console/project-[project]/authentication/user-[user]/memberships/[[page]]/+page.ts rename to src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.ts diff --git a/src/routes/console/project-[project]/authentication/user-[user]/sessions/[[page]]/+page.svelte b/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.svelte similarity index 97% rename from src/routes/console/project-[project]/authentication/user-[user]/sessions/[[page]]/+page.svelte rename to src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.svelte index 595e95d7b..44daf3d1d 100644 --- a/src/routes/console/project-[project]/authentication/user-[user]/sessions/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.svelte @@ -88,7 +88,7 @@ diff --git a/src/routes/console/project-[project]/authentication/user-[user]/sessions/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.ts similarity index 100% rename from src/routes/console/project-[project]/authentication/user-[user]/sessions/[[page]]/+page.ts rename to src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.ts diff --git a/src/routes/console/project-[project]/authentication/user-[user]/store.ts b/src/routes/console/project-[project]/auth/user-[user]/store.ts similarity index 100% rename from src/routes/console/project-[project]/authentication/user-[user]/store.ts rename to src/routes/console/project-[project]/auth/user-[user]/store.ts diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte index d368b6e75..b5dab3650 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte @@ -144,7 +144,7 @@ disabled={$work[attribute.key][$work[attribute.key].length - 1] === null} on:click={() => addArrayItem(attribute.key)}>
    From eff54c39a79778a3b4f5b944208bd07f5561850d Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 8 Nov 2022 11:33:53 +0100 Subject: [PATCH 2/2] fix: replace missed authentication to auth --- src/lib/constants.ts | 8 ++++---- src/routes/console/project-[project]/auth/+layout.svelte | 2 +- .../console/project-[project]/auth/breadcrumbs.svelte | 2 +- src/routes/console/project-[project]/auth/header.svelte | 2 +- .../console/project-[project]/auth/settings/+page.svelte | 2 +- .../auth/teams/team-[team]/breadcrumbs.svelte | 2 +- .../project-[project]/auth/user-[user]/breadcrumbs.svelte | 2 +- .../console/project-[project]/overview/+layout.svelte | 2 +- .../console/project-[project]/overview/keys/scopes.svelte | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index b9d21d1ed..54dafb875 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -41,22 +41,22 @@ export const scopes: { { scope: 'users.read', description: "Access to read your project's users", - category: 'Authentication' + category: 'Auth' }, { scope: 'users.write', description: "Access to create, update, and delete your project's users", - category: 'Authentication' + category: 'Auth' }, { scope: 'teams.read', description: "Access to read your project's teams", - category: 'Authentication' + category: 'Auth' }, { scope: 'teams.write', description: "Access to create, update, and delete your project's teams", - category: 'Authentication' + category: 'Auth' }, { scope: 'databases.read', diff --git a/src/routes/console/project-[project]/auth/+layout.svelte b/src/routes/console/project-[project]/auth/+layout.svelte index e7ba50d0b..f900d7734 100644 --- a/src/routes/console/project-[project]/auth/+layout.svelte +++ b/src/routes/console/project-[project]/auth/+layout.svelte @@ -1,5 +1,5 @@ - Authentication - Appwrite + Auth - Appwrite diff --git a/src/routes/console/project-[project]/auth/breadcrumbs.svelte b/src/routes/console/project-[project]/auth/breadcrumbs.svelte index 655b7b565..77e02ac04 100644 --- a/src/routes/console/project-[project]/auth/breadcrumbs.svelte +++ b/src/routes/console/project-[project]/auth/breadcrumbs.svelte @@ -14,7 +14,7 @@ }, { href: `/console/project-${$project?.$id}/auth`, - title: 'Authentication' + title: 'Auth' } ]; diff --git a/src/routes/console/project-[project]/auth/header.svelte b/src/routes/console/project-[project]/auth/header.svelte index 03664881c..99fea587b 100644 --- a/src/routes/console/project-[project]/auth/header.svelte +++ b/src/routes/console/project-[project]/auth/header.svelte @@ -34,7 +34,7 @@ - Authentication + Auth {#each tabs as tab} diff --git a/src/routes/console/project-[project]/auth/settings/+page.svelte b/src/routes/console/project-[project]/auth/settings/+page.svelte index df821ecb6..66032e6c3 100644 --- a/src/routes/console/project-[project]/auth/settings/+page.svelte +++ b/src/routes/console/project-[project]/auth/settings/+page.svelte @@ -44,7 +44,7 @@ {#if $authMethods && $OAuthProviders} - Authentication Methods + Auth Methods

    Enable the authentication methods you wish to use.

    diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte index 18789e08b..277e199c2 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte @@ -15,7 +15,7 @@ }, { href: `/console/project-${$project?.$id}/auth`, - title: 'Authentication' + title: 'Auth' }, { href: `/console/project-${$project?.$id}/auth/teams-${$team?.$id}`, diff --git a/src/routes/console/project-[project]/auth/user-[user]/breadcrumbs.svelte b/src/routes/console/project-[project]/auth/user-[user]/breadcrumbs.svelte index 424e7b533..1662d3e4f 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/breadcrumbs.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/breadcrumbs.svelte @@ -15,7 +15,7 @@ }, { href: `/console/project-${$project?.$id}/auth`, - title: 'Authentication' + title: 'Auth' }, { href: `/console/project-${$project?.$id}/auth/user-${$user?.$id}`, diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index 85f8d2d37..020c7f10b 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -218,7 +218,7 @@
    diff --git a/src/routes/console/project-[project]/overview/keys/scopes.svelte b/src/routes/console/project-[project]/overview/keys/scopes.svelte index b72e8e2cf..0d2e7a14f 100644 --- a/src/routes/console/project-[project]/overview/keys/scopes.svelte +++ b/src/routes/console/project-[project]/overview/keys/scopes.svelte @@ -8,7 +8,7 @@ export let scopes: string[]; enum Category { - Authentication = 'Authentication', + Auth = 'Auth', Database = 'Database', Functions = 'Functions', Storage = 'Storage', @@ -82,7 +82,7 @@
    - {#each [Category.Authentication, Category.Database, Category.Functions, Category.Storage, Category.Other] as category} + {#each [Category.Auth, Category.Database, Category.Functions, Category.Storage, Category.Other] as category} {@const checked = categoryState(category, scopes)}