Change all routes & paths to use base path

GDYUClub · Apr 18, 2024 · 66b7fe1 · 66b7fe1
1 parent 2b8203b
commit 66b7fe1
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 24 deletions.
diff --git a/src/app.html b/src/app.html
@@ -4,6 +4,7 @@
 		<meta charset="utf-8" />
 		<link rel="icon" href="%sveltekit.assets%/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<base href="/%sveltekit.assets%/" />
 		%sveltekit.head%
 	</head>
 	<body data-sveltekit-preload-data="hover">

diff --git a/src/routes/+layout.js b/src/routes/+layout.js
@@ -1,2 +1 @@
-export const prerender = true;
-export const trailingSlash = 'always';
+export const prerender = true;
diff --git a/src/routes/about.svelte b/src/routes/about.svelte
@@ -45,7 +45,7 @@
 <style>
     .aboutImg {
         aspect-ratio: 2/1;
-        background: url('/assets/GDYU_tabling_fall_2023.png');
+        background: url('assets/GDYU_tabling_fall_2023.png');
         background-color: #F5D33D;
         background-position: 50% 50%;
         background-size: 110%;

diff --git a/src/routes/header.svelte b/src/routes/header.svelte
@@ -1,5 +1,4 @@
 <script>
-    import { base } from '$app/paths'
     import { page } from '$app/stores'
     import navMode from '$lib/navMode'
 
@@ -42,39 +41,39 @@
 <div class="flex {navColor()} align-middle h-auto">
     <div class="flex lg:w-1/6 w-1/4 h-16 justify-evenly">
         <div class="h-full px-2 flex">
-            <img src="{base}/assets/shib.png" alt="" class="my-auto lg:h-3/5 h-4/5 object-contain"/>
+            <img src="assets/shib.png" alt="" class="my-auto lg:h-3/5 h-4/5 object-contain"/>
         </div>
         <div class="h-full px-2 w-16">
         </div>
     </div>
 
     <nav class="lg:flex lg:w-4/6 w-2/4 h-full gap-4 my-auto text-center">
-        <a href="/" class="w-1/5">
+        <a href="#" class="w-1/5">
             <div class="textNav {navTextColor('/')}">HOME</div>
         </a>
-        <a href="/about" class="w-1/5">
+        <a href="about" class="w-1/5">
             <div class="textNav {navTextColor('/about')}">ABOUT</div>
         </a>
-        <a href="/projects" class="w-1/5">
+        <a href="projects" class="w-1/5">
             <div class="textNav {navTextColor('/projects')}">PROJECTS</div>
         </a>
-        <a href="/zine" class="w-1/5">
+        <a href="zine" class="w-1/5">
             <div class="textNav {navTextColor('/zine')}">ZINE</div>
         </a>
-        <a href="/store" class="w-1/5">
+        <a href="store" class="w-1/5">
             <div class="textNav {navTextColor('/store')}">STORE</div>
         </a>
     </nav>
 
     <div class="flex lg:w-1/6 w-1/4 h-16 justify-center">
         <div class="h-full px-2 flex">
             <a href="https://discord.gg/bb9DqYbeMb" target="_blank" class="my-auto lg:h-3/5 h-4/5">
-                <img src="/assets/discord-mark-blue.svg" alt="Discord" class="h-full"/>
+                <img src="assets/discord-mark-blue.svg" alt="Discord" class="h-full"/>
             </a>
         </div>
         <div class="h-full px-2 flex">
             <a href="https://www.instagram.com/gdyuclub/" target="_blank" class="my-auto lg:h-3/5 h-4/5">
-                <img src="/assets/insta.svg" alt="Instagram" class="h-full"/>
+                <img src="assets/insta.svg" alt="Instagram" class="h-full"/>
             </a>
         </div>
     </div>

diff --git a/src/routes/hero.svelte b/src/routes/hero.svelte
@@ -17,7 +17,7 @@
     <div class="flex lg:w-10/12 w-4/12">
         <video
             class="video m-auto"
-            src="/assets/projects/demos/titledemo.mp4"
+            src="assets/projects/demos/titledemo.mp4"
             autoplay
             muted
             buffered
@@ -53,7 +53,7 @@
         height: 50%;
         mask-size: 150%;
         mask-position: 50% 50%;
-        mask-image: url(/assets/logo-invert.svg);
+        mask-image: url('assets/logo-invert.svg');
     }
     
 </style>
diff --git a/src/routes/programs.svelte b/src/routes/programs.svelte
@@ -88,19 +88,19 @@
     }
 
     .eventCard .A {
-        background: url('/assets/GDYU_blender_workshop.png');
+        background: url('assets/GDYU_blender_workshop.png');
         background-position: 50% 90%;
         background-size: 100%;
     }
 
     .eventCard .B {
-        background: url('/assets/GDYU_monthly_event.png');
+        background: url('assets/GDYU_monthly_event.png');
         background-position: 50% 0%;
         background-size: 100%;
     }
 
     .eventCard .C {
-        background: url('/assets/GDYU_talk_about_games.png');
+        background: url('assets/GDYU_talk_about_games.png');
         background-position: 70% 0%;
         background-repeat: no-repeat;
         background-size: 125% 147%;

diff --git a/src/routes/projects.svelte b/src/routes/projects.svelte
@@ -61,7 +61,7 @@
                 {#each clubProjects as project }
                 <ProjectCard project={project} />
                 {/each}
-                <a href="/projects" class="flex viewButton w-96 py-10">
+                <a href="projects" class="flex viewButton w-96 py-10">
                     <div class="text-center m-auto">
                         MORE <br> PROJECTS
                     </div>

diff --git a/src/routes/store/+page.svelte b/src/routes/store/+page.svelte
@@ -10,7 +10,7 @@
 </script>
 
 <div class="flex flex-col dark" style="height: 85vh">
-  <img class="w-96 m-auto mb-0" src="/assets/pocket_shib.png" alt=""/>
+  <img class="w-96 m-auto mb-0" src="assets/pocket_shib.png" alt=""/>
   <div class="pinkText blockHeaderText m-auto mt-10">COMING SOON...</div>
 </div>
 

diff --git a/src/routes/zine/+page.svelte b/src/routes/zine/+page.svelte
@@ -59,7 +59,7 @@
   }
   .flashHero {
     height: 600px;
-    background-image: url('/assets/flash.svg');
+    background-image: url('assets/flash.svg');
     background-position: center center;
     background-repeat: no-repeat;
     background-size: contain;
@@ -69,7 +69,7 @@
     line-height: calc(10px + 1vw);
   }
   .flashApply {
-      background-image: url('/assets/pocket_shib.png');
+      background-image: url('assets/pocket_shib.png');
       background-position: 50% 70%;
       background-repeat: no-repeat;
       background-size: 110%;

diff --git a/src/routes/zine/zineAbout.svelte b/src/routes/zine/zineAbout.svelte
@@ -27,19 +27,19 @@
                     <p class="darkText cardTitleText text-center pt-4">TABS</p>
                     <p class="pinkText cardText text-center pt-4">[150-300 Words]</p>
                     <p class="darkText cardText text-center pt-4 px-4">The shortest articles in FLASH!, Tabs are for little thoughts about the games you've played; moments you loved, characters you connected to, places you remember</p>
-                    <img class="w-1/2 mx-auto py-8 mt-auto" src="/assets/tabs.svg" alt="">
+                    <img class="w-1/2 mx-auto py-8 mt-auto" src="assets/tabs.svg" alt="">
                 </div>
                 <div class="zineCard w-96 flex flex-col">
                     <p class="darkText cardTitleText text-center pt-4">PAGES</p>
                     <p class="pinkText cardText text-center pt-4">[300-700 Words]</p>
                     <p class="darkText cardText text-center pt-4 px-4">A good place for longer thoughts, Pages are for short personal essays about your experiences in games</p>
-                    <img class="w-1/2 mx-auto py-8 mt-auto" src="/assets/pages.svg" alt="">
+                    <img class="w-1/2 mx-auto py-8 mt-auto" src="assets/pages.svg" alt="">
                 </div>
                 <div class="zineCard w-96 flex flex-col">
                     <p class="darkText cardTitleText text-center pt-4">WINDOWS</p>
                     <p class="pinkText cardText text-center pt-4">[500-700 Words]</p>
                     <p class="darkText cardText text-center pt-4 px-4">With a different focus than other stories, Windows are for writing about the game industry and game development</p>
-                    <img class="w-1/2 mx-auto py-8 mt-auto" src="/assets/windows.svg" alt="">
+                    <img class="w-1/2 mx-auto py-8 mt-auto" src="assets/windows.svg" alt="">
                 </div>
             </div>
         </div>