Merge branch 'main' into add-bull-queue

This commit is contained in:
Maidul Islam
2023-08-19 13:46:26 -04:00
committed by GitHub
383 changed files with 7173 additions and 8536 deletions
+9 -12
View File
@@ -38,12 +38,11 @@ import {
} from "@app/components/v2";
import { TabsObject } from "@app/components/v2/Tabs";
import { useSubscription, useUser, useWorkspace } from "@app/context";
import { fetchOrgUsers, useAddUserToWs, useCreateWorkspace, useUploadWsKey } from "@app/hooks/api";
import { fetchOrgUsers, useAddUserToWs, useCreateWorkspace, useRegisterUserAction,useUploadWsKey } from "@app/hooks/api";
import { useFetchServerStatus } from "@app/hooks/api/serverDetails";
import { usePopUp } from "@app/hooks/usePopUp";
import { encryptAssymmetric } from "../../../../components/utilities/cryptography/crypto";
import registerUserAction from "../../../api/userActions/registerUserAction";
const features = [
{
@@ -73,6 +72,7 @@ const LearningItem = ({
userAction,
link
}: ItemProps): JSX.Element => {
const registerUserAction = useRegisterUserAction();
if (link) {
return (
<a
@@ -92,9 +92,9 @@ const LearningItem = ({
tabIndex={0}
onClick={async () => {
if (userAction && userAction !== "first_time_secrets_pushed") {
await registerUserAction({
action: userAction
});
await registerUserAction.mutateAsync(
userAction
);
}
}}
className={`group relative flex h-[5.5rem] w-full items-center justify-between overflow-hidden rounded-md border ${
@@ -133,9 +133,7 @@ const LearningItem = ({
tabIndex={0}
onClick={async () => {
if (userAction) {
await registerUserAction({
action: userAction
});
await registerUserAction.mutateAsync(userAction);
}
}}
className="relative my-1.5 flex h-[5.5rem] w-full cursor-pointer items-center justify-between overflow-hidden rounded-md border border-dashed border-bunker-400 bg-bunker-700 py-2 pl-2 pr-6 shadow-xl duration-200 hover:bg-bunker-500"
@@ -172,6 +170,7 @@ const LearningItemSquare = ({
userAction,
link
}: ItemProps): JSX.Element => {
const registerUserAction = useRegisterUserAction();
return (
<a
target={`${link?.includes("https") ? "_blank" : "_self"}`}
@@ -190,9 +189,7 @@ const LearningItemSquare = ({
tabIndex={0}
onClick={async () => {
if (userAction && userAction !== "first_time_secrets_pushed") {
await registerUserAction({
action: userAction
});
await registerUserAction.mutateAsync(userAction);
}
}}
className={`group relative flex w-full items-center justify-between overflow-hidden rounded-md border ${
@@ -421,7 +418,7 @@ export default function Organization() {
localStorage.setItem("projectData.id", workspace._id);
}}
>
<div 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">
<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">
Explore{" "}
<FontAwesomeIcon
icon={faArrowRight}