6 files changed, 47 insertions, 36 deletions
diff --git a/ui/pages/auth/register.tmpl.html b/ui/pages/auth/register.tmpl.html
deleted file mode 100644
index 7dfd7aa..0000000
--- a/ui/pages/auth/register.tmpl.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{{define "title"}}Register{{end}}
-
-{{define "main"}}
-    <h1>Registration</h1>
-    <form hx-post="/user">
-        <label>
-            Username
-            <input type="text" placeholder="username" />
-        </label>
-        <label>
-            Password
-            <input type="password" placeholder="password" />
-        </label>
-        <button type="submit">Register</button>
-    </form>
-{{end}}
diff --git a/ui/pages/user/create.tmpl.html b/ui/pages/user/create.tmpl.html
new file mode 100644
index 0000000..5e1087a
--- /dev/null
+++ b/ui/pages/user/create.tmpl.html
@@ -0,0 +1,20 @@
+{{define "title"}}Create User{{end}}
+
+{{define "main"}}
+    <h1>Create User</h1>
+    <form hx-post="/user" action="/user" method="POST" hx-target="#messages" hx-swap="outerHTML">
+        <label>
+            Email
+            <input type="email" placeholder="email" name="email" />
+        </label>
+        <label>
+            Username
+            <input type="text" placeholder="username" name="username" />
+        </label>
+        <label>
+            Password
+            <input type="password" placeholder="password" name="password" />
+        </label>
+        <button type="submit" hx-disabled-elt="this">Create</button>
+    </form>
+{{end}}
diff --git a/ui/pages/user/login.tmpl.html b/ui/pages/user/login.tmpl.html
new file mode 100644
index 0000000..5c42f97
--- /dev/null
+++ b/ui/pages/user/login.tmpl.html
@@ -0,0 +1,16 @@
+{{define "title"}}Login{{end}}
+
+{{define "main"}}
+    <h1>Login</h1>
+    <form hx-post="/user" action="/user/auth" method="POST" hx-target="#messages" hx-swap="outerHTML">
+        <label>
+            Username
+            <input type="text" placeholder="username" name="username" />
+        </label>
+        <label>
+            Password
+            <input type="password" placeholder="password" name="password" />
+        </label>
+        <button type="submit" hx-disabled-elt="this">Login</button>
+    </form>
+{{end}}
diff --git a/ui/pages/users/create.tmpl.html b/ui/pages/users/create.tmpl.html
deleted file mode 100644
index 381f6ea..0000000
--- a/ui/pages/users/create.tmpl.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{{define "title"}}Create User{{end}}
-
-{{define "main"}}
-    <h1>Registration</h1>
-    <form hx-post="/user">
-        <label>
-            Email
-            <input type="email" placeholder="email" />
-        </label>
-        <label>
-            Username
-            <input type="text" placeholder="username" />
-        </label>
-        <label>
-            Password
-            <input type="password" placeholder="password" />
-        </label>
-        <button type="submit">Register</button>
-    </form>
-{{end}}
diff --git a/ui/templates/base.tmpl.html b/ui/templates/base.tmpl.html
index 4e28bc0..a080925 100644
--- a/ui/templates/base.tmpl.html
+++ b/ui/templates/base.tmpl.html
@@ -3,9 +3,11 @@
 <html lang="en">
 <head>
     <title>{{template "title" .}} | newsstand.nyc</title>
+    <link rel="stylesheet" href="https://unpkg.com/@blaze/css@x.x.x/dist/blaze/blaze.css">
     <script src="https://unpkg.com/htmx.org@1.9.9" integrity="sha384-QFjmbokDn2DjBjq+fM+8LUIVrAgqcNW2s0PjAxHETgRn9l4fvX31ZxDxvwQnyMOX" crossorigin="anonymous"></script>
 </head>
 <body>
+    {{template "messages" .}}
     {{template "main" .}}
 </body>
 </html>
diff --git a/ui/templates/messages.tmpl.html b/ui/templates/messages.tmpl.html
new file mode 100644
index 0000000..b9d327f
--- /dev/null
+++ b/ui/templates/messages.tmpl.html
@@ -0,0 +1,9 @@
+{{define "messages"}}
+<div id="messages">
+    {{ if .Message }}
+    <div class="c-alert c-alert--info" role="alert">
+        {{.Message}}
+    </div>
+    {{ end }}
+</div>
+{{end}}