merge conflict resolve

frontend/src/components/basic/Layout.tsx

@@ -162,7 +162,7 @@ const Layout = ({ children }: LayoutProps) => {
       },
       {
         href: `/activity/${workspaceMapping[workspaceSelected as any]}`,
-        title: 'Activity Logs',
+        title: 'Audit Logs',
         emoji: <FontAwesomeIcon icon={faFileLines} />
       },
       {

frontend/src/components/dashboard/DropZone.tsx

@@ -71,6 +71,19 @@ const DropZone = ({
         }));
         break;
       }
+      case 'json': {
+        const keyPairs = JSON.parse(String(file));
+        secrets = Object.keys(keyPairs).map((key, index) => ({
+          id: guidGenerator(),
+          pos: numCurrentRows + index,
+          key,
+          value: keyPairs[key as keyof typeof keyPairs],
+          comment: '',
+          type: 'shared',
+          tags: []
+        }));
+        break;
+      }
       case 'yml': {
         const parsedFile = parseDocument(file.toString());
         const keyPairs = parsedFile.contents!.toJSON();

frontend/src/components/v2/EmptyState/EmptyState.tsx

@@ -11,7 +11,7 @@ type Props = {
 };
 
 export const EmptyState = ({ title, className, children, icon = faCubesStacked }: Props) => (
-  <div className={twMerge('flex w-full flex-col items-center px-2 pt-6 text-bunker-300', className)}>
+  <div className={twMerge('flex w-full bg-bunker-700 flex-col items-center px-2 pt-6 text-bunker-300', className)}>
     <FontAwesomeIcon icon={icon} size="2x" className='mr-4' />
     <div className='flex flex-row items-center py-4'>
       <div className="text-bunker-300 text-sm">{title}</div>

frontend/src/components/v2/Tag/Tag.tsx

@@ -14,7 +14,7 @@ const tagVariants = cva('inline-flex whitespace-nowrap text-sm rounded-sm mr-1.5
       red: 'bg-red/80 text-bunker-100'
     },
     size: {
-      sm: 'px-1 py-0.5'
+      sm: 'px-1.5 py-0.5'
     }
   }
 });

frontend/src/layouts/AppLayout/AppLayout.tsx

@@ -308,7 +308,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
                           isSelected={router.asPath === `/activity/${currentWorkspace?._id}`}
                           icon={<FontAwesomeIcon icon={faFileLines} size="lg" />}
                         >
-                          Activity Logs
+                          Audit Logs
                         </MenuItem>
                       </a>
                     </Link>

frontend/src/pages/activity/[id].tsx

@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from 'react';
+import Head from 'next/head';
 import { useRouter } from 'next/router';
 import { useTranslation } from 'next-i18next';
 
@@ -125,7 +126,12 @@ export default function Activity() {
 
   return (
     <div className="mx-6 lg:mx-0 w-full h-screen">
-      <NavHeader pageName="Project Activity" isProjectRelated />
+      <Head>
+        <title>Audit Logs</title>
+        <link rel="icon" href="/infisical.ico" />
+        <meta property="og:image" content="/images/message.png" />
+      </Head>
+      <NavHeader pageName="Audit Logs" isProjectRelated />
       {currentSidebarAction && (
         <ActivitySideBar toggleSidebar={toggleSidebar} currentAction={currentSidebarAction} />
       )}

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

@@ -47,9 +47,9 @@ export default function TravisCICreateIntegrationPage() {
     return (
     <div className="h-full w-full flex justify-center items-center">
       <Card className="max-w-md p-8 rounded-md">
-        <CardTitle className='text-center'>TravisCI Integration</CardTitle>
+        <CardTitle className='text-center'>Travis CI Integration</CardTitle>
          <FormControl
-          label="Travis API Token"
+          label="Travis CI API Token"
           errorText={apiKeyErrorText}
           isError={apiKeyErrorText !== '' ?? false}
         >
@@ -65,7 +65,7 @@ export default function TravisCICreateIntegrationPage() {
             className='mt-4'
             isLoading={isLoading}
         >
-            Connect to TravisCI
+            Connect to Travis CI
         </Button>
       </Card>
     </div>

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

@@ -73,7 +73,7 @@ export default function TravisCICreateIntegrationPage() {
     return (integrationAuth && workspace && selectedSourceEnvironment && integrationAuthApps && targetApp) ? (
     <div className="h-full w-full flex justify-center items-center">
       <Card className="max-w-md p-8 rounded-md">
-        <CardTitle className='text-center'>TravisCI Integration</CardTitle>
+        <CardTitle className='text-center'>Travis CI Integration</CardTitle>
         <FormControl
           label="Project Environment"
           className='mt-4'
@@ -91,7 +91,7 @@ export default function TravisCICreateIntegrationPage() {
           </Select>
         </FormControl>
         <FormControl
-          label="TravisCI Project"
+          label="Travis CI Project"
           className='mt-4'
         >
           <Select

frontend/src/pages/login.tsx

@@ -90,7 +90,7 @@ export default function Login() {
           <ListBox
             isSelected={lang}
             onChange={setLanguage}
-            data={['en', 'ko', 'fr', 'pt-BR']}
+            data={['en', 'ko', 'fr', 'pt-BR', 'pt-PT']}
             isFull
             text={`${t('common:language')}: `}
           />

frontend/src/pages/settings/billing/[id].tsx

@@ -77,13 +77,13 @@ export default function SettingsBilling() {
   }, []);
 
   return (
-    <div className="bg-bunker-800 max-h-screen flex flex-col justify-between text-white">
+    <div className="bg-bunker-800 pb-4 flex flex-col justify-between text-white">
       <Head>
         <title>{t('common:head-title', { title: t('billing:title') })}</title>
         <link rel="icon" href="/infisical.ico" />
       </Head>
       <div className="flex flex-row">
-        <div className="w-full max-h-screen pb-2 overflow-y-auto">
+        <div className="w-full pb-2">
           <NavHeader pageName={t('billing:title')} />
           <div className="flex flex-row justify-between items-center ml-6 my-8 text-xl max-w-5xl">
             <div className="flex flex-col justify-start items-start text-3xl">
@@ -93,7 +93,6 @@ export default function SettingsBilling() {
           </div>
           <div className="flex flex-col ml-6 text-mineshaft-50 w-max">
             <p className="text-xl font-semibold">{t('billing:subscription')}</p>
-            <div className="mt-4 text-bunker-200 h-14 flex justify-center items-center rounded-md bg-bunker-600 mr-4"> If you are looking to get an annual plan, please reach out to <a className="ml-1.5 underline text-primary underline-offset-2" href="mailto:[email protected]">team@infisical.com</a></div>
             <div className="grid grid-cols-2 grid-rows-2 gap-y-6 gap-x-3 mt-4 overflow-x-auto">
               {plans.map((plan) => (
                 <Plan key={plan.name} plan={plan} />

frontend/src/views/Settings/OrgSettingsPage/components/OrgMembersTable/OrgMembersTable.tsx

@@ -1,5 +1,6 @@
 import { useMemo, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
+import { useRouter } from 'next/router';
 import { faMagnifyingGlass, faPlus, faTrash, faUsers } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { yupResolver } from '@hookform/resolvers/yup';
@@ -61,6 +62,7 @@ export const OrgMembersTable = ({
   userId,
   isLoading
 }: Props) => {
+  const router = useRouter();
   const [searchMemberFilter, setSearchMemberFilter] = useState('');
   const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
     'addMember',
@@ -159,7 +161,7 @@ export const OrgMembersTable = ({
                           <Select
                             defaultValue={role}
                             isDisabled={userId === user?._id}
-                            className="w-full bg-mineshaft-600"
+                            className="w-40 bg-mineshaft-600"
                             onValueChange={(selectedRole) =>
                               onRoleChange(orgMembershipId, selectedRole)
                             }
@@ -172,8 +174,8 @@ export const OrgMembersTable = ({
                           </Select>
                         )}
                         {(status === 'invited' || status === 'verified') && (
-                          <Button colorSchema="secondary" onClick={() => onInviteMember(email)}>
-                            Resent Invite
+                          <Button className='w-40' colorSchema="secondary" onClick={() => onInviteMember(email)}>
+                            Resend Invite
                           </Button>
                         )}
                         {status === 'completed' && (
@@ -193,7 +195,17 @@ export const OrgMembersTable = ({
                             </Tag>
                           ))
                         ) : (
-                          <Tag colorSchema="red">This user isn&apos;t part of any projects yet</Tag>
+                          <div className='flex flex-row'>
+                            <Tag colorSchema="red">This user isn&apos;t part of any projects yet</Tag>
+                            <button 
+                              type="button"
+                              onClick={() => router.push(`/users/${router.query.id}`)}
+                              className='text-sm bg-mineshaft w-max px-1.5 py-0.5 hover:bg-primary duration-200 hover:text-black cursor-pointer rounded-sm'
+                            >
+                              <FontAwesomeIcon icon={faPlus} className="mr-1" />
+                              Add to projects
+                            </button>
+                          </div>
                         )}
                       </Td>
                       <Td>