diff --git a/src/lib/components/channel.svelte b/src/lib/components/channel.svelte index c811dad..7942960 100644 --- a/src/lib/components/channel.svelte +++ b/src/lib/components/channel.svelte @@ -1,6 +1,6 @@ diff --git a/src/lib/functions/clientWebsocket.svelte.ts b/src/lib/functions/clientWebsocket.svelte.ts index 5c08ce6..bc19808 100644 --- a/src/lib/functions/clientWebsocket.svelte.ts +++ b/src/lib/functions/clientWebsocket.svelte.ts @@ -1,4 +1,4 @@ -import type { TypeMessage, TypeFullMessage } from '$lib/types'; +import type { TypeFullMessage, TypeMessage } from '$lib/types'; import type { Socket } from 'socket.io-client'; class Websocket { diff --git a/src/lib/functions/websocketConfig.ts b/src/lib/functions/websocketConfig.ts index 538e644..104fc2c 100644 --- a/src/lib/functions/websocketConfig.ts +++ b/src/lib/functions/websocketConfig.ts @@ -2,8 +2,8 @@ import { Server as SocketIOServer } from 'socket.io'; import type { HttpServer } from 'vite'; // Don't try to replace with $lib alias. Since this // file gets loaded as a vite plugin, it will crash -import { db } from '../server/db'; import { v4 as uuidv4 } from 'uuid'; +import { db } from '../server/db'; let io: SocketIOServer | undefined; diff --git a/src/lib/hooks.server.ts b/src/lib/hooks.server.ts index f4207cf..bcf6dcd 100644 --- a/src/lib/hooks.server.ts +++ b/src/lib/hooks.server.ts @@ -1,7 +1,7 @@ import { building } from '$app/environment'; +import { startupSocketIOServer } from '$lib/functions/websocketConfig'; import type { Handle } from '@sveltejs/kit'; import { Server as SocketIOServer } from 'socket.io'; -import { startupSocketIOServer } from '$lib/functions/websocketConfig'; let io: SocketIOServer | undefined; export const handle = (async ({ event, resolve }) => { diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 362d630..c41f31e 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -1,7 +1,7 @@ import { type ClassValue, clsx } from 'clsx'; -import { twMerge } from 'tailwind-merge'; import { cubicOut } from 'svelte/easing'; import type { TransitionConfig } from 'svelte/transition'; +import { twMerge } from 'tailwind-merge'; export function cn(...inputs: ClassValue[]) { return twMerge(clsx(inputs)); diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index f5ee9cd..d2a2951 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -1,8 +1,8 @@ diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts index 35485ea..729fde3 100644 --- a/src/routes/+layout.server.ts +++ b/src/routes/+layout.server.ts @@ -1,7 +1,7 @@ import { db } from '$lib/server/db'; -import { zod } from 'sveltekit-superforms/adapters'; -import { superValidate } from 'sveltekit-superforms'; import { newChannelSchema } from '$lib/types/schema'; +import { superValidate } from 'sveltekit-superforms'; +import { zod } from 'sveltekit-superforms/adapters'; export async function load() { const form = await superValidate(zod(newChannelSchema)); diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index ee13ea1..6976046 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,8 +1,8 @@ diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts index d6f06a6..bbd717b 100644 --- a/src/routes/+page.server.ts +++ b/src/routes/+page.server.ts @@ -1,9 +1,9 @@ -import { redirect, fail } from '@sveltejs/kit'; -import { zod } from 'sveltekit-superforms/adapters'; -import { setError, superValidate, message } from 'sveltekit-superforms'; -import { newChannelSchema } from '$lib/types/schema'; -import type { Actions } from './$types'; import { db } from '$lib/server/db'; +import { newChannelSchema } from '$lib/types/schema'; +import { fail, redirect } from '@sveltejs/kit'; +import { message, setError, superValidate } from 'sveltekit-superforms'; +import { zod } from 'sveltekit-superforms/adapters'; +import type { Actions } from './$types'; export function load(): void { redirect(308, '/channel/general'); diff --git a/src/routes/channel/[channel]/+page.server.ts b/src/routes/channel/[channel]/+page.server.ts index f3708c5..fb6b8f4 100644 --- a/src/routes/channel/[channel]/+page.server.ts +++ b/src/routes/channel/[channel]/+page.server.ts @@ -1,6 +1,6 @@ +import { db } from '$lib/server/db'; import type { TypeMessage } from '$lib/types'; import { error } from '@sveltejs/kit'; -import { db } from '$lib/server/db'; export async function load({ params }): Promise<{ messages: TypeMessage[] }> { let messages: TypeMessage[]; diff --git a/src/routes/channel/[channel]/+page.svelte b/src/routes/channel/[channel]/+page.svelte index 2920b99..dba8f34 100644 --- a/src/routes/channel/[channel]/+page.svelte +++ b/src/routes/channel/[channel]/+page.svelte @@ -1,15 +1,15 @@