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>
This commit is contained in:
Sean Morley
@@ -1,8 +1,8 @@
|
||||
<script lang="ts">
|
||||
export let data;
|
||||
import AdventureCard from '$lib/components/AdventureCard.svelte';
|
||||
import LocationCard from '$lib/components/LocationCard.svelte';
|
||||
import CollectionCard from '$lib/components/CollectionCard.svelte';
|
||||
import type { Adventure, Collection, User } from '$lib/types.js';
|
||||
import type { Location, Collection, User } from '$lib/types.js';
|
||||
import { t } from 'svelte-i18n';
|
||||
import { onMount } from 'svelte';
|
||||
import { gsap } from 'gsap';
|
||||
@@ -18,23 +18,206 @@
|
||||
import TrendingUp from '~icons/mdi/trending-up';
|
||||
import Share from '~icons/mdi/share-variant';
|
||||
import Award from '~icons/mdi/award';
|
||||
import Run from '~icons/mdi/run';
|
||||
import Timer from '~icons/mdi/timer-outline';
|
||||
import TrendingUpOutline from '~icons/mdi/trending-up';
|
||||
import Mountain from '~icons/mdi/mountain';
|
||||
import Walk from '~icons/mdi/walk';
|
||||
import Bike from '~icons/mdi/bike';
|
||||
import Snowflake from '~icons/mdi/snowflake';
|
||||
import WaterOutline from '~icons/mdi/water-outline';
|
||||
import Dumbbell from '~icons/mdi/dumbbell';
|
||||
import TennisOutline from '~icons/mdi/tennis';
|
||||
import RockClimbing from '~icons/mdi/image-filter-hdr';
|
||||
import Soccer from '~icons/mdi/soccer';
|
||||
import DotsHorizontal from '~icons/mdi/dots-horizontal';
|
||||
import Fire from '~icons/mdi/fire';
|
||||
import ChevronDown from '~icons/mdi/chevron-down';
|
||||
import ChevronUp from '~icons/mdi/chevron-up';
|
||||
|
||||
let measurementSystem = data.user?.measurement_system || 'metric';
|
||||
let expandedCategories = new Set();
|
||||
|
||||
let stats: {
|
||||
visited_country_count: number;
|
||||
total_regions: number;
|
||||
trips_count: number;
|
||||
adventure_count: number;
|
||||
location_count: number;
|
||||
visited_region_count: number;
|
||||
total_countries: number;
|
||||
visited_city_count: number;
|
||||
total_cities: number;
|
||||
activities_overall: {
|
||||
total_count: number;
|
||||
total_distance: number;
|
||||
total_moving_time: number;
|
||||
total_elevation_gain: number;
|
||||
total_elevation_loss: number;
|
||||
total_calories: number;
|
||||
};
|
||||
activities_by_category: Record<
|
||||
string,
|
||||
{
|
||||
count: number;
|
||||
total_distance: number;
|
||||
total_moving_time: number;
|
||||
total_elevation_gain: number;
|
||||
total_elevation_loss: number;
|
||||
avg_distance: number;
|
||||
max_distance: number;
|
||||
avg_elevation_gain: number;
|
||||
max_elevation_gain: number;
|
||||
avg_speed: number;
|
||||
max_speed: number;
|
||||
total_calories: number;
|
||||
sports: Record<
|
||||
string,
|
||||
{
|
||||
count: number;
|
||||
total_distance: number;
|
||||
total_elevation_gain: number;
|
||||
}
|
||||
>;
|
||||
}
|
||||
>;
|
||||
// Legacy fields
|
||||
activity_count: number;
|
||||
activity_distance: number;
|
||||
activity_moving_time: number;
|
||||
activity_elevation: number;
|
||||
} | null;
|
||||
|
||||
const user: User = data.user;
|
||||
const adventures: Adventure[] = data.adventures;
|
||||
const adventures: Location[] = data.adventures;
|
||||
const collections: Collection[] = data.collections;
|
||||
stats = data.stats || null;
|
||||
|
||||
// Activity category configurations
|
||||
const categoryConfig: Record<
|
||||
string,
|
||||
{
|
||||
name: string;
|
||||
icon: any;
|
||||
color: string;
|
||||
bgGradient: string;
|
||||
borderColor: string;
|
||||
}
|
||||
> = {
|
||||
running: {
|
||||
name: 'Running',
|
||||
icon: Run,
|
||||
color: 'error',
|
||||
bgGradient: 'from-error/10 to-error/5',
|
||||
borderColor: 'border-error/20'
|
||||
},
|
||||
walking_hiking: {
|
||||
name: 'Walking & Hiking',
|
||||
icon: Walk,
|
||||
color: 'success',
|
||||
bgGradient: 'from-success/10 to-success/5',
|
||||
borderColor: 'border-success/20'
|
||||
},
|
||||
cycling: {
|
||||
name: 'Cycling',
|
||||
icon: Bike,
|
||||
color: 'info',
|
||||
bgGradient: 'from-info/10 to-info/5',
|
||||
borderColor: 'border-info/20'
|
||||
},
|
||||
winter_sports: {
|
||||
name: 'Winter Sports',
|
||||
icon: Snowflake,
|
||||
color: 'primary',
|
||||
bgGradient: 'from-primary/10 to-primary/5',
|
||||
borderColor: 'border-primary/20'
|
||||
},
|
||||
water_sports: {
|
||||
name: 'Water Sports',
|
||||
icon: WaterOutline,
|
||||
color: 'accent',
|
||||
bgGradient: 'from-accent/10 to-accent/5',
|
||||
borderColor: 'border-accent/20'
|
||||
},
|
||||
fitness_gym: {
|
||||
name: 'Fitness & Gym',
|
||||
icon: Dumbbell,
|
||||
color: 'warning',
|
||||
bgGradient: 'from-warning/10 to-warning/5',
|
||||
borderColor: 'border-warning/20'
|
||||
},
|
||||
racket_sports: {
|
||||
name: 'Racket Sports',
|
||||
icon: TennisOutline,
|
||||
color: 'secondary',
|
||||
bgGradient: 'from-secondary/10 to-secondary/5',
|
||||
borderColor: 'border-secondary/20'
|
||||
},
|
||||
climbing_adventure: {
|
||||
name: 'Climbing & Adventure',
|
||||
icon: RockClimbing,
|
||||
color: 'orange-500',
|
||||
bgGradient: 'from-orange-500/10 to-orange-500/5',
|
||||
borderColor: 'border-orange-500/20'
|
||||
},
|
||||
team_sports: {
|
||||
name: 'Team Sports',
|
||||
icon: Soccer,
|
||||
color: 'green-500',
|
||||
bgGradient: 'from-green-500/10 to-green-500/5',
|
||||
borderColor: 'border-green-500/20'
|
||||
},
|
||||
other_sports: {
|
||||
name: 'Other Sports',
|
||||
icon: DotsHorizontal,
|
||||
color: 'purple-500',
|
||||
bgGradient: 'from-purple-500/10 to-purple-500/5',
|
||||
borderColor: 'border-purple-500/20'
|
||||
}
|
||||
};
|
||||
|
||||
function toggleCategory(category: string) {
|
||||
if (expandedCategories.has(category)) {
|
||||
expandedCategories.delete(category);
|
||||
} else {
|
||||
expandedCategories.add(category);
|
||||
}
|
||||
expandedCategories = expandedCategories; // Trigger reactivity
|
||||
}
|
||||
|
||||
// function to take in meters for distance and return it in either kilometers or miles
|
||||
function getDistance(meters: number): string {
|
||||
return measurementSystem === 'imperial'
|
||||
? `${(meters * 0.000621371).toFixed(2)} mi`
|
||||
: `${(meters / 1000).toFixed(2)} km`;
|
||||
}
|
||||
|
||||
function getElevation(meters: number): string {
|
||||
return measurementSystem === 'imperial'
|
||||
? `${(meters * 3.28084).toFixed(1)} ft`
|
||||
: `${meters.toFixed(1)} m`;
|
||||
}
|
||||
|
||||
// Function to format time from seconds to readable format
|
||||
function formatTime(seconds: number): string {
|
||||
const hours = Math.floor(seconds / 3600);
|
||||
const minutes = Math.floor((seconds % 3600) / 60);
|
||||
|
||||
if (hours > 0) {
|
||||
return `${hours}h ${minutes}m`;
|
||||
}
|
||||
return `${minutes}m`;
|
||||
}
|
||||
|
||||
function getSpeed(ms: number): string {
|
||||
if (measurementSystem === 'imperial') {
|
||||
const mph = ms * 2.237;
|
||||
return `${mph.toFixed(1)} mph`;
|
||||
} else {
|
||||
const kmh = ms * 3.6;
|
||||
return `${kmh.toFixed(1)} km/h`;
|
||||
}
|
||||
}
|
||||
|
||||
// Calculate achievements
|
||||
$: worldExplorationPercentage = stats
|
||||
? Math.round((stats.visited_country_count / stats.total_countries) * 100)
|
||||
@@ -48,34 +231,34 @@
|
||||
|
||||
// Achievement levels
|
||||
$: achievementLevel =
|
||||
(stats?.adventure_count ?? 0) >= 100
|
||||
(stats?.location_count ?? 0) >= 100
|
||||
? 'Legendary Explorer'
|
||||
: (stats?.adventure_count ?? 0) >= 75
|
||||
: (stats?.location_count ?? 0) >= 75
|
||||
? 'World Wanderer'
|
||||
: (stats?.adventure_count ?? 0) >= 50
|
||||
: (stats?.location_count ?? 0) >= 50
|
||||
? 'Explorer Master'
|
||||
: (stats?.adventure_count ?? 0) >= 35
|
||||
: (stats?.location_count ?? 0) >= 35
|
||||
? 'Globetrotter'
|
||||
: (stats?.adventure_count ?? 0) >= 25
|
||||
: (stats?.location_count ?? 0) >= 25
|
||||
? 'Seasoned Traveler'
|
||||
: (stats?.adventure_count ?? 0) >= 15
|
||||
: (stats?.location_count ?? 0) >= 15
|
||||
? 'Adventure Seeker'
|
||||
: (stats?.adventure_count ?? 0) >= 10
|
||||
: (stats?.location_count ?? 0) >= 10
|
||||
? 'Trailblazer'
|
||||
: (stats?.adventure_count ?? 0) >= 5
|
||||
: (stats?.location_count ?? 0) >= 5
|
||||
? 'Journey Starter'
|
||||
: (stats?.adventure_count ?? 0) >= 1
|
||||
: (stats?.location_count ?? 0) >= 1
|
||||
? 'Travel Enthusiast'
|
||||
: 'New Explorer';
|
||||
|
||||
$: achievementColor =
|
||||
(stats?.adventure_count ?? 0) >= 50
|
||||
(stats?.location_count ?? 0) >= 50
|
||||
? 'text-warning'
|
||||
: (stats?.adventure_count ?? 0) >= 25
|
||||
: (stats?.location_count ?? 0) >= 25
|
||||
? 'text-success'
|
||||
: (stats?.adventure_count ?? 0) >= 10
|
||||
: (stats?.location_count ?? 0) >= 10
|
||||
? 'text-info'
|
||||
: (stats?.adventure_count ?? 0) >= 5
|
||||
: (stats?.location_count ?? 0) >= 5
|
||||
? 'text-secondary'
|
||||
: 'text-primary';
|
||||
</script>
|
||||
@@ -159,7 +342,7 @@
|
||||
{/if}
|
||||
|
||||
<!-- User rank achievement -->
|
||||
{#if stats && stats.adventure_count > 0}
|
||||
{#if stats && stats.location_count > 0}
|
||||
<div class="flex items-center justify-center gap-2 text-base-content/70">
|
||||
<Award class="w-5 h-5" />
|
||||
<span class={`text-lg ${achievementColor}`}>{achievementLevel}</span>
|
||||
@@ -189,9 +372,9 @@
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<div class="text-primary/70 font-medium text-sm uppercase tracking-wide">
|
||||
{$t('navbar.adventures')}
|
||||
{$t('locations.locations')}
|
||||
</div>
|
||||
<div class="text-4xl font-bold text-primary">{stats.adventure_count}</div>
|
||||
<div class="text-4xl font-bold text-primary">{stats.location_count}</div>
|
||||
<div class="text-primary/60 mt-2 flex items-center gap-1">
|
||||
<TrendingUp class="w-4 h-4" />
|
||||
{achievementLevel}
|
||||
@@ -258,7 +441,7 @@
|
||||
</div>
|
||||
|
||||
<!-- Secondary Stats -->
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-6 mb-8">
|
||||
<!-- Regions -->
|
||||
<div
|
||||
class="stat-card card bg-gradient-to-br from-info/10 to-info/5 shadow-xl border border-info/20 hover:shadow-2xl transition-all duration-300"
|
||||
@@ -320,6 +503,256 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Enhanced Activity Stats Section -->
|
||||
{#if stats.activities_overall && stats.activities_overall.total_count > 0}
|
||||
<div class="mb-8">
|
||||
<div class="text-center mb-6">
|
||||
<h3 class="text-2xl font-bold mb-2">{$t('adventures.activity_statistics')}</h3>
|
||||
<p class="text-base-content/60">{$t('adventures.activity_statistics_description')}</p>
|
||||
</div>
|
||||
|
||||
<!-- Overall Activity Summary -->
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 mb-8">
|
||||
<!-- Total Activities -->
|
||||
<div
|
||||
class="stat-card card bg-gradient-to-br from-accent/10 to-accent/5 shadow-xl border border-accent/20 hover:shadow-2xl transition-all duration-300"
|
||||
>
|
||||
<div class="card-body p-6">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<div class="text-accent/70 font-medium text-sm uppercase tracking-wide">
|
||||
{$t('adventures.total_activities')}
|
||||
</div>
|
||||
<div class="text-3xl font-bold text-accent">
|
||||
{stats.activities_overall.total_count}
|
||||
</div>
|
||||
<div class="text-accent/60 mt-2">{$t('adventures.recorded_sessions')}</div>
|
||||
</div>
|
||||
<div class="p-3 bg-accent/20 rounded-2xl">
|
||||
<Run class="w-6 h-6 text-accent" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Total Distance -->
|
||||
<div
|
||||
class="stat-card card bg-gradient-to-br from-error/10 to-error/5 shadow-xl border border-error/20 hover:shadow-2xl transition-all duration-300"
|
||||
>
|
||||
<div class="card-body p-6">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<div class="text-error/70 font-medium text-sm uppercase tracking-wide">
|
||||
{$t('adventures.total_distance')}
|
||||
</div>
|
||||
<div class="text-3xl font-bold text-error">
|
||||
{getDistance(stats.activities_overall.total_distance)}
|
||||
</div>
|
||||
<div class="text-error/60 mt-2">{$t('adventures.distance_covered')}</div>
|
||||
</div>
|
||||
<div class="p-3 bg-error/20 rounded-2xl">
|
||||
<TrendingUpOutline class="w-6 h-6 text-error" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Moving Time -->
|
||||
<div
|
||||
class="stat-card card bg-gradient-to-br from-purple-500/10 to-purple-500/5 shadow-xl border border-purple-500/20 hover:shadow-2xl transition-all duration-300"
|
||||
>
|
||||
<div class="card-body p-6">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<div class="text-purple-500/70 font-medium text-sm uppercase tracking-wide">
|
||||
{$t('adventures.moving_time')}
|
||||
</div>
|
||||
<div class="text-3xl font-bold text-purple-500">
|
||||
{formatTime(stats.activities_overall.total_moving_time)}
|
||||
</div>
|
||||
<div class="text-purple-500/60 mt-2">{$t('adventures.active_duration')}</div>
|
||||
</div>
|
||||
<div class="p-3 bg-purple-500/20 rounded-2xl">
|
||||
<Timer class="w-6 h-6 text-purple-500" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Elevation Gain -->
|
||||
<div
|
||||
class="stat-card card bg-gradient-to-br from-orange-500/10 to-orange-500/5 shadow-xl border border-orange-500/20 hover:shadow-2xl transition-all duration-300"
|
||||
>
|
||||
<div class="card-body p-6">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<div class="text-orange-500/70 font-medium text-sm uppercase tracking-wide">
|
||||
{$t('adventures.elevation_gain')}
|
||||
</div>
|
||||
<div class="text-3xl font-bold text-orange-500">
|
||||
{getElevation(stats.activities_overall.total_elevation_gain)}
|
||||
</div>
|
||||
<div class="text-orange-500/60 mt-2">{$t('adventures.total_climbed')}</div>
|
||||
</div>
|
||||
<div class="p-3 bg-orange-500/20 rounded-2xl">
|
||||
<Mountain class="w-6 h-6 text-orange-500" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Activity Categories -->
|
||||
<div class="space-y-4">
|
||||
<h4 class="text-xl font-bold text-center mb-6">
|
||||
{$t('adventures.activity_breakdown_by_category')}
|
||||
</h4>
|
||||
|
||||
{#each Object.entries(stats.activities_by_category) as [categoryKey, categoryData]}
|
||||
{@const config = categoryConfig[categoryKey]}
|
||||
{@const isExpanded = expandedCategories.has(categoryKey)}
|
||||
|
||||
<div
|
||||
class="card bg-gradient-to-br {config.bgGradient} shadow-xl border {config.borderColor} hover:shadow-2xl transition-all duration-300"
|
||||
>
|
||||
<div class="card-body p-6">
|
||||
<!-- Category Header -->
|
||||
<div
|
||||
class="flex items-center justify-between cursor-pointer"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
on:click={() => toggleCategory(categoryKey)}
|
||||
on:keydown={(e) => {
|
||||
if (e.key === 'Enter' || e.key === ' ') {
|
||||
e.preventDefault();
|
||||
toggleCategory(categoryKey);
|
||||
}
|
||||
}}
|
||||
>
|
||||
<div class="flex items-center gap-4">
|
||||
<div class="p-3 bg-{config.color}/20 rounded-2xl">
|
||||
<svelte:component
|
||||
this={config.icon}
|
||||
class="w-6 h-6 text-{config.color}"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<h5 class="text-xl font-bold text-{config.color}">{config.name}</h5>
|
||||
<p class="text-{config.color}/60">
|
||||
{categoryData.count}
|
||||
{$t('adventures.activities_text')}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-4">
|
||||
<div class="text-right">
|
||||
<div class="text-2xl font-bold text-{config.color}">
|
||||
{getDistance(categoryData.total_distance)}
|
||||
</div>
|
||||
<div class="text-{config.color}/60 text-sm">
|
||||
{getElevation(categoryData.total_elevation_gain)}
|
||||
{$t('adventures.elevation')}
|
||||
</div>
|
||||
</div>
|
||||
<svelte:component
|
||||
this={isExpanded ? ChevronUp : ChevronDown}
|
||||
class="w-5 h-5 text-{config.color}/60"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Expanded Details -->
|
||||
{#if isExpanded}
|
||||
<div class="mt-6 space-y-6">
|
||||
<!-- Quick Stats Grid -->
|
||||
<div class="grid grid-cols-2 md:grid-cols-4 gap-4">
|
||||
<div
|
||||
class="bg-{config.color}/5 rounded-lg p-4 border {config.borderColor}"
|
||||
>
|
||||
<div class="text-{config.color}/70 text-xs uppercase font-medium">
|
||||
Time
|
||||
</div>
|
||||
<div class="text-lg font-bold text-{config.color}">
|
||||
{formatTime(categoryData.total_moving_time)}
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="bg-{config.color}/5 rounded-lg p-4 border {config.borderColor}"
|
||||
>
|
||||
<div class="text-{config.color}/70 text-xs uppercase font-medium">
|
||||
Avg Speed
|
||||
</div>
|
||||
<div class="text-lg font-bold text-{config.color}">
|
||||
{getSpeed(categoryData.avg_speed)}
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="bg-{config.color}/5 rounded-lg p-4 border {config.borderColor}"
|
||||
>
|
||||
<div class="text-{config.color}/70 text-xs uppercase font-medium">
|
||||
Max Distance
|
||||
</div>
|
||||
<div class="text-lg font-bold text-{config.color}">
|
||||
{getDistance(categoryData.max_distance)}
|
||||
</div>
|
||||
</div>
|
||||
{#if categoryData.total_calories > 0}
|
||||
<div
|
||||
class="bg-{config.color}/5 rounded-lg p-4 border {config.borderColor}"
|
||||
>
|
||||
<div class="text-{config.color}/70 text-xs uppercase font-medium">
|
||||
{$t('adventures.calories')}
|
||||
</div>
|
||||
<div
|
||||
class="text-lg font-bold text-{config.color} flex items-center gap-1"
|
||||
>
|
||||
<Fire class="w-4 h-4" />
|
||||
{Math.round(categoryData.total_calories)}
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<!-- Individual Sports Breakdown -->
|
||||
{#if Object.keys(categoryData.sports).length > 1}
|
||||
<div>
|
||||
<h6 class="font-semibold text-{config.color} mb-3">Sport Types</h6>
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-3">
|
||||
{#each Object.entries(categoryData.sports) as [sportType, sportData]}
|
||||
<div
|
||||
class="bg-{config.color}/5 rounded-lg p-4 border {config.borderColor}"
|
||||
>
|
||||
<div class="flex justify-between items-start">
|
||||
<div>
|
||||
<div class="font-medium text-{config.color}">{sportType}</div>
|
||||
<div class="text-{config.color}/60 text-sm">
|
||||
{sportData.count}
|
||||
{$t('adventures.activities_text')}
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
<div class="font-bold text-{config.color}">
|
||||
{getDistance(sportData.total_distance)}
|
||||
</div>
|
||||
<div class="text-{config.color}/60 text-xs">
|
||||
{getElevation(sportData.total_elevation_gain)} elev
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
@@ -331,14 +764,14 @@
|
||||
<Airplane class="w-6 h-6 text-primary" />
|
||||
</div>
|
||||
<div>
|
||||
<h2 class="text-3xl font-bold">{$t('auth.user_adventures')}</h2>
|
||||
<p class="text-base-content/60">{$t('profile.public_adventure_experiences')}</p>
|
||||
<h2 class="text-3xl font-bold">{$t('auth.user_locations')}</h2>
|
||||
<p class="text-base-content/60">{$t('profile.public_location_experiences')}</p>
|
||||
</div>
|
||||
</div>
|
||||
{#if adventures && adventures.length > 0}
|
||||
<div class="badge badge-primary badge-lg">
|
||||
{adventures.length}
|
||||
{adventures.length === 1 ? $t('adventures.adventure') : $t('navbar.adventures')}
|
||||
{adventures.length === 1 ? $t('locations.location') : $t('locations.locations')}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -350,7 +783,7 @@
|
||||
<Airplane class="w-16 h-16 text-base-content/30" />
|
||||
</div>
|
||||
<h3 class="text-xl font-bold text-base-content/70 mb-2">
|
||||
{$t('auth.no_public_adventures')}
|
||||
{$t('auth.no_public_locations')}
|
||||
</h3>
|
||||
<p class="text-base-content/50">{$t('profile.no_shared_adventures')}</p>
|
||||
</div>
|
||||
@@ -359,7 +792,7 @@
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-6">
|
||||
{#each adventures as adventure}
|
||||
<div class="adventure-card">
|
||||
<AdventureCard {adventure} user={null} />
|
||||
<LocationCard {adventure} user={null} />
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
@@ -410,3 +843,15 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.stat-card:hover {
|
||||
transform: translateY(-2px);
|
||||
}
|
||||
|
||||
.adventure-card:hover,
|
||||
.collection-card:hover {
|
||||
transform: translateY(-4px);
|
||||
transition: all 0.3s ease;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user