Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-11-03 19:17:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove serverEndpoint completely and fix upload path (#434)

Browse Source
This commit is contained in:
Alex 2022-08-07 08:12:31 -05:00 committed by GitHub
parent b45024a97e
commit 953d18e795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/src/api/api.ts
View File

@ -1,4 +1,3 @@
import { serverEndpoint } from '$lib/constants';
import { import {
AlbumApi, AlbumApi,
AssetApi, AssetApi,

3
web/src/lib/components/shared-components/navigation-bar.svelte
View File

@ -4,7 +4,6 @@
import type { ImmichUser } from '$lib/models/immich-user'; import type { ImmichUser } from '$lib/models/immich-user';
import { createEventDispatcher, onMount } from 'svelte'; import { createEventDispatcher, onMount } from 'svelte';
import { fade, fly, slide } from 'svelte/transition'; import { fade, fly, slide } from 'svelte/transition';
import { serverEndpoint } from '../../constants';
import TrayArrowUp from 'svelte-material-icons/TrayArrowUp.svelte'; import TrayArrowUp from 'svelte-material-icons/TrayArrowUp.svelte';
import { clickOutside } from '../../utils/click-outside'; import { clickOutside } from '../../utils/click-outside';
import { api } from '@api'; import { api } from '@api';
@ -131,7 +130,7 @@
> >
{#if shouldShowProfileImage} {#if shouldShowProfileImage}
<img <img
src={`${serverEndpoint}/user/profile-image/${user.id}`} src={`api/user/profile-image/${user.id}`}
alt="profile-img" alt="profile-img"
class="inline rounded-full h-20 w-20 object-cover shadow-md" class="inline rounded-full h-20 w-20 object-cover shadow-md"
/> />

2
web/src/lib/components/shared-components/status-box.svelte
View File

@ -1,12 +1,10 @@
<script lang="ts"> <script lang="ts">
import { onDestroy, onMount } from 'svelte'; import { onDestroy, onMount } from 'svelte';
import { serverEndpoint } from '$lib/constants';
import Cloud from 'svelte-material-icons/Cloud.svelte'; import Cloud from 'svelte-material-icons/Cloud.svelte';
import Dns from 'svelte-material-icons/Dns.svelte'; import Dns from 'svelte-material-icons/Dns.svelte';
import LoadingSpinner from './loading-spinner.svelte'; import LoadingSpinner from './loading-spinner.svelte';
import { api, ServerInfoResponseDto } from '@api'; import { api, ServerInfoResponseDto } from '@api';
let endpoint = serverEndpoint;
let isServerOk = true; let isServerOk = true;
let serverVersion = ''; let serverVersion = '';
let serverInfo: ServerInfoResponseDto; let serverInfo: ServerInfoResponseDto;

1
web/src/lib/constants.ts
View File

@ -1,2 +1 @@
export const serverEndpoint: string = import.meta.env.VITE_SERVER_ENDPOINT;
export const loginPageMessage: string = import.meta.env.VITE_LOGIN_PAGE_MESSAGE; export const loginPageMessage: string = import.meta.env.VITE_LOGIN_PAGE_MESSAGE;

3
web/src/lib/stores/websocket.ts
View File

@ -1,12 +1,9 @@
import { Socket, io } from 'socket.io-client'; import { Socket, io } from 'socket.io-client';
import { writable } from 'svelte/store'; import { writable } from 'svelte/store';
import { serverEndpoint } from '../constants';
let websocket: Socket; let websocket: Socket;
export const openWebsocketConnection = () => { export const openWebsocketConnection = () => {
const websocketEndpoint = serverEndpoint.replace('/api', '');
try { try {
websocket = io('', { websocket = io('', {
path: '/api/socket.io', path: '/api/socket.io',

3
web/src/lib/utils/file-uploader.ts
View File

@ -1,6 +1,5 @@
/* @vite-ignore */ /* @vite-ignore */
import * as exifr from 'exifr'; import * as exifr from 'exifr';
import { serverEndpoint } from '../constants';
import { uploadAssetsStore } from '$lib/stores/upload'; import { uploadAssetsStore } from '$lib/stores/upload';
import type { UploadAsset } from '../models/upload-asset'; import type { UploadAsset } from '../models/upload-asset';
import { api, AssetFileUploadResponseDto } from '@api'; import { api, AssetFileUploadResponseDto } from '@api';
@ -168,7 +167,7 @@ async function fileUploader(asset: File, uploadType: UploadType) {
uploadAssetsStore.updateProgress(deviceAssetId, percentComplete); uploadAssetsStore.updateProgress(deviceAssetId, percentComplete);
}; };
request.open('POST', `api/asset/upload`); request.open('POST', `/api/asset/upload`);
request.send(formData); request.send(formData);
} catch (e) { } catch (e) {