From 616228c997b8aaf8a112271348715e674b99888f Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel.flanagan@divvypay.com>
Date: Sat, 1 Oct 2022 14:03:15 -0500
Subject: [PATCH] Styles!

---
 components/Button.tsx  |  1 -
 components/Page.tsx    | 11 ++++----
 db-migrations.ts       | 57 ++++++++++++++++++++++++++++++++++--------
 fresh.gen.ts           | 40 ++++++++++++++---------------
 import_map.json        |  2 ++
 islands/Counter.tsx    |  2 +-
 main.ts                |  4 +--
 routes/index.tsx       |  4 +--
 routes/note.tsx        |  4 +--
 routes/note/create.tsx |  6 ++---
 routes/register.tsx    | 33 ++++++++++++++++--------
 twind.config.ts        | 22 +++++++++++++---
 12 files changed, 124 insertions(+), 62 deletions(-)

diff --git a/components/Button.tsx b/components/Button.tsx
index 909d380..0d10b4b 100644
--- a/components/Button.tsx
+++ b/components/Button.tsx
@@ -6,7 +6,6 @@ export function Button(props: JSX.HTMLAttributes<HTMLButtonElement>) {
     <button
       {...props}
       disabled={!IS_BROWSER || props.disabled}
-      class="px-2 py-1 border(gray-100 2) hover:bg-gray-200"
     />
   );
 }
diff --git a/components/Page.tsx b/components/Page.tsx
index 2db69fc..acf3444 100644
--- a/components/Page.tsx
+++ b/components/Page.tsx
@@ -1,14 +1,15 @@
 import { JSX } from "preact";
 
-const NAV_ITEM_CLASSES =
-  "flex justify-center items-center px-4 py-2 text-blue-500 hover:bg-purple-700";
+const NAV_ITEM_CLASSES = "flex justify-center items-center px-4 py-2";
+
+const HEADER_CLASSES = "bg-gray-200 dark:bg-gray-800";
 
 export function Page(props: JSX.HTMLAttributes<HTMLDivElement>) {
   return (
     <div class="relative min-h-screen flex flex-col">
       <header class="flex justify-start items-center">
-        <nav class="flex bg-gray-800 w-full drop-shadow-md">
-          <a href="/" class={NAV_ITEM_CLASSES}>
+        <nav class={`flex w-full drop-shadow-md ${HEADER_CLASSES}`}>
+          <a href="/" class={`${NAV_ITEM_CLASSES} text-black dark:text-white`}>
             <h1 class="text-2xl">LyricScreen</h1>
           </a>
           <a href="/note" class={NAV_ITEM_CLASSES}>Notes</a>
@@ -19,7 +20,7 @@ export function Page(props: JSX.HTMLAttributes<HTMLDivElement>) {
       <main class="p-2">
         {props.children}
       </main>
-      <footer class="p-2 bg-gray-800 w-full mt-auto">
+      <footer class={`p-2 w-full mt-auto ${HEADER_CLASSES}`}>
         "It's a bit much, really..."
       </footer>
     </div>
diff --git a/db-migrations.ts b/db-migrations.ts
index e9d9e8a..09f5cc9 100644
--- a/db-migrations.ts
+++ b/db-migrations.ts
@@ -1,13 +1,19 @@
-import { query } from "./db.ts";
+import { query } from "@/db.ts";
 
 const id = "id uuid primary key default uuid_generate_v4()";
 
+interface TableSpec {
+  columns: string[];
+  additionalStatements?: string[];
+  prepStatements?: string[];
+}
+
 const timestamps = [
   "created_at timestamptz not null default now()",
   "updated_at timestamptz not null default now()",
 ];
 
-const tables = {
+const tables: Record<string, TableSpec> = {
   "note": {
     columns: [id, "content text not null", ...timestamps],
   },
@@ -16,24 +22,53 @@ const tables = {
       id,
       "username text not null unique",
       "hashed_password text not null",
+      "name text",
       ...timestamps,
     ],
-    constraints: [],
+  },
+  "team": {
+    columns: [
+      id,
+      "name text not null",
+      ...timestamps,
+    ],
+    additionalStatements: [
+      'create index name_idx on team ("name")',
+    ],
+  },
+  "team_user": {
+    prepStatements: [
+      "drop type if exists team_user_status",
+      "create type team_user_status as enum ('invited', 'accepted', 'owner')",
+    ],
+    columns: [
+      "team_id uuid",
+      "user_id uuid",
+      "status team_user_status",
+      ...timestamps,
+    ],
+    additionalStatements: [
+      "create index team_user_idx on team_user (team_id) include (user_id)",
+      "create index team_idx on team_user (team_id)",
+      "create index user_idx on team_user (user_id)",
+      "create index status_idx on team_user (status)",
+    ],
   },
 };
 
 const tableStatements = Object.entries(tables).map(([name, meta]) => `
-  drop table if exists "${name}";
-  create table "${name}" (
-    ${meta.columns.join(",\n    ")}
-  );
+${(meta.prepStatements || []).map((s) => `${s};`).join("\n")}
+-- TABLE ${name}
+drop table if exists "${name}";
+create table "${name}" (
+  ${meta.columns.join(",\n  ")}
+);
+${(meta.additionalStatements || []).map((s) => `${s};`).join("\n")}
 `);
 
-console.log(tableStatements);
-
 const queryString = `
-  create extension if not exists "uuid-ossp";
-  ${tableStatements.map((s) => s.trim()).join("\n\n  ")}
+create extension if not exists "uuid-ossp";
+${tableStatements.map((s) => s.trim()).join("\n\n")}
 `;
 console.log(queryString);
 await query(queryString);
diff --git a/fresh.gen.ts b/fresh.gen.ts
index 4d6bd63..48c1e64 100644
--- a/fresh.gen.ts
+++ b/fresh.gen.ts
@@ -2,26 +2,26 @@
 // This file SHOULD be checked into source version control.
 // This file is automatically updated during development when running `dev.ts`.
 
-import config from "./deno.json" assert { type: "json" };
-import * as $0 from "./routes/[name].tsx";
-import * as $1 from "./routes/_404.tsx";
-import * as $2 from "./routes/_500.tsx";
-import * as $3 from "./routes/_middleware.ts";
-import * as $4 from "./routes/about.tsx";
-import * as $5 from "./routes/api/joke.ts";
-import * as $6 from "./routes/api/random-uuid.ts";
-import * as $7 from "./routes/countdown.tsx";
-import * as $8 from "./routes/github/[username].tsx";
-import * as $9 from "./routes/index.tsx";
-import * as $10 from "./routes/login.tsx";
-import * as $11 from "./routes/note.tsx";
-import * as $12 from "./routes/note/[id].tsx";
-import * as $13 from "./routes/note/create.tsx";
-import * as $14 from "./routes/register.tsx";
-import * as $15 from "./routes/route-config-example.tsx";
-import * as $16 from "./routes/search.tsx";
-import * as $$0 from "./islands/Countdown.tsx";
-import * as $$1 from "./islands/Counter.tsx";
+import config from "@/deno.json" assert { type: "json" };
+import * as $0 from "@/routes/[name].tsx";
+import * as $1 from "@/routes/_404.tsx";
+import * as $2 from "@/routes/_500.tsx";
+import * as $3 from "@/routes/_middleware.ts";
+import * as $4 from "@/routes/about.tsx";
+import * as $5 from "@/routes/api/joke.ts";
+import * as $6 from "@/routes/api/random-uuid.ts";
+import * as $7 from "@/routes/countdown.tsx";
+import * as $8 from "@/routes/github/[username].tsx";
+import * as $9 from "@/routes/index.tsx";
+import * as $10 from "@/routes/login.tsx";
+import * as $11 from "@/routes/note.tsx";
+import * as $12 from "@/routes/note/[id].tsx";
+import * as $13 from "@/routes/note/create.tsx";
+import * as $14 from "@/routes/register.tsx";
+import * as $15 from "@/routes/route-config-example.tsx";
+import * as $16 from "@/routes/search.tsx";
+import * as $$0 from "@/islands/Countdown.tsx";
+import * as $$1 from "@/islands/Counter.tsx";
 
 const manifest = {
   routes: {
diff --git a/import_map.json b/import_map.json
index 0a6675b..9264962 100644
--- a/import_map.json
+++ b/import_map.json
@@ -1,5 +1,7 @@
 {
   "imports": {
+    "@/": "./",
+    "$std/": "https://deno.land/std@0.144.0/",
     "$fresh/": "https://deno.land/x/fresh@1.1.1/",
     "preact": "https://esm.sh/preact@10.11.0",
     "preact/": "https://esm.sh/preact@10.11.0/",
diff --git a/islands/Counter.tsx b/islands/Counter.tsx
index 1b437bf..4e31391 100644
--- a/islands/Counter.tsx
+++ b/islands/Counter.tsx
@@ -1,5 +1,5 @@
 import { useState } from "preact/hooks";
-import { Button } from "../components/Button.tsx";
+import { Button } from "@/components/Button.tsx";
 
 interface CounterProps {
   start: number;
diff --git a/main.ts b/main.ts
index bb00964..ea25e6e 100644
--- a/main.ts
+++ b/main.ts
@@ -5,9 +5,9 @@
 /// <reference lib="deno.ns" />
 
 import { start } from "$fresh/server.ts";
-import manifest from "./fresh.gen.ts";
+import manifest from "@/fresh.gen.ts";
 
 import twindPlugin from "$fresh/plugins/twind.ts";
-import twindConfig from "./twind.config.ts";
+import twindConfig from "@/twind.config.ts";
 
 await start(manifest, { plugins: [twindPlugin(twindConfig)] });
diff --git a/routes/index.tsx b/routes/index.tsx
index f6de535..b512209 100644
--- a/routes/index.tsx
+++ b/routes/index.tsx
@@ -1,5 +1,5 @@
-import Counter from "../islands/Counter.tsx";
-import { Page } from "../components/Page.tsx";
+import Counter from "@/islands/Counter.tsx";
+import { Page } from "@/components/Page.tsx";
 
 export default function Home() {
   return (
diff --git a/routes/note.tsx b/routes/note.tsx
index 2ba7c77..d5f43dc 100644
--- a/routes/note.tsx
+++ b/routes/note.tsx
@@ -25,9 +25,9 @@ export default function NotesPage({ data: notes }: PageProps<Note[]>) {
       <h1>List of Notes</h1>
       <p>Create a note:</p>
       <form class="flex flex-col" action="./note/create" method="POST">
-        <textarea rows="6" class="px-4 py-2 bg-gray-800" name="content">
+        <textarea rows={6} class="" name="content">
         </textarea>
-        <button class="mt-2 px-4 py-2 bg-gray-800">Post</button>
+        <input class="mt-2" type="submit" value="Post" />
       </form>
       {notes.map(({ id, content, created_at }) => (
         <div class="my-4" key={id}>
diff --git a/routes/note/create.tsx b/routes/note/create.tsx
index a8f5ae6..cd76d74 100644
--- a/routes/note/create.tsx
+++ b/routes/note/create.tsx
@@ -1,6 +1,6 @@
 import { Handlers, PageProps } from "$fresh/server.ts";
-import { query } from "../../db.ts";
-import { Page } from "../../components/Page.tsx";
+import { query } from "@/db.ts";
+import { Page } from "@/components/Page.tsx";
 
 type NoteID = string;
 
@@ -8,7 +8,7 @@ export const handler: Handlers<NoteID> = {
   async POST(request, context) {
     const content = (await request.formData()).get("content");
     if (!content) throw "no content provided";
-    const result = await query(
+    const result = await query<{ id: string }>(
       "insert into note (content) values ($1) returning id",
       [content],
     );
diff --git a/routes/register.tsx b/routes/register.tsx
index 1354103..c9982af 100644
--- a/routes/register.tsx
+++ b/routes/register.tsx
@@ -14,8 +14,12 @@ export const handler: Handlers<UserID | RegistrationError | null> = {
     const formData = (await request.formData());
     const username = formData.get("username");
     const password = formData.get("password");
-    if (!username) throw "no username provided";
-    if (!password) throw "no password provided";
+    if (!username) {
+      return await context.render({ message: "no username provided" });
+    }
+    if (!password) {
+      return await context.render({ message: "no password provided" });
+    }
     const hashed_password = await hash(password.toString());
     try {
       const result = await query<{ id: string }>(
@@ -27,12 +31,15 @@ export const handler: Handlers<UserID | RegistrationError | null> = {
       const { rows: [{ id }] } = result;
       return await context.render(id);
     } catch (err) {
-      if (err instanceof PostgresError) {
-        console.error("PostgresError:", err);
-        return await context.render({ message: err.message });
-      } else {
-        throw err;
+      if (
+        err instanceof PostgresError && err.fields.code == "23505" &&
+        err.fields.constraint == "user_username_key"
+      ) {
+        return await context.render({
+          message: `A user with username '${username}' already exists`,
+        });
       }
+      throw err;
     }
   },
 };
@@ -62,14 +69,18 @@ function RegistrationForm(props?: RegistrationError | null) {
   return (
     <Page>
       {props != null &&
-        <p class="text-red-500">{props.message}</p>}
+        (
+          <p class="text-red-500">
+            <strong>Error</strong>: {props.message}
+          </p>
+        )}
       <form class="flex flex-col max-w-lg" method="post">
         <label for="username">Username</label>
-        <input class="bg-gray-800 px-4 py-2" type="text" name="username" />
+        <input type="text" name="username" />
         <label for="password">Password</label>
-        <input class="bg-gray-800 px-4 py-2" type="password" name="password" />
+        <input type="password" name="password" />
         <input
-          class="bg-gray-800 px-4 p-2 mt-2"
+          class="bg-blue-800 px-4 p-2 mt-2"
           type="submit"
           value="Register"
         />
diff --git a/twind.config.ts b/twind.config.ts
index 360eea8..a7a698d 100644
--- a/twind.config.ts
+++ b/twind.config.ts
@@ -1,10 +1,24 @@
 import { Options } from "$fresh/plugins/twind.ts";
-
 import { apply } from "twind";
+import { css } from "twind/css";
+
+const button = apply(
+  "bg-blue(400 500(hover:& focus:&) dark:(600 700(hover:& focus:&))) px-4 py-2 rounded cursor-pointer ring(focus:& current)",
+);
+
+const input = apply(
+  "rounded bg-gray(200 300(hover:& focus:&) dark:(800 700(hover:& focus:&))) px-4 py-2 ring(focus:& current)",
+);
 
 export default {
   selfURL: import.meta.url,
-  preflight: {
-    body: apply("bg-white text-black dark:(bg-gray-900 text-white)"),
-  },
+  preflight: (preflight) =>
+    css(preflight, {
+      body: apply("bg-white text-black dark:(bg-gray-900 text-white)"),
+      "body input, body textarea": input,
+      "body button, body input[type=submit]": button,
+      "body a": apply(
+        "text-blue(600 700(hover:&) dark:(400 300(hover:&))",
+      ),
+    }),
 } as Options;