Merge pull request #2185 from ever-co/develop

Release
ever-co · Feb 8, 2024 · 8e295f6 · 8e295f6
2 parents 8202052 + 1916031
commit 8e295f6
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 12 deletions.
diff --git a/apps/web/app/hooks/features/useKanban.ts b/apps/web/app/hooks/features/useKanban.ts
@@ -34,6 +34,7 @@ export function useKanban() {
 			setKanbanBoard(kanban);
 			setLoading(false);
 		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [taskStatusHook.loading, tasksFetching]);
 
 	/**

diff --git a/apps/web/app/hooks/features/useOrganizationTeams.ts b/apps/web/app/hooks/features/useOrganizationTeams.ts
@@ -109,6 +109,7 @@ function useCreateOrganizationTeam() {
 				return res;
 			});
 		},
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[isTeamMember, queryCall, refreshToken, setActiveTeamId, setIsTeamMember, setTeams, teamsRef]
 	);
 

diff --git a/apps/web/app/hooks/features/useTaskLabels.ts b/apps/web/app/hooks/features/useTaskLabels.ts
@@ -51,6 +51,7 @@ export function useTaskLabels() {
 
 			return res;
 		});
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [user, activeTeamId, setTaskLabels, taskLabels, queryCall]);
 
 	useEffect(() => {

diff --git a/apps/web/app/hooks/features/useTeamTasks.ts b/apps/web/app/hooks/features/useTeamTasks.ts
@@ -254,6 +254,7 @@ export function useTeamTasks() {
 				return res;
 			});
 		},
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[createQueryCall, deepCheckAndUpdateTasks, activeTeam]
 	);
 

diff --git a/apps/web/app/services/server/requests/public-organization-team.ts b/apps/web/app/services/server/requests/public-organization-team.ts
@@ -31,8 +31,7 @@ export function getPublicOrganizationTeamRequest({
 		params[`relations[${i}]`] = rl;
 	});
 
-
-	const queries = qs.stringify(params || {});
+	const queries = qs.stringify(params);
 
 	return serverFetch<IOrganizationTeamWithMStatus>({
 		path: `/public/team/${profileLink}/${teamId}?${queries.toString()}`,

diff --git a/apps/web/components/layout/header/request-to-join-modal.tsx b/apps/web/components/layout/header/request-to-join-modal.tsx
@@ -202,17 +202,15 @@ const BecomeMember = ({ closeModal }: { closeModal: any }) => {
 		},
 		[
 			activeTeam,
+			position,
 			joinButtonAction,
-			setJoinButtonAction,
 			requestToJoinTeam,
-			validateRequestToJoinTeam,
-			formValues,
+			t,
 			requestToJoinPayload,
-			position,
-			closeModal,
+			validateRequestToJoinTeam,
+			formValues.code,
 			setErrors,
-			t('pages.home.SENT_EMAIL_VERIFICATION'),
-			t('errors.ERROR_WHILE_VERIFY_CODE')
+			closeModal
 		]
 	);
 

diff --git a/apps/web/components/shared/skeleton/Skeleton.tsx b/apps/web/components/shared/skeleton/Skeleton.tsx
@@ -19,6 +19,7 @@ const Skeleton = ({
 				width ? `w-[${width}px]` : 'w-[160px]',
 				className
 			)}
+			style={{ borderRadius }}
 		/>
 	);
 };

diff --git a/apps/web/components/shared/skeleton/UserTeamCardSkeleton.tsx b/apps/web/components/shared/skeleton/UserTeamCardSkeleton.tsx
@@ -58,7 +58,7 @@ const Skeleton = ({
 	width: number;
 	borderRadius: number;
 	className: string;
-}) => {	
+}) => {
 	return (
 		<div
 			className={clsxm(
@@ -67,6 +67,7 @@ const Skeleton = ({
 				width ? `w-[${width}px]` : 'w-[160px]',
 				className
 			)}
+			style={{ borderRadius }}
 		></div>
 	);
 };

diff --git a/apps/web/lib/features/task/task-filters.tsx b/apps/web/lib/features/task/task-filters.tsx
@@ -418,7 +418,7 @@ export function TaskNameFilter({
 	const t = useTranslations();
 
 	const [typingTimeout, setTypingTimeout] = useState<NodeJS.Timeout | null>(null);
-	const [tempValue, setTempValue] = useState<string>('');
+	const [tempValue, setTempValue] = useState<string>(value);
 
 	const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
 		const inputValue = e.target.value;

diff --git a/apps/web/lib/features/team-members-table-view.tsx b/apps/web/lib/features/team-members-table-view.tsx
@@ -52,6 +52,7 @@ const TeamMembersTableView = ({
 				}
 			}
 		],
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[]
 	);
 

diff --git a/apps/web/lib/features/team/invite/invite-form-modal.tsx b/apps/web/lib/features/team/invite/invite-form-modal.tsx
@@ -68,6 +68,7 @@ export function InviteFormModal({ open, closeModal }: { open: boolean; closeModa
 					}
 				});
 		},
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[selectedEmail, setErrors, closeModal, inviteUser]
 	);
 

diff --git a/apps/web/lib/layout/auth-layout.tsx b/apps/web/lib/layout/auth-layout.tsx
@@ -53,6 +53,7 @@ export function AuthLayout({ children, title, description, isAuthPage = true }:
 											src={`/assets/cover/${image}`}
 											layout="responsive"
 											objectFit="fill"
+											priority
 											width={2880}
 											height={2840}
 											alt={t('TITLE')}

diff --git a/apps/web/styles/globals.css b/apps/web/styles/globals.css
@@ -1,4 +1,4 @@
-@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;500;600;700;800&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:wght@300;400;500;600;700;800&family=Poppins:ital,wght@0,300;0,500;0,700;0,800;1,400;1,600&family=Raleway:ital,wght@0,100;0,200;0,300;0,400;0,500;0,700;1,100;1,200;1,300;1,400;1,700&display=swap');
 
 @tailwind base;
 @tailwind components;