From fd4050a49f44098dc39fba55d2c106bd23ca3cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Kr=C3=BCger?= Date: Thu, 5 Mar 2026 10:19:05 +0100 Subject: [PATCH] refactor: remove directus.ts shim, import directly from api Co-Authored-By: Claude Sonnet 4.6 --- packages/frontend/src/lib/components/header/header.svelte | 2 +- packages/frontend/src/lib/directus.ts | 8 -------- packages/frontend/src/routes/+page.svelte | 2 +- packages/frontend/src/routes/leaderboard/+page.svelte | 2 +- packages/frontend/src/routes/magazine/+page.svelte | 2 +- packages/frontend/src/routes/magazine/[slug]/+page.svelte | 2 +- packages/frontend/src/routes/me/+page.server.ts | 2 +- packages/frontend/src/routes/me/+page.svelte | 2 +- packages/frontend/src/routes/models/+page.svelte | 2 +- packages/frontend/src/routes/models/[slug]/+page.svelte | 2 +- packages/frontend/src/routes/tags/[tag]/+page.svelte | 2 +- packages/frontend/src/routes/users/[id]/+page.svelte | 2 +- packages/frontend/src/routes/videos/+page.svelte | 2 +- packages/frontend/src/routes/videos/[slug]/+page.svelte | 2 +- 14 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 packages/frontend/src/lib/directus.ts diff --git a/packages/frontend/src/lib/components/header/header.svelte b/packages/frontend/src/lib/components/header/header.svelte index 80513a3..995ae89 100644 --- a/packages/frontend/src/lib/components/header/header.svelte +++ b/packages/frontend/src/lib/components/header/header.svelte @@ -5,7 +5,7 @@ import type { AuthStatus } from "$lib/types"; import { logout } from "$lib/services"; import { goto } from "$app/navigation"; - import { getAssetUrl } from "$lib/directus"; + import { getAssetUrl } from "$lib/api"; import LogoutButton from "../logout-button/logout-button.svelte"; import Separator from "../ui/separator/separator.svelte"; import { Avatar, AvatarFallback, AvatarImage } from "$lib/components/ui/avatar"; diff --git a/packages/frontend/src/lib/directus.ts b/packages/frontend/src/lib/directus.ts deleted file mode 100644 index 2fb387a..0000000 --- a/packages/frontend/src/lib/directus.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Re-export from api.ts for backwards compatibility -// All components that import from $lib/directus continue to work -export { - apiUrl as directusApiUrl, - getAssetUrl, - isModel, - getGraphQLClient as getDirectusInstance, -} from "./api.js"; diff --git a/packages/frontend/src/routes/+page.svelte b/packages/frontend/src/routes/+page.svelte index 51619e8..1982be5 100644 --- a/packages/frontend/src/routes/+page.svelte +++ b/packages/frontend/src/routes/+page.svelte @@ -2,7 +2,7 @@ import { _ } from "svelte-i18n"; import { Button } from "$lib/components/ui/button"; import { Card, CardContent } from "$lib/components/ui/card"; - import { getAssetUrl } from "$lib/directus"; + import { getAssetUrl } from "$lib/api"; import Meta from "$lib/components/meta/meta.svelte"; import { formatVideoDuration } from "$lib/utils.js"; diff --git a/packages/frontend/src/routes/leaderboard/+page.svelte b/packages/frontend/src/routes/leaderboard/+page.svelte index e796667..c6e4926 100644 --- a/packages/frontend/src/routes/leaderboard/+page.svelte +++ b/packages/frontend/src/routes/leaderboard/+page.svelte @@ -3,7 +3,7 @@ import { Button } from "$lib/components/ui/button"; import { Card, CardContent, CardHeader, CardTitle } from "$lib/components/ui/card"; import { Avatar, AvatarImage, AvatarFallback } from "$lib/components/ui/avatar"; - import { getAssetUrl } from "$lib/directus"; + import { getAssetUrl } from "$lib/api"; import Meta from "$lib/components/meta/meta.svelte"; import PeonyBackground from "$lib/components/background/peony-background.svelte"; diff --git a/packages/frontend/src/routes/magazine/+page.svelte b/packages/frontend/src/routes/magazine/+page.svelte index 6a8b3f6..0eec4a1 100644 --- a/packages/frontend/src/routes/magazine/+page.svelte +++ b/packages/frontend/src/routes/magazine/+page.svelte @@ -8,7 +8,7 @@ import TimeAgo from "javascript-time-ago"; import type { Article } from "$lib/types"; - import { getAssetUrl } from "$lib/directus"; + import { getAssetUrl } from "$lib/api"; import { calcReadingTime } from "$lib/utils.js"; import Meta from "$lib/components/meta/meta.svelte"; diff --git a/packages/frontend/src/routes/magazine/[slug]/+page.svelte b/packages/frontend/src/routes/magazine/[slug]/+page.svelte index 435626d..a42c28b 100644 --- a/packages/frontend/src/routes/magazine/[slug]/+page.svelte +++ b/packages/frontend/src/routes/magazine/[slug]/+page.svelte @@ -5,7 +5,7 @@ import { Card, CardContent } from "$lib/components/ui/card"; import { calcReadingTime } from "$lib/utils"; import TimeAgo from "javascript-time-ago"; - import { getAssetUrl } from "$lib/directus"; + import { getAssetUrl } from "$lib/api"; import Meta from "$lib/components/meta/meta.svelte"; import PeonyBackground from "$lib/components/background/peony-background.svelte"; import SharingPopupButton from "$lib/components/sharing-popup/sharing-popup-button.svelte"; diff --git a/packages/frontend/src/routes/me/+page.server.ts b/packages/frontend/src/routes/me/+page.server.ts index 60b69a9..533d7ae 100644 --- a/packages/frontend/src/routes/me/+page.server.ts +++ b/packages/frontend/src/routes/me/+page.server.ts @@ -1,6 +1,6 @@ import { redirect } from "@sveltejs/kit"; import { getAnalytics, getFolders, getRecordings } from "$lib/services"; -import { isModel } from "$lib/directus"; +import { isModel } from "$lib/api"; export async function load({ locals, fetch }) { // Redirect to login if not authenticated diff --git a/packages/frontend/src/routes/me/+page.svelte b/packages/frontend/src/routes/me/+page.svelte index f3f3853..bc53eb2 100644 --- a/packages/frontend/src/routes/me/+page.svelte +++ b/packages/frontend/src/routes/me/+page.svelte @@ -14,7 +14,7 @@ import PeonyBackground from "$lib/components/background/peony-background.svelte"; import { onMount } from "svelte"; import { goto, invalidateAll } from "$app/navigation"; - import { getAssetUrl, isModel } from "$lib/directus"; + import { getAssetUrl, isModel } from "$lib/api"; import * as Alert from "$lib/components/ui/alert"; import { toast } from "svelte-sonner"; import { deleteRecording, removeFile, updateProfile, uploadFile } from "$lib/services"; diff --git a/packages/frontend/src/routes/models/+page.svelte b/packages/frontend/src/routes/models/+page.svelte index 846ee44..11888c4 100644 --- a/packages/frontend/src/routes/models/+page.svelte +++ b/packages/frontend/src/routes/models/+page.svelte @@ -4,7 +4,7 @@ import { Card, CardContent } from "$lib/components/ui/card"; import { Input } from "$lib/components/ui/input"; import { Select, SelectContent, SelectItem, SelectTrigger } from "$lib/components/ui/select"; - import { getAssetUrl } from "$lib/directus"; + import { getAssetUrl } from "$lib/api"; import Meta from "$lib/components/meta/meta.svelte"; let searchQuery = $state(""); diff --git a/packages/frontend/src/routes/models/[slug]/+page.svelte b/packages/frontend/src/routes/models/[slug]/+page.svelte index 198d9b5..60c7411 100644 --- a/packages/frontend/src/routes/models/[slug]/+page.svelte +++ b/packages/frontend/src/routes/models/[slug]/+page.svelte @@ -3,7 +3,7 @@ import { Button } from "$lib/components/ui/button"; import { Card, CardContent } from "$lib/components/ui/card"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "$lib/components/ui/tabs"; - import { getAssetUrl } from "$lib/directus"; + import { getAssetUrl } from "$lib/api"; import Meta from "$lib/components/meta/meta.svelte"; import PeonyBackground from "$lib/components/background/peony-background.svelte"; import SharingPopupButton from "$lib/components/sharing-popup/sharing-popup-button.svelte"; diff --git a/packages/frontend/src/routes/tags/[tag]/+page.svelte b/packages/frontend/src/routes/tags/[tag]/+page.svelte index 14de933..f94cbee 100644 --- a/packages/frontend/src/routes/tags/[tag]/+page.svelte +++ b/packages/frontend/src/routes/tags/[tag]/+page.svelte @@ -4,7 +4,7 @@ import { Card, CardContent } from "$lib/components/ui/card"; import { Input } from "$lib/components/ui/input"; import { Select, SelectContent, SelectItem, SelectTrigger } from "$lib/components/ui/select"; - import { getAssetUrl } from "$lib/directus"; + import { getAssetUrl } from "$lib/api"; import Meta from "$lib/components/meta/meta.svelte"; let searchQuery = $state(""); diff --git a/packages/frontend/src/routes/users/[id]/+page.svelte b/packages/frontend/src/routes/users/[id]/+page.svelte index 51c8d91..74e600b 100644 --- a/packages/frontend/src/routes/users/[id]/+page.svelte +++ b/packages/frontend/src/routes/users/[id]/+page.svelte @@ -2,7 +2,7 @@ import { _, locale } from "svelte-i18n"; import { Button } from "$lib/components/ui/button"; import { Card, CardContent } from "$lib/components/ui/card"; - import { getAssetUrl } from "$lib/directus"; + import { getAssetUrl } from "$lib/api"; import Meta from "$lib/components/meta/meta.svelte"; import PeonyBackground from "$lib/components/background/peony-background.svelte"; diff --git a/packages/frontend/src/routes/videos/+page.svelte b/packages/frontend/src/routes/videos/+page.svelte index dfb2477..ea8eb0a 100644 --- a/packages/frontend/src/routes/videos/+page.svelte +++ b/packages/frontend/src/routes/videos/+page.svelte @@ -4,7 +4,7 @@ import { Card, CardContent } from "$lib/components/ui/card"; import { Input } from "$lib/components/ui/input"; import { Select, SelectContent, SelectItem, SelectTrigger } from "$lib/components/ui/select"; - import { getAssetUrl } from "$lib/directus"; + import { getAssetUrl } from "$lib/api"; import Meta from "$lib/components/meta/meta.svelte"; import TimeAgo from "javascript-time-ago"; import { formatVideoDuration } from "$lib/utils"; diff --git a/packages/frontend/src/routes/videos/[slug]/+page.svelte b/packages/frontend/src/routes/videos/[slug]/+page.svelte index 0faf544..dfe4d8f 100644 --- a/packages/frontend/src/routes/videos/[slug]/+page.svelte +++ b/packages/frontend/src/routes/videos/[slug]/+page.svelte @@ -3,7 +3,7 @@ import { Button } from "$lib/components/ui/button"; import { Card, CardContent } from "$lib/components/ui/card"; import "media-chrome"; - import { getAssetUrl } from "$lib/directus"; + import { getAssetUrl } from "$lib/api"; import TimeAgo from "javascript-time-ago"; import { page } from "$app/state"; import PeonyBackground from "$lib/components/background/peony-background.svelte";