Merge pull request #1063 from Infisical/ui-updates

fix styling issues

frontend/src/components/v2/ContentLoader/ContentLoader.tsx

@@ -23,10 +23,8 @@ export const ContentLoader = ({ text, frequency = 2000 }: Props) => {
   }, []);
 
   return (
-    <div className="container mx-auto flex relative flex-col h-1/2 w-full items-center justify-center px-8 text-mineshaft-50 dark:[color-scheme:dark] space-y-8">
+    <div className="container mx-auto flex relative flex-col h-screen w-full items-center justify-center px-8 text-mineshaft-50 dark:[color-scheme:dark] space-y-8">
-      <div>
+      <img src="/images/loading/loading.gif" height={70} width={120} alt="loading animation" />
-        <img src="/images/loading/loading.gif" height={210} width={240} alt="loading animation" />
-      </div>
       {text && isTextArray && (
         <AnimatePresence exitBeforeEnter>
           <motion.div
@@ -40,7 +38,7 @@ export const ContentLoader = ({ text, frequency = 2000 }: Props) => {
           </motion.div>
         </AnimatePresence>
       )}
-      {text && !isTextArray && <div className="text-primary text-sm">{text}</div>}
+      {text && !isTextArray && <div className="text-primary text-xs">{text}</div>}
     </div>
   );
 };

frontend/src/layouts/AppLayout/AppLayout.tsx

@@ -10,6 +10,7 @@ import crypto from "crypto";
 import { useEffect } from "react";
 import { Controller, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
+import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { faGithub, faSlack } from "@fortawesome/free-brands-svg-icons";
@@ -67,9 +68,10 @@ import {
   useCreateWorkspace,
   useGetOrgTrialUrl,
   useGetSecretApprovalRequestCount,
+  useGetUserAction,
   useLogoutUser,
-  useUploadWsKey
+  useRegisterUserAction,
-} from "@app/hooks/api";
+  useUploadWsKey} from "@app/hooks/api";
 
 interface LayoutProps {
   children: React.ReactNode;
@@ -116,7 +118,8 @@ export const AppLayout = ({ children }: LayoutProps) => {
   const { user } = useUser();
   const { subscription } = useSubscription();
   const workspaceId = currentWorkspace?._id || "";
-  // const [ isLearningNoteOpen, setIsLearningNoteOpen ] = useState(true);
+  const { data: updateClosed } = useGetUserAction("september_update_closed");
+  
   const { data: secretApprovalReqCount } = useGetSecretApprovalRequestCount({ workspaceId });
 
   const isAddingProjectsAllowed = subscription?.workspaceLimit
@@ -143,6 +146,12 @@ export const AppLayout = ({ children }: LayoutProps) => {
 
   const { t } = useTranslation();
 
+  const registerUserAction = useRegisterUserAction();
+
+  const closeUpdate = async () => {
+    await registerUserAction.mutateAsync("september_update_closed");
+  }
+
   const logout = useLogoutUser();
   const logOutUser = async () => {
     try {
@@ -488,9 +497,9 @@ export const AppLayout = ({ children }: LayoutProps) => {
                             }
                             icon="system-outline-189-domain-verification"
                           >
-                            Secret approval
+                            Secret approvals
                             {Boolean(secretApprovalReqCount?.open) && (
-                              <span className="text-xs p-0.5 rounded ml-2 bg-primary text-black">
+                              <span className="text-xs font-semibold py-0.5 px-1 rounded ml-2 bg-primary-600 border border-primary-400 text-black">
                                 {secretApprovalReqCount?.open}
                               </span>
                             )}
@@ -546,19 +555,6 @@ export const AppLayout = ({ children }: LayoutProps) => {
                           </MenuItem>
                         </a>
                       </Link>
-                      {/* {workspaces.map(project => <Link key={project._id} href={`/project/${project?._id}/secrets/overview`} passHref>
-                        <a>
-                          <SubMenuItem
-                            isSelected={false}
-                            icon="system-outline-44-folder"
-                          >
-                            {project.name}
-                          </SubMenuItem>
-                        </a>
-                        <div className="pl-8 text-mineshaft-300 text-sm py-1 cursor-default hover:text-mineshaft-100">
-                          <FontAwesomeIcon icon={faFolder} className="text-xxs pr-0.5"/> {project.name} <FontAwesomeIcon icon={faArrowRight} className="text-xs pl-0.5"/>
-                        </div>
-                      </Link>)} */}
                       <Link href={`/org/${currentOrg?._id}/members`} passHref>
                         <a>
                           <MenuItem
@@ -610,26 +606,26 @@ export const AppLayout = ({ children }: LayoutProps) => {
                     : "mb-4"
                 } flex w-full cursor-default flex-col items-center px-3 text-sm text-mineshaft-400`}
               >
-                {/*   <div className={`${isLearningNoteOpen ? "block" : "hidden"} z-0 absolute h-60 w-[9.9rem] ${router.asPath.includes("org") ? "bottom-[8.4rem]" : "bottom-[5.4rem]"} bg-mineshaft-900 border border-mineshaft-600 mb-4 rounded-md opacity-30`}/>
+                {/* <div className={`${isLearningNoteOpen ? "block" : "hidden"} z-0 absolute h-60 w-[9.9rem] ${router.asPath.includes("org") ? "bottom-[8.4rem]" : "bottom-[5.4rem]"} bg-mineshaft-900 border border-mineshaft-600 mb-4 rounded-md opacity-30`}/>
                 <div className={`${isLearningNoteOpen ? "block" : "hidden"} z-0 absolute h-60 w-[10.7rem] ${router.asPath.includes("org") ? "bottom-[8.15rem]" : "bottom-[5.15rem]"} bg-mineshaft-900 border border-mineshaft-600 mb-4 rounded-md opacity-50`}/>
                 <div className={`${isLearningNoteOpen ? "block" : "hidden"} z-0 absolute h-60 w-[11.5rem] ${router.asPath.includes("org") ? "bottom-[7.9rem]" : "bottom-[4.9rem]"} bg-mineshaft-900 border border-mineshaft-600 mb-4 rounded-md opacity-70`}/>
-                <div className={`${isLearningNoteOpen ? "block" : "hidden"} z-0 absolute h-60 w-[12.3rem] ${router.asPath.includes("org") ? "bottom-[7.65rem]" : "bottom-[4.65rem]"} bg-mineshaft-900 border border-mineshaft-600 mb-4 rounded-md opacity-90`}/>
+                <div className={`${isLearningNoteOpen ? "block" : "hidden"} z-0 absolute h-60 w-[12.3rem] ${router.asPath.includes("org") ? "bottom-[7.65rem]" : "bottom-[4.65rem]"} bg-mineshaft-900 border border-mineshaft-600 mb-4 rounded-md opacity-90`}/> */}
-                <div className={`${isLearningNoteOpen ? "block" : "hidden"} relative z-10 h-60 w-52 bg-mineshaft-900 border border-mineshaft-600 mb-6 rounded-md flex flex-col items-center justify-start px-3`}>
+                <div className={`${!updateClosed ? "block" : "hidden"} relative z-10 h-64 w-52 bg-mineshaft-900 border border-mineshaft-600 mb-6 rounded-md flex flex-col items-center justify-start px-3`}>
-                  <div className="w-full mt-2 text-md text-mineshaft-100 font-semibold">Kubernetes Operator</div>
+                  <div className="w-full mt-2 text-md text-mineshaft-100 font-semibold">Infisical September update</div>
-                  <div className="w-full mt-1 text-sm text-mineshaft-300 font-normal leading-[1.2rem] mb-1">Integrate Infisical into your Kubernetes infrastructure</div>
+                  <div className="w-full mt-1 text-sm text-mineshaft-300 font-normal leading-[1.2rem] mb-1">Improved RBAC, new integrations, dashboard remake, and more!</div>
-                  <div className="h-[6.8rem] w-full bg-mineshaft-200 rounded-md mt-2 rounded-md border border-mineshaft-700"> 
+                  <div className="h-[6.77rem] w-full rounded-md mt-2 border border-mineshaft-700"> 
-                    <Image src="/images/kubernetes-asset.png" height={319} width={539} alt="kubernetes image" className="rounded-sm" />
+                    <Image src="/images/infisical-update-september-2023.png" height={319} width={539} alt="kubernetes image" className="rounded-sm" />
                   </div>
                   <div className="w-full flex justify-between items-center mt-3 px-0.5">
                     <button
                       type="button"
-                      onClick={() => setIsLearningNoteOpen(false)}
+                      onClick={() => closeUpdate()}
                       className="text-mineshaft-400 hover:text-mineshaft-100 duration-200"
                     >
                       Close
                     </button>
                     <a
-                      href="https://infisical.com/docs/documentation/getting-started/kubernetes"
+                      href="https://infisical.com/blog/infisical-update-september-2023"
                       target="_blank"
                       rel="noopener noreferrer"
                       className="text-sm text-mineshaft-400 font-normal leading-[1.2rem] hover:text-mineshaft-100 duration-200"
@@ -637,7 +633,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
                       Learn More <FontAwesomeIcon icon={faArrowUpRightFromSquare} className="text-xs pl-0.5"/>
                     </a>
                   </div>
-                </div> */}
+                </div>
                 {router.asPath.includes("org") && (
                   <div
                     onKeyDown={() => null}

frontend/src/pages/login/index.tsx

@@ -9,7 +9,7 @@ export default function LoginPage() {
   const { t } = useTranslation();
 
   return (
-    <div className="flex min-h-screen flex-col justify-center bg-gradient-to-tr from-mineshaft-600 via-mineshaft-800 to-bunker-700 px-6 pb-28 ">
+    <div className="flex min-h-screen max-h-screen overflow-y-auto flex-col justify-center bg-gradient-to-tr from-mineshaft-600 via-mineshaft-800 to-bunker-700 px-6">
       <Head>
         <title>{t("common.head-title", { title: t("login.title") })}</title>
         <link rel="icon" href="/infisical.ico" />
@@ -23,6 +23,7 @@ export default function LoginPage() {
         </div>
       </Link>
       <Login />
+      <div className="pb-28"/>
     </div>
   );
 }

frontend/src/pages/signup/index.tsx

@@ -145,7 +145,7 @@ export default function SignUp() {
   };
 
   return (
-    <div className="flex min-h-screen flex-col justify-center bg-gradient-to-tr from-mineshaft-600 via-mineshaft-800 to-bunker-700 px-6 pb-28 ">
+    <div className="flex min-h-screen max-h-screen overflow-y-auto flex-col justify-center bg-gradient-to-tr from-mineshaft-600 via-mineshaft-800 to-bunker-700 px-6 pb-28 ">
       <Head>
         <title>{t("common.head-title", { title: t("signup.title") })}</title>
         <link rel="icon" href="/infisical.ico" />

frontend/src/views/Login/components/InitialStep/InitialStep.tsx

@@ -112,7 +112,7 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
       <h1 className="mb-8 bg-gradient-to-b from-white to-bunker-200 bg-clip-text text-center text-xl font-medium text-transparent">
         Login to Infisical
       </h1>
-      <div className="mt-4 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
+      <div className="mt-2 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
         <Button
           colorSchema="primary"
           variant="outline_bg"
@@ -125,12 +125,12 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
             window.close();
           }}
           leftIcon={<FontAwesomeIcon icon={faGoogle} className="mr-2" />}
-          className="mx-0 h-11 w-full"
+          className="mx-0 h-10 w-full"
         >
           {t("login.continue-with-google")}
         </Button>
       </div>
-      <div className="mt-4 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
+      <div className="mt-2 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
         <Button
           colorSchema="primary"
           variant="outline_bg"
@@ -144,12 +144,12 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
             window.close();
           }}
           leftIcon={<FontAwesomeIcon icon={faGithub} className="mr-2" />}
-          className="mx-0 h-11 w-full"
+          className="mx-0 h-10 w-full"
         >
           Continue with GitHub
         </Button>
       </div>
-      <div className="mt-4 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
+      <div className="mt-2 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
         <Button
           colorSchema="primary"
           variant="outline_bg"
@@ -163,12 +163,12 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
             window.close();
           }}
           leftIcon={<FontAwesomeIcon icon={faGitlab} className="mr-2" />}
-          className="mx-0 h-11 w-full"
+          className="mx-0 h-10 w-full"
         >
           Continue with GitLab
         </Button>
       </div>
-      <div className="mt-4 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
+      <div className="mt-2 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
         <Button
           colorSchema="primary"
           variant="outline_bg"
@@ -176,7 +176,7 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
             setStep(2);
           }}
           leftIcon={<FontAwesomeIcon icon={faLock} className="mr-2" />}
-          className="mx-0 h-11 w-full"
+          className="mx-0 h-10 w-full"
         >
           Continue with SSO
         </Button>
@@ -194,10 +194,10 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
           placeholder="Enter your email..."
           isRequired
           autoComplete="username"
-          className="h-11"
+          className="h-10"
         />
       </div>
-      <div className="mt-4 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
+      <div className="mt-2 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
         <Input
           value={password}
           onChange={(e) => setPassword(e.target.value)}
@@ -206,15 +206,15 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
           isRequired
           autoComplete="current-password"
           id="current-password"
-          className="select:-webkit-autofill:focus h-11"
+          className="select:-webkit-autofill:focus h-10"
         />
       </div>
-      <div className="mt-5 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
+      <div className="mt-3 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
         <Button
           type="submit"
           size="sm"
           isFullWidth
-          className="h-11"
+          className="h-10"
           colorSchema="primary"
           variant="solid"
           isLoading={isLoading}
@@ -226,10 +226,9 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
       {!isLoading && loginError && <Error text={t("login.error-login") ?? ""} />}
       {!serverDetails?.inviteOnlySignup ? (
         <div className="mt-6 flex flex-row text-sm text-bunker-400">
-          <span className="mr-1">Don&apos;t have an acount yet?</span>
           <Link href="/signup">
             <span className="cursor-pointer duration-200 hover:text-bunker-200 hover:underline hover:decoration-primary-700 hover:underline-offset-4">
-              {t("login.create-account")}
+              Don&apos;t have an acount yet? {t("login.create-account")}
             </span>
           </Link>
         </div>
@@ -237,10 +236,9 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
         <div />
       )}
       <div className="flex flex-row text-sm text-bunker-400">
-        <span className="mr-1">Forgot password?</span>
         <Link href="/verify-email">
           <span className="cursor-pointer duration-200 hover:text-bunker-200 hover:underline hover:decoration-primary-700 hover:underline-offset-4">
-            Recover your account
+            Forgot password? Recover your account
           </span>
         </Link>
       </div>

frontend/src/views/SecretMainPage/SecretMainPage.tsx

@@ -39,9 +39,9 @@ import { StoreProvider } from "./SecretMainPage.store";
 import { Filter, GroupBy, SortDir } from "./SecretMainPage.types";
 
 const LOADER_TEXT = [
-  "Retriving your encrypted secrets",
+  "Retrieving your encrypted secrets...",
-  "Fetching folders",
+  "Fetching folders...",
-  "Getting secret import links"
+  "Getting secret import links..."
 ];
 
 export const SecretMainPage = () => {

frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx

@@ -325,7 +325,7 @@ export const SecretOverviewPage = () => {
                   className="bg-mineshaft-700"
                 />
               )}
-              {isTableEmpty && (
+              {isTableEmpty && !isTableLoading && (
                 <Tr>
                   <Td colSpan={userAvailableEnvs.length + 1}>
                     <EmptyState title="Let's add some secrets" icon={faFolderBlank} iconSize="3x">
@@ -335,7 +335,7 @@ export const SecretOverviewPage = () => {
                           query: { id: workspaceId, env: userAvailableEnvs?.[0]?.slug }
                         }}
                       >
-                        <Button className="mt-2 p-1">Go to {userAvailableEnvs?.[0]?.name}</Button>
+                        <Button className="mt-4" variant="outline_bg" colorSchema="primary" size="md">Go to {userAvailableEnvs?.[0]?.name}</Button>
                       </Link>
                     </EmptyState>
                   </Td>

frontend/src/views/Settings/BillingSettingsPage/components/BillingCloudTab/PreviewSection.tsx

@@ -1,3 +1,7 @@
+import Link from "next/link";
+import { faArrowUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
 import { OrgPermissionCan } from "@app/components/permissions";
 import { Button } from "@app/components/v2";
 import {
@@ -74,24 +78,36 @@ export const PreviewSection = () => {
         subscription?.slug !== "enterprise" &&
         subscription?.slug !== "pro" &&
         subscription?.slug !== "pro-annual" && (
-          <div className="p-4 rounded-lg flex-1 border border-mineshaft-600 mb-6 flex items-center bg-mineshaft-600">
+          <div className="flex flex-row space-x-6">
-            <div className="flex-1">
+            <div className="p-4 rounded-lg flex-1 border border-primary/40 mb-6 flex items-center bg-primary/10">
-              <h2 className="text-xl font-semibold text-mineshaft-50">Become Infisical</h2>
+              <div className="flex-1">
-              <p className="text-gray-400 mt-4">
+                <h2 className="text-xl font-medium text-mineshaft-100">Unleash the full power of <span className="text-transparent font-semibold bg-clip-text bg-gradient-to-r from-primary-500 to-yellow">Infisical</span></h2>
-                Unlimited members, projects, RBAC, smart alerts, and so much more
+                <p className="text-gray-400 mt-4">
-              </p>
+                  Get unlimited members, projects, RBAC, smart alerts, and so much more.
+                </p>
+              </div>
+              <OrgPermissionCan I={OrgPermissionActions.Create} a={OrgPermissionSubjects.Billing}>
+                {(isAllowed) => (
+                  <Button
+                    onClick={() => handleUpgradeBtnClick()}
+                    color="mineshaft"
+                    isDisabled={!isAllowed}
+                  >
+                    {!subscription.has_used_trial ? "Start Pro Free Trial" : "Upgrade Plan"}
+                  </Button>
+                )}
+              </OrgPermissionCan>
+            </div>
+            <div className="flex flex-col max-w-[12rem] w-full items-start border border-mineshaft-600 mb-6 flex items-center bg-mineshaft-800 p-4 rounded-lg">
+              <div className="mb-4 flex justify-center w-full font-semibold text-mineshaft-200">Want to learn more? </div>
+              <div className="flex justify-center w-full">
+                <Link href="https://infisical.com/schedule-demo">
+                  <span className="rounded-full px-4 py-2 bg-mineshaft-600 border border-mineshaft-500 hover:bg-primary/10 hover:border-primary/40 duration-200 cursor-pointer">
+                    Book a demo <FontAwesomeIcon icon={faArrowUpRightFromSquare} className="text-xs mb-[0.06rem] ml-1"/>
+                  </span>
+                </Link> 
+              </div>
             </div>
-            <OrgPermissionCan I={OrgPermissionActions.Create} a={OrgPermissionSubjects.Billing}>
-              {(isAllowed) => (
-                <Button
-                  onClick={() => handleUpgradeBtnClick()}
-                  color="mineshaft"
-                  isDisabled={!isAllowed}
-                >
-                  {!subscription.has_used_trial ? "Start Pro Free Trial" : "Upgrade Plan"}
-                </Button>
-              )}
-            </OrgPermissionCan>
           </div>
         )}
       {!isLoading && subscription && data && (