From f2e2f88dadf65a8f3ab93549cc2d0c6d67cf9da5 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Fri, 18 Oct 2024 11:58:08 +0200
Subject: [PATCH] wip3

---
 src/frontend/components/article_nav.rs | 19 ++++++++++++-------
 src/frontend/components/credentials.rs |  8 ++++----
 src/frontend/pages/article/list.rs     | 20 ++++++++++++++------
 src/frontend/pages/login.rs            |  2 +-
 src/frontend/pages/register.rs         |  2 +-
 5 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/frontend/components/article_nav.rs b/src/frontend/components/article_nav.rs
index ef68a9a..6ee5523 100644
--- a/src/frontend/components/article_nav.rs
+++ b/src/frontend/components/article_nav.rs
@@ -88,13 +88,18 @@ pub fn ArticleNav(
                                 </Show>
                             </div>
                             <div class="flex flex-row">
-                            <h1 class="text-4xl font-bold font-serif my-4 grow max-w-fit">{title}</h1>
-                            <Show when=move || protected>
-                                <span title="Article can only be edited by local admins">
-                                    "Protected"
-                                </span>
-                            </Show>
-                                    </div>
+                                <h1 class="text-4xl font-bold font-serif my-6 grow flex-auto">
+                                    {title}
+                                </h1>
+                                <Show when=move || protected>
+                                    <span
+                                        class="place-self-center"
+                                        title="Article can only be edited by local admins"
+                                    >
+                                        "Protected"
+                                    </span>
+                                </Show>
+                            </div>
                         }
                     })
             }}
diff --git a/src/frontend/components/credentials.rs b/src/frontend/components/credentials.rs
index cecebec..4912635 100644
--- a/src/frontend/components/credentials.rs
+++ b/src/frontend/components/credentials.rs
@@ -18,8 +18,8 @@ pub fn CredentialsForm(
     });
 
     view! {
-        <form on:submit=|ev| ev.prevent_default()>
-            <p>{title}</p>
+        <form class="form-control max-w-80" on:submit=|ev| ev.prevent_default()>
+            <h1 class="text-4xl font-bold font-serif my-4 grow max-w-fit">{title}</h1>
             {move || {
                 error
                     .get()
@@ -44,7 +44,7 @@ pub fn CredentialsForm(
                     set_username.update(|v| *v = val);
                 }
             />
-
+            <div class="h-2"></div>
             <input
                 type="password"
                 class="input"
@@ -71,7 +71,7 @@ pub fn CredentialsForm(
 
             <div>
                 <button
-                    class="btn"
+                    class="btn btn-primary my-2"
                     prop:disabled=move || button_is_disabled.get()
                     on:click=move |_| dispatch_action()
                 >
diff --git a/src/frontend/pages/article/list.rs b/src/frontend/pages/article/list.rs
index 06fc287..09b5bb0 100644
--- a/src/frontend/pages/article/list.rs
+++ b/src/frontend/pages/article/list.rs
@@ -23,15 +23,21 @@ pub fn ListArticles() -> impl IntoView {
     view! {
         <h1 class="text-4xl font-bold font-serif my-4">Most recently edited Articles</h1>
         <Suspense fallback=|| view! { "Loading..." }>
-            <fieldset on:input=move |ev| {
+            <fieldset 
+            class="flex flex-row"
+            on:input=move |ev| {
                 let val = ev.target().unwrap().unchecked_into::<web_sys::HtmlInputElement>().id();
                 let is_local_only = val == "only-local";
                 set_only_local.update(|p| *p = is_local_only);
             }>
-                <input type="radio" name="listing-type" class="radio radio-primary" />
-                <label for="only-local">Only Local</label>
-                <input type="radio" name="listing-type" class="radio radio-primary" checked />
-                <label for="all">All</label>
+                <label class="label cursor-pointer max-w-32">
+                    <span>Only Local</span>
+                    <input type="radio" name="listing-type" class="radio checked:bg-primary" />
+                </label>
+                <label class="label cursor-pointer max-w-32">
+                    <span>All</span>
+                    <input type="radio" name="listing-type" class="radio checked:bg-primary" checked="checked" />
+                </label>
             </fieldset>
             <ul class="list-disc">
                 {move || {
@@ -42,7 +48,9 @@ pub fn ListArticles() -> impl IntoView {
                                 .map(|a| {
                                     view! {
                                         <li>
-                                            <a class="link link-secondary" href=article_link(&a)>{article_title(&a)}</a>
+                                            <a class="link link-secondary" href=article_link(&a)>
+                                                {article_title(&a)}
+                                            </a>
                                         </li>
                                     }
                                 })
diff --git a/src/frontend/pages/login.rs b/src/frontend/pages/login.rs
index 27f41a9..2c2d62f 100644
--- a/src/frontend/pages/login.rs
+++ b/src/frontend/pages/login.rs
@@ -43,7 +43,7 @@ pub fn Login() -> impl IntoView {
             fallback=move || {
                 view! {
                     <CredentialsForm
-                        title="Please enter the desired credentials"
+                        title="Login"
                         action_label="Login"
                         action=login_action
                         error=login_error.into()
diff --git a/src/frontend/pages/register.rs b/src/frontend/pages/register.rs
index 55190e1..810ff67 100644
--- a/src/frontend/pages/register.rs
+++ b/src/frontend/pages/register.rs
@@ -44,7 +44,7 @@ pub fn Register() -> impl IntoView {
             fallback=move || {
                 view! {
                     <CredentialsForm
-                        title="Please enter the desired credentials"
+                        title="Register"
                         action_label="Register"
                         action=register_action
                         error=register_error.into()