@@ -11,8 +13,8 @@
-
- 
+
+ 
@@ -20,7 +22,7 @@
- try editing src/routes/index.svelte
+ try editing src/routes/+page.svelte
diff --git a/sveltekit/src/routes/+page.ts b/sveltekit/src/routes/+page.ts
index 189f71e..a72419a 100644
--- a/sveltekit/src/routes/+page.ts
+++ b/sveltekit/src/routes/+page.ts
@@ -1 +1,3 @@
+// since there's no dynamic data here, we can prerender
+// it so that it gets served as a static asset in production
export const prerender = true;
diff --git a/sveltekit/src/lib/Counter.svelte b/sveltekit/src/routes/Counter.svelte
similarity index 100%
rename from sveltekit/src/lib/Counter.svelte
rename to sveltekit/src/routes/Counter.svelte
diff --git a/sveltekit/src/lib/header/Header.svelte b/sveltekit/src/routes/Header.svelte
similarity index 84%
rename from sveltekit/src/lib/header/Header.svelte
rename to sveltekit/src/routes/Header.svelte
index 9d3120f..80c2ee9 100644
--- a/sveltekit/src/lib/header/Header.svelte
+++ b/sveltekit/src/routes/Header.svelte
@@ -1,6 +1,7 @@
-
@@ -15,12 +16,14 @@
diff --git a/sveltekit/src/routes/about/+page.svelte b/sveltekit/src/routes/about/+page.svelte
index 561607a..b034478 100644
--- a/sveltekit/src/routes/about/+page.svelte
+++ b/sveltekit/src/routes/about/+page.svelte
@@ -11,7 +11,7 @@
following into your command line and following the prompts:
- npm init svelte
+ npm create svelte@latest
The page you're looking at is purely static HTML, with no client-side interactivity needed.
diff --git a/sveltekit/src/routes/about/+page.ts b/sveltekit/src/routes/about/+page.ts
index 3e094ec..e739ef4 100644
--- a/sveltekit/src/routes/about/+page.ts
+++ b/sveltekit/src/routes/about/+page.ts
@@ -1,13 +1,9 @@
-import { browser, dev } from '$app/env';
+import { dev } from '$app/environment';
// we don't need any JS on this page, though we'll load
-// it in dev so that we get hot module replacement...
-export const hydrate = dev;
-
-// ...but if the client-side router is already loaded
-// (i.e. we came here from elsewhere in the app), use it
-export const router = browser;
+// it in dev so that we get hot module replacement
+export const csr = dev;
// since there's no dynamic data here, we can prerender
-// it so that it gets served as a static asset in prod
+// it so that it gets served as a static asset in production
export const prerender = true;
diff --git a/sveltekit/src/routes/todos/+page.server.ts b/sveltekit/src/routes/todos/+page.server.ts
index 3950818..a51cf55 100644
--- a/sveltekit/src/routes/todos/+page.server.ts
+++ b/sveltekit/src/routes/todos/+page.server.ts
@@ -1,12 +1,12 @@
-import { redirect as kitRedirect } from '@sveltejs/kit';
-import type { PageServerLoad, Action } from './$types';
+import { fail } from '@sveltejs/kit';
+import type { PageServerLoad, Actions } from './$types';
import { getFormData } from 'remix-params-helper';
import { z } from 'zod';
import e from '$db';
import { client } from '$lib/edgedb';
export const load: PageServerLoad = async ({ locals }) => {
- // locals.userid comes from src/hooks.ts
+ // locals.userid comes from src/hooks.server.ts
const todos = await e
.select(e.Todo, (todo) => ({
id: true,
@@ -19,66 +19,58 @@ export const load: PageServerLoad = async ({ locals }) => {
return { todos };
};
-export const POST: Action = async ({ request, locals }) => {
- const schema = z.object({
- text: z.string()
- });
- const { data, errors, success } = await getFormData(request, schema);
+export const actions: Actions = {
+ addTodo: async ({ request, locals }) => {
+ const schema = z.object({
+ text: z.string()
+ });
+ const { data, errors, success } = await getFormData(request, schema);
- if (!success) {
- return { errors };
- }
-
- await e
- .insert(e.Todo, {
- text: data.text,
- created_by: locals.userid
- })
- .run(client);
-};
+ if (!success) {
+ return fail(400, errors);
+ }
-// If the user has JavaScript disabled, the URL will change to
-// include the method override unless we redirect back to /todos
-const redirect = kitRedirect(303, '/todos');
-
-export const PATCH: Action = async ({ request }) => {
- const schema = z.object({
- id: z.string().uuid(),
- text: z.string().optional(),
- done: z.boolean().optional()
- });
- const { data, errors, success } = await getFormData(request, schema);
-
- if (!success) {
- return { errors };
- }
+ await e
+ .insert(e.Todo, {
+ text: data.text,
+ created_by: locals.userid
+ })
+ .run(client);
+ },
+ editTodo: async ({ request }) => {
+ const schema = z.object({
+ id: z.string().uuid(),
+ text: z.string().optional(),
+ done: z.boolean().optional()
+ });
+ const { data, errors, success } = await getFormData(request, schema);
- const { id, text, done } = data;
- await e
- .update(e.Todo, (todo) => ({
- filter: e.op(todo.id, '=', e.uuid(id)),
- set: { text, done }
- }))
- .run(client);
+ if (!success) {
+ return fail(400, errors);
+ }
- throw redirect;
-};
+ const { id, text, done } = data;
+ await e
+ .update(e.Todo, () => ({
+ filter_single: { id },
+ set: { text, done }
+ }))
+ .run(client);
+ },
+ deleteTodo: async ({ request }) => {
+ const schema = z.object({
+ id: z.string().uuid()
+ });
+ const { data, errors, success } = await getFormData(request, schema);
-export const DELETE: Action = async ({ request }) => {
- const schema = z.object({
- id: z.string().uuid()
- });
- const { data, errors, success } = await getFormData(request, schema);
+ if (!success) {
+ return fail(400, errors);
+ }
- if (!success) {
- return { errors };
+ await e
+ .delete(e.Todo, () => ({
+ filter_single: { id: data.id }
+ }))
+ .run(client);
}
-
- await e
- .delete(e.Todo, (todo) => ({
- filter: e.op(todo.id, '=', e.uuid(data.id))
- }))
- .run(client);
-
- throw redirect;
};
diff --git a/sveltekit/src/routes/todos/+page.svelte b/sveltekit/src/routes/todos/+page.svelte
index 048e9a9..bc5572a 100644
--- a/sveltekit/src/routes/todos/+page.svelte
+++ b/sveltekit/src/routes/todos/+page.svelte
@@ -1,5 +1,5 @@