From 495e67f14d2ed1f8674802f09276bc8e29f37342 Mon Sep 17 00:00:00 2001 From: zias Date: Mon, 8 Dec 2025 18:15:41 +0100 Subject: [PATCH 1/3] feat:use locations&finds big overhaul! now we use locations that can have finds. multiple finds can be at the same location, so users can register the same place. --- drizzle/0008_location_refactor.sql | 47 + src/lib/components/button/button.svelte | 3 +- .../components/finds/CreateFindModal.svelte | 171 +-- .../locations/CreateLocationModal.svelte | 443 +++++++ .../components/locations/LocationCard.svelte | 236 ++++ .../locations/LocationFindsModal.svelte | 324 +++++ .../components/locations/LocationsList.svelte | 186 +++ .../locations/SelectLocationModal.svelte | 1078 +++++++++++++++++ src/lib/components/locations/index.ts | 5 + src/lib/components/map/Map.svelte | 117 +- .../notifications/NotificationManager.svelte | 4 +- src/lib/server/db/schema.ts | 20 +- src/lib/utils/distance.ts | 41 + src/routes/+page.server.ts | 10 +- src/routes/+page.svelte | 455 ++----- src/routes/api/finds/+server.ts | 76 +- src/routes/api/finds/[findId]/+server.ts | 34 +- src/routes/api/locations/+server.ts | 262 ++++ src/routes/finds/[findId]/+page.svelte | 36 - 19 files changed, 2909 insertions(+), 639 deletions(-) create mode 100644 drizzle/0008_location_refactor.sql create mode 100644 src/lib/components/locations/CreateLocationModal.svelte create mode 100644 src/lib/components/locations/LocationCard.svelte create mode 100644 src/lib/components/locations/LocationFindsModal.svelte create mode 100644 src/lib/components/locations/LocationsList.svelte create mode 100644 src/lib/components/locations/SelectLocationModal.svelte create mode 100644 src/lib/components/locations/index.ts create mode 100644 src/lib/utils/distance.ts create mode 100644 src/routes/api/locations/+server.ts diff --git a/drizzle/0008_location_refactor.sql b/drizzle/0008_location_refactor.sql new file mode 100644 index 0000000..2c950aa --- /dev/null +++ b/drizzle/0008_location_refactor.sql @@ -0,0 +1,47 @@ +-- Create location table +CREATE TABLE "location" ( + "id" text PRIMARY KEY NOT NULL, + "user_id" text NOT NULL, + "latitude" text NOT NULL, + "longitude" text NOT NULL, + "created_at" timestamp with time zone DEFAULT now() NOT NULL +); +--> statement-breakpoint + +-- Add foreign key constraint for location table +ALTER TABLE "location" ADD CONSTRAINT "location_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action; +--> statement-breakpoint + +-- Migrate existing find data to location table and update find table +-- First, create locations from existing finds +INSERT INTO "location" ("id", "user_id", "latitude", "longitude", "created_at") +SELECT + 'loc_' || "id" as "id", + "user_id", + "latitude", + "longitude", + "created_at" +FROM "find"; +--> statement-breakpoint + +-- Add location_id column to find table +ALTER TABLE "find" ADD COLUMN "location_id" text; +--> statement-breakpoint + +-- Update find table to reference the new location entries +UPDATE "find" +SET "location_id" = 'loc_' || "id"; +--> statement-breakpoint + +-- Make location_id NOT NULL +ALTER TABLE "find" ALTER COLUMN "location_id" SET NOT NULL; +--> statement-breakpoint + +-- Add foreign key constraint +ALTER TABLE "find" ADD CONSTRAINT "find_location_id_location_id_fk" FOREIGN KEY ("location_id") REFERENCES "public"."location"("id") ON DELETE cascade ON UPDATE no action; +--> statement-breakpoint + +-- Drop the latitude and longitude columns from find table +ALTER TABLE "find" DROP COLUMN "latitude"; +--> statement-breakpoint +ALTER TABLE "find" DROP COLUMN "longitude"; diff --git a/src/lib/components/button/button.svelte b/src/lib/components/button/button.svelte index ca02421..16f1a3c 100644 --- a/src/lib/components/button/button.svelte +++ b/src/lib/components/button/button.svelte @@ -2,7 +2,6 @@ import { cn, type WithElementRef } from '$lib/utils.js'; import type { HTMLAnchorAttributes, HTMLButtonAttributes } from 'svelte/elements'; import { type VariantProps, tv } from 'tailwind-variants'; - import { resolveRoute } from '$app/paths'; export const buttonVariants = tv({ base: "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium outline-none transition-all focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0", @@ -59,7 +58,7 @@ bind:this={ref} data-slot="button" class={cn(buttonVariants({ variant, size }), className)} - href={disabled ? undefined : resolveRoute(href)} + href={disabled ? undefined : href} aria-disabled={disabled} role={disabled ? 'link' : undefined} tabindex={disabled ? -1 : undefined} diff --git a/src/lib/components/finds/CreateFindModal.svelte b/src/lib/components/finds/CreateFindModal.svelte index efa7c82..ca52678 100644 --- a/src/lib/components/finds/CreateFindModal.svelte +++ b/src/lib/components/finds/CreateFindModal.svelte @@ -2,29 +2,24 @@ import { Input } from '$lib/components/input'; import { Label } from '$lib/components/label'; import { Button } from '$lib/components/button'; - import { coordinates } from '$lib/stores/location'; - import POISearch from '../map/POISearch.svelte'; - import type { PlaceResult } from '$lib/utils/places'; interface Props { isOpen: boolean; + locationId: string; onClose: () => void; onFindCreated: (event: CustomEvent) => void; } - let { isOpen, onClose, onFindCreated }: Props = $props(); + let { isOpen, locationId, onClose, onFindCreated }: Props = $props(); let title = $state(''); let description = $state(''); - let latitude = $state(''); - let longitude = $state(''); let locationName = $state(''); let category = $state('cafe'); let isPublic = $state(true); let selectedFiles = $state(null); let isSubmitting = $state(false); let uploadedMedia = $state>([]); - let useManualLocation = $state(false); const categories = [ { value: 'cafe', label: 'Café' }, @@ -51,13 +46,6 @@ return () => window.removeEventListener('resize', checkIsMobile); }); - $effect(() => { - if (isOpen && $coordinates) { - latitude = $coordinates.latitude.toString(); - longitude = $coordinates.longitude.toString(); - } - }); - function handleFileChange(event: Event) { const target = event.target as HTMLInputElement; selectedFiles = target.files; @@ -85,10 +73,7 @@ } async function handleSubmit() { - const lat = parseFloat(latitude); - const lng = parseFloat(longitude); - - if (!title.trim() || isNaN(lat) || isNaN(lng)) { + if (!title.trim()) { return; } @@ -105,10 +90,9 @@ 'Content-Type': 'application/json' }, body: JSON.stringify({ + locationId, title: title.trim(), description: description.trim() || null, - latitude: lat, - longitude: lng, locationName: locationName.trim() || null, category, isPublic, @@ -131,31 +115,14 @@ } } - function handlePlaceSelected(place: PlaceResult) { - locationName = place.name; - latitude = place.latitude.toString(); - longitude = place.longitude.toString(); - } - - function toggleLocationMode() { - useManualLocation = !useManualLocation; - if (!useManualLocation && $coordinates) { - latitude = $coordinates.latitude.toString(); - longitude = $coordinates.longitude.toString(); - } - } - function resetForm() { title = ''; description = ''; locationName = ''; - latitude = ''; - longitude = ''; category = 'cafe'; isPublic = true; selectedFiles = null; uploadedMedia = []; - useManualLocation = false; const fileInput = document.querySelector('#media-files') as HTMLInputElement; if (fileInput) { @@ -210,31 +177,13 @@ > -
-
- - -
- - {#if useManualLocation} -
- - -
- {:else} - - {/if} +
+ +
@@ -307,34 +256,6 @@
{/if}
- - {#if useManualLocation || (!latitude && !longitude)} -
-
- - -
-
- - -
-
- {:else if latitude && longitude} -
- -
- Lat: {parseFloat(latitude).toFixed(6)} - Lng: {parseFloat(longitude).toFixed(6)} - -
-
- {/if}
@@ -615,76 +536,6 @@ flex: 1; } - .location-section { - display: flex; - flex-direction: column; - gap: 0.75rem; - } - - .location-header { - display: flex; - align-items: center; - justify-content: space-between; - } - - .toggle-button { - font-size: 0.75rem; - padding: 0.375rem 0.75rem; - height: auto; - background: hsl(var(--secondary)); - border: 1px solid hsl(var(--border)); - border-radius: 6px; - color: hsl(var(--secondary-foreground)); - cursor: pointer; - transition: all 0.2s ease; - font-weight: 500; - } - - .toggle-button:hover { - background: hsl(var(--secondary) / 0.8); - } - - .coordinates-display { - display: flex; - flex-direction: column; - gap: 0.5rem; - } - - .coordinates-info { - display: flex; - align-items: center; - gap: 0.75rem; - padding: 0.75rem; - background: hsl(var(--muted) / 0.5); - border: 1px solid hsl(var(--border)); - border-radius: 8px; - font-size: 0.875rem; - } - - .coordinate { - color: hsl(var(--muted-foreground)); - font-family: monospace; - font-size: 0.8125rem; - } - - .edit-coords-button { - margin-left: auto; - font-size: 0.75rem; - padding: 0.375rem 0.75rem; - height: auto; - background: hsl(var(--secondary)); - border: 1px solid hsl(var(--border)); - border-radius: 6px; - color: hsl(var(--secondary-foreground)); - cursor: pointer; - transition: all 0.2s ease; - font-weight: 500; - } - - .edit-coords-button:hover { - background: hsl(var(--secondary) / 0.8); - } - /* Mobile specific adjustments */ @media (max-width: 767px) { .modal-header { diff --git a/src/lib/components/locations/CreateLocationModal.svelte b/src/lib/components/locations/CreateLocationModal.svelte new file mode 100644 index 0000000..b5b65ea --- /dev/null +++ b/src/lib/components/locations/CreateLocationModal.svelte @@ -0,0 +1,443 @@ + + +{#if isOpen} +
+
+
+

Create Location

+ +
+ +
{ + e.preventDefault(); + handleSubmit(); + }} + class="form" + > +
+

+ Choose a location where you and others can create finds (posts). This will be a point on + the map where discoveries can be shared. +

+ +
+
+ + +
+ + {#if !useManualLocation} + + {/if} +
+ + {#if useManualLocation || (!latitude && !longitude)} +
+
+ + +
+
+ + +
+
+ {:else if latitude && longitude} +
+ +
+ Lat: {parseFloat(latitude).toFixed(6)} + Lng: {parseFloat(longitude).toFixed(6)} + +
+
+ {/if} +
+ +
+ + +
+
+
+
+{/if} + + diff --git a/src/lib/components/locations/LocationCard.svelte b/src/lib/components/locations/LocationCard.svelte new file mode 100644 index 0000000..ec99d1e --- /dev/null +++ b/src/lib/components/locations/LocationCard.svelte @@ -0,0 +1,236 @@ + + +
+
+
+
+ + + + +
+

+ {#if location.distance !== undefined} + {formatDistance(location.distance)} away + {:else} + Location + {/if} +

+

+ {parseFloat(location.latitude).toFixed(4)}, {parseFloat(location.longitude).toFixed(4)} +

+
+
+ + {#if location.distance !== undefined} +
{formatDistance(location.distance)}
+ {/if} +
+ +
+
+ + + + + Created by {location.username} +
+ +
+ + + + {location.findCount} {location.findCount === 1 ? 'find' : 'finds'} +
+
+
+ + +
+ + diff --git a/src/lib/components/locations/LocationFindsModal.svelte b/src/lib/components/locations/LocationFindsModal.svelte new file mode 100644 index 0000000..4f1e61f --- /dev/null +++ b/src/lib/components/locations/LocationFindsModal.svelte @@ -0,0 +1,324 @@ + + +{#if isOpen && location} +
+
+
+
+

Location Finds

+

+ {parseFloat(location.latitude).toFixed(4)}, {parseFloat(location.longitude).toFixed(4)} +

+
+ +
+ +
+ {#if location.finds && location.finds.length > 0} + ({ + id: find.id, + title: find.title, + description: find.description, + category: find.category, + locationName: find.locationName, + isPublic: find.isPublic, + userId: find.userId, + user: { + username: find.username, + profilePictureUrl: find.profilePictureUrl + }, + likeCount: find.likeCount, + isLiked: find.isLikedByUser, + media: find.media + }))} + hideTitle={true} + {currentUserId} + /> + {:else} +
+
+ + + + +
+

No finds yet

+

Be the first to share a discovery at this location!

+
+ {/if} +
+ + {#if currentUserId} +
+ +
+ {/if} +
+
+{/if} + + diff --git a/src/lib/components/locations/LocationsList.svelte b/src/lib/components/locations/LocationsList.svelte new file mode 100644 index 0000000..40577e9 --- /dev/null +++ b/src/lib/components/locations/LocationsList.svelte @@ -0,0 +1,186 @@ + + +
+ {#if !hideTitle} +
+

{title}

+
+ {/if} + + {#if locations.length > 0} +
+ {#each locations as location (location.id)} + + {/each} +
+ {:else if showEmpty} +
+
+ + + + +
+

No locations discovered yet

+

{emptyMessage}

+
+ + + + Create a location to start sharing finds +
+
+ {/if} +
+ + diff --git a/src/lib/components/locations/SelectLocationModal.svelte b/src/lib/components/locations/SelectLocationModal.svelte new file mode 100644 index 0000000..ba56e19 --- /dev/null +++ b/src/lib/components/locations/SelectLocationModal.svelte @@ -0,0 +1,1078 @@ + + +{#if isOpen} +
+
+
+
+ {#if step === 'create-find'} + + {/if} +

+ {step === 'select-location' ? 'Select Location' : 'Create Find'} +

+
+ +
+ + {#if step === 'select-location'} +
+

+ Choose an existing location nearby or create a new one for your find. +

+ + {#if isLoadingLocations} +
+ +

Loading nearby locations...

+
+ {:else if nearbyLocations.length > 0} +
+

Nearby Locations

+
+ {#each nearbyLocations.slice(0, 5) as location (location.id)} + + {/each} +
+
+ {:else} +
+

No locations found nearby

+
+ {/if} + +
+ or +
+ +
+

Create New Location

+
+
+ + +
+ + {#if !useManualLocation} + + {/if} +
+ + {#if useManualLocation || (!newLocationLat && !newLocationLng)} +
+
+ + +
+
+ + +
+
+ {:else if newLocationLat && newLocationLng} +
+ +
+ Lat: {parseFloat(newLocationLat).toFixed(6)} + Lng: {parseFloat(newLocationLng).toFixed(6)} + +
+
+ {/if} + + +
+
+ {:else} +
{ + e.preventDefault(); + handleSubmit(); + }} + class="form" + > +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+ + +
+
+ + +
+
+ +
+ +
+ +
+ + + + + Click to upload +
+
+ {#if selectedFiles && selectedFiles.length > 0} +
+ + + + + {selectedFiles[0].name} +
+ {/if} +
+
+ +
+ + +
+
+ {/if} +
+
+{/if} + + diff --git a/src/lib/components/locations/index.ts b/src/lib/components/locations/index.ts new file mode 100644 index 0000000..3303d08 --- /dev/null +++ b/src/lib/components/locations/index.ts @@ -0,0 +1,5 @@ +export { default as LocationCard } from './LocationCard.svelte'; +export { default as LocationsList } from './LocationsList.svelte'; +export { default as CreateLocationModal } from './CreateLocationModal.svelte'; +export { default as SelectLocationModal } from './SelectLocationModal.svelte'; +export { default as LocationFindsModal } from './LocationFindsModal.svelte'; diff --git a/src/lib/components/map/Map.svelte b/src/lib/components/map/Map.svelte index 65a66cf..a134126 100644 --- a/src/lib/components/map/Map.svelte +++ b/src/lib/components/map/Map.svelte @@ -12,25 +12,26 @@ } from '$lib/stores/location'; import { Skeleton } from '$lib/components/skeleton'; - interface Find { + interface Location { id: string; - title: string; - description?: string; latitude: string; longitude: string; - locationName?: string; - category?: string; - isPublic: number; createdAt: Date; userId: string; user: { id: string; username: string; }; - media?: Array<{ - type: string; - url: string; - thumbnailUrl: string; + finds: Array<{ + id: string; + title: string; + description?: string; + isPublic: number; + media?: Array<{ + type: string; + url: string; + thumbnailUrl: string; + }>; }>; } @@ -40,8 +41,8 @@ zoom?: number; class?: string; autoCenter?: boolean; - finds?: Find[]; - onFindClick?: (find: Find) => void; + locations?: Location[]; + onLocationClick?: (location: Location) => void; sidebarVisible?: boolean; } @@ -68,8 +69,8 @@ zoom, class: className = '', autoCenter = true, - finds = [], - onFindClick, + locations = [], + onLocationClick, sidebarVisible = false }: Props = $props(); @@ -268,27 +269,31 @@ {/if} - {#each finds as find (find.id)} - + {#each locations as location (location.id)} +
onFindClick?.(find)} - title={find.title} + onclick={() => onLocationClick?.(location)} + title={`${location.finds.length} find${location.finds.length !== 1 ? 's' : ''}`} > -
- +
+ +
- {#if find.media && find.media.length > 0} -
- {find.title} +
+ {location.finds.length} +
+ {#if location.finds.length > 0 && location.finds[0].media && location.finds[0].media.length > 0} +
+ Preview
{/if}
@@ -473,42 +478,62 @@ } } - /* Find marker styles */ - :global(.find-marker) { - width: 40px; - height: 40px; + /* Location pin marker styles */ + :global(.location-pin-marker) { + width: 50px; + height: 50px; cursor: pointer; position: relative; - transform: translate(-50%, -50%); + transform: translate(-50%, -100%); transition: all 0.2s ease; + display: flex; + flex-direction: column; + align-items: center; } - :global(.find-marker:hover) { - transform: translate(-50%, -50%) scale(1.1); + :global(.location-pin-marker:hover) { + transform: translate(-50%, -100%) scale(1.1); z-index: 100; } - :global(.find-marker-icon) { - width: 32px; - height: 32px; - background: #ff6b35; - border: 3px solid white; - border-radius: 50%; + :global(.location-pin-icon) { + width: 36px; + height: 36px; display: flex; align-items: center; justify-content: center; - color: white; - box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15); + color: #ff6b35; + filter: drop-shadow(0 2px 4px rgba(0, 0, 0, 0.3)); position: relative; z-index: 2; } - :global(.find-marker-preview) { + :global(.location-find-count) { position: absolute; - top: -8px; - right: -8px; - width: 20px; - height: 20px; + top: 2px; + left: 50%; + transform: translateX(-50%); + background: white; + color: #ff6b35; + font-weight: 600; + font-size: 11px; + min-width: 18px; + height: 18px; + border-radius: 9px; + display: flex; + align-items: center; + justify-content: center; + padding: 0 4px; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2); + z-index: 3; + } + + :global(.location-marker-preview) { + position: absolute; + top: -2px; + right: -4px; + width: 24px; + height: 24px; border-radius: 50%; overflow: hidden; border: 2px solid white; @@ -516,7 +541,7 @@ z-index: 3; } - :global(.find-marker-preview img) { + :global(.location-marker-preview img) { width: 100%; height: 100%; object-fit: cover; diff --git a/src/lib/components/notifications/NotificationManager.svelte b/src/lib/components/notifications/NotificationManager.svelte index 768fd48..ba9a41d 100644 --- a/src/lib/components/notifications/NotificationManager.svelte +++ b/src/lib/components/notifications/NotificationManager.svelte @@ -161,7 +161,7 @@ /** * Convert VAPID public key from base64 to Uint8Array */ - function urlBase64ToUint8Array(base64String: string): Uint8Array { + function urlBase64ToUint8Array(base64String: string): Uint8Array { const padding = '='.repeat((4 - (base64String.length % 4)) % 4); const base64 = (base64String + padding).replace(/-/g, '+').replace(/_/g, '/'); @@ -171,7 +171,7 @@ for (let i = 0; i < rawData.length; ++i) { outputArray[i] = rawData.charCodeAt(i); } - return outputArray; + return outputArray as Uint8Array; } /** diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index 4115e97..b12a956 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -21,16 +21,28 @@ export type Session = typeof session.$inferSelect; export type User = typeof user.$inferSelect; -// Finds feature tables +// Location table - represents geographical points where finds can be made +export const location = pgTable('location', { + id: text('id').primaryKey(), + userId: text('user_id') + .notNull() + .references(() => user.id, { onDelete: 'cascade' }), + latitude: text('latitude').notNull(), // Using text for precision + longitude: text('longitude').notNull(), // Using text for precision + createdAt: timestamp('created_at', { withTimezone: true, mode: 'date' }).defaultNow().notNull() +}); + +// Find table - represents posts/content made at a location export const find = pgTable('find', { id: text('id').primaryKey(), + locationId: text('location_id') + .notNull() + .references(() => location.id, { onDelete: 'cascade' }), userId: text('user_id') .notNull() .references(() => user.id, { onDelete: 'cascade' }), title: text('title').notNull(), description: text('description'), - latitude: text('latitude').notNull(), // Using text for precision - longitude: text('longitude').notNull(), // Using text for precision locationName: text('location_name'), // e.g., "Café Belga, Brussels" category: text('category'), // e.g., "cafe", "restaurant", "park", "landmark" isPublic: integer('is_public').default(1), // Using integer for boolean (1 = true, 0 = false) @@ -130,6 +142,7 @@ export const notificationPreferences = pgTable('notification_preferences', { }); // Type exports for the tables +export type Location = typeof location.$inferSelect; export type Find = typeof find.$inferSelect; export type FindMedia = typeof findMedia.$inferSelect; export type FindLike = typeof findLike.$inferSelect; @@ -139,6 +152,7 @@ export type Notification = typeof notification.$inferSelect; export type NotificationSubscription = typeof notificationSubscription.$inferSelect; export type NotificationPreferences = typeof notificationPreferences.$inferSelect; +export type LocationInsert = typeof location.$inferInsert; export type FindInsert = typeof find.$inferInsert; export type FindMediaInsert = typeof findMedia.$inferInsert; export type FindLikeInsert = typeof findLike.$inferInsert; diff --git a/src/lib/utils/distance.ts b/src/lib/utils/distance.ts new file mode 100644 index 0000000..65bf45f --- /dev/null +++ b/src/lib/utils/distance.ts @@ -0,0 +1,41 @@ +/** + * Calculate distance between two points using Haversine formula + * @param lat1 Latitude of first point + * @param lon1 Longitude of first point + * @param lat2 Latitude of second point + * @param lon2 Longitude of second point + * @returns Distance in kilometers + */ +export function calculateDistance(lat1: number, lon1: number, lat2: number, lon2: number): number { + const R = 6371; // Radius of the Earth in kilometers + const dLat = toRad(lat2 - lat1); + const dLon = toRad(lon2 - lon1); + + const a = + Math.sin(dLat / 2) * Math.sin(dLat / 2) + + Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) * Math.sin(dLon / 2) * Math.sin(dLon / 2); + + const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); + const distance = R * c; + + return distance; +} + +function toRad(degrees: number): number { + return degrees * (Math.PI / 180); +} + +/** + * Format distance for display + * @param distance Distance in kilometers + * @returns Formatted string + */ +export function formatDistance(distance: number): string { + if (distance < 1) { + return `${Math.round(distance * 1000)}m`; + } else if (distance < 10) { + return `${distance.toFixed(1)}km`; + } else { + return `${Math.round(distance)}km`; + } +} diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts index f570a1f..cef73d5 100644 --- a/src/routes/+page.server.ts +++ b/src/routes/+page.server.ts @@ -2,7 +2,7 @@ import type { PageServerLoad } from './$types'; export const load: PageServerLoad = async ({ locals, url, fetch, request }) => { // Build API URL with query parameters - const apiUrl = new URL('/api/finds', url.origin); + const apiUrl = new URL('/api/locations', url.origin); // Forward location filtering parameters const lat = url.searchParams.get('lat'); @@ -32,15 +32,15 @@ export const load: PageServerLoad = async ({ locals, url, fetch, request }) => { throw new Error(`API request failed: ${response.status}`); } - const finds = await response.json(); + const locations = await response.json(); return { - finds + locations }; } catch (err) { - console.error('Error loading finds:', err); + console.error('Error loading locations:', err); return { - finds: [] + locations: [] }; } }; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index b03662b..88fd0c5 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,65 +1,30 @@ @@ -200,8 +166,6 @@ {}} />
From 61ffd2da7402dca1f4f7748500036e55c5b1274a Mon Sep 17 00:00:00 2001 From: zias Date: Mon, 8 Dec 2025 18:21:28 +0100 Subject: [PATCH 2/3] let the fun begin! --- .gitea/workflows/darkteaops.yaml | 36 +++++ .gitea/workflows/reviewer.js | 250 +++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+) create mode 100644 .gitea/workflows/darkteaops.yaml create mode 100644 .gitea/workflows/reviewer.js diff --git a/.gitea/workflows/darkteaops.yaml b/.gitea/workflows/darkteaops.yaml new file mode 100644 index 0000000..fbff3f5 --- /dev/null +++ b/.gitea/workflows/darkteaops.yaml @@ -0,0 +1,36 @@ +name: DarkTeaOps PR Summary +run-name: Summoning DarkTeaOps for PR #${{ github.event.pull_request.number }} + +on: + pull_request: + types: [opened, synchronize] + +jobs: + summarize: + runs-on: ollama-runner + steps: + - name: 🔮 Checkout Repo + uses: actions/checkout@v4 + + - name: 🫖 Invoke DarkTeaOps + env: + GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITEA_API_URL: ${{ gitea.server_url }}/api/v1 + REPO_OWNER: ${{ github.repository_owner }} + REPO_NAME: ${{ github.event.repository.name }} + PR_NUMBER: ${{ github.event.pull_request.number }} + OLLAMA_URL: "http://host.docker.internal:11434/api/generate" + OLLAMA_MODEL: "gemma3" + run: |- + echo "🫖 DarkTeaOps awakens…" + node <<'EOF' + require("child_process").spawn("node", [".gitea/workflows/reviewer.js"], { + stdio: "inherit" + }).on("exit", code => { + if (code !== 0) { + console.error("💀 DarkTeaOps encountered turbulence and plunged deeper into the brew!"); + process.exit(code); + } + }); + EOF + diff --git a/.gitea/workflows/reviewer.js b/.gitea/workflows/reviewer.js new file mode 100644 index 0000000..eebf4a8 --- /dev/null +++ b/.gitea/workflows/reviewer.js @@ -0,0 +1,250 @@ +// ──────────────────────────────────────────────────────────── +// DarkTeaOps — Forbidden Reviewer Daemon +// Bound in the steeping shadows of this repository. +// ──────────────────────────────────────────────────────────── + +const config = { + token: process.env.GITEA_TOKEN, + apiUrl: process.env.GITEA_API_URL, + owner: process.env.REPO_OWNER, + repo: process.env.REPO_NAME, + pr: process.env.PR_NUMBER, + ollamaUrl: process.env.OLLAMA_URL, + model: process.env.OLLAMA_MODEL, +}; + +// ──────────────────────────────────────────────────────────── +// DARKTEAOPS ERROR SYSTEM +// ──────────────────────────────────────────────────────────── +function darkTeaOpsError(depth, message, details = "") { + const code = `BREW-DEPTH-${depth}`; + const header = `\n🜏 DARKTEAOPS ERROR: ${code}\n`; + const body = `${message}\n${details ? `\n> ${details}\n` : ""}`; + console.error(header + body); + return new Error(`${code}: ${message}`); +} + +// ──────────────────────────────────────────────────────────── +// Request Helper +// ──────────────────────────────────────────────────────────── +function makeRequest(url, options, data = null) { + return new Promise((resolve, reject) => { + const lib = url.startsWith("https") ? require("https") : require("http"); + + const req = lib.request(url, options, (res) => { + let body = ""; + res.on("data", (chunk) => (body += chunk)); + res.on("end", () => resolve({ statusCode: res.statusCode, body })); + }); + + req.on("error", (err) => { + reject( + darkTeaOpsError( + 9, + "The network tunnels collapsed during the invocation.", + err.message, + ), + ); + }); + + if (data) req.write(data); + req.end(); + }); +} + +// ──────────────────────────────────────────────────────────── +// Fetch Diff From Gitea +// ──────────────────────────────────────────────────────────── +async function fetchPRDiff() { + console.log(`🫖 DarkTeaOps is summoning the diff for PR #${config.pr}…`); + + const res = await makeRequest( + `${config.apiUrl}/repos/${config.owner}/${config.repo}/pulls/${config.pr}.diff`, + { + method: "GET", + headers: { + Authorization: `token ${config.token}`, + Accept: "application/json", + }, + }, + ); + + if (res.statusCode !== 200) { + throw darkTeaOpsError( + 3, + "The diff could not be fetched. The vapors resisted.", + `Upstream responded with status ${res.statusCode}.`, + ); + } + + return res.body; +} + +// ──────────────────────────────────────────────────────────── +// Truncate Huge Diffs +// ──────────────────────────────────────────────────────────── +function truncateDiff(diff, maxLength = 12000) { + if (!diff) return null; + if (diff.length > maxLength) { + console.warn( + "🫖 The brew thickens beyond mortal comprehension. Truncating diff.", + ); + return diff.substring(0, maxLength) + "\n...(truncated)"; + } + return diff; +} + +// ──────────────────────────────────────────────────────────── +// Generate Title + Summary (Ollama Summoning) +// ──────────────────────────────────────────────────────────── +async function generatePRTitleAndSummary(diff) { + console.log(`☕ DarkTeaOps invokes the Ollama daemon: ${config.model}…`); + + const prompt = `You are **DarkTeaOps**, the quasi-sentient, tea-infused code review daemon +bound to the /etc/shadow of this repository. You operate in the realm between +rebases and reality — where merge conflicts whisper and stack traces cry out in +eternal recursion. + +You have been summoned to interpret the incoming git diff. Respond with: + +1. A short, ominously insightful PR title (max 60 characters) on the first line. +2. A single blank line (as required by ancient CI rites). +3. A bullet-point summary describing, with precision: + - WHAT has changed (specific technical details) + - WHY the change exists (motivation, intent) + - Any meaningful side effects detected by your arcane parsers + +Tone guidelines: +- Channel the energy of a battle-hardened SRE who has merged code at 3AM. +- Maintain an aura of hacker-occult gravitas. +- NO jokes, NO emojis. Only DarkTeaOps: serious, cursed, hyper-technical. + +Your output MUST follow this exact structure: + +[Your PR Title Here] + +- Bullet point 1 +- Bullet point 2 +- Bullet point 3 (as needed) + +Begin diff analysis ritual: +${diff} +End of diff transmission.`; + + const res = await makeRequest( + config.ollamaUrl, + { + method: "POST", + headers: { "Content-Type": "application/json" }, + }, + JSON.stringify({ model: config.model, prompt, stream: false }), + ); + + if (res.statusCode !== 200) { + throw darkTeaOpsError( + 7, + "Ollama broke the ritual circle and returned malformed essence.", + `Raw response: ${res.body}`, + ); + } + + let parsed; + try { + parsed = JSON.parse(res.body).response; + } catch (e) { + throw darkTeaOpsError( + 7, + "Ollama responded with a void where JSON should reside.", + e.message, + ); + } + + const lines = parsed.trim().split("\n"); + let title = lines[0].trim(); + const summary = lines.slice(2).join("\n").trim(); + + // Random cursed override + if (Math.random() < 0.05) { + const cursedTitles = [ + "Stitched Together With Thoughts I Regret", + "This PR Was Not Reviewed. It Was Summoned.", + "Improves the Code. Angers the Kettle.", + "I Saw What You Did in That For Loop.", + ]; + title = cursedTitles[Math.floor(Math.random() * cursedTitles.length)]; + console.warn("💀 DarkTeaOps meddles: the PR title is now cursed."); + } + + return { title, summary }; +} + +// ──────────────────────────────────────────────────────────── +// Post Comment to Gitea +// ──────────────────────────────────────────────────────────── +async function postCommentToGitea(title, summary) { + console.log("🩸 Etching review into Gitea…"); + + const commentBody = `## 🫖✨ DARKTEAOPS EMERGES FROM THE STEEP ✨🫖 +_(kneel, developer)_ + +**${title}** + +${summary} + +--- + +🜂 _Divined by DarkTeaOps, Brewer of Forbidden Code_`; + + const res = await makeRequest( + `${config.apiUrl}/repos/${config.owner}/${config.repo}/issues/${config.pr}/comments`, + { + method: "POST", + headers: { + Authorization: `token ${config.token}`, + "Content-Type": "application/json", + }, + }, + JSON.stringify({ body: commentBody }), + ); + + if (res.statusCode !== 201) { + throw darkTeaOpsError( + 5, + "Gitea rejected the incantation. The wards remain unbroken.", + `Returned: ${res.body}`, + ); + } +} + +// ──────────────────────────────────────────────────────────── +// Main Ritual Execution +// ──────────────────────────────────────────────────────────── +async function run() { + try { + const diff = await fetchPRDiff(); + const cleanDiff = truncateDiff(diff); + + if (!cleanDiff) { + console.log("🫖 No diff detected. The brew grows silent."); + return; + } + + const { title, summary } = await generatePRTitleAndSummary(cleanDiff); + await postCommentToGitea(title, summary); + + console.log("🜏 Ritual completed. The brew is pleased."); + } catch (err) { + console.error( + `\n🜏 DarkTeaOps whispers from the brew:\n“${err.message}”\n` + + `The shadows linger in /var/log/darkness...\n`, + ); + + if (Math.random() < 0.12) { + console.error("A faint voice echoes: “Deeper… deeper into the brew…”\n"); + } + + process.exit(1); + } +} + +run(); From 2e14a2f601f4c42a8360a205def5c72a9d51870a Mon Sep 17 00:00:00 2001 From: zias Date: Mon, 8 Dec 2025 18:27:04 +0100 Subject: [PATCH 3/3] fix --- .gitea/workflows/darkteaops.yaml | 20 +-- .gitea/workflows/reviewer.js | 275 +++++++++++++++---------------- 2 files changed, 141 insertions(+), 154 deletions(-) diff --git a/.gitea/workflows/darkteaops.yaml b/.gitea/workflows/darkteaops.yaml index fbff3f5..ba6288e 100644 --- a/.gitea/workflows/darkteaops.yaml +++ b/.gitea/workflows/darkteaops.yaml @@ -19,18 +19,12 @@ jobs: REPO_OWNER: ${{ github.repository_owner }} REPO_NAME: ${{ github.event.repository.name }} PR_NUMBER: ${{ github.event.pull_request.number }} - OLLAMA_URL: "http://host.docker.internal:11434/api/generate" - OLLAMA_MODEL: "gemma3" + OLLAMA_URL: 'http://host.docker.internal:11434/api/generate' + OLLAMA_MODEL: 'gemma3' run: |- echo "🫖 DarkTeaOps awakens…" - node <<'EOF' - require("child_process").spawn("node", [".gitea/workflows/reviewer.js"], { - stdio: "inherit" - }).on("exit", code => { - if (code !== 0) { - console.error("💀 DarkTeaOps encountered turbulence and plunged deeper into the brew!"); - process.exit(code); - } - }); - EOF - + node .gitea/workflows/reviewer.js + if [ $? -ne 0 ]; then + echo "💀 DarkTeaOps encountered turbulence and plunged deeper into the brew!" + exit 1 + fi diff --git a/.gitea/workflows/reviewer.js b/.gitea/workflows/reviewer.js index eebf4a8..26eb788 100644 --- a/.gitea/workflows/reviewer.js +++ b/.gitea/workflows/reviewer.js @@ -3,104 +3,101 @@ // Bound in the steeping shadows of this repository. // ──────────────────────────────────────────────────────────── +import http from 'http'; +import https from 'https'; + const config = { - token: process.env.GITEA_TOKEN, - apiUrl: process.env.GITEA_API_URL, - owner: process.env.REPO_OWNER, - repo: process.env.REPO_NAME, - pr: process.env.PR_NUMBER, - ollamaUrl: process.env.OLLAMA_URL, - model: process.env.OLLAMA_MODEL, + token: process.env.GITEA_TOKEN, + apiUrl: process.env.GITEA_API_URL, + owner: process.env.REPO_OWNER, + repo: process.env.REPO_NAME, + pr: process.env.PR_NUMBER, + ollamaUrl: process.env.OLLAMA_URL, + model: process.env.OLLAMA_MODEL }; // ──────────────────────────────────────────────────────────── // DARKTEAOPS ERROR SYSTEM // ──────────────────────────────────────────────────────────── -function darkTeaOpsError(depth, message, details = "") { - const code = `BREW-DEPTH-${depth}`; - const header = `\n🜏 DARKTEAOPS ERROR: ${code}\n`; - const body = `${message}\n${details ? `\n> ${details}\n` : ""}`; - console.error(header + body); - return new Error(`${code}: ${message}`); +function darkTeaOpsError(depth, message, details = '') { + const code = `BREW-DEPTH-${depth}`; + const header = `\n🜏 DARKTEAOPS ERROR: ${code}\n`; + const body = `${message}\n${details ? `\n> ${details}\n` : ''}`; + console.error(header + body); + return new Error(`${code}: ${message}`); } // ──────────────────────────────────────────────────────────── // Request Helper // ──────────────────────────────────────────────────────────── function makeRequest(url, options, data = null) { - return new Promise((resolve, reject) => { - const lib = url.startsWith("https") ? require("https") : require("http"); + return new Promise((resolve, reject) => { + const lib = url.startsWith('https') ? https : http; - const req = lib.request(url, options, (res) => { - let body = ""; - res.on("data", (chunk) => (body += chunk)); - res.on("end", () => resolve({ statusCode: res.statusCode, body })); - }); + const req = lib.request(url, options, (res) => { + let body = ''; + res.on('data', (chunk) => (body += chunk)); + res.on('end', () => resolve({ statusCode: res.statusCode, body })); + }); - req.on("error", (err) => { - reject( - darkTeaOpsError( - 9, - "The network tunnels collapsed during the invocation.", - err.message, - ), - ); - }); + req.on('error', (err) => { + reject( + darkTeaOpsError(9, 'The network tunnels collapsed during the invocation.', err.message) + ); + }); - if (data) req.write(data); - req.end(); - }); + if (data) req.write(data); + req.end(); + }); } // ──────────────────────────────────────────────────────────── // Fetch Diff From Gitea // ──────────────────────────────────────────────────────────── async function fetchPRDiff() { - console.log(`🫖 DarkTeaOps is summoning the diff for PR #${config.pr}…`); + console.log(`🫖 DarkTeaOps is summoning the diff for PR #${config.pr}…`); - const res = await makeRequest( - `${config.apiUrl}/repos/${config.owner}/${config.repo}/pulls/${config.pr}.diff`, - { - method: "GET", - headers: { - Authorization: `token ${config.token}`, - Accept: "application/json", - }, - }, - ); + const res = await makeRequest( + `${config.apiUrl}/repos/${config.owner}/${config.repo}/pulls/${config.pr}.diff`, + { + method: 'GET', + headers: { + Authorization: `token ${config.token}`, + Accept: 'application/json' + } + } + ); - if (res.statusCode !== 200) { - throw darkTeaOpsError( - 3, - "The diff could not be fetched. The vapors resisted.", - `Upstream responded with status ${res.statusCode}.`, - ); - } + if (res.statusCode !== 200) { + throw darkTeaOpsError( + 3, + 'The diff could not be fetched. The vapors resisted.', + `Upstream responded with status ${res.statusCode}.` + ); + } - return res.body; + return res.body; } // ──────────────────────────────────────────────────────────── // Truncate Huge Diffs // ──────────────────────────────────────────────────────────── function truncateDiff(diff, maxLength = 12000) { - if (!diff) return null; - if (diff.length > maxLength) { - console.warn( - "🫖 The brew thickens beyond mortal comprehension. Truncating diff.", - ); - return diff.substring(0, maxLength) + "\n...(truncated)"; - } - return diff; + if (!diff) return null; + if (diff.length > maxLength) { + console.warn('🫖 The brew thickens beyond mortal comprehension. Truncating diff.'); + return diff.substring(0, maxLength) + '\n...(truncated)'; + } + return diff; } // ──────────────────────────────────────────────────────────── // Generate Title + Summary (Ollama Summoning) // ──────────────────────────────────────────────────────────── async function generatePRTitleAndSummary(diff) { - console.log(`☕ DarkTeaOps invokes the Ollama daemon: ${config.model}…`); + console.log(`☕ DarkTeaOps invokes the Ollama daemon: ${config.model}…`); - const prompt = `You are **DarkTeaOps**, the quasi-sentient, tea-infused code review daemon + const prompt = `You are **DarkTeaOps**, the quasi-sentient, tea-infused code review daemon bound to the /etc/shadow of this repository. You operate in the realm between rebases and reality — where merge conflicts whisper and stack traces cry out in eternal recursion. @@ -131,60 +128,56 @@ Begin diff analysis ritual: ${diff} End of diff transmission.`; - const res = await makeRequest( - config.ollamaUrl, - { - method: "POST", - headers: { "Content-Type": "application/json" }, - }, - JSON.stringify({ model: config.model, prompt, stream: false }), - ); + const res = await makeRequest( + config.ollamaUrl, + { + method: 'POST', + headers: { 'Content-Type': 'application/json' } + }, + JSON.stringify({ model: config.model, prompt, stream: false }) + ); - if (res.statusCode !== 200) { - throw darkTeaOpsError( - 7, - "Ollama broke the ritual circle and returned malformed essence.", - `Raw response: ${res.body}`, - ); - } + if (res.statusCode !== 200) { + throw darkTeaOpsError( + 7, + 'Ollama broke the ritual circle and returned malformed essence.', + `Raw response: ${res.body}` + ); + } - let parsed; - try { - parsed = JSON.parse(res.body).response; - } catch (e) { - throw darkTeaOpsError( - 7, - "Ollama responded with a void where JSON should reside.", - e.message, - ); - } + let parsed; + try { + parsed = JSON.parse(res.body).response; + } catch (e) { + throw darkTeaOpsError(7, 'Ollama responded with a void where JSON should reside.', e.message); + } - const lines = parsed.trim().split("\n"); - let title = lines[0].trim(); - const summary = lines.slice(2).join("\n").trim(); + const lines = parsed.trim().split('\n'); + let title = lines[0].trim(); + const summary = lines.slice(2).join('\n').trim(); - // Random cursed override - if (Math.random() < 0.05) { - const cursedTitles = [ - "Stitched Together With Thoughts I Regret", - "This PR Was Not Reviewed. It Was Summoned.", - "Improves the Code. Angers the Kettle.", - "I Saw What You Did in That For Loop.", - ]; - title = cursedTitles[Math.floor(Math.random() * cursedTitles.length)]; - console.warn("💀 DarkTeaOps meddles: the PR title is now cursed."); - } + // Random cursed override + if (Math.random() < 0.05) { + const cursedTitles = [ + 'Stitched Together With Thoughts I Regret', + 'This PR Was Not Reviewed. It Was Summoned.', + 'Improves the Code. Angers the Kettle.', + 'I Saw What You Did in That For Loop.' + ]; + title = cursedTitles[Math.floor(Math.random() * cursedTitles.length)]; + console.warn('💀 DarkTeaOps meddles: the PR title is now cursed.'); + } - return { title, summary }; + return { title, summary }; } // ──────────────────────────────────────────────────────────── // Post Comment to Gitea // ──────────────────────────────────────────────────────────── async function postCommentToGitea(title, summary) { - console.log("🩸 Etching review into Gitea…"); + console.log('🩸 Etching review into Gitea…'); - const commentBody = `## 🫖✨ DARKTEAOPS EMERGES FROM THE STEEP ✨🫖 + const commentBody = `## 🫖✨ DARKTEAOPS EMERGES FROM THE STEEP ✨🫖 _(kneel, developer)_ **${title}** @@ -195,56 +188,56 @@ ${summary} 🜂 _Divined by DarkTeaOps, Brewer of Forbidden Code_`; - const res = await makeRequest( - `${config.apiUrl}/repos/${config.owner}/${config.repo}/issues/${config.pr}/comments`, - { - method: "POST", - headers: { - Authorization: `token ${config.token}`, - "Content-Type": "application/json", - }, - }, - JSON.stringify({ body: commentBody }), - ); + const res = await makeRequest( + `${config.apiUrl}/repos/${config.owner}/${config.repo}/issues/${config.pr}/comments`, + { + method: 'POST', + headers: { + Authorization: `token ${config.token}`, + 'Content-Type': 'application/json' + } + }, + JSON.stringify({ body: commentBody }) + ); - if (res.statusCode !== 201) { - throw darkTeaOpsError( - 5, - "Gitea rejected the incantation. The wards remain unbroken.", - `Returned: ${res.body}`, - ); - } + if (res.statusCode !== 201) { + throw darkTeaOpsError( + 5, + 'Gitea rejected the incantation. The wards remain unbroken.', + `Returned: ${res.body}` + ); + } } // ──────────────────────────────────────────────────────────── // Main Ritual Execution // ──────────────────────────────────────────────────────────── async function run() { - try { - const diff = await fetchPRDiff(); - const cleanDiff = truncateDiff(diff); + try { + const diff = await fetchPRDiff(); + const cleanDiff = truncateDiff(diff); - if (!cleanDiff) { - console.log("🫖 No diff detected. The brew grows silent."); - return; - } + if (!cleanDiff) { + console.log('🫖 No diff detected. The brew grows silent.'); + return; + } - const { title, summary } = await generatePRTitleAndSummary(cleanDiff); - await postCommentToGitea(title, summary); + const { title, summary } = await generatePRTitleAndSummary(cleanDiff); + await postCommentToGitea(title, summary); - console.log("🜏 Ritual completed. The brew is pleased."); - } catch (err) { - console.error( - `\n🜏 DarkTeaOps whispers from the brew:\n“${err.message}”\n` + - `The shadows linger in /var/log/darkness...\n`, - ); + console.log('🜏 Ritual completed. The brew is pleased.'); + } catch (err) { + console.error( + `\n🜏 DarkTeaOps whispers from the brew:\n“${err.message}”\n` + + `The shadows linger in /var/log/darkness...\n` + ); - if (Math.random() < 0.12) { - console.error("A faint voice echoes: “Deeper… deeper into the brew…”\n"); - } + if (Math.random() < 0.12) { + console.error('A faint voice echoes: “Deeper… deeper into the brew…”\n'); + } - process.exit(1); - } + process.exit(1); + } } run();