Fixes found after user testing

KittyCAD · Jan 9, 2024 · 06dd1fa · 06dd1fa
1 parent b4b3e2e
commit 06dd1fa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
 		"dev": "vite dev",
 		"build": "vite build",
 		"preview": "vite preview",
-		"test": "npm run test:integration && npm run test:unit",
+		"test": "npm run test:integration && npm run test:unit run",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
 		"lint": "prettier --plugin-search-dir . --check . && eslint .",

diff --git a/src/components/GenerationListItem.svelte b/src/components/GenerationListItem.svelte
@@ -68,9 +68,13 @@
 	<span class="text">{data.prompt.trim()}</span>
 	<div class="group-hover:hidden group-focus:hidden">
 		{#if data.status === 'completed'}
-			<Checkmark class={'w-5 h-5 rounded-full' + (isUnread ? ' bg-green' : '')} />
+			<Checkmark
+				class={'w-5 h-5 rounded-full' + (isUnread ? ' bg-green text-chalkboard-120' : '')}
+			/>
 		{:else if data.status === 'failed' || error}
-			<Close class={'w-5 h-5 rounded-full' + (isUnread ? ' bg-destroy-10' : '')} />
+			<Close
+				class={'w-5 h-5 rounded-full' + (isUnread ? ' bg-destroy-10 text-chalkboard-120' : '')}
+			/>
 		{:else}
 			<Spinner class="w-5 h-5 animate-spin" />
 		{/if}

diff --git a/src/hooks.server.ts b/src/hooks.server.ts
@@ -4,8 +4,6 @@ import { users, Client } from '@kittycad/lib'
 import { SIGN_OUT_PARAM } from '$lib/paths'
 const unProtectedRoutes = ['/']
 
-const domain = import.meta.env.DEV ? 'localhost' : '.zoo.dev'
-
 export const handle = async ({ event, resolve }) => {
 	const token = event.cookies.get(AUTH_COOKIE_NAME)
 	if (!token && !unProtectedRoutes.includes(event.url.pathname)) {
@@ -37,7 +35,7 @@ export const handle = async ({ event, resolve }) => {
 	const query = event.url.searchParams.get(SIGN_OUT_PARAM)
 
 	if (Boolean(query) == true) {
-		event.cookies.delete(AUTH_COOKIE_NAME, { domain, path: '/' })
+		event.cookies.delete(AUTH_COOKIE_NAME, { domain: event.url.hostname, path: '/' })
 		event.url.searchParams.delete(SIGN_OUT_PARAM)
 		throw redirect(303, '/')
 	}