Finishing touches before 6.0 (#1000)

* Update +page.svelte TODO: Resolve issue 999!!! * move 6 to root level * Fixed dev logo path --------- Co-authored-by: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com> Co-authored-by: Karnikaa Velumani <karnikaavelumani@csu.fullerton.edu>
EthanThatOneKid · Dec 8, 2023 · a11c004 · a11c004
1 parent 16464b1
commit a11c004
Show file tree

Hide file tree

Showing 15 changed files with 563 additions and 825 deletions.
diff --git a/src/routes/(site)/+page.svelte b/src/routes/(site)/+page.svelte
@@ -1,9 +1,11 @@
 <script>
   import Spacing from '$lib/public/legacy/spacing.svelte';
   import Hero from './hero.svelte';
-  import WhyJoin from './why-join.svelte';
-  import AcmPaths from './acm-paths.svelte';
-  import ReadyUp from './ready-up.svelte';
+  import Desc from './desc.svelte';
+  import Teams from './teams.svelte';
+  import Testimony from './testimony.svelte';
+  import Lucky from './lucky.svelte';
+  import Blog from './blog.svelte';
 </script>
 
 <svelte:head>
@@ -16,14 +18,22 @@
 
 <Spacing --min="120px" --med="175px" --max="200px" />
 
-<WhyJoin />
+<Desc />
 
 <Spacing --min="120px" --med="175px" --max="200px" />
 
-<AcmPaths />
+<Teams />
 
 <Spacing --min="120px" --med="175px" --max="200px" />
 
-<ReadyUp />
+<Testimony />
+
+<Spacing --min="120px" --med="175px" --max="200px" />
+
+<Lucky />
+
+<Spacing --min="120px" --med="175px" --max="200px" />
+
+<Blog />
 
 <Spacing --min="75px" --med="100px" --max="120px" />
diff --git a/src/routes/(site)/6/+page.svelte b/src/routes/(site)/6/+page.svelte
diff --git a/src/routes/(site)/6/hero.svelte b/src/routes/(site)/6/hero.svelte
diff --git a/src/routes/(site)/6/teams/+page.svelte b/src/routes/(site)/6/teams/+page.svelte