diff --git a/web/src/routes/+page.svelte b/web/src/routes/+page.svelte
new file mode 100644
index 0000000000..62e7d963f3
--- /dev/null
+++ b/web/src/routes/+page.svelte
@@ -0,0 +1,29 @@
+
+
+
+ Welcome 🎉 - Immich
+
+
+
+
+
+
+
+
+
Welcome to IMMICH Web
+
+
diff --git a/web/src/routes/+page.ts b/web/src/routes/+page.ts
new file mode 100644
index 0000000000..98dcbfe038
--- /dev/null
+++ b/web/src/routes/+page.ts
@@ -0,0 +1,21 @@
+export const prerender = false;
+import { redirect } from '@sveltejs/kit';
+import { api } from '@api';
+import { browser } from '$app/env';
+import type { PageLoad } from './$types';
+import { goto } from '$app/navigation';
+
+export const load: PageLoad = async ({ parent }) => {
+ const { user } = await parent();
+ if (user) {
+ throw redirect(302, '/photos');
+ }
+
+ if (browser) {
+ const { data } = await api.userApi.getUserCount();
+
+ return {
+ isAdminUserExist: data.userCount != 0
+ };
+ }
+};
diff --git a/web/src/routes/admin/+page.server.ts b/web/src/routes/admin/+page.server.ts
new file mode 100644
index 0000000000..dcaf404aa9
--- /dev/null
+++ b/web/src/routes/admin/+page.server.ts
@@ -0,0 +1,19 @@
+import { redirect } from '@sveltejs/kit';
+import { serverApi, UserResponseDto } from '@api';
+import type { PageServerLoad } from './$types';
+
+export const load: PageServerLoad = async ({ parent }) => {
+ const { user } = await parent();
+
+ if (!user) {
+ throw redirect(302, '/auth/login');
+ } else if (!user.isAdmin) {
+ throw redirect(302, '/photos');
+ }
+
+ const { data: allUsers } = await serverApi.userApi.getAllUsers(false);
+ return {
+ user: user,
+ allUsers: allUsers
+ };
+};
diff --git a/web/src/routes/admin/index.svelte b/web/src/routes/admin/+page.svelte
similarity index 76%
rename from web/src/routes/admin/index.svelte
rename to web/src/routes/admin/+page.svelte
index c97ad69e89..8d18519c2d 100644
--- a/web/src/routes/admin/index.svelte
+++ b/web/src/routes/admin/+page.svelte
@@ -1,47 +1,3 @@
-
-
-
+
+
+ {data.album.albumName} - Immich
+
+
+
diff --git a/web/src/routes/albums/[albumId]/index.svelte b/web/src/routes/albums/[albumId]/index.svelte
deleted file mode 100644
index 54256f336f..0000000000
--- a/web/src/routes/albums/[albumId]/index.svelte
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
- {album.albumName} - Immich
-
-
-
diff --git a/web/src/routes/albums/[albumId]/photos/[assetId].svelte b/web/src/routes/albums/[albumId]/photos/[assetId].svelte
deleted file mode 100644
index 4349114cf3..0000000000
--- a/web/src/routes/albums/[albumId]/photos/[assetId].svelte
+++ /dev/null
@@ -1,28 +0,0 @@
-
diff --git a/web/src/routes/albums/[albumId]/photos/[assetId]/+page.svelte b/web/src/routes/albums/[albumId]/photos/[assetId]/+page.svelte
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/src/routes/albums/[albumId]/photos/[assetId]/+page.ts b/web/src/routes/albums/[albumId]/photos/[assetId]/+page.ts
new file mode 100644
index 0000000000..2c337b31be
--- /dev/null
+++ b/web/src/routes/albums/[albumId]/photos/[assetId]/+page.ts
@@ -0,0 +1,18 @@
+import { redirect } from '@sveltejs/kit';
+export const prerender = false;
+import type { PageLoad } from './$types';
+
+export const load: PageLoad = async ({ params, parent }) => {
+ const { user } = await parent();
+ if (!user) {
+ throw redirect(302, '/auth/login');
+ }
+
+ const albumId = params['albumId'];
+
+ if (albumId) {
+ throw redirect(302, `/albums/${albumId}`);
+ } else {
+ throw redirect(302, `/photos`);
+ }
+};
diff --git a/web/src/routes/auth/change-password/+page.svelte b/web/src/routes/auth/change-password/+page.svelte
new file mode 100644
index 0000000000..d5d489f440
--- /dev/null
+++ b/web/src/routes/auth/change-password/+page.svelte
@@ -0,0 +1,25 @@
+
+
+
+ Change Password - Immich
+
+
+
diff --git a/web/src/routes/auth/change-password/+page.ts b/web/src/routes/auth/change-password/+page.ts
new file mode 100644
index 0000000000..8200151ffb
--- /dev/null
+++ b/web/src/routes/auth/change-password/+page.ts
@@ -0,0 +1,21 @@
+import { api } from '@api';
+import { redirect } from '@sveltejs/kit';
+export const prerender = false;
+
+import type { PageLoad } from './$types';
+
+export const load: PageLoad = async () => {
+ try {
+ const { data: userInfo } = await api.userApi.getMyUserInfo();
+
+ if (userInfo.shouldChangePassword) {
+ return {
+ user: userInfo
+ };
+ } else {
+ throw redirect(302, '/photos');
+ }
+ } catch (e) {
+ throw redirect(302, '/auth/login');
+ }
+};
diff --git a/web/src/routes/auth/change-password/index.svelte b/web/src/routes/auth/change-password/index.svelte
deleted file mode 100644
index 82e7890916..0000000000
--- a/web/src/routes/auth/change-password/index.svelte
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
- Change Password - Immich
-
-
-
diff --git a/web/src/routes/auth/login/index.svelte b/web/src/routes/auth/login/+page.svelte
similarity index 93%
rename from web/src/routes/auth/login/index.svelte
rename to web/src/routes/auth/login/+page.svelte
index 37b09a5862..27287db12f 100644
--- a/web/src/routes/auth/login/index.svelte
+++ b/web/src/routes/auth/login/+page.svelte
@@ -4,7 +4,7 @@
import LoginForm from '$lib/components/forms/login-form.svelte';
- const onLoginSuccess = async () => {
+ const onLoginSuccess = () => {
goto('/photos');
};
diff --git a/web/src/routes/auth/logout.ts b/web/src/routes/auth/logout.ts
deleted file mode 100644
index 2439ed37cd..0000000000
--- a/web/src/routes/auth/logout.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { api, serverApi } from '@api';
-import type { RequestHandler } from '@sveltejs/kit';
-
-export const POST: RequestHandler = async () => {
- api.removeAccessToken();
- serverApi.removeAccessToken();
-
- return {
- headers: {
- 'Set-Cookie': [
- 'immich_is_authenticated=deleted; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT;',
- 'immich_access_token=delete; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT'
- ]
- },
- body: {
- ok: true
- }
- };
-};
diff --git a/web/src/routes/auth/logout/+server.ts b/web/src/routes/auth/logout/+server.ts
new file mode 100644
index 0000000000..c3e4c396ed
--- /dev/null
+++ b/web/src/routes/auth/logout/+server.ts
@@ -0,0 +1,27 @@
+import { json } from '@sveltejs/kit';
+import { api, serverApi } from '@api';
+import type { RequestHandler } from '@sveltejs/kit';
+
+export const POST: RequestHandler = async () => {
+ api.removeAccessToken();
+ serverApi.removeAccessToken();
+
+ const headers = new Headers();
+
+ headers.append(
+ 'set-cookie',
+ 'immich_is_authenticated=deleted; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT;'
+ );
+ headers.append(
+ 'set-cookie',
+ 'immich_access_token=delete; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT'
+ );
+ return json(
+ {
+ ok: true
+ },
+ {
+ headers
+ }
+ );
+};
diff --git a/web/src/routes/auth/register/+page.server.ts b/web/src/routes/auth/register/+page.server.ts
new file mode 100644
index 0000000000..8f78289b7d
--- /dev/null
+++ b/web/src/routes/auth/register/+page.server.ts
@@ -0,0 +1,13 @@
+import { redirect } from '@sveltejs/kit';
+import type { PageServerLoad } from './$types';
+import { serverApi } from '@api';
+
+export const load: PageServerLoad = async () => {
+ const { data } = await serverApi.userApi.getUserCount();
+ if (data.userCount != 0) {
+ // Admin has been registered, redirect to login
+ throw redirect(302, '/auth/login');
+ }
+
+ return;
+};
diff --git a/web/src/routes/auth/register/+page.svelte b/web/src/routes/auth/register/+page.svelte
new file mode 100644
index 0000000000..9301a28bae
--- /dev/null
+++ b/web/src/routes/auth/register/+page.svelte
@@ -0,0 +1,11 @@
+
+
+
+ Admin Registration - Immich
+
+
+
diff --git a/web/src/routes/auth/register/index.svelte b/web/src/routes/auth/register/index.svelte
deleted file mode 100644
index e3fa41ed98..0000000000
--- a/web/src/routes/auth/register/index.svelte
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
- Admin Registration - Immich
-
-
-
diff --git a/web/src/routes/data/README.md b/web/src/routes/data/README.md
deleted file mode 100644
index 9067c01fb2..0000000000
--- a/web/src/routes/data/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This directory contain SSR endpoints to user serverApi instance to make request directly to DNS
\ No newline at end of file
diff --git a/web/src/routes/data/album/get-album-info.ts b/web/src/routes/data/album/get-album-info.ts
deleted file mode 100644
index ddb637eec2..0000000000
--- a/web/src/routes/data/album/get-album-info.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { AlbumResponseDto, serverApi } from '@api';
-import type { RequestEvent, RequestHandlerOutput } from '@sveltejs/kit';
-
-export const GET = async ({
- url
-}: RequestEvent): Promise
> => {
- try {
- const albumId = url.searchParams.get('albumId') || '';
- const { data } = await serverApi.albumApi.getAlbumInfo(albumId);
- return {
- body: data
- };
- } catch {
- return {
- status: 500
- };
- }
-};
diff --git a/web/src/routes/data/album/get-all-albums.ts b/web/src/routes/data/album/get-all-albums.ts
deleted file mode 100644
index 3f0fb69b54..0000000000
--- a/web/src/routes/data/album/get-all-albums.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { AlbumResponseDto, serverApi } from '@api';
-import type { RequestEvent, RequestHandler, RequestHandlerOutput } from '@sveltejs/kit';
-
-export const GET = async ({
- url
-}: RequestEvent): Promise> => {
- try {
- const isShared = url.searchParams.get('isShared') === 'true' || undefined;
- const { data } = await serverApi.albumApi.getAllAlbums(isShared);
- return {
- body: data
- };
- } catch {
- return {
- status: 500
- };
- }
-};
diff --git a/web/src/routes/data/asset/get-all-assets.ts b/web/src/routes/data/asset/get-all-assets.ts
deleted file mode 100644
index d175061f97..0000000000
--- a/web/src/routes/data/asset/get-all-assets.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { AssetResponseDto, serverApi } from '@api';
-import type { RequestHandlerOutput } from '@sveltejs/kit';
-
-export const GET = async (): Promise> => {
- try {
- const { data } = await serverApi.assetApi.getAllAssets();
- return {
- body: data
- };
- } catch {
- return {
- status: 500
- };
- }
-};
diff --git a/web/src/routes/data/user/get-all-users.ts b/web/src/routes/data/user/get-all-users.ts
deleted file mode 100644
index 00a7ecb3ff..0000000000
--- a/web/src/routes/data/user/get-all-users.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { serverApi, UserResponseDto } from '@api';
-import type { RequestEvent, RequestHandlerOutput } from '@sveltejs/kit';
-
-export const GET = async ({url} : RequestEvent): Promise> => {
- try {
- const isAll = url.searchParams.get('isAll') === 'true';
-
- const { data } = await serverApi.userApi.getAllUsers(isAll);
- return {
- body: data
- };
- } catch {
- return {
- status: 500
- };
- }
-};
diff --git a/web/src/routes/data/user/get-my-user-info.ts b/web/src/routes/data/user/get-my-user-info.ts
deleted file mode 100644
index 65cc8c5baa..0000000000
--- a/web/src/routes/data/user/get-my-user-info.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { serverApi, UserResponseDto } from '@api';
-import type { RequestHandlerOutput } from '@sveltejs/kit';
-
-export const GET = async (): Promise> => {
- try {
- const { data } = await serverApi.userApi.getMyUserInfo();
- return {
- body: data
- };
- } catch {
- return {
- status: 500
- };
- }
-};
diff --git a/web/src/routes/index.svelte b/web/src/routes/index.svelte
deleted file mode 100644
index 58bd979bdc..0000000000
--- a/web/src/routes/index.svelte
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
- Welcome 🎉 - Immich
-
-
-
-
-
-
-
-
-
Welcome to IMMICH Web
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {#each data.sharedAlbums as album}
+
+
+
+ {/each}
+
+
+
+ Create a shared album to share photos and videos with people in your network
+
+
-
-
-
-
-
-
-
-
-
-
-
- {#each sharedAlbums as album}
-
-
-
- {/each}
-
-
-
- Create a shared album to share photos and videos with people in your network
-
-