mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-07 17:27:40 +00:00
Merge pull request #1816 from akhilmhdh/fix/remove-migration-notice
fix: removed migration notice
This commit is contained in:
@@ -21,9 +21,7 @@ import {
|
|||||||
faNetworkWired,
|
faNetworkWired,
|
||||||
faPlug,
|
faPlug,
|
||||||
faPlus,
|
faPlus,
|
||||||
faUserPlus,
|
faUserPlus
|
||||||
faWarning,
|
|
||||||
faXmark
|
|
||||||
} from "@fortawesome/free-solid-svg-icons";
|
} from "@fortawesome/free-solid-svg-icons";
|
||||||
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||||
import { yupResolver } from "@hookform/resolvers/yup";
|
import { yupResolver } from "@hookform/resolvers/yup";
|
||||||
@@ -56,7 +54,6 @@ import {
|
|||||||
fetchOrgUsers,
|
fetchOrgUsers,
|
||||||
useAddUserToWsNonE2EE,
|
useAddUserToWsNonE2EE,
|
||||||
useCreateWorkspace,
|
useCreateWorkspace,
|
||||||
useGetUserAction,
|
|
||||||
useRegisterUserAction
|
useRegisterUserAction
|
||||||
} from "@app/hooks/api";
|
} from "@app/hooks/api";
|
||||||
// import { fetchUserWsKey } from "@app/hooks/api/keys/queries";
|
// import { fetchUserWsKey } from "@app/hooks/api/keys/queries";
|
||||||
@@ -312,9 +309,8 @@ const LearningItem = ({
|
|||||||
href={link}
|
href={link}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className={`${
|
className={`${complete ? "bg-gradient-to-r from-primary-500/70 p-[0.07rem]" : ""
|
||||||
complete ? "bg-gradient-to-r from-primary-500/70 p-[0.07rem]" : ""
|
} mb-3 rounded-md`}
|
||||||
} mb-3 rounded-md`}
|
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
onKeyDown={() => null}
|
onKeyDown={() => null}
|
||||||
@@ -325,11 +321,10 @@ const LearningItem = ({
|
|||||||
await registerUserAction.mutateAsync(userAction);
|
await registerUserAction.mutateAsync(userAction);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
className={`group relative flex h-[5.5rem] w-full items-center justify-between overflow-hidden rounded-md border ${
|
className={`group relative flex h-[5.5rem] w-full items-center justify-between overflow-hidden rounded-md border ${complete
|
||||||
complete
|
|
||||||
? "cursor-default border-mineshaft-900 bg-gradient-to-r from-[#0e1f01] to-mineshaft-700"
|
? "cursor-default border-mineshaft-900 bg-gradient-to-r from-[#0e1f01] to-mineshaft-700"
|
||||||
: "cursor-pointer border-mineshaft-600 bg-mineshaft-800 shadow-xl hover:bg-mineshaft-700"
|
: "cursor-pointer border-mineshaft-600 bg-mineshaft-800 shadow-xl hover:bg-mineshaft-700"
|
||||||
} text-mineshaft-100 duration-200`}
|
} text-mineshaft-100 duration-200`}
|
||||||
>
|
>
|
||||||
<div className="mr-4 flex flex-row items-center">
|
<div className="mr-4 flex flex-row items-center">
|
||||||
<FontAwesomeIcon icon={icon} className="mx-2 w-16 text-4xl" />
|
<FontAwesomeIcon icon={icon} className="mx-2 w-16 text-4xl" />
|
||||||
@@ -407,9 +402,8 @@ const LearningItemSquare = ({
|
|||||||
href={link}
|
href={link}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className={`${
|
className={`${complete ? "bg-gradient-to-r from-primary-500/70 p-[0.07rem]" : ""
|
||||||
complete ? "bg-gradient-to-r from-primary-500/70 p-[0.07rem]" : ""
|
} w-full rounded-md`}
|
||||||
} w-full rounded-md`}
|
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
onKeyDown={() => null}
|
onKeyDown={() => null}
|
||||||
@@ -420,11 +414,10 @@ const LearningItemSquare = ({
|
|||||||
await registerUserAction.mutateAsync(userAction);
|
await registerUserAction.mutateAsync(userAction);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
className={`group relative flex w-full items-center justify-between overflow-hidden rounded-md border ${
|
className={`group relative flex w-full items-center justify-between overflow-hidden rounded-md border ${complete
|
||||||
complete
|
|
||||||
? "cursor-default border-mineshaft-900 bg-gradient-to-r from-[#0e1f01] to-mineshaft-700"
|
? "cursor-default border-mineshaft-900 bg-gradient-to-r from-[#0e1f01] to-mineshaft-700"
|
||||||
: "cursor-pointer border-mineshaft-600 bg-mineshaft-800 shadow-xl hover:bg-mineshaft-700"
|
: "cursor-pointer border-mineshaft-600 bg-mineshaft-800 shadow-xl hover:bg-mineshaft-700"
|
||||||
} text-mineshaft-100 duration-200`}
|
} text-mineshaft-100 duration-200`}
|
||||||
>
|
>
|
||||||
<div className="flex w-full flex-col items-center px-6 py-4">
|
<div className="flex w-full flex-col items-center px-6 py-4">
|
||||||
<div className="flex w-full flex-row items-start justify-between">
|
<div className="flex w-full flex-row items-start justify-between">
|
||||||
@@ -438,9 +431,8 @@ const LearningItemSquare = ({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div
|
<div
|
||||||
className={`text-right text-sm font-normal text-mineshaft-300 ${
|
className={`text-right text-sm font-normal text-mineshaft-300 ${complete ? "font-semibold text-primary" : ""
|
||||||
complete ? "font-semibold text-primary" : ""
|
}`}
|
||||||
}`}
|
|
||||||
>
|
>
|
||||||
{complete ? "Complete!" : `About ${time}`}
|
{complete ? "Complete!" : `About ${time}`}
|
||||||
</div>
|
</div>
|
||||||
@@ -483,12 +475,6 @@ const OrganizationPage = withPermission(
|
|||||||
|
|
||||||
const addUsersToProject = useAddUserToWsNonE2EE();
|
const addUsersToProject = useAddUserToWsNonE2EE();
|
||||||
|
|
||||||
const { data: updateClosed } = useGetUserAction("april_13_2024_db_update_closed");
|
|
||||||
const registerUserAction = useRegisterUserAction();
|
|
||||||
const closeUpdate = async () => {
|
|
||||||
await registerUserAction.mutateAsync("april_13_2024_db_update_closed");
|
|
||||||
};
|
|
||||||
|
|
||||||
const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
|
const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
|
||||||
"addNewWs",
|
"addNewWs",
|
||||||
"upgradePlan"
|
"upgradePlan"
|
||||||
@@ -594,31 +580,6 @@ const OrganizationPage = withPermission(
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="mb-4 flex flex-col items-start justify-start px-6 py-6 pb-0 text-3xl">
|
<div className="mb-4 flex flex-col items-start justify-start px-6 py-6 pb-0 text-3xl">
|
||||||
{(window.location.origin.includes("https://app.infisical.com") || window.location.origin.includes("http://localhost:8080")) && (
|
|
||||||
<div
|
|
||||||
className={`${
|
|
||||||
!updateClosed ? "block" : "hidden"
|
|
||||||
} mb-4 flex w-full flex-row items-center rounded-md border border-primary-600 bg-primary/10 p-2 text-base text-white`}
|
|
||||||
>
|
|
||||||
<FontAwesomeIcon icon={faWarning} className="p-6 text-4xl text-primary" />
|
|
||||||
<div className="text-sm">
|
|
||||||
<span className="text-lg font-semibold">Scheduled maintenance on May 11th 2024 </span>{" "}
|
|
||||||
<br />
|
|
||||||
Infisical will undergo scheduled maintenance for approximately 2 hour on Saturday, May 11th, 11am EST. During these hours, read
|
|
||||||
operations to Infisical will continue to function normally but no resources will be editable.
|
|
||||||
No action is required on your end — your applications will continue to fetch secrets.
|
|
||||||
<br />
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => closeUpdate()}
|
|
||||||
aria-label="close"
|
|
||||||
className="flex h-full items-start text-mineshaft-100 duration-200 hover:text-red-400"
|
|
||||||
>
|
|
||||||
<FontAwesomeIcon icon={faXmark} />
|
|
||||||
</button>
|
|
||||||
</div>)}
|
|
||||||
|
|
||||||
<p className="mr-4 font-semibold text-white">Projects</p>
|
<p className="mr-4 font-semibold text-white">Projects</p>
|
||||||
<div className="mt-6 flex w-full flex-row">
|
<div className="mt-6 flex w-full flex-row">
|
||||||
<Input
|
<Input
|
||||||
@@ -748,95 +709,94 @@ const OrganizationPage = withPermission(
|
|||||||
new Date().getTime() - new Date(user?.createdAt).getTime() <
|
new Date().getTime() - new Date(user?.createdAt).getTime() <
|
||||||
30 * 24 * 60 * 60 * 1000
|
30 * 24 * 60 * 60 * 1000
|
||||||
) && (
|
) && (
|
||||||
<div className="mb-4 flex flex-col items-start justify-start px-6 pb-0 text-3xl">
|
<div className="mb-4 flex flex-col items-start justify-start px-6 pb-0 text-3xl">
|
||||||
<p className="mr-4 mb-4 font-semibold text-white">Onboarding Guide</p>
|
<p className="mr-4 mb-4 font-semibold text-white">Onboarding Guide</p>
|
||||||
<div className="mb-3 grid w-full grid-cols-1 gap-3 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4">
|
<div className="mb-3 grid w-full grid-cols-1 gap-3 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4">
|
||||||
<LearningItemSquare
|
|
||||||
text="Watch Infisical demo"
|
|
||||||
subText="Set up Infisical in 3 min."
|
|
||||||
complete={hasUserClickedIntro}
|
|
||||||
icon={faHandPeace}
|
|
||||||
time="3 min"
|
|
||||||
userAction="intro_cta_clicked"
|
|
||||||
link="https://www.youtube.com/watch?v=PK23097-25I"
|
|
||||||
/>
|
|
||||||
{orgWorkspaces.length !== 0 && (
|
|
||||||
<>
|
|
||||||
<LearningItemSquare
|
|
||||||
text="Add your secrets"
|
|
||||||
subText="Drop a .env file or type your secrets."
|
|
||||||
complete={hasUserPushedSecrets}
|
|
||||||
icon={faPlus}
|
|
||||||
time="1 min"
|
|
||||||
userAction="first_time_secrets_pushed"
|
|
||||||
link={`/project/${orgWorkspaces[0]?.id}/secrets/overview`}
|
|
||||||
/>
|
|
||||||
<LearningItemSquare
|
|
||||||
text="Invite your teammates"
|
|
||||||
subText="Infisical is better used as a team."
|
|
||||||
complete={usersInOrg}
|
|
||||||
icon={faUserPlus}
|
|
||||||
time="2 min"
|
|
||||||
link={`/org/${router.query.id}/members?action=invite`}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
<div className="block xl:hidden 2xl:block">
|
|
||||||
<LearningItemSquare
|
<LearningItemSquare
|
||||||
text="Join Infisical Slack"
|
text="Watch Infisical demo"
|
||||||
subText="Have any questions? Ask us!"
|
subText="Set up Infisical in 3 min."
|
||||||
complete={hasUserClickedSlack}
|
complete={hasUserClickedIntro}
|
||||||
icon={faSlack}
|
icon={faHandPeace}
|
||||||
time="1 min"
|
time="3 min"
|
||||||
userAction="slack_cta_clicked"
|
userAction="intro_cta_clicked"
|
||||||
link="https://infisical.com/slack"
|
link="https://www.youtube.com/watch?v=PK23097-25I"
|
||||||
/>
|
/>
|
||||||
|
{orgWorkspaces.length !== 0 && (
|
||||||
|
<>
|
||||||
|
<LearningItemSquare
|
||||||
|
text="Add your secrets"
|
||||||
|
subText="Drop a .env file or type your secrets."
|
||||||
|
complete={hasUserPushedSecrets}
|
||||||
|
icon={faPlus}
|
||||||
|
time="1 min"
|
||||||
|
userAction="first_time_secrets_pushed"
|
||||||
|
link={`/project/${orgWorkspaces[0]?.id}/secrets/overview`}
|
||||||
|
/>
|
||||||
|
<LearningItemSquare
|
||||||
|
text="Invite your teammates"
|
||||||
|
subText="Infisical is better used as a team."
|
||||||
|
complete={usersInOrg}
|
||||||
|
icon={faUserPlus}
|
||||||
|
time="2 min"
|
||||||
|
link={`/org/${router.query.id}/members?action=invite`}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
<div className="block xl:hidden 2xl:block">
|
||||||
|
<LearningItemSquare
|
||||||
|
text="Join Infisical Slack"
|
||||||
|
subText="Have any questions? Ask us!"
|
||||||
|
complete={hasUserClickedSlack}
|
||||||
|
icon={faSlack}
|
||||||
|
time="1 min"
|
||||||
|
userAction="slack_cta_clicked"
|
||||||
|
link="https://infisical.com/slack"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{orgWorkspaces.length !== 0 && (
|
||||||
{orgWorkspaces.length !== 0 && (
|
<div className="group relative mb-3 flex h-full w-full cursor-default flex-col items-center justify-between overflow-hidden rounded-md border border-mineshaft-600 bg-mineshaft-800 pl-2 pr-2 pt-4 pb-2 text-mineshaft-100 shadow-xl duration-200">
|
||||||
<div className="group relative mb-3 flex h-full w-full cursor-default flex-col items-center justify-between overflow-hidden rounded-md border border-mineshaft-600 bg-mineshaft-800 pl-2 pr-2 pt-4 pb-2 text-mineshaft-100 shadow-xl duration-200">
|
<div className="mb-4 flex w-full flex-row items-center pr-4">
|
||||||
<div className="mb-4 flex w-full flex-row items-center pr-4">
|
<div className="mr-4 flex w-full flex-row items-center">
|
||||||
<div className="mr-4 flex w-full flex-row items-center">
|
<FontAwesomeIcon icon={faNetworkWired} className="mx-2 w-16 text-4xl" />
|
||||||
<FontAwesomeIcon icon={faNetworkWired} className="mx-2 w-16 text-4xl" />
|
{false && (
|
||||||
{false && (
|
<div className="absolute left-12 top-10 flex h-7 w-7 items-center justify-center rounded-full bg-bunker-500 p-2 group-hover:bg-mineshaft-700">
|
||||||
<div className="absolute left-12 top-10 flex h-7 w-7 items-center justify-center rounded-full bg-bunker-500 p-2 group-hover:bg-mineshaft-700">
|
<FontAwesomeIcon
|
||||||
<FontAwesomeIcon
|
icon={faCheckCircle}
|
||||||
icon={faCheckCircle}
|
className="h-5 w-5 text-4xl text-green"
|
||||||
className="h-5 w-5 text-4xl text-green"
|
/>
|
||||||
/>
|
</div>
|
||||||
</div>
|
)}
|
||||||
)}
|
<div className="flex flex-col items-start pl-0.5">
|
||||||
<div className="flex flex-col items-start pl-0.5">
|
<div className="mt-0.5 text-xl font-semibold">Inject secrets locally</div>
|
||||||
<div className="mt-0.5 text-xl font-semibold">Inject secrets locally</div>
|
<div className="text-sm font-normal">
|
||||||
<div className="text-sm font-normal">
|
Replace .env files with a more secure and efficient alternative.
|
||||||
Replace .env files with a more secure and efficient alternative.
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div
|
||||||
|
className={`w-28 pr-4 text-right text-sm font-semibold ${false && "text-green"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
About 2 min
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<TabsObject />
|
||||||
className={`w-28 pr-4 text-right text-sm font-semibold ${
|
{false && <div className="absolute bottom-0 left-0 h-1 w-full bg-green" />}
|
||||||
false && "text-green"
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
About 2 min
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<TabsObject />
|
)}
|
||||||
{false && <div className="absolute bottom-0 left-0 h-1 w-full bg-green" />}
|
{orgWorkspaces.length !== 0 && (
|
||||||
</div>
|
<LearningItem
|
||||||
)}
|
text="Integrate Infisical with your infrastructure"
|
||||||
{orgWorkspaces.length !== 0 && (
|
subText="Connect Infisical to various 3rd party services and platforms."
|
||||||
<LearningItem
|
complete={false}
|
||||||
text="Integrate Infisical with your infrastructure"
|
icon={faPlug}
|
||||||
subText="Connect Infisical to various 3rd party services and platforms."
|
time="15 min"
|
||||||
complete={false}
|
link="https://infisical.com/docs/integrations/overview"
|
||||||
icon={faPlug}
|
/>
|
||||||
time="15 min"
|
)}
|
||||||
link="https://infisical.com/docs/integrations/overview"
|
</div>
|
||||||
/>
|
)}
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<Modal
|
<Modal
|
||||||
isOpen={popUp.addNewWs.isOpen}
|
isOpen={popUp.addNewWs.isOpen}
|
||||||
onOpenChange={(isModalOpen) => {
|
onOpenChange={(isModalOpen) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user