Minor fixes for switch heights and urls

rianadon · Nov 17, 2024 · 9c95cdc · 9c95cdc
1 parent de658a0
commit 9c95cdc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/lib/geometry/switches.ts b/src/lib/geometry/switches.ts
@@ -11,10 +11,10 @@ export function switchInfo(sw: Switch | undefined): SwInfo {
   if (sw == 'mx-pcb') {
     return { height: 6.2, pressedHeight: 2.6 }
   }
-  if (sw == 'box' || sw?.startsWith('mx') || sw?.startsWith('old-mx')) {
+  if (sw?.startsWith('mx') || sw?.startsWith('old-mx')) {
     return { height: 6.2, pressedHeight: 2.6 }
   }
-  if (sw == 'choc') {
+  if (sw?.startsWith('choc')) {
     return { height: 5, pressedHeight: 2 }
   }
   if (sw == 'alps') {

diff --git a/src/routes/showcase/+page.svelte b/src/routes/showcase/+page.svelte
@@ -25,7 +25,7 @@
   class="mx-8 my-6 grid sm:grid-cols-[repeat(2,18rem)] md:grid-cols-[repeat(2,21rem)] gap-2 justify-center"
 >
   {#each keyboards as kbd}
-    <a class="block bg-[#2e272d]/50 rounded-2 overflow-hidden citem" href="{base}/showcase/{kbd.key}">
+    <a class="block bg-[#2e272d]/50 rounded-2 overflow-hidden citem" href="{base}/showcase/{kbd.key}/">
       {#if browser}
         <div class="w-full aspect-[1.9/1] vignette">
           <img

diff --git a/src/routes/showcase/[slug]/+page.svelte b/src/routes/showcase/[slug]/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { base } from '$app/paths'
+  import { page } from '$app/stores'
   import Header from '$lib/Header.svelte'
   import Icon from '$lib/presentation/Icon.svelte'
   import {
@@ -19,7 +20,7 @@
 
 <svelte:head>
   <title>{kbd.name} • Showcase • Cosmos Keyboard</title>
-  <link rel="canonical" href="https://ryanis.cool/cosmos/showcase" />
+  <link rel="canonical" href="https://ryanis.cool/cosmos/showcase/{$page.params.slug}/" />
   <link rel="icon" href="{base}/favicon.png" />
 </svelte:head>