Updated UI for Vercel, GCP, GitLab, Checkly, Vault integrations

frontend/src/pages/integrations/gitlab/authorize.tsx

@@ -1,7 +1,10 @@
 import crypto from "crypto";
 
 import { useState } from "react";
-import { faGoogle } from "@fortawesome/free-brands-svg-icons";
+import Head from "next/head";
+import Image from "next/image";
+import Link from "next/link";
+import { faArrowUpRightFromSquare, faBookOpen } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { useGetCloudIntegrations } from "@app/hooks/api";
@@ -32,9 +35,37 @@ export default function GitLabAuthorizeIntegrationPage() {
 
   return (
     <div className="flex h-full w-full items-center justify-center">
-      <Card className="max-w-md rounded-md p-8">
-        <CardTitle className="text-center">GitLab Integration</CardTitle>
-        <FormControl label="Self-hosted URL (optional)">
+      <Head>
+        <title>Authorize GitLab Integration</title>
+        <link rel='icon' href='/infisical.ico' />
+      </Head>
+      <Card className="max-w-lg rounded-md border border-mineshaft-600 mb-12">
+        <CardTitle 
+          className="text-left px-6 text-xl" 
+          subTitle="Authorize this integration to be able to sync secrets from Infisical to GitLab. If needed, specify the self-hosted GitLab URL."
+        >
+          <div className="flex flex-row items-center">
+            <div className="inline flex items-center pb-0.5">
+              <Image
+                src="/images/integrations/Gitlab.png"
+                height={28}
+                width={28}
+                alt="Gitlab logo"
+              />
+            </div>
+            <span className="ml-2.5">GitLab Integration </span>
+            <Link href="https://infisical.com/docs/integrations/cicd/gitlab" passHref>
+              <a target="_blank" rel="noopener noreferrer">
+                <div className="ml-2 mb-1 rounded-md text-yellow text-sm inline-block bg-yellow/20 px-1.5 pb-[0.03rem] pt-[0.04rem] opacity-80 hover:opacity-100 cursor-default">
+                  <FontAwesomeIcon icon={faBookOpen} className="mr-1.5"/> 
+                  Docs
+                  <FontAwesomeIcon icon={faArrowUpRightFromSquare} className="ml-1.5 text-xxs mb-[0.07rem]"/> 
+                </div>
+              </a>
+            </Link>
+          </div>
+        </CardTitle>
+        <FormControl label="Self-hosted URL (optional)" className="px-6">
             <Input 
                 placeholder="https://self-hosted-gitlab.com" 
                 value={gitLabURL} onChange={(e) => setGitLabURL(e.target.value)} 
@@ -42,8 +73,9 @@ export default function GitLabAuthorizeIntegrationPage() {
           </FormControl>
         <Button
             onClick={handleIntegrateWithOAuth}
-            leftIcon={<FontAwesomeIcon icon={faGoogle} className="mr-2" />}
-            className="h-11 w-full mx-0 mt-4"
+            colorSchema="primary"
+            variant="outline_bg"
+            className="mb-6 mt-2 ml-auto mr-6 w-min"
         > 
             Continue with OAuth
         </Button>

frontend/src/pages/integrations/gitlab/create.tsx

@@ -1,5 +1,10 @@
 import { useEffect, useState } from "react";
+import Head from "next/head";
+import Image from "next/image";
+import Link from "next/link";
 import { useRouter } from "next/router";
+import { faArrowUpRightFromSquare, faBookOpen, faBugs, faCircleInfo } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import queryString from "query-string";
 
 import {
@@ -38,11 +43,11 @@ export default function GitLabCreateIntegrationPage() {
 
   const [targetTeamId, setTargetTeamId] = useState<string | null>(null);
 
-  const { data: integrationAuthApps } = useGetIntegrationAuthApps({
+  const { data: integrationAuthApps, isLoading: isintegrationAuthAppsLoading } = useGetIntegrationAuthApps({
     integrationAuthId: (integrationAuthId as string) ?? "",
     ...(targetTeamId ? { teamId: targetTeamId } : {})
   });
-  const { data: integrationAuthTeams } = useGetIntegrationAuthTeams(
+  const { data: integrationAuthTeams, isLoading: isintegrationAuthTeamsLoading } = useGetIntegrationAuthTeams(
     (integrationAuthId as string) ?? ""
   );
 
@@ -114,10 +119,38 @@ export default function GitLabCreateIntegrationPage() {
     integrationAuthApps &&
     integrationAuthTeams &&
     targetAppId ? (
-    <div className="flex h-full w-full items-center justify-center">
-      <Card className="max-w-md rounded-md p-8">
-        <CardTitle className="text-center">GitLab Integration</CardTitle>
-        <FormControl label="Project Environment">
+    <div className="flex flex-col h-full w-full items-center justify-center">
+      <Head>
+        <title>Set Up GitLab Integration</title>
+        <link rel='icon' href='/infisical.ico' />
+      </Head>
+      <Card className="max-w-lg rounded-md border border-mineshaft-600">
+        <CardTitle 
+          className="text-left px-6 text-xl" 
+          subTitle="Select which environment or folder in Infisical you want to sync to GitLab's environment variables."
+        >
+          <div className="flex flex-row items-center">
+            <div className="inline flex items-center pb-0.5">
+              <Image
+                src="/images/integrations/Gitlab.png"
+                height={28}
+                width={28}
+                alt="Gitlab logo"
+              />
+            </div>
+            <span className="ml-2.5">GitLab Integration </span>
+            <Link href="https://infisical.com/docs/integrations/cicd/gitlab" passHref>
+              <a target="_blank" rel="noopener noreferrer">
+                <div className="ml-2 mb-1 rounded-md text-yellow text-sm inline-block bg-yellow/20 px-1.5 pb-[0.03rem] pt-[0.04rem] opacity-80 hover:opacity-100 cursor-default">
+                  <FontAwesomeIcon icon={faBookOpen} className="mr-1.5"/> 
+                  Docs
+                  <FontAwesomeIcon icon={faArrowUpRightFromSquare} className="ml-1.5 text-xxs mb-[0.07rem]"/> 
+                </div>
+              </a>
+            </Link>
+          </div>
+        </CardTitle>
+        <FormControl label="Project Environment" className="px-6">
           <Select
             value={selectedSourceEnvironment}
             onValueChange={(val) => setSelectedSourceEnvironment(val)}
@@ -133,14 +166,14 @@ export default function GitLabCreateIntegrationPage() {
             ))}
           </Select>
         </FormControl>
-        <FormControl label="Secrets Path">
+        <FormControl label="Secrets Path" className="px-6">
           <Input
             value={secretPath}
             onChange={(evt) => setSecretPath(evt.target.value)}
             placeholder="Provide a path, default is /"
           />
         </FormControl>
-        <FormControl label="GitLab Integration Type">
+        <FormControl label="GitLab Integration Type" className="px-6">
           <Select
             value={targetEntity}
             onValueChange={(val) => setTargetEntity(val)}
@@ -156,7 +189,7 @@ export default function GitLabCreateIntegrationPage() {
           </Select>
         </FormControl>
         {targetEntity === "group" && targetTeamId && (
-          <FormControl label="GitLab Group">
+          <FormControl label="GitLab Group" className="px-6">
             <Select
               value={targetTeamId}
               onValueChange={(val) => setTargetTeamId(val)}
@@ -179,7 +212,7 @@ export default function GitLabCreateIntegrationPage() {
             </Select>
           </FormControl>
         )}
-        <FormControl label="GitLab Project">
+        <FormControl label="GitLab Project" className="px-6">
           <Select
             value={targetAppId}
             onValueChange={(val) => setTargetAppId(val)}
@@ -202,7 +235,7 @@ export default function GitLabCreateIntegrationPage() {
             )}
           </Select>
         </FormControl>
-        <FormControl label="GitLab Environment Scope (Optional)">
+        <FormControl label="GitLab Environment Scope (Optional)" className="px-6">
           <Input
             placeholder="*"
             value={targetEnvironment}
@@ -211,17 +244,41 @@ export default function GitLabCreateIntegrationPage() {
         </FormControl>
         <Button
           onClick={handleButtonClick}
-          color="mineshaft"
-          className="mt-4"
+          colorSchema="primary"
+          variant="outline_bg"
+          className="mb-6 mt-2 ml-auto mr-6 w-min"
           isLoading={isLoading}
           isDisabled={integrationAuthApps.length === 0}
         >
           Create Integration
         </Button>
       </Card>
+      <div className="border-t border-mineshaft-800 w-full max-w-md mt-6"/>
+      <div className="flex flex-col bg-mineshaft-800 border border-mineshaft-600 w-full p-4 max-w-lg mt-6 rounded-md">
+        <div className="flex flex-row items-center"><FontAwesomeIcon icon={faCircleInfo} className="text-mineshaft-200 text-xl"/> <span className="ml-3 text-md text-mineshaft-100">Pro Tips</span></div>
+        <span className="text-mineshaft-300 text-sm mt-4">After creating an integration, your secrets will start syncing immediately. This might cause an unexpected override of current secrets in GitLab with secrets from Infisical.</span>
+      </div>
     </div>
   ) : (
-    <div />
+    <div className="flex justify-center items-center w-full h-full">
+      <Head>
+        <title>Set Up GitLab Integration</title>
+        <link rel='icon' href='/infisical.ico' />
+      </Head>
+      {isintegrationAuthAppsLoading || isintegrationAuthTeamsLoading ? <img src="/images/loading/loading.gif" height={70} width={120} alt="infisical loading indicator" /> : <div className="max-w-md h-max p-6 border border-mineshaft-600 rounded-md bg-mineshaft-800 text-mineshaft-200 flex flex-col text-center">
+        <FontAwesomeIcon icon={faBugs} className="text-6xl my-2 inlineli"/>
+        <p>
+          Something went wrong. Please contact <a
+            className="inline underline underline-offset-4 decoration-primary-500 opacity-80 hover:opacity-100 text-mineshaft-100 duration-200 cursor-pointer"
+            target="_blank"
+            rel="noopener noreferrer"
+            href="mailto:[email protected]"
+          >
+            support@infisical.com
+          </a> if the issue persists.
+        </p>
+      </div>}
+    </div>
   );
 }