From 9f43138252f50f014e51f8e9de9d92975b46af09 Mon Sep 17 00:00:00 2001
From: Imbus <imbus64@protonmail.com>
Date: Wed, 15 Nov 2023 07:29:59 +0100
Subject: [PATCH] Formatted entire project

---
 client-solid/src/Icons.tsx             | 14 ++++++-------
 client-solid/src/LoginModal.tsx        | 22 +++++++++------------
 client-solid/src/Navbar.tsx            | 16 +++++++--------
 client-solid/src/NewPost.tsx           | 20 +++++++++----------
 client-solid/src/Posts.tsx             | 19 +++++++++---------
 client-solid/src/Primary.tsx           |  5 +++--
 client-solid/src/RegLogin/Login.tsx    |  3 ++-
 client-solid/src/RegLogin/Register.tsx | 27 ++++++++++++++------------
 client-solid/src/Root.tsx              |  7 +++----
 client-solid/src/SinglePost.tsx        | 11 ++++++-----
 client-solid/src/api.ts                | 14 ++++++-------
 client-solid/src/index.tsx             |  6 ++----
 12 files changed, 80 insertions(+), 84 deletions(-)

diff --git a/client-solid/src/Icons.tsx b/client-solid/src/Icons.tsx
index 9e1ab36..b7195da 100644
--- a/client-solid/src/Icons.tsx
+++ b/client-solid/src/Icons.tsx
@@ -8,7 +8,7 @@ export function Arrow(): JSXElement {
       viewBox="0 0 24 24"
       stroke-width="1.5"
       stroke="currentColor"
-      class="w-6 h-6"
+      class="h-6 w-6"
     >
       <path
         stroke-linecap="round"
@@ -20,7 +20,7 @@ export function Arrow(): JSXElement {
 }
 
 export function loadSpinner(): JSXElement {
-  return <span class="loading loading-spinner loading-lg self-center"></span>;
+  return <span class="loading loading-spinner loading-lg self-center" />;
 }
 
 // Hamburger menu icon
@@ -32,7 +32,7 @@ export function Bars(): JSXElement {
       viewBox="0 0 24 24"
       stroke-width="1.5"
       stroke="currentColor"
-      class="w-6 h-6"
+      class="h-6 w-6"
     >
       <path
         stroke-linecap="round"
@@ -51,7 +51,7 @@ export function UserCircle(): JSXElement {
       viewBox="0 0 24 24"
       stroke-width="1.5"
       stroke="currentColor"
-      class="w-6 h-6"
+      class="h-6 w-6"
     >
       <path
         stroke-linecap="round"
@@ -70,7 +70,7 @@ export function Flake(): JSXElement {
       stroke-width="1"
       stroke="currentColor"
       viewBox="0 0 24 24"
-      class="w-8 h-8"
+      class="h-8 w-8"
       data-testid="AcUnitIcon"
     >
       <path d="M22 11h-4.17l3.24-3.24-1.41-1.42L15 11h-2V9l4.66-4.66-1.42-1.41L13 6.17V2h-2v4.17L7.76 2.93 6.34 4.34 11 9v2H9L4.34 6.34 2.93 7.76 6.17 11H2v2h4.17l-3.24 3.24 1.41 1.42L9 13h2v2l-4.66 4.66 1.42 1.41L11 17.83V22h2v-4.17l3.24 3.24 1.42-1.41L13 15v-2h2l4.66 4.66 1.41-1.42L17.83 13H22z" />
@@ -86,7 +86,7 @@ export function Plus(): JSXElement {
       viewBox="0 0 24 24"
       stroke-width="1.5"
       stroke="currentColor"
-      class="w-6 h-6"
+      class="h-6 w-6"
     >
       <path
         stroke-linecap="round"
@@ -105,7 +105,7 @@ export function Home(): JSXElement {
       viewBox="0 0 24 24"
       stroke-width="1.5"
       stroke="currentColor"
-      class="w-6 h-6"
+      class="h-6 w-6"
     >
       <path
         stroke-linecap="round"
diff --git a/client-solid/src/LoginModal.tsx b/client-solid/src/LoginModal.tsx
index 5f5b0b4..152044c 100644
--- a/client-solid/src/LoginModal.tsx
+++ b/client-solid/src/LoginModal.tsx
@@ -1,15 +1,11 @@
 import { JSXElement, Show, onCleanup, useContext } from "solid-js";
-import { ModalContext } from "./Root";
+
 import { LoginForm } from "./RegLogin/Login";
 import { RegisterForm } from "./RegLogin/Register";
+import { ModalContext } from "./Root";
 
 export function LoginModal(): JSXElement {
-  const modal_ctx = useContext(ModalContext);
-
-  if (!modal_ctx) {
-    // Handle the case where ModalContext is not available
-    return null;
-  }
+  const modal_ctx = useContext(ModalContext)!;
 
   const closeModal = (): void => {
     modal_ctx.setLoginModalOpen(false);
@@ -26,13 +22,13 @@ export function LoginModal(): JSXElement {
         <div class="modal-box">
           <form method="dialog">
             <button
-              onclick={closeModal}
-              class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2"
+              onClick={closeModal}
+              class="btn btn-circle btn-ghost btn-sm absolute right-2 top-2"
             >
               ✕
             </button>
           </form>
-          <h3 class="font-bold text-lg mb-2">Welcome!</h3>
+          <h3 class="mb-2 text-lg font-bold">Welcome!</h3>
           <div class="tabs tabs-lifted">
             <input
               type="radio"
@@ -41,7 +37,7 @@ export function LoginModal(): JSXElement {
               aria-label="Login"
               checked
             />
-            <div class="tab-content bg-base-100 border-base-300 rounded-box p-10">
+            <div class="tab-content rounded-box border-base-300 bg-base-100 p-10">
               <LoginForm />
             </div>
 
@@ -51,13 +47,13 @@ export function LoginModal(): JSXElement {
               class="tab"
               aria-label="Register"
             />
-            <div class="tab-content bg-base-100 border-base-300 rounded-box p-10">
+            <div class="tab-content rounded-box border-base-300 bg-base-100 p-10">
               <RegisterForm />
             </div>
           </div>
         </div>
         <form method="dialog" class="modal-backdrop">
-          <button onclick={closeModal}>close</button>
+          <button onClick={closeModal}>close</button>
         </form>
       </dialog>
     </Show>
diff --git a/client-solid/src/Navbar.tsx b/client-solid/src/Navbar.tsx
index 2ed5fea..3e2fdd6 100644
--- a/client-solid/src/Navbar.tsx
+++ b/client-solid/src/Navbar.tsx
@@ -1,8 +1,8 @@
-import { JSXElement, Show, useContext } from "solid-js";
 import { A } from "@solidjs/router";
-import { LoginContext } from "./Root";
-import { ModalContext } from "./Root";
+import { JSXElement, Show, useContext } from "solid-js";
+
 import { Flake, Home, Plus, UserCircle } from "./Icons";
+import { LoginContext, ModalContext } from "./Root";
 
 // Represents a single list item in the menu bar
 function MenuItem(props: { href: string; children: JSXElement }): JSXElement {
@@ -19,7 +19,7 @@ function MenuItem(props: { href: string; children: JSXElement }): JSXElement {
 function Menu(): JSXElement {
   const login_ctx = useContext(LoginContext);
   return (
-    <ul class="menu md:menu-horizontal space-y-2 md:space-x-2 md:space-y-0 rounded-box">
+    <ul class="menu space-y-2 rounded-box md:menu-horizontal md:space-x-2 md:space-y-0">
       <MenuItem href="/">
         <Home />
       </MenuItem>
@@ -49,9 +49,9 @@ export function Navbar(): JSXElement {
   };
 
   return (
-    <div class="navbar text-neutral-content max-w-3xl max-w rounded-box md:my-4">
+    <div class="max-w navbar max-w-3xl rounded-box text-neutral-content md:my-4">
       <div class="flex-1">
-        <A href={"/"} class="btn btn-ghost normal-case pl-1 text-xl">
+        <A href={"/"} class="btn btn-ghost pl-1 text-xl normal-case">
           <Flake />
           FrostByte
         </A>
@@ -59,10 +59,10 @@ export function Navbar(): JSXElement {
       <div class="flex">
         <Menu />
       </div>
-      <div class="flex-1 justify-end flex">
+      <div class="flex flex-1 justify-end">
         <A
           href="#"
-          class="btn btn-ghost capitalize pr-1 text-sm"
+          class="btn btn-ghost pr-1 text-sm capitalize"
           onClick={clickHandler}
         >
           {
diff --git a/client-solid/src/NewPost.tsx b/client-solid/src/NewPost.tsx
index 552e237..40d6a63 100644
--- a/client-solid/src/NewPost.tsx
+++ b/client-solid/src/NewPost.tsx
@@ -1,8 +1,8 @@
-import { JSXElement, Show, createSignal, onMount, useContext } from "solid-js";
-import { createPost } from "./api";
-import { NewPost } from "./api";
 import { useNavigate } from "@solidjs/router";
+import { JSXElement, Show, createSignal, onMount, useContext } from "solid-js";
+
 import { LoginContext } from "./Root";
+import { NewPost, createPost } from "./api";
 
 export function NewPostInputArea(): JSXElement {
   const [content, setContent] = createSignal("");
@@ -35,25 +35,23 @@ export function NewPostInputArea(): JSXElement {
   return (
     <Show
       when={!waiting()}
-      fallback={
-        <span class="loading loading-spinner loading-lg self-center"></span>
-      }
+      fallback={<span class="loading loading-spinner loading-lg self-center" />}
     >
-      <div class="flex flex-col w-full space-y-2">
+      <div class="flex w-full flex-col space-y-2">
         <textarea
           class="textarea textarea-bordered h-32"
           placeholder="Speak your mind..."
           maxLength={500}
-          oninput={(input): void => {
+          onInput={(input): void => {
             setContent(input.target.value);
           }}
-        ></textarea>
+        />
         <button
           class={
-            "btn btn-primary self-end btn-sm" +
+            "btn btn-primary btn-sm self-end" +
             (content() == "" ? " btn-disabled" : "")
           }
-          onclick={sendPost}
+          onClick={sendPost}
         >
           Submit
         </button>
diff --git a/client-solid/src/Posts.tsx b/client-solid/src/Posts.tsx
index 3342d2f..72b22aa 100644
--- a/client-solid/src/Posts.tsx
+++ b/client-solid/src/Posts.tsx
@@ -1,9 +1,8 @@
-import { JSXElement, Show, createSignal, For } from "solid-js";
-import { getPosts } from "./api";
-import { Post } from "./api";
 import { useNavigate } from "@solidjs/router";
-import { Arrow } from "./Icons";
-import { loadSpinner } from "./Icons";
+import { For, JSXElement, Show, createSignal } from "solid-js";
+
+import { Arrow, loadSpinner } from "./Icons";
+import { Post, getPosts } from "./api";
 
 export function Posts(): JSXElement {
   const [posts, setPosts] = createSignal([] as Post[]);
@@ -17,22 +16,22 @@ export function Posts(): JSXElement {
   return (
     <Show when={!loading()} fallback={loadSpinner()}>
       <For each={posts()}>
-        {(post): JSXElement => <PostSegment post={post}></PostSegment>}
+        {(post): JSXElement => <PostSegment post={post} />}
       </For>
     </Show>
   );
 }
 
 // This is the card container for a post
-export function PostSegment({ post }: { post: Post }): JSXElement {
+export function PostSegment(props: { post: Post }): JSXElement {
   const nav = useNavigate();
   return (
-    <div class="card border-b-2 flex-grow border-b-base-300 bg-base-200 hover:bg-base-300 transition-all compact text-base-content w-full">
+    <div class="card compact w-full flex-grow border-b-2 border-b-base-300 bg-base-200 text-base-content transition-all hover:bg-base-300">
       <div class="card-body">
-        <p class="text-base-content break-words">{post?.content}</p>
+        <p class="break-words text-base-content">{props.post?.content}</p>
         <div class="card-actions justify-end">
           <button
-            onClick={(): void => nav("/post/" + post?.id)}
+            onClick={(): void => nav("/post/" + props.post?.id)}
             class="btn btn-xs"
           >
             <Arrow />
diff --git a/client-solid/src/Primary.tsx b/client-solid/src/Primary.tsx
index 2b8a2fa..dfffd80 100644
--- a/client-solid/src/Primary.tsx
+++ b/client-solid/src/Primary.tsx
@@ -1,8 +1,9 @@
 import { Route, Routes } from "@solidjs/router";
+import { JSXElement } from "solid-js";
+
+import { NewPostInputArea } from "./NewPost";
 import { Posts } from "./Posts";
 import { SinglePost } from "./SinglePost";
-import { NewPostInputArea } from "./NewPost";
-import { JSXElement } from "solid-js";
 
 // Primary is the section of the page that holds the main content
 export function Primary(): JSXElement {
diff --git a/client-solid/src/RegLogin/Login.tsx b/client-solid/src/RegLogin/Login.tsx
index 45be727..1436f26 100644
--- a/client-solid/src/RegLogin/Login.tsx
+++ b/client-solid/src/RegLogin/Login.tsx
@@ -1,4 +1,5 @@
 import { JSXElement, createSignal, useContext } from "solid-js";
+
 import { LoginContext, ModalContext } from "../Root";
 
 export function LoginForm(): JSXElement {
@@ -20,7 +21,7 @@ export function LoginForm(): JSXElement {
   async function loginPress(e: Event): Promise<void> {
     e.preventDefault();
     setWaiting(true);
-    submitLogin(username(), password()).then((token) => {
+    submitLogin(username(), password()).then((token): void => {
       if (token != "") {
         setWaiting(false);
         setError(false);
diff --git a/client-solid/src/RegLogin/Register.tsx b/client-solid/src/RegLogin/Register.tsx
index ffa5939..33c15f5 100644
--- a/client-solid/src/RegLogin/Register.tsx
+++ b/client-solid/src/RegLogin/Register.tsx
@@ -1,4 +1,5 @@
 import { JSXElement, createSignal, useContext } from "solid-js";
+
 import { LoginContext, ModalContext } from "../Root";
 
 export function RegisterForm(): JSXElement {
@@ -21,19 +22,21 @@ export function RegisterForm(): JSXElement {
   async function regPress(e: Event): Promise<void> {
     e.preventDefault();
     setWaiting(true);
-    submitRegistration(username(), password(), captcha()).then((token) => {
-      if (token != "") {
-        setWaiting(false);
-        setError(false);
-        login_ctx?.setUsername(username());
-        login_ctx?.setToken(token);
-        modal_ctx?.setLoginModalOpen(false);
-        setUsername("");
-        setPassword("");
-      } else {
-        loginFailed();
+    submitRegistration(username(), password(), captcha()).then(
+      (token): void => {
+        if (token != "") {
+          setWaiting(false);
+          setError(false);
+          login_ctx?.setUsername(username());
+          login_ctx?.setToken(token);
+          modal_ctx?.setLoginModalOpen(false);
+          setUsername("");
+          setPassword("");
+        } else {
+          loginFailed();
+        }
       }
-    });
+    );
   }
 
   return (
diff --git a/client-solid/src/Root.tsx b/client-solid/src/Root.tsx
index 7d04539..c1cfd63 100644
--- a/client-solid/src/Root.tsx
+++ b/client-solid/src/Root.tsx
@@ -1,9 +1,8 @@
-import { Accessor, JSXElement, createSignal } from "solid-js";
-import { createContext } from "solid-js";
+import { Accessor, JSXElement, createContext, createSignal } from "solid-js";
 
+import { LoginModal } from "./LoginModal";
 import { Navbar } from "./Navbar";
 import { Primary } from "./Primary";
-import { LoginModal } from "./LoginModal";
 
 // Representing the state of varoious modals.
 // So far we only have one modal, but we can add more later
@@ -44,7 +43,7 @@ function Root(): JSXElement {
           <div class="flex flex-col items-center">
             <Navbar />
             <LoginModal />
-            <div class="flex flex-col items-center w-full md:max-w-3xl px-2 space-y-2">
+            <div class="flex w-full flex-col items-center space-y-2 px-2 md:max-w-3xl">
               <Primary />
             </div>
           </div>
diff --git a/client-solid/src/SinglePost.tsx b/client-solid/src/SinglePost.tsx
index e274fd0..7e5eca5 100644
--- a/client-solid/src/SinglePost.tsx
+++ b/client-solid/src/SinglePost.tsx
@@ -1,8 +1,9 @@
 import { useParams } from "@solidjs/router";
 import { JSXElement, Show, Suspense, createResource } from "solid-js";
-import { getPost } from "./api";
-import { PostSegment } from "./Posts";
+
 import { loadSpinner } from "./Icons";
+import { PostSegment } from "./Posts";
+import { getPost } from "./api";
 
 export function SinglePost(): JSXElement {
   const params = useParams();
@@ -10,9 +11,9 @@ export function SinglePost(): JSXElement {
 
   return (
     <Suspense fallback={loadSpinner()}>
-        <Show when={post()}>
-          <PostSegment post={post()!}></PostSegment>
-        </Show>
+      <Show when={post()}>
+        <PostSegment post={post()!} />
+      </Show>
     </Suspense>
   );
 }
diff --git a/client-solid/src/api.ts b/client-solid/src/api.ts
index 948abbe..8aba575 100644
--- a/client-solid/src/api.ts
+++ b/client-solid/src/api.ts
@@ -1,19 +1,19 @@
 // This file contains types and functions related to interacting with the API.
 
 export interface NewPost {
-    content: string;
-    token: string;
+  content: string;
+  token: string;
 }
 
 interface Votes {
-    up: number;
-    down: number;
+  up: number;
+  down: number;
 }
 
 export interface Post extends NewPost {
-    id: string;
-    createdAt: string;
-    votes: Votes;
+  id: string;
+  createdAt: string;
+  votes: Votes;
 }
 
 export async function getPosts(): Promise<Post[]> {
diff --git a/client-solid/src/index.tsx b/client-solid/src/index.tsx
index 2d8108e..30109db 100644
--- a/client-solid/src/index.tsx
+++ b/client-solid/src/index.tsx
@@ -1,10 +1,8 @@
-/* @refresh reload */
+import { Router } from "@solidjs/router";
 import { render } from "solid-js/web";
 
-import "./index.css";
 import Root from "./Root";
-
-import { Router } from "@solidjs/router";
+import "./index.css";
 
 const root = document.getElementById("root");