cjones/immich
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(web): continue after login (#18302)

Browse Source
This commit is contained in:
Jason Rasmussen
2025-05-15 14:45:23 -04:00
committed by GitHub
parent 6117329057
commit c046651f23
34 changed files with 65 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/routes/(user)/albums/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getAllAlbums } from '@immich/sdk';
import type { PageLoad } from './$types';
export const load = (async () => {
await authenticate();
export const load = (async ({ url }) => {
await authenticate(url);
const sharedAlbums = await getAllAlbums({ shared: true });
const albums = await getAllAlbums({});
const $t = await getFormatter();
web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getAssetInfoFromParam } from '$lib/utils/navigation';
import { getAlbumInfo } from '@immich/sdk';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
await authenticate();
export const load = (async ({ params, url }) => {
await authenticate(url);
const [album, asset] = await Promise.all([
getAlbumInfo({ id: params.albumId, withoutAssets: true }),
getAssetInfoFromParam(params),
web/src/routes/(user)/archive/[[photos=photos]]/[[assetId=id]]/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getAssetInfoFromParam } from '$lib/utils/navigation';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
await authenticate();
export const load = (async ({ params, url }) => {
await authenticate(url);
const asset = await getAssetInfoFromParam(params);
const $t = await getFormatter();
web/src/routes/(user)/buy/+page.ts
+1 -1
View File
@@ -5,7 +5,7 @@ import { activateProduct, getActivationKey } from '$lib/utils/license-utils';
import type { PageLoad } from './$types';
export const load = (async ({ url }) => {
await authenticate();
await authenticate(url);
const $t = await getFormatter();
const licenseKey = url.searchParams.get('licenseKey');
web/src/routes/(user)/explore/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getAllPeople, getExploreData } from '@immich/sdk';
import type { PageLoad } from './$types';
export const load = (async () => {
await authenticate();
export const load = (async ({ url }) => {
await authenticate(url);
const [items, response] = await Promise.all([getExploreData(), getAllPeople({ withHidden: false })]);
const $t = await getFormatter();
web/src/routes/(user)/favorites/[[photos=photos]]/[[assetId=id]]/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getAssetInfoFromParam } from '$lib/utils/navigation';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
await authenticate();
export const load = (async ({ params, url }) => {
await authenticate(url);
const asset = await getAssetInfoFromParam(params);
const $t = await getFormatter();
web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.ts
+1 -1
View File
@@ -7,7 +7,7 @@ import { buildTree, normalizeTreePath } from '$lib/utils/tree-utils';
import type { PageLoad } from './$types';
export const load = (async ({ params, url }) => {
await authenticate();
await authenticate(url);
const asset = await getAssetInfoFromParam(params);
const $t = await getFormatter();
web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getAssetInfoFromParam } from '$lib/utils/navigation';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
await authenticate();
export const load = (async ({ params, url }) => {
await authenticate(url);
const asset = await getAssetInfoFromParam(params);
const $t = await getFormatter();
web/src/routes/(user)/memory/[[photos=photos]]/[[assetId=id]]/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getAssetInfoFromParam } from '$lib/utils/navigation';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
const user = await authenticate();
export const load = (async ({ params, url }) => {
const user = await authenticate(url);
const asset = await getAssetInfoFromParam(params);
const $t = await getFormatter();
web/src/routes/(user)/partners/[userId]/[[photos=photos]]/[[assetId=id]]/+page.ts
+2 -2
View File
@@ -4,8 +4,8 @@ import { getAssetInfoFromParam } from '$lib/utils/navigation';
import { getUser } from '@immich/sdk';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
await authenticate();
export const load = (async ({ params, url }) => {
await authenticate(url);
const partner = await getUser({ id: params.userId });
const asset = await getAssetInfoFromParam(params);
web/src/routes/(user)/people/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getAllPeople } from '@immich/sdk';
import type { PageLoad } from './$types';
export const load = (async () => {
await authenticate();
export const load = (async ({ url }) => {
await authenticate(url);
const people = await getAllPeople({ withHidden: true });
const $t = await getFormatter();
web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.ts
+2 -2
View File
@@ -4,8 +4,8 @@ import { getAssetInfoFromParam } from '$lib/utils/navigation';
import { getPerson, getPersonStatistics } from '@immich/sdk';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
await authenticate();
export const load = (async ({ params, url }) => {
await authenticate(url);
const [person, statistics, asset] = await Promise.all([
getPerson({ id: params.personId }),
web/src/routes/(user)/photos/[[assetId=id]]/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getAssetInfoFromParam } from '$lib/utils/navigation';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
await authenticate();
export const load = (async ({ params, url }) => {
await authenticate(url);
const asset = await getAssetInfoFromParam(params);
const $t = await getFormatter();
web/src/routes/(user)/places/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getAssetsByCity } from '@immich/sdk';
import type { PageLoad } from './$types';
export const load = (async () => {
await authenticate();
export const load = (async ({ url }) => {
await authenticate(url);
const items = await getAssetsByCity();
const $t = await getFormatter();
web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getAssetInfoFromParam } from '$lib/utils/navigation';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
await authenticate();
export const load = (async ({ params, url }) => {
await authenticate(url);
const asset = await getAssetInfoFromParam(params);
const $t = await getFormatter();
web/src/routes/(user)/share/[key]/[[photos=photos]]/[[assetId=id]]/+page.ts
+2 -2
View File
@@ -5,9 +5,9 @@ import { getAssetInfoFromParam } from '$lib/utils/navigation';
import { getMySharedLink, isHttpError } from '@immich/sdk';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
export const load = (async ({ params, url }) => {
const { key } = params;
await authenticate({ public: true });
await authenticate(url, { public: true });
const $t = await getFormatter();
web/src/routes/(user)/shared-links/[[id=id]]/+page.ts
+2 -2
View File
@@ -2,8 +2,8 @@ import { authenticate } from '$lib/utils/auth';
import { getFormatter } from '$lib/utils/i18n';
import type { PageLoad } from './$types';
export const load = (async () => {
await authenticate();
export const load = (async ({ url }) => {
await authenticate(url);
const $t = await getFormatter();
return {
web/src/routes/(user)/sharing/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { PartnerDirection, getAllAlbums, getPartners } from '@immich/sdk';
import type { PageLoad } from './$types';
export const load = (async () => {
await authenticate();
export const load = (async ({ url }) => {
await authenticate(url);
const sharedAlbums = await getAllAlbums({ shared: true });
const partners = await getPartners({ direction: PartnerDirection.SharedWith });
const $t = await getFormatter();
web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.ts
+1 -1
View File
@@ -7,7 +7,7 @@ import { getAllTags } from '@immich/sdk';
import type { PageLoad } from './$types';
export const load = (async ({ params, url }) => {
await authenticate();
await authenticate(url);
const asset = await getAssetInfoFromParam(params);
const $t = await getFormatter();
web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getAssetInfoFromParam } from '$lib/utils/navigation';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
await authenticate();
export const load = (async ({ params, url }) => {
await authenticate(url);
const asset = await getAssetInfoFromParam(params);
const $t = await getFormatter();
web/src/routes/(user)/user-settings/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getApiKeys, getSessions } from '@immich/sdk';
import type { PageLoad } from './$types';
export const load = (async () => {
await authenticate();
export const load = (async ({ url }) => {
await authenticate(url);
const keys = await getApiKeys();
const sessions = await getSessions();
web/src/routes/(user)/utilities/+page.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { getFormatter } from '$lib/utils/i18n';
import { getAssetInfoFromParam } from '$lib/utils/navigation';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
await authenticate();
export const load = (async ({ params, url }) => {
await authenticate(url);
const asset = await getAssetInfoFromParam(params);
const $t = await getFormatter();
web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.ts
+2 -2
View File
@@ -4,8 +4,8 @@ import { getAssetInfoFromParam } from '$lib/utils/navigation';
import { getAssetDuplicates } from '@immich/sdk';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
await authenticate();
export const load = (async ({ params, url }) => {
await authenticate(url);
const asset = await getAssetInfoFromParam(params);
const duplicates = await getAssetDuplicates();
const $t = await getFormatter();