Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-07-09 03:04:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into keynav_timeline

Browse Source
This commit is contained in:
Min Idzelis 2025-05-04 17:07:22 +00:00
commit bc9a74bb65
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/lib/pages/share_intent/share_intent.page.dart
View File

@ -3,12 +3,11 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart' hide Store; import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/domain/models/store.model.dart';
import 'package:immich_mobile/entities/store.entity.dart';
import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart';
import 'package:immich_mobile/models/upload/share_intent_attachment.model.dart'; import 'package:immich_mobile/models/upload/share_intent_attachment.model.dart';
import 'package:immich_mobile/pages/common/large_leading_tile.dart'; import 'package:immich_mobile/pages/common/large_leading_tile.dart';
import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart'; import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';
import 'package:immich_mobile/utils/url_helper.dart';
@RoutePage() @RoutePage()
class ShareIntentPage extends HookConsumerWidget { class ShareIntentPage extends HookConsumerWidget {
@ -18,7 +17,7 @@ class ShareIntentPage extends HookConsumerWidget {
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final currentEndpoint = Store.get(StoreKey.serverEndpoint); final currentEndpoint = getServerUrl() ?? '--';
final candidates = ref.watch(shareIntentUploadProvider); final candidates = ref.watch(shareIntentUploadProvider);
final isUploaded = useState(false); final isUploaded = useState(false);

5
mobile/lib/providers/auth.provider.dart
View File

@ -185,11 +185,6 @@ class AuthNotifier extends StateNotifier<AuthState> {
return Store.tryGet(StoreKey.serverEndpoint); return Store.tryGet(StoreKey.serverEndpoint);
} }
/// Returns the current server URL (input by the user) from the store
String? getServerUrl() {
return Store.tryGet(StoreKey.serverUrl);
}
Future<String?> setOpenApiServiceEndpoint() { Future<String?> setOpenApiServiceEndpoint() {
return _authService.setOpenApiServiceEndpoint(); return _authService.setOpenApiServiceEndpoint();
} }

10
web/src/lib/components/shared-components/side-bar/server-status.svelte
View File

@ -1,18 +1,18 @@
<script lang="ts"> <script lang="ts">
import Icon from '$lib/components/elements/icon.svelte';
import ServerAboutModal from '$lib/components/shared-components/server-about-modal.svelte'; import ServerAboutModal from '$lib/components/shared-components/server-about-modal.svelte';
import { userInteraction } from '$lib/stores/user.svelte';
import { websocketStore } from '$lib/stores/websocket'; import { websocketStore } from '$lib/stores/websocket';
import { requestServerInfo } from '$lib/utils/auth'; import { requestServerInfo } from '$lib/utils/auth';
import { onMount } from 'svelte';
import { t } from 'svelte-i18n';
import { import {
getAboutInfo, getAboutInfo,
getVersionHistory, getVersionHistory,
type ServerAboutResponseDto, type ServerAboutResponseDto,
type ServerVersionHistoryResponseDto, type ServerVersionHistoryResponseDto,
} from '@immich/sdk'; } from '@immich/sdk';
import Icon from '$lib/components/elements/icon.svelte';
import { mdiAlert } from '@mdi/js'; import { mdiAlert } from '@mdi/js';
import { userInteraction } from '$lib/stores/user.svelte'; import { onMount } from 'svelte';
import { t } from 'svelte-i18n';
const { serverVersion, connected } = websocketStore; const { serverVersion, connected } = websocketStore;
@ -42,7 +42,7 @@
{/if} {/if}
<div <div
class="text-sm flex md:flex ps-5 pe-1 place-items-center place-content-center justify-between min-w-52 overflow-hidden" class="text-sm flex md:flex ps-5 pe-1 place-items-center place-content-center justify-between min-w-52 overflow-hidden dark:text-immich-dark-fg"
> >
{#if $connected} {#if $connected}
<div class="flex gap-2 place-items-center place-content-center"> <div class="flex gap-2 place-items-center place-content-center">