From a51f9ffb467c647fb69f2cbdc6e20daa8062aec3 Mon Sep 17 00:00:00 2001
From: James Ritchie <james@jamesritchie.co.uk>
Date: Thu, 15 Dec 2022 17:22:47 +0000
Subject: [PATCH] New Org page styled up

---
 .../navigation/OrganizationMenu.tsx           |  2 +-
 .../app/components/primitives/Buttons.tsx     |  4 +--
 apps/webapp/app/routes/__app/orgs/new.tsx     | 33 +++++++------------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/apps/webapp/app/components/navigation/OrganizationMenu.tsx b/apps/webapp/app/components/navigation/OrganizationMenu.tsx
index 696567ede..6842f1ec2 100644
--- a/apps/webapp/app/components/navigation/OrganizationMenu.tsx
+++ b/apps/webapp/app/components/navigation/OrganizationMenu.tsx
@@ -10,7 +10,7 @@ import {
   useOrganizations,
 } from "~/hooks/useOrganizations";
 
-const actionClassNames = "text-green-500";
+const actionClassNames = "text-white";
 
 export function OrganizationMenu() {
   const organizations = useOrganizations();
diff --git a/apps/webapp/app/components/primitives/Buttons.tsx b/apps/webapp/app/components/primitives/Buttons.tsx
index e17774f4e..12d61d09a 100644
--- a/apps/webapp/app/components/primitives/Buttons.tsx
+++ b/apps/webapp/app/components/primitives/Buttons.tsx
@@ -5,11 +5,11 @@ const commonClasses =
   "inline-flex items-center justify-center rounded max-w-max px-4 py-2 gap-2 text-sm transition whitespace-nowrap";
 const primaryClasses = classnames(
   commonClasses,
-  "bg-blue-500 text-white hover:bg-blue-600 focus:bg-blue-600"
+  "bg-blue-600 text-white hover:bg-blue-700 focus:bg-blue-700"
 );
 const secondaryClasses = classnames(
   commonClasses,
-  "bg-slate-800 text-white hover:bg-slate-900 focus:bg-slate-700"
+  "bg-slate-850 text-white hover:bg-slate-900 focus:bg-slate-700"
 );
 
 type ButtonProps = React.DetailedHTMLProps<
diff --git a/apps/webapp/app/routes/__app/orgs/new.tsx b/apps/webapp/app/routes/__app/orgs/new.tsx
index f409c638b..787423702 100644
--- a/apps/webapp/app/routes/__app/orgs/new.tsx
+++ b/apps/webapp/app/routes/__app/orgs/new.tsx
@@ -1,9 +1,10 @@
-import { BriefcaseIcon } from "@heroicons/react/24/outline";
+import { BookmarkIcon, BriefcaseIcon } from "@heroicons/react/24/outline";
 import type { ActionFunction } from "@remix-run/node";
 import { json, redirect } from "@remix-run/node";
 import { Form, useActionData } from "@remix-run/react";
 import * as React from "react";
 import { PrimaryButton, SecondaryLink } from "~/components/primitives/Buttons";
+import { Header1 } from "~/components/primitives/text/Headers";
 import { createOrganization } from "~/models/organization.server";
 import { requireUserId } from "~/services/session.server";
 
@@ -49,15 +50,11 @@ export default function NewOrganizationPage() {
   }, [actionData]);
 
   return (
-    <main className="bg-slate-50 w-full h-screen flex items-center justify-center">
-      <div className="flex flex-col gap-y-3.5 max-w-lg bg-white shadow border border-slate-200 rounded-md p-10">
-        <h3 className="font-semibold text-slate-600 text-xl">
+    <main className="w-full h-full flex items-center justify-center">
+      <div className="flex flex-col gap-y-3.5 min-w-[400px] bg-slate-800 border border-slate-800 rounded-md p-10">
+        <Header1 size="large" className="">
           Create a new Organization
-        </h3>
-        <p className="text-slate-600">
-          Use Organizations to hold a collection of Projects. A typical
-          Organization is named after a company or team.
-        </p>
+        </Header1>
         <Form
           method="post"
           style={{
@@ -74,13 +71,13 @@ export default function NewOrganizationPage() {
               </label>
               <div className="group flex">
                 <div className="flex justify-end pointer-events-none z-10 -mr-8 items-center w-8">
-                  <BriefcaseIcon className="h-5 w-5 text-slate-600"></BriefcaseIcon>
+                  <BookmarkIcon className="h-5 w-5 text-slate-600" />
                 </div>
                 <input
                   ref={titleRef}
                   name="title"
-                  placeholder="e.g. My first Organization"
-                  className="relative w-full pl-10 pr-3 py-2 rounded-md border text-slate-600 bg-slate-50 group-focus:border-blue-500 placeholder:text-slate-400"
+                  placeholder="e.g. Company name"
+                  className="relative w-full pl-10 pr-3 py-2 rounded bg-slate-900 group-focus:border-blue-500 placeholder:text-slate-600"
                   aria-invalid={actionData?.errors?.title ? true : undefined}
                   aria-errormessage={
                     actionData?.errors?.title ? "title-error" : undefined
@@ -96,17 +93,11 @@ export default function NewOrganizationPage() {
           </div>
 
           <div className="flex justify-between">
-            <SecondaryLink
-              to="/"
-              className="rounded bg-blue-500  py-2 px-4 text-white hover:bg-blue-600 focus:bg-blue-400"
-            >
+            <SecondaryLink to="/" className="rounded py-2 px-4">
               Cancel
             </SecondaryLink>
-            <PrimaryButton
-              type="submit"
-              className="rounded bg-blue-500  py-2 px-4 text-white hover:bg-blue-600 focus:bg-blue-400"
-            >
-              Create
+            <PrimaryButton type="submit" className="rounded py-2 px-4">
+              Create Organization
             </PrimaryButton>
           </div>
         </Form>