Merge pull request #2028 from ever-co/develop

Release
ever-co · Dec 28, 2023 · 50732e8 · 50732e8
2 parents 99dcd32 + ca096ec
commit 50732e8
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 58 deletions.
diff --git a/apps/web/app/[locale]/layout.tsx b/apps/web/app/[locale]/layout.tsx
@@ -10,6 +10,7 @@ import { AppState } from 'lib/app/init-state';
 
 import 'react-loading-skeleton/dist/skeleton.css';
 import '../../styles/globals.css';
+import { ThemeProvider } from 'next-themes';
 
 const locales = ['en', 'de', 'ar', 'bg', 'zh', 'nl', 'de', 'he', 'it', 'pl', 'pt', 'ru', 'es', 'fr'];
 
@@ -56,10 +57,12 @@ export default function LocaleLayout({ children, params: { locale } }: Props) {
 				)}
 			</head> */}
 			<NextIntlClientProvider locale={locale} messages={messages} timeZone="Asia/Kolkata">
-				<body className={clsx('flex h-full flex-col')}>
+				<body className={clsx('flex h-full flex-col dark:bg-[#191A20]')}>
 					<RecoilRoot>
-						<AppState />
-						{children}
+						<ThemeProvider attribute="class" defaultTheme="system" enableSystem disableTransitionOnChange>
+							<AppState />
+							{children}
+						</ThemeProvider>
 					</RecoilRoot>
 				</body>
 			</NextIntlClientProvider>

diff --git a/apps/web/app/[locale]/settings/personal/page.tsx b/apps/web/app/[locale]/settings/personal/page.tsx
@@ -17,8 +17,6 @@ const Personal = () => {
 	const t = useTranslations();
 	const [user] = useRecoilState(userState);
 	const breadcrumb = [...JSON.parse(t('pages.settings.BREADCRUMB'))];
-	console.log(JSON.parse(t('pages.settings.BREADCRUMB')));
-
 
 	return (
 		<>

diff --git a/apps/web/components/pages/task/details-section/blocks/task-estimations-info.tsx b/apps/web/components/pages/task/details-section/blocks/task-estimations-info.tsx
@@ -49,6 +49,7 @@ const TaskEstimationsInfo = () => {
 													key={member.id}
 													profilePicSrc={member.user?.imageUrl}
 													names={member.fullName}
+													userId={member.userId}
 													//@ts-ignore
 													time={
 														<TaskEstimate

diff --git a/apps/web/components/ui/data-table.tsx b/apps/web/components/ui/data-table.tsx
@@ -21,13 +21,14 @@ interface DataTableProps<TData, TValue> {
 	data: TData[];
 	footerRows?: React.ReactNode[];
 	isError?: boolean;
+	isHeader?: boolean;
 	noResultsMessage?: {
 		heading: string;
 		content: string;
 	};
 }
 
-function DataTable<TData, TValue>({ columns, data, footerRows }: DataTableProps<TData, TValue>) {
+function DataTable<TData, TValue>({ columns, data, footerRows, isHeader }: DataTableProps<TData, TValue>) {
 	const [rowSelection, setRowSelection] = React.useState({});
 	const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({});
 	const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([]);
@@ -57,21 +58,24 @@ function DataTable<TData, TValue>({ columns, data, footerRows }: DataTableProps<
 
 	return (
 		<Table className="border-transparent bg-light--theme-light dark:bg-dark--theme-light mt-8 w-full rounded-2xl">
-			<TableHeader>
-				{table.getHeaderGroups().map((headerGroup) => (
-					<TableRow key={headerGroup.id}>
-						{headerGroup.headers.map((header) => {
-							return (
-								<TableHead key={header.id}>
-									{header.isPlaceholder
-										? null
-										: flexRender(header.column.columnDef.header, header.getContext())}
-								</TableHead>
-							);
-						})}
-					</TableRow>
-				))}
-			</TableHeader>
+			{isHeader && (
+				<TableHeader>
+					{table.getHeaderGroups().map((headerGroup) => (
+						<TableRow key={headerGroup.id}>
+							{headerGroup.headers.map((header) => {
+								return (
+									<TableHead key={header.id}>
+										{header.isPlaceholder
+											? null
+											: flexRender(header.column.columnDef.header, header.getContext())}
+									</TableHead>
+								);
+							})}
+						</TableRow>
+					))}
+				</TableHeader>
+			)}
+
 			<TableBody className="divide-y divide-gray-200">
 				{table.getRowModel().rows?.length ? (
 					table.getRowModel().rows.map((row) => (

diff --git a/apps/web/lib/components/dropdown.tsx b/apps/web/lib/components/dropdown.tsx
@@ -113,18 +113,22 @@ export function Dropdown<T extends DropdownItem>({
 									/>
 								</div>
 							)}
-							<section className={"max-h-[9.125rem] overflow-y-auto"}>
-							{items.map((Item, index) => (
-								<Listbox.Option
-									key={Item.key ? Item.key : index}
-									value={Item}
-									disabled={!!Item.disabled}
-								>
-									{({ active, selected }) => {
-										return Item.Label ? <Item.Label active={active} selected={selected} /> : <></>;
-									}}
-								</Listbox.Option>
-							))}
+							<section className={'max-h-[80vh] overflow-y-auto'}>
+								{items.map((Item, index) => (
+									<Listbox.Option
+										key={Item.key ? Item.key : index}
+										value={Item}
+										disabled={!!Item.disabled}
+									>
+										{({ active, selected }) => {
+											return Item.Label ? (
+												<Item.Label active={active} selected={selected} />
+											) : (
+												<></>
+											);
+										}}
+									</Listbox.Option>
+								))}
 							</section>
 
 							{/* Additional content */}

diff --git a/apps/web/lib/components/tooltip.tsx b/apps/web/lib/components/tooltip.tsx
@@ -47,7 +47,14 @@ export function Tooltip({
 						{...getTooltipProps()}
 						className={clsx('tooltip-container w-1/3 md:w-fit', labelContainerClassName)}
 					>
-						<span className={clsx(labelClassName, 'text-xs')}>{label}</span>
+						<span
+							className={clsx(labelClassName, 'text-xs font-poppins')}
+							// style={{
+							// 	fontFamily: 'poppins'
+							// }}
+						>
+							{label}
+						</span>
 						<div {...getArrowProps()} className="tooltip-arrow" />
 					</Transition>
 				</>

diff --git a/apps/web/lib/features/task/task-filters.tsx b/apps/web/lib/features/task/task-filters.tsx
@@ -436,15 +436,15 @@ export function TaskNameFilter({
 	};
 
 	return (
-		<div className={clsxm('flex flex-row w-full md:w-1/2 gap-2 mt-3 ml-auto', fullWidth && '!w-full')}>
+		<div className={clsxm('flex flex-row w-full md:w-1/2 gap-2 mt-0 ml-auto', fullWidth && '!w-full')}>
 			<InputField
 				value={tempValue}
 				autoFocus={true}
 				onChange={(e) => handleInputChange(e)}
 				placeholder={t('common.TYPE_SOMETHING') + '...'}
-				wrapperClassName="mb-0 dark:bg-transparent"
+				wrapperClassName="mb-0 dark:bg-transparent !w-full rounded-xl"
 			/>
-			<Button className="py-2 md:px-3 px-2 min-w-[6.25rem] rounded-xl" variant="outline-danger" onClick={close}>
+			<Button className="py-1 md:px-3 px-1 min-w-[5rem] rounded-xl" variant="outline-danger" onClick={close}>
 				{t('common.CLOSE')}
 			</Button>
 		</div>

diff --git a/apps/web/lib/features/team/user-team-block/user-team-block-header.tsx b/apps/web/lib/features/team/user-team-block/user-team-block-header.tsx
@@ -11,7 +11,6 @@ import {
 	NotWorkingIcon,
 	OnlineIcon
 } from 'lib/components/svgs';
-import { Transition } from '@headlessui/react';
 import { Button, VerticalSeparator } from 'lib/components';
 import { useTaskFilter, TaskNameFilter } from 'lib/features';
 import { useRecoilState } from 'recoil';
@@ -53,7 +52,7 @@ export function UserTeamBlockHeader() {
 	return (
 		<>
 			<div className="hidden sm:flex row font-normal pt-4 justify-between hidde dark:text-[#7B8089]">
-				<div className="flex items-center w-3/4">
+				<div className="flex items-center w-5/6">
 					<div
 						className={clsxm(
 							'w-1/6 text-center flex items-center justify-center gap-2 py-4 cursor-pointer',
@@ -179,29 +178,42 @@ export function UserTeamBlockHeader() {
 						</span>
 					</div>
 				</div>
-				<div className="w-1/4 flex justify-end gap-2	items-center">
+
+				<div className="1/6 flex justify-end gap-2 items-center">
 					{/* <Invite /> */}
-					<button
-						ref={hook.outclickFilterCard.ignoreElementRef}
-						className={clsxm('outline-none')}
-						onClick={() => hook.toggleFilterType('search')}
-					>
-						<SearchNormalIcon
-							className={clsxm(
-								'dark:stroke-white',
-								hook.filterType === 'search' && ['stroke-primary-light dark:stroke-primary-light']
-							)}
+					{hook.filterType === 'search' ? (
+						<TaskNameFilter
+							fullWidth={true}
+							value={hook.taskName}
+							setValue={hook.setTaskName}
+							close={() => {
+								hook.toggleFilterType('search');
+							}}
 						/>
-					</button>
+					) : (
+						<>
+							<button
+								ref={hook.outclickFilterCard.ignoreElementRef}
+								className={clsxm('outline-none')}
+								onClick={() => hook.toggleFilterType('search')}
+							>
+								<SearchNormalIcon
+									className={clsxm(
+										'dark:stroke-white'
+										// hook.filterType === 'search' && ['stroke-primary-light dark:stroke-primary-light']
+									)}
+								/>
+							</button>
+							<VerticalSeparator />
 
-					<VerticalSeparator />
-
-					<Button className="py-3.5 px-4 gap-3 rounded-xl outline-none" onClick={openModal}>
-						Invite
-					</Button>
+							<Button className="py-3.5 px-4 gap-3 rounded-xl outline-none" onClick={openModal}>
+								Invite
+							</Button>
+						</>
+					)}
 				</div>
 			</div>
-			<div className="hidden sm:flex w-1/2 row font-normal  justify-end hidde dark:text-[#7B8089]">
+			{/* <div className="hidden sm:flex w-1/2 row font-normal  justify-end hidde dark:text-[#7B8089]">
 				<Transition
 					show={hook.filterType !== undefined}
 					enter="transition duration-100 ease-out"
@@ -224,7 +236,7 @@ export function UserTeamBlockHeader() {
 						/>
 					)}
 				</Transition>
-			</div>
+			</div> */}
 			<InviteFormModal open={isOpen && !!user?.isEmailVerified} closeModal={closeModal} />
 		</>
 	);

diff --git a/apps/web/styles/globals.css b/apps/web/styles/globals.css
@@ -17,6 +17,10 @@ html.dark {
 	--tooltipBackground: #000;
 }
 
+.font-poppins {
+	font-family: 'Poppins';
+}
+
 @layer base {
 	html {
 		font-family: 'Poppins', sans-serif;