sup

Author: Sup2point0

src/parts/core/nav.link.svelte

@@ -1,30 +1,28 @@
 <script lang="ts">
 
-import { base } from "$app/paths";
 import { page } from "$app/state";
 import { browser } from "$app/environment";
 
 
 interface Props {
   text: string;
-  link?: string;
-  intern?: string;
+  link: string;
 }
 
-let { text, link, intern }: Props = $props();
+let { text, link }: Props = $props();
 
 
 let active = $derived(
-  browser && page.url && intern &&
-  window?.location.pathname.includes(intern)
+  browser && page.url &&
+  window?.location.pathname.includes(link)
 );
 
 </script>
 
 
 <a class="nav-link"
   class:active
-  href={link || `${base}/${intern}`}
+  href={link}
 >
   {text}
 </a>

src/parts/core/nav.svelte

@@ -6,12 +6,12 @@ import NavLink from "#parts/core/nav.link.svelte";
 
 
 <nav>
-  <NavLink text="INFO" intern="sup/info" />
+  <NavLink text="INFO" link="/sup/info" />
   <NavLink text="SUP" link="https://sup2point0.github.io" />
-  <NavLink text="LOVES" intern="sup/loves" />
-  <NavLink text="MUSIC" intern="sup/music" />
-  <NavLink text="PROJECTS" intern="sup/projects" />
-  <NavLink text="DEV" intern="sup/dev" />
+  <NavLink text="LOVES" link="/sup/loves" />
+  <NavLink text="MUSIC" link="/sup/music" />
+  <NavLink text="PROJECTS" link="/sup/projects" />
+  <NavLink text="DEV" link="/sup/dev" />
 </nav>
 
 

src/parts/ui/card.link.svelte

@@ -5,22 +5,19 @@ A card that links to another page.
 
 <script lang="ts">
 
-import { base } from "$app/paths";
-
-
 interface Props {
-  intern: string;
+  link: string;
   text?: string;
   children?: any;
 }
 
-let { intern, text, children }: Props = $props();
+let { link, text, children }: Props = $props();
 
 </script>
 
 
 <a class="card"
-  href="{base}/{intern}"
+  href={link}
 >
   {#if text}
     <h3> {@html text.toUpperCase()} </h3>

src/routes/(sup)/sup/music/+page.svelte

@@ -6,10 +6,10 @@ import LinkCard from "#parts/ui/card.link.svelte";
 
 
 <div class="cards">
-  <LinkCard intern="sup/music/listen" text="Music I Listen To">
+  <LinkCard link="/sup/music/listen" text="Music I Listen To">
   </LinkCard>
 
-  <LinkCard intern="sup/music/create" text="Music I Make">
+  <LinkCard link="/sup/music/create" text="Music I Make">
   </LinkCard>
 </div>
 

src/routes/(sup)/sup/music/create/+page.svelte

@@ -12,10 +12,10 @@ import LinkCard from "#parts/ui/card.link.svelte";
 ]} />
 
 <div class="cards">
-  <LinkCard intern="sup/music/create/tracks" text="Tracks">
+  <LinkCard link="/sup/music/create/tracks" text="Tracks">
   </LinkCard>
 
-  <LinkCard intern="sup/music/create/albums" text="Albums">
+  <LinkCard link="/sup/music/create/albums" text="Albums">
   </LinkCard>
 </div>
 

src/routes/(sup)/sup/music/create/albums/+page.svelte

@@ -4,7 +4,7 @@ import Main from "#parts/core/main.svelte";
 import Breadcrumbs from "#parts/ui/breadcrumbs.svelte";
 import AlbumCard from "#parts/music/card.album.svelte";
 
-import { albums } from "#src/routes/(sup)/sup/music/music";
+import { albums } from "../create";
 
 </script>
 

src/routes/(sup)/sup/music/create/albums/[album]/+page.ts

@@ -1,4 +1,4 @@
-import { albums_list } from "#src/routes/(sup)/sup/music/music";
+import { albums_list } from "../../create";
 import type { AlbumData } from "#scripts/types";
 
 

src/routes/(sup)/sup/music/create/albums/archives/[album]/+page.ts

@@ -1,4 +1,4 @@
-import { albums_list } from "#src/routes/(sup)/sup/music/music";
+import { albums_list } from "#src/routes/(sup)/sup/music/create/create";
 import type { AlbumData } from "#scripts/types";
 
 

src/routes/(sup)/sup/music/music.ts …/routes/(sup)/sup/music/create/create.tssrc/routes/(sup)/sup/music/music.ts renamed to src/routes/(sup)/sup/music/create/create.ts src/routes/(sup)/sup/music/music.ts renamed to src/routes/(sup)/sup/music/create/create.ts

@@ -5,7 +5,7 @@ import Breadcrumbs from "#parts/ui/breadcrumbs.svelte";
 import SearchFilters from "#parts/ui/search-filters.svelte";
 import TrackCard from "#parts/music/card.track.svelte";
 
-import { tracks_list } from "#src/routes/(sup)/sup/music/music";
+import { tracks_list } from "../create";
 import { TrackSearchFilter } from "./filter.svelte";