Merge branch 'main' of github.com:appwrite/console into chore-format-prices

This commit is contained in:
Arman committed 2024-02-01 17:58:01 +01:00
commit 82ed213edf
4 files changed
+23 -2

No files matched your search

+5
View File
@@ -6,12 +6,17 @@ import { sdk } from '$lib/stores/sdk';
import { redirect } from '@sveltejs/kit';
import { Dependencies } from '$lib/constants';
import type { LayoutLoad } from './$types';
import { redirectTo } from './store';
export const ssr = false;
export const load: LayoutLoad = async ({ depends, url }) => {
depends(Dependencies.ACCOUNT);
redirectTo.set(url.searchParams.get('forceRedirect') || null);
url.searchParams.delete('forceRedirect');
try {
const account = await sdk.forConsole.account.get<{ organization?: string }>();
+9 -1
View File
@@ -16,6 +16,7 @@
import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
import { isCloud } from '$lib/system';
import { page } from '$app/stores';
import { redirectTo } from '$routes/store';
let mail: string, pass: string, disabled: boolean;
@@ -23,12 +24,18 @@
try {
disabled = true;
await sdk.forConsole.account.createEmailSession(mail, pass);
await invalidate(Dependencies.ACCOUNT);
addNotification({
type: 'success',
message: 'Successfully logged in.'
});
if ($redirectTo) {
window.location.href = $redirectTo;
return;
}
await invalidate(Dependencies.ACCOUNT);
trackEvent(Submit.AccountCreate);
if ($page.url.searchParams) {
const redirect = $page.url.searchParams.get('redirect');
$page.url.searchParams.delete('redirect');
@@ -52,6 +59,7 @@
function onGithubLogin() {
let url = window.location.origin;
if ($page.url.searchParams) {
const redirect = $page.url.searchParams.get('redirect');
$page.url.searchParams.delete('redirect');
+8
View File
@@ -19,6 +19,7 @@
import { ID } from '@appwrite.io/console';
import { isCloud } from '$lib/system';
import { page } from '$app/stores';
import { redirectTo } from '$routes/store';
let name: string, mail: string, pass: string, disabled: boolean;
let terms = false;
@@ -28,7 +29,14 @@
disabled = true;
await sdk.forConsole.account.create(ID.unique(), mail, pass, name ?? '');
await sdk.forConsole.account.createEmailSession(mail, pass);
if ($redirectTo) {
window.location.href = $redirectTo;
return;
}
await invalidate(Dependencies.ACCOUNT);
if ($page.url.searchParams) {
const redirect = $page.url.searchParams.get('redirect');
$page.url.searchParams.delete('redirect');
+1 -1
View File
@@ -1,5 +1,5 @@
import { writable } from 'svelte/store';
export const loading = writable(true);
export const requestedMigration = writable<Record<string, string> | null>(null);
export const redirectTo = writable<string | null>(null);