fix: resolve issue with incorrect import from ramda

jerrythomas · Jan 18, 2024 · c515e55 · c515e55
1 parent 15da432
commit c515e55
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 113 deletions.
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
@@ -56,9 +56,9 @@
     "@kavach/core": "workspace:*",
     "@kavach/deflector": "workspace:*",
     "@kavach/logger": "workspace:*",
-    "@rokkit/atoms": "1.0.0-next.66",
-    "@rokkit/molecules": "1.0.0-next.66",
-    "@rokkit/organisms": "1.0.0-next.66",
+    "@rokkit/atoms": "1.0.0-next.67",
+    "@rokkit/molecules": "1.0.0-next.67",
+    "@rokkit/organisms": "1.0.0-next.67",
     "ramda": "^0.29.1"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/sites/skeleton/package.json b/sites/skeleton/package.json
@@ -42,14 +42,14 @@
     "@kavach/core": "workspace:*",
     "@kavach/logger": "workspace:*",
     "@kavach/svelte": "workspace:*",
-    "@rokkit/actions": "1.0.0-next.66",
-    "@rokkit/atoms": "1.0.0-next.66",
-    "@rokkit/core": "1.0.0-next.66",
-    "@rokkit/icons": "1.0.0-next.66",
-    "@rokkit/molecules": "1.0.0-next.66",
-    "@rokkit/organisms": "1.0.0-next.66",
-    "@rokkit/stores": "1.0.0-next.66",
-    "@rokkit/themes": "1.0.0-next.66",
+    "@rokkit/actions": "1.0.0-next.67",
+    "@rokkit/atoms": "1.0.0-next.67",
+    "@rokkit/core": "1.0.0-next.67",
+    "@rokkit/icons": "1.0.0-next.67",
+    "@rokkit/molecules": "1.0.0-next.67",
+    "@rokkit/organisms": "1.0.0-next.67",
+    "@rokkit/stores": "1.0.0-next.67",
+    "@rokkit/themes": "1.0.0-next.67",
     "@supabase/supabase-js": "^2.39.3",
     "prism-svelte": "^0.5.0",
     "prismjs": "^1.29.0"

diff --git a/starter/supabase/package.json b/starter/supabase/package.json
@@ -48,19 +48,19 @@
     "@fontsource/open-sans": "^5.0.22",
     "@fontsource/overpass": "^5.0.16",
     "@fontsource/victor-mono": "^5.0.11",
-    "@kavach/adapter-supabase": "workspace:1.0.0-next.19",
-    "@kavach/core": "workspace:1.0.0-next.19",
-    "@kavach/logger": "workspace:1.0.0-next.19",
-    "@kavach/svelte": "workspace:1.0.0-next.19",
-    "@rokkit/actions": "1.0.0-next.66",
-    "@rokkit/atoms": "1.0.0-next.66",
-    "@rokkit/core": "1.0.0-next.66",
-    "@rokkit/icons": "1.0.0-next.66",
-    "@rokkit/layout": "1.0.0-next.66",
-    "@rokkit/molecules": "1.0.0-next.66",
-    "@rokkit/organisms": "1.0.0-next.66",
-    "@rokkit/stores": "1.0.0-next.66",
-    "@rokkit/themes": "1.0.0-next.66",
+    "@kavach/adapter-supabase": "workspace:1.0.0-next.20",
+    "@kavach/core": "workspace:1.0.0-next.20",
+    "@kavach/logger": "workspace:1.0.0-next.20",
+    "@kavach/svelte": "workspace:1.0.0-next.20",
+    "@rokkit/actions": "1.0.0-next.67",
+    "@rokkit/atoms": "1.0.0-next.67",
+    "@rokkit/core": "1.0.0-next.67",
+    "@rokkit/icons": "1.0.0-next.67",
+    "@rokkit/layout": "1.0.0-next.67",
+    "@rokkit/molecules": "1.0.0-next.67",
+    "@rokkit/organisms": "1.0.0-next.67",
+    "@rokkit/stores": "1.0.0-next.67",
+    "@rokkit/themes": "1.0.0-next.67",
     "@supabase/supabase-js": "^2.39.3",
     "openai": "^4.24.7",
     "prism-svelte": "^0.5.0",

diff --git a/starter/supabase/src/routes/DarkModeToggle.svelte b/starter/supabase/src/routes/DarkModeToggle.svelte
@@ -0,0 +1,19 @@
+<script>
+import { theme } from '@rokkit/stores'
+import { defaultStateIcons } from '@rokkit/core'
+import { Icon } from '@rokkit/atoms'
+
+function toggleMode() {
+		const mode = $theme.mode === 'dark' ? 'light' : 'dark'
+		theme.set({ ...$theme, mode })
+	}
+
+</script>
+<theme-mode role="switch" aria-checked={$theme.mode === 'dark'} class="flex p-0">
+	<Icon
+		name={defaultStateIcons.mode[$theme.mode]}
+		role="button"
+		on:click={toggleMode}
+		class="border border-neutral-muted rounded"
+	/>
+</theme-mode>
diff --git a/starter/supabase/src/routes/Header.svelte b/starter/supabase/src/routes/Header.svelte
@@ -2,7 +2,8 @@
 	import { afterNavigate, beforeNavigate } from '$app/navigation'
 	import { Icon, ProgressBar } from '@rokkit/atoms'
 	import { goto } from '$app/navigation'
-	import { gravatar } from '@kavach/core'
+	import UserIcon from './UserIcon.svelte'
+	import DarkModeToggle from './DarkModeToggle.svelte'
 
 	let className = ''
 	export { className as class }
@@ -12,10 +13,11 @@
 	export let menu = []
 
 	let loading = false
+
 	beforeNavigate(() => (loading = true))
 	afterNavigate(() => (loading = false))
 
-	$: avatar = user?.avatar_url ?? gravatar(user?.email)
+
 </script>
 
 <header
@@ -41,11 +43,8 @@
 			{/each}
 		</nav>
 	</top-menu>
-	<settings class="flex items-center justify-end gap-3 pr-4">
-		{#if user}
-			<p>{user.full_name}</p>
-			<img src={avatar} alt={user.name} class="aspect-square h-8" />
-			<Icon name="carbon:logout" label="logout" on:click={() => goto('/logout')} />
-		{/if}
+	<settings class="flex items-center justify-end gap-4 pr-4">
+		<DarkModeToggle />
+		<UserIcon {user} />
 	</settings>
 </header>