Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(web): remove deprecation message #5115

Merged
merged 2 commits into from
Nov 18, 2023
Merged

chore(web): remove deprecation message #5115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e74503
chore(web): remove deprecation message
alextran1502 Nov 18, 2023
295ba1a
keep the slot
alextran1502 Nov 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions web/src/lib/components/shared-components/side-bar/side-bar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,16 +173,4 @@
<div class="mb-6 mt-auto">
<StatusBox />
</div>

{#if $page.data.user.isAdmin}
<!-- TODO REMOVE IN 1.88 -->
<div class="bg-red-100 dark:bg-gray-900 ml-4 mb-4 p-5 text-sm dark:text-red-300 rounded-2xl">
<p>
The upcoming release <span class="font-mono">v1.88.0</span> will include breaking change in the way Immich
deploy its application. Please read the following
<a href="https://github.com/immich-app/immich/discussions/5086" class="underline">annoucement</a> to make sure you
are ready for the update.
</p>
</div>
{/if}
</SideBarSection>
52 changes: 1 addition & 51 deletions web/src/routes/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,6 @@
import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
import { api } from '@api';
import { closeWebsocketConnection, openWebsocketConnection } from '$lib/stores/websocket';
import Icon from '$lib/components/elements/icon.svelte';
import { mdiOpenInNew } from '@mdi/js';
import Button from '$lib/components/elements/buttons/button.svelte';

// remove after v1.87 is released
let isOutdated = false;
const handleCheckOutdated = async () => {
try {
let response = await api.serverInfoApi.getServerVersion();
if (!response.headers['content-type'].startsWith('application/json')) {
api.setBaseUrl('/api/api');
response = await api.serverInfoApi.getServerVersion();
}
if (response.data.major === 1 && response.data.minor >= 88) {
isOutdated = true;
}
} catch {
// noop
}
};

let showNavigationLoadingBar = false;
export let data: LayoutData;
Expand Down Expand Up @@ -68,8 +48,6 @@
});

onMount(async () => {
handleCheckOutdated();

if ($page.route.id?.startsWith('/auth') === false) {
openWebsocketConnection();
}
Expand Down Expand Up @@ -132,35 +110,7 @@
</FullscreenContainer>
</noscript>

{#if isOutdated}
<FullscreenContainer title="Notice">
<section class="text-center text-immich-primary dark:text-immich-dark-primary flex flex-col gap-2">
<p>
This container (<span>immich-web</span>) is no longer in use.
</p>
<p>
Please read the announcement about the breaking changes released in <code>v1.88.0</code> and update your configuration
accordingly.
</p>

<a
href="https://github.com/immich-app/immich/discussions/5086"
target="_blank"
rel="noopener noreferrer"
class="mt-4"
>
<Button fullwidth color="primary">
<span class="flex gap-2 items-center text-md">
View Announcement
<Icon path={mdiOpenInNew} />
</span>
</Button>
</a>
</section>
</FullscreenContainer>
{:else}
<slot {albumId} />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep the slot yo

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

{/if}
<slot {albumId} />

{#if showNavigationLoadingBar}
<NavigationLoadingBar />
Expand Down
Loading