Jaime Baez 2 роки тому
батько
коміт
4f7a3afbfc
40 змінених файлів з 122 додано та 121 видалено
  1. 3 0
      web/.eslintrc.cjs
  2. 1 2
      web/src/api/utils.ts
  3. 2 3
      web/src/lib/components/album-page/album-card.svelte
  4. 1 3
      web/src/lib/components/album-page/album-viewer.svelte
  5. 0 2
      web/src/lib/components/asset-viewer/asser-viewer-nav-bar.svelte
  6. 4 2
      web/src/lib/components/asset-viewer/asset-viewer.svelte
  7. 7 4
      web/src/lib/components/asset-viewer/detail-panel.svelte
  8. 1 1
      web/src/lib/components/asset-viewer/intersection-observer.svelte
  9. 3 1
      web/src/lib/components/asset-viewer/photo-viewer.svelte
  10. 1 3
      web/src/lib/components/asset-viewer/video-viewer.svelte
  11. 2 2
      web/src/lib/components/forms/admin-registration-form.svelte
  12. 2 2
      web/src/lib/components/forms/change-password-form.svelte
  13. 2 3
      web/src/lib/components/forms/edit-user-form.svelte
  14. 2 2
      web/src/lib/components/forms/login-form.svelte
  15. 1 2
      web/src/lib/components/photos-page/asset-date-group.svelte
  16. 0 3
      web/src/lib/components/shared-components/announcement-box.svelte
  17. 1 1
      web/src/lib/components/shared-components/base-modal.svelte
  18. 1 1
      web/src/lib/components/shared-components/circle-avatar.svelte
  19. 5 3
      web/src/lib/components/shared-components/circle-icon-button.svelte
  20. 2 4
      web/src/lib/components/shared-components/context-menu/context-menu.svelte
  21. 10 8
      web/src/lib/components/shared-components/control-app-bar.svelte
  22. 5 5
      web/src/lib/components/shared-components/immich-thumbnail.svelte
  23. 1 1
      web/src/lib/components/shared-components/navigation-bar.svelte
  24. 2 5
      web/src/lib/components/shared-components/portal/portal.svelte
  25. 21 23
      web/src/lib/components/shared-components/scrollbar/scrollbar.svelte
  26. 2 0
      web/src/lib/components/shared-components/side-bar/side-bar-button.svelte
  27. 2 2
      web/src/lib/components/shared-components/side-bar/side-bar.svelte
  28. 5 3
      web/src/lib/components/shared-components/upload-panel.svelte
  29. 1 2
      web/src/lib/components/sharing-page/shared-album-list-tile.svelte
  30. 3 3
      web/src/lib/models/asset-grid-state.ts
  31. 4 6
      web/src/lib/stores/assets.store.ts
  32. 2 1
      web/src/lib/stores/websocket.ts
  33. 3 2
      web/src/lib/utils/click-outside.ts
  34. 16 9
      web/src/lib/utils/file-uploader.ts
  35. 1 1
      web/src/routes/+layout.server.ts
  36. 0 1
      web/src/routes/+layout.svelte
  37. 1 1
      web/src/routes/admin/+page.server.ts
  38. 1 1
      web/src/routes/albums/+page.server.ts
  39. 0 2
      web/src/routes/photos/+page.svelte
  40. 1 1
      web/svelte.config.js

+ 3 - 0
web/.eslintrc.cjs

@@ -16,5 +16,8 @@ module.exports = {
 		browser: true,
 		es2017: true,
 		node: true
+	},
+	globals: {
+		NodeJS: true
 	}
 };

+ 1 - 2
web/src/api/utils.ts

@@ -1,5 +1,4 @@
-import { AssetCountByTimeGroupResponseDto } from '@api';
-let _basePath = '/api';
+const _basePath = '/api';
 
 export function getFileUrl(aid: string, did: string, isThumb?: boolean, isWeb?: boolean) {
 	const urlObj = new URL(`${window.location.origin}${_basePath}/asset/file`);

+ 2 - 3
web/src/lib/components/album-page/album-card.svelte

@@ -15,12 +15,11 @@
 	import { AlbumResponseDto, api, ThumbnailFormat } from '@api';
 	import { createEventDispatcher, onMount } from 'svelte';
 	import DotsVertical from 'svelte-material-icons/DotsVertical.svelte';
-	import { fly } from 'svelte/transition';
 	import CircleIconButton from '../shared-components/circle-icon-button.svelte';
 
 	export let album: AlbumResponseDto;
 
-	let imageData: string = `/api/asset/thumbnail/${album.albumThumbnailAssetId}?format=${ThumbnailFormat.Webp}`;
+	let imageData = `/api/asset/thumbnail/${album.albumThumbnailAssetId}?format=${ThumbnailFormat.Webp}`;
 	const dispatchClick = createEventDispatcher<OnClick>();
 	const dispatchShowContextMenu = createEventDispatcher<OnShowContextMenu>();
 
@@ -29,7 +28,7 @@
 			return;
 		}
 
-		const { data } = await api.assetApi.getAssetThumbnail(thubmnailId!, ThumbnailFormat.Jpeg, {
+		const { data } = await api.assetApi.getAssetThumbnail(thubmnailId, ThumbnailFormat.Jpeg, {
 			responseType: 'blob'
 		});
 

+ 1 - 3
web/src/lib/components/album-page/album-viewer.svelte

@@ -11,7 +11,6 @@
 	import CircleAvatar from '../shared-components/circle-avatar.svelte';
 	import ImmichThumbnail from '../shared-components/immich-thumbnail.svelte';
 	import AssetSelection from './asset-selection.svelte';
-	import _ from 'lodash-es';
 	import UserSelectionModal from './user-selection-modal.svelte';
 	import ShareInfoModal from './share-info-modal.svelte';
 	import CircleIconButton from '../shared-components/circle-icon-button.svelte';
@@ -53,8 +52,7 @@
 	let currentViewAssetIndex = 0;
 
 	let viewWidth: number;
-	let thumbnailSize: number = 300;
-	let border = '';
+	let thumbnailSize = 300;
 	let backUrl = '/albums';
 	let currentAlbumName = '';
 	let currentUser: UserResponseDto;

+ 0 - 2
web/src/lib/components/asset-viewer/asser-viewer-nav-bar.svelte

@@ -2,9 +2,7 @@
 	import { createEventDispatcher } from 'svelte';
 
 	import ArrowLeft from 'svelte-material-icons/ArrowLeft.svelte';
-	import DotsVertical from 'svelte-material-icons/DotsVertical.svelte';
 	import CloudDownloadOutline from 'svelte-material-icons/CloudDownloadOutline.svelte';
-	import TrashCanOutline from 'svelte-material-icons/TrashCanOutline.svelte';
 	import InformationOutline from 'svelte-material-icons/InformationOutline.svelte';
 	import CircleIconButton from '../shared-components/circle-icon-button.svelte';
 	const dispatch = createEventDispatcher();

+ 4 - 2
web/src/lib/components/asset-viewer/asset-viewer.svelte

@@ -29,12 +29,14 @@
 	let isShowDetail = false;
 	let appearsInAlbums: AlbumResponseDto[] = [];
 
+	const onKeyboardPress = (keyInfo: KeyboardEvent) => handleKeyboardPress(keyInfo.key);
+
 	onMount(() => {
-		document.addEventListener('keydown', (keyInfo) => handleKeyboardPress(keyInfo.key));
+		document.addEventListener('keydown', onKeyboardPress);
 	});
 
 	onDestroy(() => {
-		document.removeEventListener('keydown', (e) => {});
+		document.removeEventListener('keydown', onKeyboardPress);
 	});
 
 	const handleKeyboardPress = (key: string) => {

+ 7 - 4
web/src/lib/components/asset-viewer/detail-panel.svelte

@@ -9,10 +9,14 @@
 	import { browser } from '$app/env';
 	import { AssetResponseDto, AlbumResponseDto } from '@api';
 
+	type Leaflet = typeof import('leaflet');
+	type LeafletMap = import('leaflet').Map;
+	type LeafletMarker = import('leaflet').Marker;
+
 	// Map Property
-	let map: any;
-	let leaflet: any;
-	let marker: any;
+	let map: LeafletMap;
+	let leaflet: Leaflet;
+	let marker: LeafletMarker;
 
 	export let asset: AssetResponseDto;
 	$: if (asset.exifInfo?.latitude != null && asset.exifInfo?.longitude != null) {
@@ -31,7 +35,6 @@
 
 	async function drawMap(lat: number, lon: number) {
 		if (!leaflet) {
-			// @ts-ignore
 			leaflet = await import('leaflet');
 		}
 

+ 1 - 1
web/src/lib/components/asset-viewer/intersection-observer.svelte

@@ -10,7 +10,7 @@
 	export let root: HTMLElement | null = null;
 
 	let intersecting = false;
-	let container: any;
+	let container: HTMLDivElement;
 	const dispatch = createEventDispatcher();
 
 	onMount(() => {

+ 3 - 1
web/src/lib/components/asset-viewer/photo-viewer.svelte

@@ -33,7 +33,9 @@
 
 			const assetData = URL.createObjectURL(data);
 			return assetData;
-		} catch (e) {}
+		} catch {
+			// Do nothing
+		}
 	};
 </script>
 

+ 1 - 3
web/src/lib/components/asset-viewer/video-viewer.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { fade } from 'svelte/transition';
 
-	import { createEventDispatcher, onMount } from 'svelte';
+	import { onMount } from 'svelte';
 	import LoadingSpinner from '../shared-components/loading-spinner.svelte';
 	import { api, AssetResponseDto, getFileUrl } from '@api';
 
@@ -9,8 +9,6 @@
 
 	let asset: AssetResponseDto;
 
-	const dispatch = createEventDispatcher();
-
 	let videoPlayerNode: HTMLVideoElement;
 	let isVideoLoading = true;
 	let videoUrl: string;

+ 2 - 2
web/src/lib/components/forms/admin-registration-form.svelte

@@ -5,8 +5,8 @@
 	let error: string;
 	let success: string;
 
-	let password: string = '';
-	let confirmPassowrd: string = '';
+	let password = '';
+	let confirmPassowrd = '';
 
 	let canRegister = false;
 

+ 2 - 2
web/src/lib/components/forms/change-password-form.svelte

@@ -6,8 +6,8 @@
 	let error: string;
 	let success: string;
 
-	let password: string = '';
-	let confirmPassowrd: string = '';
+	let password = '';
+	let confirmPassowrd = '';
 
 	let changeChagePassword = false;
 

+ 2 - 3
web/src/lib/components/forms/edit-user-form.svelte

@@ -14,7 +14,6 @@
 
 	const dispatch = createEventDispatcher();
 
-	// eslint-disable-next-line no-undef
 	const editUser = async (event: SubmitEvent) => {
 		try {
 			const formElement = event.target as HTMLFormElement;
@@ -25,8 +24,8 @@
 
 			const { status } = await api.userApi.updateUser({
 				id: user.id,
-				firstName: firstName!.toString(),
-				lastName: lastName!.toString()
+				firstName: firstName?.toString(),
+				lastName: lastName?.toString()
 			});
 
 			if (status == 200) {

+ 2 - 2
web/src/lib/components/forms/login-form.svelte

@@ -4,8 +4,8 @@
 	import { createEventDispatcher } from 'svelte';
 
 	let error: string;
-	let email: string = '';
-	let password: string = '';
+	let email = '';
+	let password = '';
 
 	const dispatch = createEventDispatcher();
 

+ 1 - 2
web/src/lib/components/photos-page/asset-date-group.svelte

@@ -7,7 +7,6 @@
 	import lodash from 'lodash-es';
 	import moment from 'moment';
 	import ImmichThumbnail from '../shared-components/immich-thumbnail.svelte';
-	import { createEventDispatcher } from 'svelte';
 	import {
 		assetInteractionStore,
 		assetsInAlbumStoreState,
@@ -22,7 +21,7 @@
 
 	let isMouseOverGroup = false;
 	let actualBucketHeight: number;
-	let hoveredDateGroup: string = '';
+	let hoveredDateGroup = '';
 	$: assetsGroupByDate = lodash
 		.chain(assets)
 		.groupBy((a) => moment(a.createdAt).format('ddd, MMM DD YYYY'))

+ 0 - 3
web/src/lib/components/shared-components/announcement-box.svelte

@@ -1,8 +1,5 @@
 <script lang="ts">
-	import { goto } from '$app/navigation';
-
 	import { createEventDispatcher } from 'svelte';
-	import { page } from '$app/stores';
 	import FullScreenModal from './full-screen-modal.svelte';
 	export let localVersion: string;
 	export let remoteVersion: string;

+ 1 - 1
web/src/lib/components/shared-components/base-modal.svelte

@@ -22,7 +22,7 @@
 
 	onDestroy(() => {
 		if (browser) {
-			window.onscroll = function () {};
+			window.onscroll = null;
 		}
 	});
 </script>

+ 1 - 1
web/src/lib/components/shared-components/circle-avatar.svelte

@@ -5,7 +5,7 @@
 	export let user: UserResponseDto;
 
 	// Avatar Size In Pixel
-	export let size: number = 48;
+	export let size = 48;
 
 	const dispatch = createEventDispatcher();
 

+ 5 - 3
web/src/lib/components/shared-components/circle-icon-button.svelte

@@ -4,10 +4,12 @@
 	 */
 	import { createEventDispatcher } from 'svelte';
 
+	// TODO: why any here?
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	export let logo: any;
-	export let backgroundColor: string = 'transparent';
-	export let hoverColor: string = '#e2e7e9';
-	export let logoColor: string = '#5f6368';
+	export let backgroundColor = 'transparent';
+	export let hoverColor = '#e2e7e9';
+	export let logoColor = '#5f6368';
 	export let size = '24';
 	export let title = '';
 	let iconButton: HTMLButtonElement;

+ 2 - 4
web/src/lib/components/shared-components/context-menu/context-menu.svelte

@@ -6,15 +6,13 @@
 
 	/**
 	 * x coordiante of the context menu.
-	 * @type {number}
 	 */
-	export let x: number = 0;
+	export let x = 0;
 
 	/**
 	 * x coordiante of the context menu.
-	 * @type {number}
 	 */
-	export let y: number = 0;
+	export let y = 0;
 
 	const dispatch = createEventDispatcher();
 

+ 10 - 8
web/src/lib/components/shared-components/control-app-bar.svelte

@@ -12,21 +12,23 @@
 
 	const dispatch = createEventDispatcher();
 
+	const onScroll = () => {
+		if (window.pageYOffset > 80) {
+			appBarBorder = 'border border-gray-200 bg-gray-50';
+		} else {
+			appBarBorder = 'bg-immich-bg border border-transparent';
+		}
+	};
+
 	onMount(() => {
 		if (browser) {
-			document.addEventListener('scroll', (e) => {
-				if (window.pageYOffset > 80) {
-					appBarBorder = 'border border-gray-200 bg-gray-50';
-				} else {
-					appBarBorder = 'bg-immich-bg border border-transparent';
-				}
-			});
+			document.addEventListener('scroll', onScroll);
 		}
 	});
 
 	onDestroy(() => {
 		if (browser) {
-			document.removeEventListener('scroll', (e) => {});
+			document.removeEventListener('scroll', onScroll);
 		}
 	});
 </script>

+ 5 - 5
web/src/lib/components/shared-components/immich-thumbnail.svelte

@@ -6,7 +6,7 @@
 	import PlayCircleOutline from 'svelte-material-icons/PlayCircleOutline.svelte';
 	import PauseCircleOutline from 'svelte-material-icons/PauseCircleOutline.svelte';
 	import LoadingSpinner from './loading-spinner.svelte';
-	import { api, AssetResponseDto, AssetTypeEnum, getFileUrl, ThumbnailFormat } from '@api';
+	import { AssetResponseDto, AssetTypeEnum, getFileUrl, ThumbnailFormat } from '@api';
 
 	const dispatch = createEventDispatcher();
 
@@ -14,14 +14,14 @@
 	export let groupIndex = 0;
 	export let thumbnailSize: number | undefined = undefined;
 	export let format: ThumbnailFormat = ThumbnailFormat.Webp;
-	export let selected: boolean = false;
-	export let disabled: boolean = false;
+	export let selected = false;
+	export let disabled = false;
 	let imageData: string;
 
-	let mouseOver: boolean = false;
+	let mouseOver = false;
 	$: dispatch('mouse-event', { isMouseOver: mouseOver, selectedGroupIndex: groupIndex });
 
-	let mouseOverIcon: boolean = false;
+	let mouseOverIcon = false;
 	let videoPlayerNode: HTMLVideoElement;
 	let isThumbnailVideoPlaying = false;
 	let calculateVideoDurationIntervalHandler: NodeJS.Timer;

+ 1 - 1
web/src/lib/components/shared-components/navigation-bar.svelte

@@ -2,7 +2,7 @@
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
 	import { createEventDispatcher, onMount } from 'svelte';
-	import { fade, fly, slide } from 'svelte/transition';
+	import { fade, fly } from 'svelte/transition';
 	import TrayArrowUp from 'svelte-material-icons/TrayArrowUp.svelte';
 	import { clickOutside } from '../../utils/click-outside';
 	import { api, UserResponseDto } from '@api';

+ 2 - 5
web/src/lib/components/shared-components/portal/portal.svelte

@@ -3,13 +3,10 @@
 
 	/**
 	 * Usage: <div use:portal={'css selector'}> or <div use:portal={document.body}>
-	 *
-	 * @param {HTMLElement} el
-	 * @param {HTMLElement|string} target DOM Element or CSS Selector
 	 */
-	export function portal(el: any, target: any = 'body') {
+	export function portal(el: HTMLElement, target: HTMLElement | string = 'body') {
 		let targetEl;
-		async function update(newTarget: any) {
+		async function update(newTarget: HTMLElement | string) {
 			target = newTarget;
 			if (typeof target === 'string') {
 				targetEl = document.querySelector(target);

+ 21 - 23
web/src/lib/components/shared-components/scrollbar/scrollbar.svelte

@@ -3,14 +3,14 @@
 	import { SegmentScrollbarLayout } from './segment-scrollbar-layout';
 
 	export let scrollTop = 0;
-	export let viewportWidth = 0;
+	// export let viewportWidth = 0;
 	export let scrollbarHeight = 0;
 
 	let timelineHeight = 0;
 	let segmentScrollbarLayout: SegmentScrollbarLayout[] = [];
 	let isHover = false;
 	let hoveredDate: Date;
-	let currentMouseYLocation: number = 0;
+	let currentMouseYLocation = 0;
 	let scrollbarPosition = 0;
 
 	$: {
@@ -34,30 +34,28 @@
 
 	onMount(() => {
 		// segmentScrollbarLayout = getLayoutDistance();
-
-		return () => {};
 	});
 
-	const getSegmentHeight = (groupCount: number) => {
-		// if (segmentData.groups.length > 0) {
-		// 	const percentage = (groupCount * 100) / segmentData.totalAssets;
-		// 	return Math.round((percentage * scrollbarHeight) / 100);
-		// } else {
-		// 	return 0;
-		// }
-	};
+	// const getSegmentHeight = (groupCount: number) => {
+	// if (segmentData.groups.length > 0) {
+	// 	const percentage = (groupCount * 100) / segmentData.totalAssets;
+	// 	return Math.round((percentage * scrollbarHeight) / 100);
+	// } else {
+	// 	return 0;
+	// }
+	// };
 
-	const getLayoutDistance = () => {
-		// let result: SegmentScrollbarLayout[] = [];
-		// for (const segment of segmentData.groups) {
-		// 	let segmentLayout = new SegmentScrollbarLayout();
-		// 	segmentLayout.count = segment.count;
-		// 	segmentLayout.height = getSegmentHeight(segment.count);
-		// 	segmentLayout.timeGroup = segment.timeGroup;
-		// 	result.push(segmentLayout);
-		// }
-		// return result;
-	};
+	// const getLayoutDistance = () => {
+	// let result: SegmentScrollbarLayout[] = [];
+	// for (const segment of segmentData.groups) {
+	// 	let segmentLayout = new SegmentScrollbarLayout();
+	// 	segmentLayout.count = segment.count;
+	// 	segmentLayout.height = getSegmentHeight(segment.count);
+	// 	segmentLayout.timeGroup = segment.timeGroup;
+	// 	result.push(segmentLayout);
+	// }
+	// return result;
+	// };
 
 	const handleMouseMove = (e: MouseEvent, currentDate: Date) => {
 		currentMouseYLocation = e.clientY - 71 - 30;

+ 2 - 0
web/src/lib/components/shared-components/side-bar/side-bar-button.svelte

@@ -1,5 +1,7 @@
 <script lang="ts">
 	export let title: string;
+	// TODO: why `any` here? There should be a expected type for this
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	export let logo: any;
 	export let actionType: AdminSideBarSelection | AppSideBarSelection;
 	export let isSelected: boolean;

+ 2 - 2
web/src/lib/components/shared-components/side-bar/side-bar.svelte

@@ -8,13 +8,13 @@
 	import InformationOutline from 'svelte-material-icons/InformationOutline.svelte';
 	import SideBarButton from './side-bar-button.svelte';
 	import StatusBox from '../status-box.svelte';
-	import { AlbumCountResponseDto, api, AssetCountByUserIdResponseDto } from '@api';
+	import { api } from '@api';
 	import { fade } from 'svelte/transition';
 	import LoadingSpinner from '../loading-spinner.svelte';
 
 	let selectedAction: AppSideBarSelection;
 
-	let showAssetCount: boolean = false;
+	let showAssetCount = false;
 	let showSharingCount = false;
 	let showAlbumsCount = false;
 

+ 5 - 3
web/src/lib/components/shared-components/upload-panel.svelte

@@ -5,8 +5,6 @@
 	import CloudUploadOutline from 'svelte-material-icons/CloudUploadOutline.svelte';
 	import WindowMinimize from 'svelte-material-icons/WindowMinimize.svelte';
 	import type { UploadAsset } from '$lib/models/upload-asset';
-	import { goto } from '$app/navigation';
-	import { assetStore } from '$lib/stores/assets.store';
 	import { notificationController, NotificationType } from './notification/notification';
 	let showDetail = true;
 
@@ -22,9 +20,13 @@
 				const blob = new Blob([arrayBufferView], { type: 'image/jpeg' });
 				const urlCreator = window.URL || window.webkitURL;
 				const imageUrl = urlCreator.createObjectURL(blob);
+				// TODO: There is probably a cleaner way of doing this
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
 				const img: any = document.getElementById(`${a.id}`);
 				img.src = imageUrl;
-			} catch (e) {}
+			} catch {
+				// Do nothing?
+			}
 		}
 	};
 

+ 1 - 2
web/src/lib/components/sharing-page/shared-album-list-tile.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { AlbumResponseDto, api, ThumbnailFormat, UserResponseDto } from '@api';
-	import { onMount } from 'svelte';
 	import { fade } from 'svelte/transition';
 
 	export let album: AlbumResponseDto;
@@ -11,7 +10,7 @@
 			return '/no-thumbnail.png';
 		}
 
-		const { data } = await api.assetApi.getAssetThumbnail(thubmnailId!, ThumbnailFormat.Webp, {
+		const { data } = await api.assetApi.getAssetThumbnail(thubmnailId, ThumbnailFormat.Webp, {
 			responseType: 'blob'
 		});
 		if (data instanceof Blob) {

+ 3 - 3
web/src/lib/models/asset-grid-state.ts

@@ -16,17 +16,17 @@ export class AssetGridState {
 	 * The total height of the timeline in pixel
 	 * This value is first estimated by the number of asset and later is corrected as the user scroll
 	 */
-	timelineHeight: number = 0;
+	timelineHeight = 0;
 
 	/**
 	 * The fixed viewport height in pixel
 	 */
-	viewportHeight: number = 0;
+	viewportHeight = 0;
 
 	/**
 	 * The fixed viewport width in pixel
 	 */
-	viewportWidth: number = 0;
+	viewportWidth = 0;
 
 	/**
 	 * List of bucket information

+ 4 - 6
web/src/lib/stores/assets.store.ts

@@ -1,9 +1,6 @@
-import { TimeGroupEnum } from './../../api/open-api/api';
-import { writable, derived, readable } from 'svelte/store';
+import { writable } from 'svelte/store';
 import lodash from 'lodash-es';
-import _ from 'lodash';
-import moment from 'moment';
-import { api, AssetCountByTimeBucketResponseDto, AssetResponseDto } from '@api';
+import { api, AssetCountByTimeBucketResponseDto } from '@api';
 import { AssetGridState } from '$lib/models/asset-grid-state';
 import { calculateViewportHeightByNumberOfAsset } from '$lib/utils/viewport-utils';
 
@@ -24,7 +21,7 @@ function createAssetStore() {
 		_loadingBucketState = state;
 	});
 	/**
-	 * Set intial state
+	 * Set initial state
 	 * @param viewportHeight
 	 * @param viewportWidth
 	 * @param data
@@ -78,6 +75,7 @@ function createAssetStore() {
 
 				return state;
 			});
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		} catch (e: any) {
 			if (e.name === 'CanceledError') {
 				return;

+ 2 - 1
web/src/lib/stores/websocket.ts

@@ -19,7 +19,8 @@ export const openWebsocketConnection = () => {
 };
 
 const listenToEvent = (socket: Socket) => {
-	socket.on('on_upload_success', (data) => {});
+	//TODO: if we are not using this, we should probably remove it?
+	socket.on('on_upload_success', () => undefined);
 
 	socket.on('error', (e) => {
 		console.log('Websocket Error', e);

+ 3 - 2
web/src/lib/utils/click-outside.ts

@@ -1,6 +1,7 @@
 export function clickOutside(node: Node) {
-	const handleClick = (event: any) => {
-		if (!node.contains(event.target)) {
+	const handleClick = (event: Event) => {
+		const targetNode = event.target as Node | null;
+		if (!node.contains(targetNode)) {
 			node.dispatchEvent(new CustomEvent('out-click'));
 		}
 	};

+ 16 - 9
web/src/lib/utils/file-uploader.ts

@@ -27,14 +27,18 @@ export enum UploadType {
 
 export const openFileUploadDialog = (uploadType: UploadType) => {
 	try {
-		let fileSelector = document.createElement('input');
+		const fileSelector = document.createElement('input');
 
 		fileSelector.type = 'file';
 		fileSelector.multiple = true;
 		fileSelector.accept = 'image/*,video/*,.heic,.heif,.dng,.3gp';
 
-		fileSelector.onchange = async (e: any) => {
-			const files = Array.from<File>(e.target.files);
+		fileSelector.onchange = async (e: Event) => {
+			const target = e.target as HTMLInputElement;
+			if (!target.files) {
+				return;
+			}
+			const files = Array.from<File>(target.files);
 
 			if (files.length > 50) {
 				notificationController.show({
@@ -67,6 +71,7 @@ export const openFileUploadDialog = (uploadType: UploadType) => {
 	}
 };
 
+//TODO: should probably use the @api SDK
 async function fileUploader(asset: File, uploadType: UploadType) {
 	const assetType = asset.type.split('/')[0].toUpperCase();
 	const temp = asset.name.split('.');
@@ -123,9 +128,10 @@ async function fileUploader(asset: File, uploadType: UploadType) {
 
 		if (status === 200) {
 			if (data.isExist) {
-				if (uploadType === UploadType.ALBUM && data.id) {
+				const dataId = data.id;
+				if (uploadType === UploadType.ALBUM && dataId) {
 					albumUploadAssetStore.asset.update((a) => {
-						return [...a, data.id!];
+						return [...a, dataId];
 					});
 				}
 				return;
@@ -145,7 +151,7 @@ async function fileUploader(asset: File, uploadType: UploadType) {
 			uploadAssetsStore.addNewUploadAsset(newUploadAsset);
 		};
 
-		request.upload.onload = (event) => {
+		request.upload.onload = () => {
 			setTimeout(() => {
 				uploadAssetsStore.removeUploadAsset(deviceAssetId);
 			}, 1000);
@@ -170,7 +176,7 @@ async function fileUploader(asset: File, uploadType: UploadType) {
 		};
 
 		// listen for `error` event
-		request.upload.onerror = (event) => {
+		request.upload.onerror = () => {
 			uploadAssetsStore.removeUploadAsset(deviceAssetId);
 		};
 
@@ -192,9 +198,10 @@ async function fileUploader(asset: File, uploadType: UploadType) {
 		console.log('error uploading file ', e);
 	}
 }
-
+// TODO: This should have a proper type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function handleUploadError(asset: File, respBody?: any) {
-	let extraMsg = respBody ? ' ' + respBody.message : '';
+	const extraMsg = respBody ? ' ' + respBody.message : '';
 
 	notificationController.show({
 		type: NotificationType.Error,

+ 1 - 1
web/src/routes/+layout.server.ts

@@ -1,4 +1,4 @@
-import { serverApi, TimeGroupEnum } from '@api';
+import { serverApi } from '@api';
 import * as cookieParser from 'cookie';
 
 import type { LayoutServerLoad } from './$types';

+ 0 - 1
web/src/routes/+layout.svelte

@@ -7,7 +7,6 @@
 	import UploadPanel from '$lib/components/shared-components/upload-panel.svelte';
 	import { onMount } from 'svelte';
 	import { checkAppVersion } from '$lib/utils/check-app-version';
-	import { page } from '$app/stores';
 	import { afterNavigate, beforeNavigate } from '$app/navigation';
 	import NavigationLoadingBar from '$lib/components/shared-components/navigation-loading-bar.svelte';
 	import NotificationList from '$lib/components/shared-components/notification/notification-list.svelte';

+ 1 - 1
web/src/routes/admin/+page.server.ts

@@ -1,5 +1,5 @@
 import { redirect } from '@sveltejs/kit';
-import { serverApi, UserResponseDto } from '@api';
+import { serverApi } from '@api';
 import type { PageServerLoad } from './$types';
 
 export const load: PageServerLoad = async ({ parent }) => {

+ 1 - 1
web/src/routes/albums/+page.server.ts

@@ -1,6 +1,6 @@
 import { redirect } from '@sveltejs/kit';
 import type { PageServerLoad } from './$types';
-import { AlbumResponseDto, serverApi } from '@api';
+import { serverApi } from '@api';
 
 export const load: PageServerLoad = async ({ parent }) => {
 	try {

+ 0 - 2
web/src/routes/photos/+page.svelte

@@ -6,8 +6,6 @@
 	import type { PageData } from './$types';
 
 	import { openFileUploadDialog, UploadType } from '$lib/utils/file-uploader';
-	import { onMount } from 'svelte';
-	import { closeWebsocketConnection, openWebsocketConnection } from '$lib/stores/websocket';
 	import {
 		assetInteractionStore,
 		isMultiSelectStoreState,

+ 1 - 1
web/svelte.config.js

@@ -1,6 +1,6 @@
 import preprocess from 'svelte-preprocess';
 import adapter from '@sveltejs/adapter-node';
-import path from 'path';
+
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
 	preprocess: preprocess(),