From e8b635ce37f7b25e1937abfdb36d1df0175b7387 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Mon, 18 Mar 2024 15:36:01 +0100
Subject: [PATCH 1/2] Fix: Code cleanup & truncate organization names

---
 .../src/pages/login/select-organization.tsx   | 40 +++++--------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/frontend/src/pages/login/select-organization.tsx b/frontend/src/pages/login/select-organization.tsx
index cd37d5a27..481b42966 100644
--- a/frontend/src/pages/login/select-organization.tsx
+++ b/frontend/src/pages/login/select-organization.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable jsx-a11y/no-static-element-interactions */
-/* eslint-disable jsx-a11y/click-events-have-key-events */
 import { useCallback, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import Head from "next/head";
@@ -76,25 +74,18 @@ export default function LoginPage() {
       if (callbackPort) {
         const privateKey = localStorage.getItem("PRIVATE_KEY");
 
-        if (!privateKey) {
-          createNotification({
-            text: "Private key not found",
-            type: "error"
-          });
-        }
+        let error: string | null = null;
 
-        if (!user.email) {
-          createNotification({
-            text: "User email not found",
-            type: "error"
-          });
-        }
+        if (!privateKey) error = "Private key not found";
+        if (!user.email) error = "User email not found";
+        if (!token) error = "No token found";
 
-        if (!token) {
+        if (error) {
           createNotification({
-            text: "No token found",
+            text: error,
             type: "error"
           });
+          return;
         }
 
         const payload = {
@@ -177,33 +168,22 @@ export default function LoginPage() {
               <Spinner />
             ) : (
               organizations.data?.map((org) => (
+                // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
                 <div
                   onClick={() => handleSelectOrganization(org)}
                   key={org.id}
                   className="group flex cursor-pointer items-center justify-between rounded-md bg-mineshaft-700 px-4 py-3 capitalize text-gray-200 shadow-md transition-colors hover:bg-mineshaft-600"
                 >
-                  <p className="transition-colors">{org.name}</p>
+                  <p className="truncate transition-colors">{org.name}</p>
 
                   <FontAwesomeIcon
                     icon={faArrowRight}
-                    className="text-gray-400 transition-colors group-hover:text-primary-500"
+                    className="text-gray-400 transition-all group-hover:translate-x-2 group-hover:text-primary-500"
                   />
                 </div>
               ))
             )}
           </div>
-
-          <Button
-            className="mt-8"
-            colorSchema="primary"
-            isLoading={logout.isLoading}
-            isDisabled={logout.isLoading}
-            variant="solid"
-            size="lg"
-            onClick={handleLogout}
-          >
-            Logout
-          </Button>
         </form>
       </div>
 

From d1dacd81aa099223039bc21562e6bb43e06382b7 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Mon, 18 Mar 2024 15:36:59 +0100
Subject: [PATCH 2/2] Chore: UX improvements to project cards

---
 .../src/pages/org/[id]/overview/index.tsx     | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/frontend/src/pages/org/[id]/overview/index.tsx b/frontend/src/pages/org/[id]/overview/index.tsx
index b37c8ab9e..57b4674cf 100644
--- a/frontend/src/pages/org/[id]/overview/index.tsx
+++ b/frontend/src/pages/org/[id]/overview/index.tsx
@@ -454,7 +454,12 @@ const LearningItemSquare = ({
 };
 
 const formSchema = yup.object({
-  name: yup.string().required().label("Project Name").trim().max(64, "Too long, maximum length is 64 characters"),
+  name: yup
+    .string()
+    .required()
+    .label("Project Name")
+    .trim()
+    .max(64, "Too long, maximum length is 64 characters"),
   addMembers: yup.bool().required().label("Add Members")
 });
 
@@ -631,22 +636,21 @@ const OrganizationPage = withPermission(
             {orgWorkspaces
               .filter((ws) => ws?.name?.toLowerCase().includes(searchFilter.toLowerCase()))
               .map((workspace) => (
+                // eslint-disable-next-line jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events
                 <div
+                  onClick={() => {
+                    router.push(`/project/${workspace.id}/secrets/overview`);
+                    localStorage.setItem("projectData.id", workspace.id);
+                  }}
                   key={workspace.id}
-                  className="min-w-72 flex h-40 flex-col justify-between rounded-md border border-mineshaft-600 bg-mineshaft-800 p-4"
+                  className="min-w-72 group flex h-40 cursor-pointer flex-col justify-between rounded-md border border-mineshaft-600 bg-mineshaft-800 p-4"
                 >
                   <div className="mt-0 truncate text-lg text-mineshaft-100">{workspace.name}</div>
                   <div className="mt-0 pb-6 text-sm text-mineshaft-300">
                     {workspace.environments?.length || 0} environments
                   </div>
-                  <button
-                    type="button"
-                    onClick={() => {
-                      router.push(`/project/${workspace.id}/secrets/overview`);
-                      localStorage.setItem("projectData.id", workspace.id);
-                    }}
-                  >
-                    <div className="group ml-auto w-max cursor-pointer rounded-full border border-mineshaft-600 bg-mineshaft-900 py-2 px-4 text-sm text-mineshaft-300 hover:border-primary-500/80 hover:bg-primary-800/20 hover:text-mineshaft-200">
+                  <button type="button">
+                    <div className="group ml-auto w-max cursor-pointer rounded-full border border-mineshaft-600 bg-mineshaft-900 py-2 px-4 text-sm text-mineshaft-300 transition-all group-hover:border-primary-500/80 group-hover:bg-primary-800/20 group-hover:text-mineshaft-200">
                       Explore{" "}
                       <FontAwesomeIcon
                         icon={faArrowRight}
@@ -693,7 +697,7 @@ const OrganizationPage = withPermission(
                   <a
                     target="_blank"
                     rel="noopener noreferrer"
-                    className="group ml-auto w-max cursor-default rounded-full border border-mineshaft-600 bg-mineshaft-900 py-2 px-4 text-sm text-mineshaft-300 hover:border-primary-500/80 hover:bg-primary-800/20 hover:text-mineshaft-200"
+                    className="group ml-auto w-max cursor-default rounded-full border border-mineshaft-600 bg-mineshaft-900 py-2 px-4 text-sm text-mineshaft-300 transition-all hover:border-primary-500/80 hover:bg-primary-800/20 hover:text-mineshaft-200"
                     href={feature.link}
                   >
                     Learn more{" "}