+
diff --git a/src/lib/helpers/date.ts b/src/lib/helpers/date.ts
index 2fb0c93ba..93a71d264 100644
--- a/src/lib/helpers/date.ts
+++ b/src/lib/helpers/date.ts
@@ -1,6 +1,11 @@
export const toLocaleDate = (timestamp: number) => {
const date = new Date(timestamp * 1000);
- const options: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'long', day: 'numeric' };
+ const options: Intl.DateTimeFormatOptions = {
+ year: 'numeric',
+ month: 'long',
+ day: 'numeric',
+ hour12: false
+ };
return date.toLocaleDateString('en', options);
};
@@ -12,7 +17,8 @@ export const toLocaleDateTime = (timestamp: number) => {
month: 'long',
day: 'numeric',
hour: 'numeric',
- minute: 'numeric'
+ minute: 'numeric',
+ hour12: false
};
return date.toLocaleDateString('en', options);
diff --git a/src/lib/layout/cover.svelte b/src/lib/layout/cover.svelte
index c1968c47a..a4bd080fb 100644
--- a/src/lib/layout/cover.svelte
+++ b/src/lib/layout/cover.svelte
@@ -4,9 +4,9 @@
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index 38ffab258..fb72021cd 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -33,6 +33,9 @@
};
const onScroll = () => {
+ if (!tabsList) {
+ return;
+ }
const { offsetWidth, scrollLeft, scrollWidth } = tabsList;
showLeft = scrollLeft > 10;
showRight = scrollLeft < scrollWidth - offsetWidth - 10;
@@ -70,24 +73,22 @@
-
+
{#if $backButton}
+ {/if}
+
{$title}
- {#if $copyData?.value}
-
- {$copyData.text}
-
- {/if}
- {:else}
- {$title}
- {#if $copyData?.value}
-
- {$copyData.text}
-
- {/if}
+
+ {#if $copyData?.value}
+
+ {$copyData.text}
+
{/if}
diff --git a/src/lib/stores/app.ts b/src/lib/stores/app.ts
index 8941241d3..8dd764bad 100644
--- a/src/lib/stores/app.ts
+++ b/src/lib/stores/app.ts
@@ -3,9 +3,11 @@ import { writable } from 'svelte/store';
export type AppStore = {
theme: 'light' | 'dark' | 'auto';
+ themeInUse: 'light' | 'dark';
};
export const app = writable({
- theme: 'auto'
+ theme: 'auto',
+ themeInUse: 'light'
});
if (browser) {
diff --git a/src/lib/stores/auth-methods.ts b/src/lib/stores/auth-methods.ts
index ad7d64b23..82b7ecb6d 100644
--- a/src/lib/stores/auth-methods.ts
+++ b/src/lib/stores/auth-methods.ts
@@ -58,7 +58,7 @@ function createAuthMethods() {
value: project.authAnonymous
},
{
- label: 'Invites',
+ label: 'Team Invites',
method: 'invites',
value: project.authInvites
},
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 5df5c4a54..bae275346 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -36,11 +36,14 @@
const darkThemeMq = window.matchMedia('(prefers-color-scheme: dark)');
if (darkThemeMq.matches) {
document.body.setAttribute('class', `theme-dark`);
+ $app.themeInUse = 'dark';
} else {
document.body.setAttribute('class', `theme-light`);
+ $app.themeInUse = 'light';
}
} else {
document.body.setAttribute('class', `theme-${$app.theme}`);
+ $app.themeInUse = $app.theme;
}
}
}
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/index.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/index.svelte
index 9cb322f28..04cb02f3b 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/index.svelte
+++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/index.svelte
@@ -73,7 +73,7 @@
diff --git a/src/routes/console/[project]/users/_createTeam.svelte b/src/routes/console/[project]/users/_createTeam.svelte
index 71eeb00c3..a0b7b1d91 100644
--- a/src/routes/console/[project]/users/_createTeam.svelte
+++ b/src/routes/console/[project]/users/_createTeam.svelte
@@ -1,5 +1,5 @@
diff --git a/src/routes/console/[project]/users/store.ts b/src/routes/console/[project]/users/store.ts
index 296bdc1c8..05c493c91 100644
--- a/src/routes/console/[project]/users/store.ts
+++ b/src/routes/console/[project]/users/store.ts
@@ -3,21 +3,10 @@ import { writable } from 'svelte/store';
import type { Models } from '@aw-labs/appwrite-console';
import { browser } from '$app/env';
-export type UsersList = {
- loading: boolean;
- response?: Models.UserList
>;
-};
-
-export type TeamsList = {
- loading: boolean;
- response?: Models.TeamList;
-};
-
function createUsersListStore() {
- const { subscribe, set } = writable({
- loading: true,
- response: browser ? JSON.parse(sessionStorage.getItem('users')) : null
- });
+ const { subscribe, set } = writable>>(
+ browser ? JSON.parse(sessionStorage.getItem('users')) : null
+ );
return {
subscribe,
@@ -31,19 +20,15 @@ function createUsersListStore() {
undefined,
'DESC'
);
- set({
- loading: false,
- response
- });
+ set(response);
}
};
}
function createTeamsListStore() {
- const { subscribe, set } = writable({
- loading: true,
- response: browser ? JSON.parse(sessionStorage.getItem('teams')) : null
- });
+ const { subscribe, set } = writable(
+ browser ? JSON.parse(sessionStorage.getItem('teams')) : null
+ );
return {
subscribe,
@@ -57,28 +42,21 @@ function createTeamsListStore() {
undefined,
'DESC'
);
- set({
- loading: false,
- response
- });
+ set(response);
}
};
}
function createUsersUsageStore() {
- const { subscribe, set } = writable({
- loading: true,
- response: browser ? JSON.parse(sessionStorage.getItem('usersUsage')) : null
- });
+ const { subscribe, set } = writable(
+ browser ? JSON.parse(sessionStorage.getItem('usersUsage')) : null
+ );
return {
subscribe,
set,
load: async (range: string) => {
const response = await sdkForProject.users.getUsage(range);
- set({
- loading: false,
- response
- });
+ set(response);
}
};
}
@@ -88,9 +66,7 @@ export const teamsList = createTeamsListStore();
export const usersUsage = createUsersUsageStore();
if (browser) {
- usersList.subscribe((n) => sessionStorage?.setItem('users', JSON.stringify(n.response ?? '')));
- teamsList.subscribe((n) => sessionStorage?.setItem('teams', JSON.stringify(n.response ?? '')));
- usersUsage.subscribe((n) =>
- sessionStorage?.setItem('usersUsage', JSON.stringify(n.response ?? ''))
- );
+ usersList.subscribe((n) => sessionStorage?.setItem('users', JSON.stringify(n ?? '')));
+ teamsList.subscribe((n) => sessionStorage?.setItem('teams', JSON.stringify(n ?? '')));
+ usersUsage.subscribe((n) => sessionStorage?.setItem('usersUsage', JSON.stringify(n ?? '')));
}
diff --git a/src/routes/console/[project]/users/teams.svelte b/src/routes/console/[project]/users/teams.svelte
index a0c73f35e..2a8dc62fd 100644
--- a/src/routes/console/[project]/users/teams.svelte
+++ b/src/routes/console/[project]/users/teams.svelte
@@ -57,11 +57,11 @@
}
}}>
- {#if $teamsList?.response?.total}
+ {#if $teamsList?.total}
Name
@@ -69,7 +69,7 @@
Created
- {#each $teamsList.response.teams as team}
+ {#each $teamsList.teams as team}
@@ -86,8 +86,8 @@
-
Total results: {$teamsList.response.total}
-
+
Total results: {$teamsList.total}
+
{:else if search}
@@ -102,8 +102,8 @@
-
Total results: {$teamsList.response.total}
-
+
Total results: {$teamsList.total}
+
{:else}
@@ -117,7 +117,7 @@
}
}}>
diff --git a/src/routes/console/[project]/users/teams/[team]/__layout.svelte b/src/routes/console/[project]/users/teams/[team]/__layout.svelte
index 5901c8297..48802785c 100644
--- a/src/routes/console/[project]/users/teams/[team]/__layout.svelte
+++ b/src/routes/console/[project]/users/teams/[team]/__layout.svelte
@@ -13,11 +13,11 @@
afterNavigate(handle);
async function handle() {
- if ($team?.response?.$id !== teamId) {
+ if ($team?.$id !== teamId) {
await team.load(teamId);
- title.set($team.response.name);
- } else if ($team.response) {
- title.set($team.response.name);
+ title.set($team.name);
+ } else if ($team) {
+ title.set($team.name);
}
backButton.set(`${base}/console/${$page.params.project}/users/teams`);
@@ -42,12 +42,16 @@
}
]);
}
+
+ $: if ($team) {
+ handle();
+ }
Appwrite - Team
-{#if $team.response}
+{#if $team}
{/if}
diff --git a/src/routes/console/[project]/users/teams/[team]/_createMember.svelte b/src/routes/console/[project]/users/teams/[team]/_createMember.svelte
index c0cac2ecb..8c2edda79 100644
--- a/src/routes/console/[project]/users/teams/[team]/_createMember.svelte
+++ b/src/routes/console/[project]/users/teams/[team]/_createMember.svelte
@@ -42,17 +42,21 @@
diff --git a/src/routes/console/[project]/users/teams/[team]/index.svelte b/src/routes/console/[project]/users/teams/[team]/index.svelte
index 98ffc800d..659ebff11 100644
--- a/src/routes/console/[project]/users/teams/[team]/index.svelte
+++ b/src/routes/console/[project]/users/teams/[team]/index.svelte
@@ -4,10 +4,11 @@
import { Container } from '$lib/layout';
import { Button, InputText, Helper } from '$lib/elements/forms';
import { sdkForProject } from '$lib/stores/sdk';
- import { toLocaleDate } from '$lib/helpers/date';
+ import { toLocaleDateTime } from '$lib/helpers/date';
import { addNotification } from '$lib/stores/notifications';
import { team } from './store';
import DeleteTeam from './_deleteTeam.svelte';
+ import { onMount } from 'svelte';
const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 48, 48).toString();
@@ -15,7 +16,12 @@
let showError: false | 'name' | 'email' | 'password' = false;
let errorMessage = 'Something went wrong';
let errorType: 'error' | 'warning' | 'success' = 'error';
- let teamName: string = $team.response.name;
+ let teamName: string = null;
+
+ onMount(async () => {
+ await team.load($page.params.team);
+ teamName ??= $team.name;
+ });
function addError(location: typeof showError, message: string, type: typeof errorType) {
showError = location;
@@ -26,7 +32,7 @@
async function updateName() {
try {
await sdkForProject.teams.update($page.params.team, teamName);
- $team.response.name = teamName;
+ $team.name = teamName;
addNotification({
message: 'Name has been updated',
type: 'success'
@@ -37,24 +43,21 @@
}
-{#if $team.response}
+{#if $team}
-
+
-
{$team.response.name}
-
{$team.response.total} Members
+
{$team.name}
+
{$team.total} Members
-
Created on {toLocaleDate($team.response.$createdAt)}
+
Created on {toLocaleDateTime($team.$createdAt)}
@@ -78,7 +81,7 @@
@@ -97,14 +100,11 @@
-
+
- {$team.response.name}
- {$team.response.total} Members
+ {$team.name}
+ {$team.total} Members
@@ -114,5 +114,5 @@
-
+
{/if}
diff --git a/src/routes/console/[project]/users/teams/[team]/members.svelte b/src/routes/console/[project]/users/teams/[team]/members.svelte
index e04e5c20f..27ebd0e23 100644
--- a/src/routes/console/[project]/users/teams/[team]/members.svelte
+++ b/src/routes/console/[project]/users/teams/[team]/members.svelte
@@ -45,10 +45,10 @@
- {#if $memberships.response?.total}
+ {#if $memberships?.total}
Name
@@ -57,7 +57,7 @@
- {#each $memberships.response.memberships as membership}
+ {#each $memberships.memberships as membership}
@@ -91,8 +91,8 @@
-
Total results: {$memberships.response.total}
-
+
Total results: {$memberships.total}
+
{:else if search}
@@ -109,15 +109,15 @@
-
Total results: {$memberships.response.total}
-
+
Total results: {$memberships.total}
+
{:else}
diff --git a/src/routes/console/[project]/users/teams/[team]/store.ts b/src/routes/console/[project]/users/teams/[team]/store.ts
index 814274259..be2f534a0 100644
--- a/src/routes/console/[project]/users/teams/[team]/store.ts
+++ b/src/routes/console/[project]/users/teams/[team]/store.ts
@@ -3,38 +3,24 @@ import type { Models } from '@aw-labs/appwrite-console';
import { writable } from 'svelte/store';
import { browser } from '$app/env';
-export type Team = {
- loading: boolean;
- response?: Models.Team;
-};
-export type Memberships = {
- loading: boolean;
- response?: Models.MembershipList;
-};
-
function createTeamStore() {
- const { subscribe, set } = writable
({
- loading: true,
- response: browser ? JSON.parse(sessionStorage.getItem('team')) : null
- });
+ const { subscribe, set } = writable(
+ browser ? JSON.parse(sessionStorage.getItem('team')) : null
+ );
return {
subscribe,
set,
load: async (teamId: string) => {
const response = await sdkForProject.teams.get(teamId);
- set({
- loading: false,
- response
- });
+ set(response);
}
};
}
function createMembershipStore() {
- const { subscribe, set } = writable({
- loading: true,
- response: browser ? JSON.parse(sessionStorage.getItem('memberships')) : null
- });
+ const { subscribe, set } = writable(
+ browser ? JSON.parse(sessionStorage.getItem('memberships')) : null
+ );
return {
subscribe,
@@ -49,10 +35,7 @@ function createMembershipStore() {
undefined,
'DESC'
);
- set({
- loading: false,
- response
- });
+ set(response);
}
};
}
@@ -61,8 +44,6 @@ export const memberships = createMembershipStore();
export const team = createTeamStore();
if (browser) {
- team.subscribe((n) => sessionStorage?.setItem('team', JSON.stringify(n.response ?? '')));
- memberships.subscribe((n) =>
- sessionStorage?.setItem('memberships', JSON.stringify(n.response ?? ''))
- );
+ team.subscribe((n) => sessionStorage?.setItem('team', JSON.stringify(n ?? '')));
+ memberships.subscribe((n) => sessionStorage?.setItem('memberships', JSON.stringify(n ?? '')));
}
diff --git a/src/routes/console/[project]/users/usage.svelte b/src/routes/console/[project]/users/usage.svelte
index 4ce0a3859..aeac13dde 100644
--- a/src/routes/console/[project]/users/usage.svelte
+++ b/src/routes/console/[project]/users/usage.svelte
@@ -7,7 +7,7 @@
let currentRange = '30d';
$: usersUsage.load(currentRange);
- $: data = $usersUsage.response;
+ $: data = $usersUsage;
//TODO: add types once they are fixed
diff --git a/src/routes/console/[project]/users/user/[user]/__layout.svelte b/src/routes/console/[project]/users/user/[user]/__layout.svelte
index 55a19c81c..a586a55b0 100644
--- a/src/routes/console/[project]/users/user/[user]/__layout.svelte
+++ b/src/routes/console/[project]/users/user/[user]/__layout.svelte
@@ -13,11 +13,11 @@
afterNavigate(handle);
async function handle() {
- if ($user?.response?.$id !== userId) {
+ if ($user?.$id !== userId) {
await user.load(userId);
- title.set($user.response.name);
- } else if ($user.response) {
- title.set($user.response.name);
+ title.set($user.name);
+ } else if ($user) {
+ title.set($user.name);
}
backButton.set(`${base}/console/${$page.params.project}/users`);
@@ -46,6 +46,10 @@
}
]);
}
+
+ $: if ($user) {
+ handle();
+ }
diff --git a/src/routes/console/[project]/users/user/[user]/_deleteAllMemberships.svelte b/src/routes/console/[project]/users/user/[user]/_deleteAllMemberships.svelte
index 929d17e45..f5c76479c 100644
--- a/src/routes/console/[project]/users/user/[user]/_deleteAllMemberships.svelte
+++ b/src/routes/console/[project]/users/user/[user]/_deleteAllMemberships.svelte
@@ -14,9 +14,7 @@
try {
await sdkForProject.teams.deleteMembership('tmpstring', 'tmpstring2');
showDeleteAll = false;
- await goto(
- `${base}/console/${$page.params.project}/users/${$user.response.$id}/membeships`
- );
+ await goto(`${base}/console/${$page.params.project}/users/${$user.$id}/membeships`);
} catch (error) {
addNotification({
type: 'error',
@@ -31,7 +29,7 @@
Delete All Memberships
- Are you sure you want to delete {$user.response.name}'s all memberships?
+ Are you sure you want to delete {$user.name}'s all memberships?
diff --git a/src/routes/console/[project]/users/user/[user]/_deleteAllSessions.svelte b/src/routes/console/[project]/users/user/[user]/_deleteAllSessions.svelte
index f3ff70117..8905281b6 100644
--- a/src/routes/console/[project]/users/user/[user]/_deleteAllSessions.svelte
+++ b/src/routes/console/[project]/users/user/[user]/_deleteAllSessions.svelte
@@ -30,7 +30,7 @@
Delete All Sessions
- Are you sure you want to delete all of {$user.response.name}'s sessions?
+ Are you sure you want to delete all of {$user.name}'s sessions?
diff --git a/src/routes/console/[project]/users/user/[user]/_deleteUser.svelte b/src/routes/console/[project]/users/user/[user]/_deleteUser.svelte
index bc177b861..4d6b273a5 100644
--- a/src/routes/console/[project]/users/user/[user]/_deleteUser.svelte
+++ b/src/routes/console/[project]/users/user/[user]/_deleteUser.svelte
@@ -13,7 +13,7 @@
const deleteUser = async () => {
try {
- await sdkForProject.users.delete($user.response.$id);
+ await sdkForProject.users.delete($user.$id);
showDelete = false;
await goto(`${base}/console/${$page.params.project}/users`);
} catch (error) {
@@ -28,7 +28,7 @@
diff --git a/src/routes/console/[project]/users/user/[user]/index.svelte b/src/routes/console/[project]/users/user/[user]/index.svelte
index c7e609065..563f9685f 100644
--- a/src/routes/console/[project]/users/user/[user]/index.svelte
+++ b/src/routes/console/[project]/users/user/[user]/index.svelte
@@ -1,6 +1,6 @@
-{#if $user.response}
+{#if $user}
-
-
{$user.response.name}
- {#if !$user.response.status}
+
+
{$user.name}
+ {#if !$user.status}
Blocked
{:else}
-
- {$user.response.emailVerification ? 'Verified' : 'Unverified'}
+
+ {$user.emailVerification || $user.phoneVerification
+ ? 'Verified'
+ : 'Unverified'}
{/if}
-
{$user.response.email}
-
Joined: {toLocaleDate($user.response.registration)}
+
{$user.email}
+
Joined: {toLocaleDateTime($user.registration)}
- {#if $user.response.status}
- {#if $user.response.phone && $user.response.email}
+ >{$user.status ? 'Block Account' : 'Unblock Accout'}
+ {#if $user.status}
+ {#if $user.phone && $user.email}
+ arrow={true}
+ arrowPosition="end">
updateVerificationEmail()}
- >{$user.response.emailVerification ? 'Unverify' : 'Verify'} email
+ >{$user.emailVerification ? 'Unverify' : 'Verify'} email
updateVerificationPhone()}>
- {$user.response.phoneVerification ? 'Unverify' : 'Verify'} phone
+ {$user.phoneVerification ? 'Unverify' : 'Verify'} phone
- {:else if !$user.response.phone}
+ {:else if !$user.phone}
- {:else if !$user.response.email}
+ {:else if !$user.email}
{/if}
{/if}
@@ -292,7 +292,7 @@
@@ -316,7 +316,7 @@
@@ -340,7 +340,7 @@
@@ -477,15 +477,12 @@
-
+
- {$user.response.name}
+ {$user.name}
- {$user.response.email}
+ {$user.email}
diff --git a/src/routes/console/[project]/users/user/[user]/sessions.svelte b/src/routes/console/[project]/users/user/[user]/sessions.svelte
index f84368b86..ca1057375 100644
--- a/src/routes/console/[project]/users/user/[user]/sessions.svelte
+++ b/src/routes/console/[project]/users/user/[user]/sessions.svelte
@@ -15,6 +15,7 @@
import DeleteAllSessions from './_deleteAllSessions.svelte';
import DeleteSessions from './_deleteSession.svelte';
import { toLocaleDateTime } from '$lib/helpers/date';
+ import { app } from '$lib/stores/app';
let offset = 0;
let showDelete = false;
@@ -54,7 +55,9 @@
diff --git a/src/routes/console/[project]/users/user/[user]/store.ts b/src/routes/console/[project]/users/user/[user]/store.ts
index 488db6387..b75052132 100644
--- a/src/routes/console/[project]/users/user/[user]/store.ts
+++ b/src/routes/console/[project]/users/user/[user]/store.ts
@@ -3,26 +3,17 @@ import type { Models } from '@aw-labs/appwrite-console';
import { writable } from 'svelte/store';
import { browser } from '$app/env';
-export type SelectedUser = {
- loading: boolean;
- response?: Models.User>;
-};
-
function createUserStore() {
- const { subscribe, set } = writable({
- loading: true,
- response: browser ? JSON.parse(sessionStorage.getItem('selectedUser')) : null
- });
+ const { subscribe, set } = writable>>(
+ browser ? JSON.parse(sessionStorage.getItem('selectedUser')) : null
+ );
return {
subscribe,
set,
load: async (userId: string) => {
const response = await sdkForProject.users.get(userId);
- set({
- loading: false,
- response
- });
+ set(response);
}
};
}
@@ -30,7 +21,5 @@ function createUserStore() {
export const user = createUserStore();
if (browser) {
- user.subscribe((n) =>
- sessionStorage?.setItem('selectedUser', JSON.stringify(n.response ?? ''))
- );
+ user.subscribe((n) => sessionStorage?.setItem('selectedUser', JSON.stringify(n ?? '')));
}
diff --git a/src/routes/login.svelte b/src/routes/login.svelte
index f8da058d7..9d4fb293f 100644
--- a/src/routes/login.svelte
+++ b/src/routes/login.svelte
@@ -1,7 +1,14 @@