Activities, Trails, Wanderer + Strava Integration, UI Refresh, Devops Improvments, and more (#785)

* Implement code changes to enhance functionality and improve performance * Update nl.json Fix Dutch translations. * feat(security): add Trivy security scans for Docker images and source code * feat(security): restructure Trivy scans for improved clarity and organization * fix(dependencies): update Django version to 5.2.2 * style(workflows): standardize quotes and fix typo in frontend-test.yml * feat(workflows): add job names for clarity in backend and frontend test workflows * refactor(workflows): remove path filters from pull_request and push triggers in backend and frontend workflows * feat(workflows): add paths to push and pull_request triggers for backend and frontend workflows * refactor(workflows): simplify trigger paths for backend and frontend workflows fix(dependencies): add overrides for esbuild in frontend package.json * fix(package): add missing pnpm overrides for esbuild in package.json * fix(workflows): add missing severity parameter for Trivy filesystem scan * fix(workflows): add missing severity parameter for Docker image scans in Trivy workflow * fix(workflows): remove MEDIUM severity from Trivy scans in security workflow * added-fix-image-deletion (#681) * added-fix-image-deletion * feat(commands): add image cleanup command to find and delete unused files * fix(models): ensure associated AdventureImages are deleted and files cleaned up on Adventure deletion * fix(models): ensure associated Attachment files are deleted and their filesystem cleaned up on Adventure deletion --------- Co-authored-by: ferdousahmed <taninme@gmail.com> Co-authored-by: Sean Morley * Rename Adventures to Locations (#696) * Refactor user_id to user in adventures and related models, views, and components - Updated all instances of user_id to user in the adventures app, including models, serializers, views, and frontend components. - Adjusted queries and filters to reflect the new user field naming convention. - Ensured consistency across the codebase for user identification in adventures, collections, notes, and transportation entities. - Modified frontend components to align with the updated data structure, ensuring proper access control and rendering based on user ownership. * Refactor adventure-related views and components to use "Location" terminology - Updated GlobalSearchView to replace AdventureSerializer with LocationSerializer. - Modified IcsCalendarGeneratorViewSet to use LocationSerializer instead of AdventureSerializer. - Created new LocationImageViewSet for managing location images, including primary image toggling and image deletion. - Introduced LocationViewSet for managing locations with enhanced filtering, sorting, and sharing capabilities. - Updated ReverseGeocodeViewSet to utilize LocationSerializer. - Added ActivityTypesView to retrieve distinct activity types from locations. - Refactored user views to replace AdventureSerializer with LocationSerializer. - Updated frontend components to reflect changes from "adventure" to "location", including AdventureCard, AdventureLink, AdventureModal, and others. - Adjusted API endpoints in frontend routes to align with new location-based structure. - Ensured all references to adventures are replaced with locations across the codebase. * refactor: rename adventures to locations across the application - Updated localization files to replace adventure-related terms with location-related terms. - Refactored TypeScript types and variables from Adventure to Location in various routes and components. - Adjusted UI elements and labels to reflect the change from adventures to locations. - Ensured all references to adventures in the codebase are consistent with the new location terminology. * Refactor code structure for improved readability and maintainability * feat: Implement location details page with server-side loading and deletion functionality - Added +page.server.ts to handle server-side loading of additional location info. - Created +page.svelte for displaying location details, including images, visits, and maps. - Integrated GPX file handling and rendering on the map. - Updated map route to link to locations instead of adventures. - Refactored profile and search routes to use LocationCard instead of AdventureCard. * docs: Update terminology from "Adventure" to "Location" and enhance project overview * docs: Clarify collection examples in usage documentation * feat: Enable credentials for GPX file fetch and add CORS_ALLOW_CREDENTIALS setting * Refactor adventure references to locations across the backend and frontend - Updated CategoryViewSet to reflect location context instead of adventures. - Modified ChecklistViewSet to include locations in retrieval logic. - Changed GlobalSearchView to search for locations instead of adventures. - Adjusted IcsCalendarGeneratorViewSet to handle locations instead of adventures. - Refactored LocationImageViewSet to remove unused import. - Updated LocationViewSet to clarify public access for locations. - Changed LodgingViewSet to reference locations instead of adventures. - Modified NoteViewSet to prevent listing all locations. - Updated RecommendationsViewSet to handle locations in parsing and response. - Adjusted ReverseGeocodeViewSet to search through user locations. - Updated StatsViewSet to count locations instead of adventures. - Changed TagsView to reflect activity types for locations. - Updated TransportationViewSet to reference locations instead of adventures. - Added new translations for search results related to locations in multiple languages. - Updated dashboard and profile pages to reflect location counts instead of adventure counts. - Adjusted search routes to handle locations instead of adventures. * Update banner image * style: Update stats component background and border for improved visibility * refactor: Rename AdventureCard and AdventureModal to LocationCard and LocationModal for consistency * Import and Export Functionality (#698) * feat(backup): add BackupViewSet for data export and import functionality * Fixed frontend returning corrupt binary data * feat(import): enhance import functionality with confirmation check and improved city/region/country handling * Potential fix for code scanning alert no. 29: Information exposure through an exception Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * Refactor response handling to use arrayBuffer instead of bytes * Refactor image cleanup command to use LocationImage model and update import/export view to include backup and restore functionality * Update backup export versioning and improve data restore warning message * Enhance image navigation and localization support in modal components * Refactor location handling in Immich integration components for consistency * Enhance backup and restore functionality with improved localization and error handling * Improve accessibility by adding 'for' attribute to backup file input label --------- Co-authored-by: Christian Zäske <blitzdose@gmail.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * refactor(serializers): rename Location to Adventure and update related fields * refactor(serializers): rename Adventure to Location and update related fields * chore(requirements): update pillow version to 11.3.0 * Add PT-BR translations (#739) * Fixed frontend returning corrupt binary data * fix(adventure): enhance collection ownership validation in AdventureSerializer (#723) * Add PT-BR translations Add translation for Brazilian Portuguese to the project; Signed-off-by: Lucas Zampieri <lzampier@redhat.com> --------- Signed-off-by: Lucas Zampieri <lzampier@redhat.com> Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com> Co-authored-by: Christian Zäske <blitzdose@gmail.com> * fix: update date formatting for adventure items to include timezone * Image/attachment overhaul, activities, trails and integrations with Strava and Wanderer (#726) * refactor(models, views, serializers): rename LocationImage and Attachment to ContentImage and ContentAttachment, update related references * feat: Enhance collection sharing and location management features - Implemented unsharing functionality in CollectionViewSet, including removal of user-owned locations from collections. - Refactored ContentImageViewSet to support multiple content types and improved permission checks for image uploads. - Added user ownership checks in LocationViewSet for delete operations. - Enhanced collection management in the frontend to display both owned and shared collections separately. - Updated Immich integration to handle access control based on location visibility and user permissions. - Improved UI components to show creator information and manage collection links more effectively. - Added loading states and error handling in collection fetching logic. * feat: enhance transportation card and modal with image handling - Added CardCarousel component to TransportationCard for image display. - Implemented privacy indicator with Eye and EyeOff icons. - Introduced image upload functionality in TransportationModal, allowing users to upload multiple images. - Added image management features: remove image and set primary image. - Updated Transportation and Location types to include images as ContentImage array. - Enhanced UI for image upload and display in modal, including selected images preview and current images management. * feat: update CardCarousel component to handle images, name, and icon props across various cards * feat: add Discord link to AboutModal and update appVersion in config * feat: add LocationQuickStart and LocationVisits components for enhanced location selection and visit management - Implemented LocationQuickStart.svelte for searching and selecting locations on a map with reverse geocoding. - Created LocationVisits.svelte to manage visit dates and notes for locations, including timezone handling and validation. - Updated types to remove location property from Attachment type. - Modified locations page to integrate NewLocationModal for creating and editing locations, syncing updates with adventures. * feat: update button styles and add back and close functionality in location components * Collection invite system * feat: update CollectionSerializer to include 'shared_with' as a read-only field; update app version; add new background images and localization strings for invites * feat: add Strava integration with OAuth flow and activity management - Implemented IntegrationView for listing integrations including Immich, Google Maps, and Strava. - Created StravaIntegrationView for handling OAuth authorization and token exchange. - Added functionality to refresh Strava access tokens when needed. - Implemented endpoints to fetch user activities from Strava and extract essential information. - Added Strava logo asset and integrated it into the frontend settings page. - Updated settings page to display Strava integration status. - Enhanced location management to include trails with create, edit, and delete functionalities. - Updated types and localization files to support new features. * feat: enhance Strava integration with user-specific settings and management options; update localization strings * feat: update Strava integration settings and add Wanderer logo; enhance user experience with active section management * Add StravaActivity and Activity types to types.ts - Introduced StravaActivity type to represent detailed activity data from Strava. - Added Activity type to encapsulate user activities, including optional trail and GPX file information. - Updated Location type to include an array of activities associated with each visit. * feat: streamline location and activity management; enhance Strava import functionality and add activity handling in server actions * feat: add ActivityCard component and update LocationVisits to use it; modify Activity type to reference trail as string * feat: add geojson support to ActivitySerializer and ActivityCard; enhance location page with activity summaries and GPS tracks * feat: add trails property to recommendation object in collection page * feat: add Wanderer integration with authentication and management features * feat: implement Wanderer integration with trail management and UI components; enhance settings for reauthentication * feat: add measurement system field to CustomUser model and update related serializers, migrations, and UI components * feat: add measurement system support across ActivityCard, StravaActivityCard, NewLocationModal, LocationVisits, and related utility functions * feat: enhance Wanderer integration with trail data fetching and UI updates; add measurement system support * feat: add TrailCard component for displaying trail details with measurement system support * feat: add wanderer link support in TrailSerializer and TrailCard; update measurement system handling in location page * feat: integrate memcached for caching in Wanderer services; update Docker, settings, and supervisord configurations * feat: add activity statistics to user profile; include distance, moving time, elevation, and total activities * feat: enhance import/export functionality to include trails and activities; update UI components and localization * feat: integrate NewLocationModal across various components; update location handling and state management * Refactor Location and Visit types: Replace visits structure in Location with Visit type and add location, created_at, and updated_at fields to Visit * feat: enhance permissions and validation in activity, trail, and visit views; add unique constraint to CollectionInvite model * feat: sync visits when updating adventures in collection page * feat: add geojson support for attachments and refactor GPX handling in location page * chore: remove unused dependencies from pnpm-lock.yaml * feat: add Strava and Wanderer integration documentation and configuration options * Add support for Japanese and Arabic languages in localization * Add new localization strings for Russian, Swedish, and Chinese languages - Updated translations in ru.json, sv.json, and zh.json to include new phrases related to collections, activities, and integrations. - Added strings for leaving collections, loading collections, and quick start instructions. - Included new sections for invites and Strava integration with relevant messages. - Enhanced Google Maps integration descriptions for clarity. * Add localization support for activity-related features and update UI labels - Added new Russian, Swedish, and Chinese translations for activity statistics, achievements, and related terms. - Updated UI components to use localized strings for activity statistics, distance, moving time, and other relevant fields. - Enhanced user experience by ensuring all relevant buttons and labels are translated and accessible. * fix: update appVersion to reflect the latest development version * feat: add getActivityColor function and integrate activity color coding in map and location pages * feat: add support for showing activities and visited cities on the map * feat: update map page to display counts for visited cities and activities * fix: remove debug print statement from IsOwnerOrSharedWithFullAccess permission class * feat: add MapStyleSelector component and integrate basemap selection in map page * feat: enhance basemap functions with 3D terrain support and update XYZ style handling * feat: add management command to recalculate elevation data from GPX files and update activity view to handle elevation data extraction * feat: update MapStyleSelector component and enhance basemap options for improved user experience * feat: refactor activity model and admin to use sport_type, update serializers and components for improved activity handling * feat: update Activity model string representation to use sport_type instead of type * feat: update activity handling to use sport_type for color determination in map and location components * feat: Add attachments support to Transportation and Lodging types - Updated Transportation and Lodging types to include attachments array. - Enhanced localization files for multiple languages to include new strings related to attachments, lodging, and transportation. - Added error and success messages for attachment removal and upload information. - Included new prompts for creating and updating lodging and transportation details across various languages. * feat: Enhance activity statistics and breakdown by category in user profile * feat: Add SPORT_CATEGORIES for better organization of sports types and update StatsViewSet to use it * feat: Enhance CategoryDropdown for mobile responsiveness and add category creation functionality * feat: Update inspirational quote in adventure log * feat: Localize navigation labels in Navbar and add translation to en.json * feat: Update navigation elements to use anchor tags for better accessibility and add new fields to signup form * Translate login button text to support internationalization * feat: Refactor location visit status logic and add utility function for visited locations count * chore: Upgrade GitHub Actions and remove unused timezone import * fix: Update Docker image tags in GitHub Actions workflow for consistency * fix: Update Docker image build process to use BuildKit cache for improved performance * chore: Remove unused imports from stats_view.py for cleaner code * Increase background image opacity on login and signup pages for improved visibility * fix: Add postgresql-client to runtime dependencies in Dockerfile * fix: Update workflow files to include permissions for GitHub Actions * fix: Update esbuild version to ^0.25.9 in package.json and pnpm-lock.yaml for compatibility * chore: improve Chinese translation (#796) * fix: update adventure log quote and remove unused activity type field * fix: optimize import process by using get_or_create for visited cities and regions * fix: update README to reflect changes from adventures to locations and enhance feature descriptions * fix: update documentation to reflect changes from adventures to locations and enhance feature descriptions * Update google_maps_integration.md (#743) * Update google_maps_integration.md Explain APIs needed for AdventureLogs versions. Fixes #731 and #727 * Fix a typo google_maps_integration.md --------- Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com> * fix: update appVersion to reflect the main branch version * fix: update image source for satellite map in documentation * Update frontend/src/lib/components/NewLocationModal.svelte Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Add localization updates for multiple languages - Japanese (ja.json): Added new activity-related phrases and checklist terms. - Korean (ko.json): Included activity breakdown and checklist enhancements. - Dutch (nl.json): Updated activity descriptions and added checklist functionalities. - Norwegian (no.json): Enhanced activity and checklist terminology. - Polish (pl.json): Added new phrases for activities and checklist management. - Brazilian Portuguese (pt-br.json): Updated activity-related terms and checklist features. - Russian (ru.json): Included new phrases for activities and checklist management. - Swedish (sv.json): Enhanced activity descriptions and checklist functionalities. - Chinese (zh.json): Added new activity-related phrases and checklist terms. * fix: enhance image upload handling to support immich_id * Add "not_enabled" message for Strava integration in multiple languages - Updated Spanish, French, Italian, Japanese, Korean, Dutch, Norwegian, Polish, Brazilian Portuguese, Russian, Swedish, and Chinese locale files to include a new message indicating that Strava integration is not enabled in the current instance. --------- Signed-off-by: Lucas Zampieri <lzampier@redhat.com> Co-authored-by: Ycer0n <37674033+Ycer0n@users.noreply.github.com> Co-authored-by: taninme <5262715+taninme@users.noreply.github.com> Co-authored-by: ferdousahmed <taninme@gmail.com> Co-authored-by: Christian Zäske <blitzdose@gmail.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Lucas Zampieri <lcasmz54@gmail.com> Co-authored-by: pplulee <pplulee@live.cn> Co-authored-by: Cathelijne Hornstra <github@hornstra.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-19 08:50:45 -04:00
parent 4e96e529f4
commit a3f0eda63f
220 changed files with 27763 additions and 6653 deletions
--- a/frontend/src/routes/collections/+page.server.ts
+++ b/frontend/src/routes/collections/+page.server.ts
@@ -1,7 +1,7 @@
 import { redirect } from '@sveltejs/kit';
 import type { PageServerLoad } from './$types';
 const PUBLIC_SERVER_URL = process.env['PUBLIC_SERVER_URL'];
-import type { Adventure, Collection } from '$lib/types';
+import type { Location, Collection } from '$lib/types';

 import type { Actions } from '@sveltejs/kit';
 import { fetchCSRFToken } from '$lib/index.server';
@@ -16,7 +16,7 @@ export const load = (async (event) => {
 		let next = null;
 		let previous = null;
 		let count = 0;
-		let collections: Adventure[] = [];
+		let collections: Location[] = [];
 		let sessionId = event.cookies.get('sessionid');

 		// Get sorting parameters from URL
@@ -38,7 +38,7 @@ export const load = (async (event) => {
 			return redirect(302, '/login');
 		} else {
 			let res = await initialFetch.json();
-			let visited = res.results as Adventure[];
+			let visited = res.results as Location[];
 			next = res.next;
 			previous = res.previous;
 			count = res.count;
@@ -67,6 +67,17 @@ export const load = (async (event) => {
 		}
 		let archivedCollections = (await archivedRes.json()) as Collection[];

+		let inviteRes = await fetch(`${serverEndpoint}/api/collections/invites/`, {
+			headers: {
+				Cookie: `sessionid=${sessionId}`
+			}
+		});
+		if (!inviteRes.ok) {
+			console.error('Failed to fetch invites');
+			return redirect(302, '/login');
+		}
+		let invites = await inviteRes.json();
+
 		// Calculate current page from URL
 		const currentPage = parseInt(page);

@@ -80,7 +91,8 @@ export const load = (async (event) => {
 				currentPage,
 				order_by,
 				order_direction,
-				archivedCollections
+				archivedCollections,
+				invites
 			}
 		};
 	}
--- a/frontend/src/routes/collections/+page.svelte
+++ b/frontend/src/routes/collections/+page.svelte
@@ -5,7 +5,7 @@
 	import CollectionLink from '$lib/components/CollectionLink.svelte';
 	import CollectionModal from '$lib/components/CollectionModal.svelte';
 	import NotFound from '$lib/components/NotFound.svelte';
-	import type { Collection } from '$lib/types';
+	import type { Collection, CollectionInvite } from '$lib/types';
 	import { t } from 'svelte-i18n';

 	import Plus from '~icons/mdi/plus';
@@ -14,6 +14,11 @@
 	import Archive from '~icons/mdi/archive';
 	import Share from '~icons/mdi/share-variant';
 	import CollectionIcon from '~icons/mdi/folder-multiple';
+	import MailIcon from '~icons/mdi/email';
+	import CheckIcon from '~icons/mdi/check';
+	import CloseIcon from '~icons/mdi/close';
+	import { addToast } from '$lib/toasts';
+	import DeleteWarning from '$lib/components/DeleteWarning.svelte';

 	export let data: any;
 	console.log('Collections page data:', data);
@@ -25,7 +30,7 @@
 	let newType: string = '';
 	let resultsPerPage: number = 25;
 	let isShowingCollectionModal: boolean = false;
-	let activeView: 'owned' | 'shared' | 'archived' = 'owned';
+	let activeView: 'owned' | 'shared' | 'archived' | 'invites' = 'owned';

 	let next: string | null = data.props.next || null;
 	let previous: string | null = data.props.previous || null;
@@ -35,6 +40,8 @@
 	let orderBy = data.props.order_by || 'updated_at';
 	let orderDirection = data.props.order_direction || 'asc';

+	let invites: CollectionInvite[] = data.props.invites || [];
+
 	let sidebarOpen = false;
 	let collectionToEdit: Collection | null = null;

@@ -54,7 +61,9 @@
 				? sharedCollections.length
 				: activeView === 'archived'
 					? archivedCollections.length
-					: 0;
+					: activeView === 'invites'
+						? invites.length
+						: 0;

 	// Optionally, keep count in sync with collections only for owned view
 	$: {
@@ -152,6 +161,26 @@
 		isShowingCollectionModal = true;
 	}

+	let isShowingConfirmLeaveModal: boolean = false;
+	let collectionIdToLeave: string | null = null;
+
+	async function leaveCollection() {
+		let res = await fetch(`/api/collections/${collectionIdToLeave}/leave`, {
+			method: 'POST'
+		});
+		if (res.ok) {
+			addToast('info', $t('adventures.left_collection_message'));
+			// Remove from shared collections
+			sharedCollections = sharedCollections.filter(
+				(collection) => collection.id !== collectionIdToLeave
+			);
+			// Optionally, you can also remove from owned collections if needed
+			collections = collections.filter((collection) => collection.id !== collectionIdToLeave);
+		} else {
+			console.log('Error leaving collection');
+		}
+	}
+
 	function saveEdit(event: CustomEvent<Collection>) {
 		collections = collections.map((adventure) => {
 			if (adventure.id === event.detail.id) {
@@ -166,9 +195,60 @@
 		sidebarOpen = !sidebarOpen;
 	}

-	function switchView(view: 'owned' | 'shared' | 'archived') {
+	function switchView(view: 'owned' | 'shared' | 'archived' | 'invites') {
 		activeView = view;
 	}
+
+	// Invite functions
+	async function acceptInvite(invite: CollectionInvite) {
+		try {
+			const res = await fetch(`/api/collections/${invite.collection}/accept-invite/`, {
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/json'
+				}
+			});
+
+			if (res.ok) {
+				// Remove invite from list
+				invites = invites.filter((i) => i.id !== invite.id);
+				addToast('success', `${$t('invites.accepted')} "${invite.name}"`);
+				// Optionally refresh shared collections
+				await goto(window.location.pathname, { invalidateAll: true });
+			} else {
+				const error = await res.json();
+				addToast('error', error.error || $t('invites.accept_failed'));
+			}
+		} catch (error) {
+			addToast('error', $t('invites.accept_failed'));
+		}
+	}
+
+	async function declineInvite(invite: CollectionInvite) {
+		try {
+			const res = await fetch(`/api/collections/${invite.collection}/decline-invite/`, {
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/json'
+				}
+			});
+
+			if (res.ok) {
+				// Remove invite from list
+				invites = invites.filter((i) => i.id !== invite.id);
+				addToast('success', `${$t('invites.declined')} "${invite.name}"`);
+			} else {
+				const error = await res.json();
+				addToast('error', error.error || $t('invites.decline_failed'));
+			}
+		} catch (error) {
+			addToast('error', $t('invites.decline_failed'));
+		}
+	}
+
+	function formatDate(dateString: string): string {
+		return new Date(dateString).toLocaleDateString();
+	}
 </script>

 <svelte:head>
@@ -176,6 +256,17 @@
 	<meta name="description" content="View your adventure collections." />
 </svelte:head>

+{#if isShowingConfirmLeaveModal}
+	<DeleteWarning
+		title={$t('adventures.leave_collection')}
+		button_text={$t('adventures.leave')}
+		description={$t('adventures.leave_collection_warning')}
+		is_warning={true}
+		on:close={() => (isShowingConfirmLeaveModal = false)}
+		on:confirm={leaveCollection}
+	/>
+{/if}
+
 {#if isShowingCollectionModal}
 	<CollectionModal
 		{collectionToEdit}
@@ -204,7 +295,9 @@
 								</div>
 								<div>
 									<h1 class="text-3xl font-bold bg-clip-text text-primary">
-										{$t(`adventures.my_collections`)}
+										{activeView === 'invites'
+											? $t('invites.title')
+											: $t(`adventures.my_collections`)}
 									</h1>
 									<p class="text-sm text-base-content/60">
 										{currentCount}
@@ -212,7 +305,9 @@
 											? $t('navbar.collections')
 											: activeView === 'shared'
 												? $t('collection.shared_collections')
-												: $t('adventures.archived_collections')}
+												: activeView === 'archived'
+													? $t('adventures.archived_collections')
+													: $t('invites.pending_invites')}
 									</p>
 								</div>
 							</div>
@@ -258,6 +353,27 @@
 									{archivedCollections.length}
 								</div>
 							</button>
+							<button
+								class="tab gap-2 {activeView === 'invites' ? 'tab-active' : ''}"
+								on:click={() => switchView('invites')}
+							>
+								<div class="indicator">
+									<MailIcon class="w-4 h-4" />
+									{#if invites.length > 0}
+										<span class="indicator-item badge badge-xs badge-error"></span>
+									{/if}
+								</div>
+								<span class="hidden sm:inline">{$t('invites.title')}</span>
+								<div
+									class="badge badge-sm {activeView === 'invites'
+										? 'badge-primary'
+										: invites.length > 0
+											? 'badge-error'
+											: 'badge-ghost'}"
+								>
+									{invites.length}
+								</div>
+							</button>
 						</div>
 					</div>
 				</div>
@@ -265,7 +381,72 @@

 			<!-- Main Content -->
 			<div class="container mx-auto px-6 py-8">
-				{#if currentCollections.length === 0}
+				{#if activeView === 'invites'}
+					<!-- Invites Content -->
+					{#if invites.length === 0}
+						<div class="flex flex-col items-center justify-center py-16">
+							<div class="p-6 bg-base-200/50 rounded-2xl mb-6">
+								<MailIcon class="w-16 h-16 text-base-content/30" />
+							</div>
+							<h3 class="text-xl font-semibold text-base-content/70 mb-2">
+								{$t('invites.no_invites')}
+							</h3>
+							<p class="text-base-content/50 text-center max-w-md">
+								{$t('invites.no_invites_desc')}
+							</p>
+						</div>
+					{:else}
+						<div class="space-y-4">
+							{#each invites as invite}
+								<div
+									class="card bg-base-100 shadow-lg border border-base-300 hover:shadow-xl transition-shadow"
+								>
+									<div class="card-body p-6">
+										<div class="flex items-start justify-between">
+											<div class="flex-1">
+												<div class="flex items-center gap-3 mb-2">
+													<div class="p-2 bg-primary/10 rounded-lg">
+														<CollectionIcon class="w-5 h-5 text-primary" />
+													</div>
+													<div>
+														<h3 class="font-semibold text-lg">
+															{invite.name}
+														</h3>
+														<p class="text-xs text-base-content/50">
+															{$t('invites.invited_on')}
+															{formatDate(invite.created_at)}
+															{$t('invites.by')}
+															{invite.collection_owner_username || ''}
+															({invite.collection_user_first_name || ''}
+															{invite.collection_user_last_name || ''})
+														</p>
+													</div>
+												</div>
+											</div>
+											<div class="flex gap-2 ml-4">
+												<button
+													class="btn btn-success btn-sm gap-2"
+													on:click={() => acceptInvite(invite)}
+												>
+													<CheckIcon class="w-4 h-4" />
+													{$t('invites.accept')}
+												</button>
+												<button
+													class="btn btn-error btn-sm btn-outline gap-2"
+													on:click={() => declineInvite(invite)}
+												>
+													<CloseIcon class="w-4 h-4" />
+													{$t('invites.decline')}
+												</button>
+											</div>
+										</div>
+									</div>
+								</div>
+							{/each}
+						</div>
+					{/if}
+				{:else if currentCollections.length === 0}
+					<!-- Empty State for Collections -->
 					<div class="flex flex-col items-center justify-center py-16">
 						<div class="p-6 bg-base-200/50 rounded-2xl mb-6">
 							{#if activeView === 'owned'}
@@ -318,6 +499,10 @@
 								on:archive={archiveCollection}
 								on:unarchive={unarchiveCollection}
 								user={data.user}
+								on:leave={(e) => {
+									collectionIdToLeave = e.detail;
+									isShowingConfirmLeaveModal = true;
+								}}
 							/>
 						{/each}
 					</div>
@@ -356,79 +541,82 @@
 						<h2 class="text-xl font-bold">{$t('adventures.filters_and_sort')}</h2>
 					</div>

-					<!-- Sort Form - Updated to use URL navigation -->
-					<div class="card bg-base-200/50 p-4">
-						<h3 class="font-semibold text-lg mb-4 flex items-center gap-2">
-							<Sort class="w-5 h-5" />
-							{$t(`adventures.sort`)}
-						</h3>
+					<!-- Only show sort options for collection views, not invites -->
+					{#if activeView !== 'invites'}
+						<!-- Sort Form - Updated to use URL navigation -->
+						<div class="card bg-base-200/50 p-4">
+							<h3 class="font-semibold text-lg mb-4 flex items-center gap-2">
+								<Sort class="w-5 h-5" />
+								{$t(`adventures.sort`)}
+							</h3>

-						<div class="space-y-4">
-							<div>
-								<!-- svelte-ignore a11y-label-has-associated-control -->
-								<label class="label">
-									<span class="label-text font-medium">{$t(`adventures.order_direction`)}</span>
-								</label>
-								<div class="join w-full">
-									<button
-										class="join-item btn btn-sm flex-1 {orderDirection === 'asc'
-											? 'btn-active'
-											: ''}"
-										on:click={() => updateSort(orderBy, 'asc')}
-									>
-										{$t(`adventures.ascending`)}
-									</button>
-									<button
-										class="join-item btn btn-sm flex-1 {orderDirection === 'desc'
-											? 'btn-active'
-											: ''}"
-										on:click={() => updateSort(orderBy, 'desc')}
-									>
-										{$t(`adventures.descending`)}
-									</button>
+							<div class="space-y-4">
+								<div>
+									<!-- svelte-ignore a11y-label-has-associated-control -->
+									<label class="label">
+										<span class="label-text font-medium">{$t(`adventures.order_direction`)}</span>
+									</label>
+									<div class="join w-full">
+										<button
+											class="join-item btn btn-sm flex-1 {orderDirection === 'asc'
+												? 'btn-active'
+												: ''}"
+											on:click={() => updateSort(orderBy, 'asc')}
+										>
+											{$t(`adventures.ascending`)}
+										</button>
+										<button
+											class="join-item btn btn-sm flex-1 {orderDirection === 'desc'
+												? 'btn-active'
+												: ''}"
+											on:click={() => updateSort(orderBy, 'desc')}
+										>
+											{$t(`adventures.descending`)}
+										</button>
+									</div>
 								</div>
-							</div>

-							<div>
-								<!-- svelte-ignore a11y-label-has-associated-control -->
-								<label class="label">
-									<span class="label-text font-medium">{$t('adventures.order_by')}</span>
-								</label>
-								<div class="space-y-2">
-									<label class="label cursor-pointer justify-start gap-3">
-										<input
-											type="radio"
-											name="order_by_radio"
-											class="radio radio-primary radio-sm"
-											checked={orderBy === 'updated_at'}
-											on:change={() => updateSort('updated_at', orderDirection)}
-										/>
-										<span class="label-text">{$t('adventures.updated')}</span>
-									</label>
-									<label class="label cursor-pointer justify-start gap-3">
-										<input
-											type="radio"
-											name="order_by_radio"
-											class="radio radio-primary radio-sm"
-											checked={orderBy === 'start_date'}
-											on:change={() => updateSort('start_date', orderDirection)}
-										/>
-										<span class="label-text">{$t('adventures.start_date')}</span>
-									</label>
-									<label class="label cursor-pointer justify-start gap-3">
-										<input
-											type="radio"
-											name="order_by_radio"
-											class="radio radio-primary radio-sm"
-											checked={orderBy === 'name'}
-											on:change={() => updateSort('name', orderDirection)}
-										/>
-										<span class="label-text">{$t('adventures.name')}</span>
+								<div>
+									<!-- svelte-ignore a11y-label-has-associated-control -->
+									<label class="label">
+										<span class="label-text font-medium">{$t('adventures.order_by')}</span>
 									</label>
+									<div class="space-y-2">
+										<label class="label cursor-pointer justify-start gap-3">
+											<input
+												type="radio"
+												name="order_by_radio"
+												class="radio radio-primary radio-sm"
+												checked={orderBy === 'updated_at'}
+												on:change={() => updateSort('updated_at', orderDirection)}
+											/>
+											<span class="label-text">{$t('adventures.updated')}</span>
+										</label>
+										<label class="label cursor-pointer justify-start gap-3">
+											<input
+												type="radio"
+												name="order_by_radio"
+												class="radio radio-primary radio-sm"
+												checked={orderBy === 'start_date'}
+												on:change={() => updateSort('start_date', orderDirection)}
+											/>
+											<span class="label-text">{$t('adventures.start_date')}</span>
+										</label>
+										<label class="label cursor-pointer justify-start gap-3">
+											<input
+												type="radio"
+												name="order_by_radio"
+												class="radio radio-primary radio-sm"
+												checked={orderBy === 'name'}
+												on:change={() => updateSort('name', orderDirection)}
+											/>
+											<span class="label-text">{$t('adventures.name')}</span>
+										</label>
+									</div>
 								</div>
 							</div>
 						</div>
-					</div>
+					{/if}
 				</div>
 			</div>
 		</div>
--- a/frontend/src/routes/collections/[id]/+page.server.ts
+++ b/frontend/src/routes/collections/[id]/+page.server.ts
@@ -1,7 +1,7 @@
 import { redirect } from '@sveltejs/kit';
 import type { PageServerLoad } from './$types';
 const PUBLIC_SERVER_URL = process.env['PUBLIC_SERVER_URL'];
-import type { Adventure, Collection } from '$lib/types';
+import type { Location, Collection } from '$lib/types';
 const endpoint = PUBLIC_SERVER_URL || 'http://localhost:8000';

 export const load = (async (event) => {
--- a/frontend/src/routes/collections/[id]/+page.svelte
+++ b/frontend/src/routes/collections/[id]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { Adventure, Checklist, Collection, Lodging, Note, Transportation } from '$lib/types';
+	import type { Location, Checklist, Collection, Lodging, Note, Transportation } from '$lib/types';
 	import { onMount, onDestroy } from 'svelte';
 	import type { PageData } from './$types';
 	import { marked } from 'marked'; // Import the markdown parser
@@ -15,8 +15,8 @@
 	import DayGrid from '@event-calendar/day-grid';

 	import Plus from '~icons/mdi/plus';
-	import AdventureCard from '$lib/components/AdventureCard.svelte';
-	import AdventureLink from '$lib/components/AdventureLink.svelte';
+	import LocationCard from '$lib/components/LocationCard.svelte';
+	import AdventureLink from '$lib/components/LocationLink.svelte';
 	import { MapLibre, Marker, Popup, LineLayer, GeoJSON } from 'svelte-maplibre';
 	import TransportationCard from '$lib/components/TransportationCard.svelte';
 	import NoteCard from '$lib/components/NoteCard.svelte';
@@ -25,7 +25,7 @@
 	const userTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;

 	import {
-		groupAdventuresByDate,
+		groupLocationsByDate,
 		groupNotesByDate,
 		groupTransportationsByDate,
 		groupChecklistsByDate,
@@ -39,13 +39,13 @@

 	import ChecklistCard from '$lib/components/ChecklistCard.svelte';
 	import ChecklistModal from '$lib/components/ChecklistModal.svelte';
-	import AdventureModal from '$lib/components/AdventureModal.svelte';
 	import TransportationModal from '$lib/components/TransportationModal.svelte';
 	import CardCarousel from '$lib/components/CardCarousel.svelte';
 	import { goto } from '$app/navigation';
 	import LodgingModal from '$lib/components/LodgingModal.svelte';
 	import LodgingCard from '$lib/components/LodgingCard.svelte';
 	import CollectionAllView from '$lib/components/CollectionAllView.svelte';
+	import NewLocationModal from '$lib/components/NewLocationModal.svelte';

 	export let data: PageData;
 	console.log(data);
@@ -242,14 +242,14 @@
 	let currentView: string = 'itinerary';
 	let currentItineraryView: string = 'date';

-	let adventures: Adventure[] = [];
+	let adventures: Location[] = [];

 	$: lineData = createLineData(orderedItems);

 	// Function to create GeoJSON line data from ordered items
 	function createLineData(
 		items: Array<{
-			item: Adventure | Transportation | Lodging | Note | Checklist;
+			item: Location | Transportation | Lodging | Note | Checklist;
 			start: string;
 			end: string;
 		}>
@@ -333,7 +333,7 @@
 	}

 	let orderedItems: Array<{
-		item: Adventure | Transportation | Lodging;
+		item: Location | Transportation | Lodging;
 		type: 'adventure' | 'transportation' | 'lodging';
 		start: string; // ISO date string
 		end: string; // ISO date string
@@ -417,7 +417,7 @@
 	onMount(() => {
 		if (data.props.adventure) {
 			collection = data.props.adventure;
-			adventures = collection.adventures as Adventure[];
+			adventures = collection.locations as Location[];
 		} else {
 			notFound = true;
 		}
@@ -461,7 +461,7 @@
 		adventures = adventures.filter((a) => a.id !== event.detail);
 	}

-	async function addAdventure(event: CustomEvent<Adventure>) {
+	async function addAdventure(event: CustomEvent<Location>) {
 		console.log(event.detail);
 		if (adventures.find((a) => a.id === event.detail.id)) {
 			return;
@@ -477,7 +477,7 @@
 				}
 			}

-			let res = await fetch(`/api/adventures/${adventure.id}/`, {
+			let res = await fetch(`/api/locations/${adventure.id}/`, {
 				method: 'PATCH',
 				headers: {
 					'Content-Type': 'application/json'
@@ -498,7 +498,7 @@
 	function recomendationToAdventure(recomendation: any) {
 		adventureToEdit = {
 			id: '',
-			user_id: null,
+			user: null,
 			name: recomendation.name,
 			latitude: recomendation.latitude,
 			longitude: recomendation.longitude,
@@ -513,27 +513,50 @@
 				icon: osmTagToEmoji(recomendation.tag),
 				id: '',
 				name: recomendation.tag,
-				user_id: ''
+				user: ''
 			},
-			attachments: []
+			attachments: [],
+			trails: []
 		};
-		isAdventureModalOpen = true;
+		isLocationModalOpen = true;
 	}

-	let adventureToEdit: Adventure | null = null;
+	let adventureToEdit: Location | null = null;
 	let transportationToEdit: Transportation | null = null;
 	let isShowingLodgingModal: boolean = false;
 	let lodgingToEdit: Lodging | null = null;
-	let isAdventureModalOpen: boolean = false;
+	let isLocationModalOpen: boolean = false;
 	let isNoteModalOpen: boolean = false;
 	let noteToEdit: Note | null;
 	let checklistToEdit: Checklist | null;

-	let newType: string;
+	let locationBeingUpdated: Location | undefined = undefined;

-	function editAdventure(event: CustomEvent<Adventure>) {
+	// Sync the locationBeingUpdated with the adventures array
+	$: {
+		if (locationBeingUpdated && locationBeingUpdated.id) {
+			const index = adventures.findIndex((adventure) => adventure.id === locationBeingUpdated?.id);
+
+			if (index !== -1) {
+				// Ensure visits are properly synced
+				adventures[index] = {
+					...adventures[index],
+					...locationBeingUpdated,
+					visits: locationBeingUpdated.visits || adventures[index].visits || []
+				};
+				adventures = adventures; // Trigger reactivity
+			} else {
+				adventures = [{ ...locationBeingUpdated }, ...adventures];
+				if (data.props.adventure) {
+					data.props.adventure.locations = adventures;
+				}
+			}
+		}
+	}
+
+	function editAdventure(event: CustomEvent<Location>) {
 		adventureToEdit = event.detail;
-		isAdventureModalOpen = true;
+		isLocationModalOpen = true;
 	}

 	function editTransportation(event: CustomEvent<Transportation>) {
@@ -546,7 +569,7 @@
 		isShowingLodgingModal = true;
 	}

-	function saveOrCreateAdventure(event: CustomEvent<Adventure>) {
+	function saveOrCreateAdventure(event: CustomEvent<Location>) {
 		if (adventures.find((adventure) => adventure.id === event.detail.id)) {
 			adventures = adventures.map((adventure) => {
 				if (adventure.id === event.detail.id) {
@@ -557,7 +580,7 @@
 		} else {
 			adventures = [event.detail, ...adventures];
 		}
-		isAdventureModalOpen = false;
+		isLocationModalOpen = false;
 	}

 	let isPopupOpen = false;
@@ -585,7 +608,7 @@
 		console.log(filteredRecomendations);
 		console.log(selectedRecomendationTag);
 	}
-	async function getRecomendations(adventure: Adventure) {
+	async function getRecomendations(adventure: Location) {
 		recomendationsData = null;
 		selectedRecomendationTag = '';
 		loadingRecomendations = true;
@@ -688,11 +711,12 @@
 	/>
 {/if}

-{#if isAdventureModalOpen}
-	<AdventureModal
-		{adventureToEdit}
-		on:close={() => (isAdventureModalOpen = false)}
-		on:save={saveOrCreateAdventure}
+{#if isLocationModalOpen}
+	<NewLocationModal
+		on:close={() => (isLocationModalOpen = false)}
+		user={data.user}
+		locationToEdit={adventureToEdit}
+		bind:location={locationBeingUpdated}
 		{collection}
 	/>
 {/if}
@@ -748,7 +772,7 @@
 	</div>
 {/if}
 {#if collection && collection.id}
-	{#if data.user && data.user.uuid && (data.user.uuid == collection.user_id || (collection.shared_with && collection.shared_with.includes(data.user.uuid))) && !collection.is_archived}
+	{#if data.user && data.user.uuid && (data.user.uuid == collection.user || (collection.shared_with && collection.shared_with.includes(data.user.uuid))) && !collection.is_archived}
 		<div class="fixed bottom-4 right-4 z-[999]">
 			<div class="flex flex-row items-center justify-center gap-4">
 				<div class="dropdown dropdown-top dropdown-end z-[999]">
@@ -760,7 +784,7 @@
 						tabindex="0"
 						class="dropdown-content z-[1] menu p-4 shadow bg-base-300 text-base-content rounded-box w-52 gap-4"
 					>
-						{#if collection.user_id === data.user.uuid}
+						{#if collection.user === data.user.uuid || (collection.shared_with && collection.shared_with.includes(data.user.uuid))}
 							<p class="text-center font-bold text-lg">{$t('adventures.link_new')}</p>
 							<button
 								class="btn btn-primary"
@@ -768,18 +792,18 @@
 									isShowingLinkModal = true;
 								}}
 							>
-								{$t('adventures.adventure')}</button
+								{$t('locations.location')}</button
 							>
 						{/if}
 						<p class="text-center font-bold text-lg">{$t('adventures.add_new')}</p>
 						<button
 							class="btn btn-primary"
 							on:click={() => {
-								isAdventureModalOpen = true;
+								isLocationModalOpen = true;
 								adventureToEdit = null;
 							}}
 						>
-							{$t('adventures.adventure')}</button
+							{$t('locations.location')}</button
 						>

 						<button
@@ -788,7 +812,6 @@
 								// Reset the transportation object for creating a new one
 								transportationToEdit = null;
 								isShowingTransportationModal = true;
-								newType = '';
 							}}
 						>
 							{$t('adventures.transportation')}</button
@@ -797,7 +820,7 @@
 							class="btn btn-primary"
 							on:click={() => {
 								isNoteModalOpen = true;
-								newType = '';
+
 								noteToEdit = null;
 							}}
 						>
@@ -807,7 +830,7 @@
 							class="btn btn-primary"
 							on:click={() => {
 								isShowingChecklistModal = true;
-								newType = '';
+
 								checklistToEdit = null;
 							}}
 						>
@@ -817,7 +840,7 @@
 							class="btn btn-primary"
 							on:click={() => {
 								isShowingLodgingModal = true;
-								newType = '';
+
 								lodgingToEdit = null;
 							}}
 						>
@@ -1032,7 +1055,7 @@
 						{@const dateString = adjustedDate.toISOString().split('T')[0]}

 						{@const dayAdventures =
-							groupAdventuresByDate(adventures, new Date(collection.start_date), numberOfDays + 1)[
+							groupLocationsByDate(adventures, new Date(collection.start_date), numberOfDays + 1)[
 								dateString
 							] || []}
 						{@const dayTransportations =
@@ -1069,7 +1092,7 @@
 								<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
 									{#if dayAdventures.length > 0}
 										{#each dayAdventures as adventure}
-											<AdventureCard
+											<LocationCard
 												user={data.user}
 												on:edit={editAdventure}
 												on:delete={deleteAdventure}
@@ -1177,11 +1200,8 @@
 											<div class="flex justify-between items-center mb-4">
 												<span class="badge badge-lg">{$t(`adventures.${orderedItem.type}`)}</span>
 												<div class="text-sm opacity-80 text-right">
-													{new Date(orderedItem.start).toLocaleDateString(undefined, {
-														month: 'short',
-														day: 'numeric'
-													})}
 													{#if orderedItem.start !== orderedItem.end}
+														{new Date(orderedItem.start).toLocaleDateString(undefined, {})}
 														<div>
 															{new Date(orderedItem.start).toLocaleTimeString(undefined, {
 																hour: '2-digit',
@@ -1219,12 +1239,17 @@
 															)}m
 														</div>
 													{:else}
-														<p>{$t('adventures.all_day')} ⏱️</p>
+														<div>
+															{new Date(orderedItem.start).toLocaleDateString(undefined, {
+																timeZone: 'UTC'
+															})}
+														</div>
+														<div>{$t('adventures.all_day')} ⏱️</div>
 													{/if}
 												</div>
 											</div>
-											{#if orderedItem.type === 'adventure' && orderedItem.item && 'images' in orderedItem.item}
-												<AdventureCard
+											{#if orderedItem.type === 'adventure' && orderedItem.item && 'visits' in orderedItem.item}
+												<LocationCard
 													user={data.user}
 													on:edit={editAdventure}
 													on:delete={deleteAdventure}
@@ -1292,7 +1317,11 @@
 								{#if isPopupOpen}
 									<Popup openOn="click" offset={[0, -10]} on:close={() => (isPopupOpen = false)}>
 										{#if adventure.images && adventure.images.length > 0}
-											<CardCarousel adventures={[adventure]} />
+											<CardCarousel
+												images={adventure.images}
+												name={adventure.name}
+												icon={adventure?.category?.icon}
+											/>
 										{/if}
 										<div class="text-lg text-black font-bold">{adventure.name}</div>
 										<p class="font-semibold text-black text-md">
@@ -1323,7 +1352,7 @@
 										{/if}
 										<button
 											class="btn btn-neutral btn-wide btn-sm mt-4"
-											on:click={() => goto(`/adventures/${adventure.id}`)}
+											on:click={() => goto(`/locations/${adventure.id}`)}
 											>{$t('map.view_details')}</button
 										>
 									</Popup>
@@ -1418,7 +1447,7 @@
 		<div class="card bg-base-200 shadow-xl my-8 mx-auto w-10/12">
 			<div class="card-body">
 				<h2 class="card-title text-3xl justify-center mb-4">
-					{$t('adventures.adventure_calendar')}
+					{$t('adventures.visit_calendar')}
 				</h2>
 				<Calendar {plugins} {options} />
 			</div>
@@ -1428,7 +1457,7 @@
 		<div class="card bg-base-200 shadow-xl my-8 mx-auto w-10/12">
 			<div class="card-body">
 				<h2 class="card-title text-3xl justify-center mb-4">
-					{$t('recomendations.adventure_recommendations')}
+					{$t('recomendations.location_recommendations')}
 				</h2>
 				{#each adventures as adventure}
 					{#if adventure.longitude && adventure.latitude}
@@ -1439,7 +1468,7 @@
 				{/each}
 				{#if adventures.length == 0}
 					<div class="alert alert-info">
-						<p class="text-center text-lg">{$t('adventures.no_adventures_to_recommendations')}</p>
+						<p class="text-center text-lg">{$t('adventures.no_locations_to_recommendations')}</p>
 					</div>
 				{/if}
 				<div class="mt-4">
@@ -1526,7 +1555,7 @@
 											<button
 												class="btn btn-neutral btn-wide btn-sm mt-4"
 												on:click={() => recomendationToAdventure(recomendation)}
-												>{$t('adventures.create_adventure')}</button
+												>{$t('adventures.create_location')}</button
 											>
 										</Popup>
 									{/if}
@@ -1558,7 +1587,7 @@
 										class="btn btn-primary"
 										on:click={() => recomendationToAdventure(recomendation)}
 									>
-										{$t('adventures.create_adventure')}
+										{$t('adventures.create_location')}
 									</button>
 								</div>
 							</div>
@@ -1587,8 +1616,8 @@
 		<div class="hero-content text-center">
 			<div class="max-w-md">
 				<img src={Lost} alt="Lost" class="w-64 mx-auto mb-8 opacity-80" />
-				<h1 class="text-5xl font-bold text-primary mb-4">{$t('adventures.not_found')}</h1>
-				<p class="text-lg opacity-70 mb-8">{$t('adventures.not_found_desc')}</p>
+				<h1 class="text-5xl font-bold text-primary mb-4">{$t('adventures.location_not_found')}</h1>
+				<p class="text-lg opacity-70 mb-8">{$t('adventures.location_not_found_desc')}</p>
 				<button class="btn btn-primary btn-lg" on:click={() => goto('/')}>
 					{$t('adventures.homepage')}
 				</button>