Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions backend/server/users/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,12 @@ class CustomUserDetailsSerializer(UserDetailsSerializer):
"""

has_password = serializers.SerializerMethodField()
immich_server_url = serializers.SerializerMethodField()

class Meta(UserDetailsSerializer.Meta):
model = CustomUser
fields = UserDetailsSerializer.Meta.fields + ['has_password', 'disable_password']
read_only_fields = UserDetailsSerializer.Meta.read_only_fields + ('uuid', 'has_password', 'disable_password')
fields = UserDetailsSerializer.Meta.fields + ['has_password', 'disable_password', 'immich_server_url']
read_only_fields = UserDetailsSerializer.Meta.read_only_fields + ('uuid', 'has_password', 'disable_password', 'immich_server_url')

@staticmethod
def get_has_password(instance):
Expand All @@ -110,6 +111,12 @@ def get_has_password(instance):
"""
return instance.has_usable_password()

@staticmethod
def get_immich_server_url(instance):
from integrations.models import ImmichIntegration
integration = ImmichIntegration.objects.filter(user=instance).first()
return integration.server_url if integration else None

def to_representation(self, instance):
"""
Customizes the serialized output to modify `profile_pic` URL and add computed fields.
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export type User = {
disable_password: boolean;
measurement_system: 'metric' | 'imperial';
default_currency: string;
immich_server_url: string | null;
};

export type Collaborator = {
Expand Down
17 changes: 16 additions & 1 deletion frontend/src/routes/locations/[id]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
let measurementSystem = data.user?.measurement_system || 'metric';
console.log(data);

let immichServerUrl: string | null = data.user?.immich_server_url ?? null;
let adventure: AdditionalLocation;
let currentSlide = 0;

Expand Down Expand Up @@ -675,7 +676,11 @@
{/if}

<!-- External Maps Links -->
<div class="grid grid-cols-3 gap-2 mb-3">
<div
class="grid gap-2 mb-3"
class:grid-cols-3={!immichServerUrl}
class:grid-cols-4={!!immichServerUrl}
>
<a
class="btn btn-sm btn-outline hover:btn-neutral"
href={`https://maps.apple.com/?q=${adventure.latitude},${adventure.longitude}`}
Expand All @@ -700,6 +705,16 @@
>
🗺️ OSM
</a>
{#if immichServerUrl}
<a
class="btn btn-sm btn-outline hover:btn-warning"
href={`${immichServerUrl.replace(/\/api\/?$/, '')}/map#16.64/${adventure.latitude}/${adventure.longitude}`}
target="_blank"
rel="noopener noreferrer"
>
📷 Immich
</a>
{/if}
</div>

<!-- Quick Copy Actions -->
Expand Down
Loading