diff --git a/apps/web/app/[locale]/layout.tsx b/apps/web/app/[locale]/layout.tsx index 8e091f809..b5da7c677 100644 --- 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) { )} */} - + - - {children} + + + {children} + diff --git a/apps/web/app/[locale]/settings/personal/page.tsx b/apps/web/app/[locale]/settings/personal/page.tsx index 49f506a81..c30ecf250 100644 --- 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 index aef2d64cb..7c7be7f80 100644 --- 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={ { data: TData[]; footerRows?: React.ReactNode[]; isError?: boolean; + isHeader?: boolean; noResultsMessage?: { heading: string; content: string; }; } -function DataTable({ columns, data, footerRows }: DataTableProps) { +function DataTable({ columns, data, footerRows, isHeader }: DataTableProps) { const [rowSelection, setRowSelection] = React.useState({}); const [columnVisibility, setColumnVisibility] = React.useState({}); const [columnFilters, setColumnFilters] = React.useState([]); @@ -57,21 +58,24 @@ function DataTable({ columns, data, footerRows }: DataTableProps< return ( - - {table.getHeaderGroups().map((headerGroup) => ( - - {headerGroup.headers.map((header) => { - return ( - - {header.isPlaceholder - ? null - : flexRender(header.column.columnDef.header, header.getContext())} - - ); - })} - - ))} - + {isHeader && ( + + {table.getHeaderGroups().map((headerGroup) => ( + + {headerGroup.headers.map((header) => { + return ( + + {header.isPlaceholder + ? null + : flexRender(header.column.columnDef.header, header.getContext())} + + ); + })} + + ))} + + )} + {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 index b048afcce..5d8fe915d 100644 --- a/apps/web/lib/components/dropdown.tsx +++ b/apps/web/lib/components/dropdown.tsx @@ -113,18 +113,22 @@ export function Dropdown({ /> )} -
- {items.map((Item, index) => ( - - {({ active, selected }) => { - return Item.Label ? : <>; - }} - - ))} +
+ {items.map((Item, index) => ( + + {({ active, selected }) => { + return Item.Label ? ( + + ) : ( + <> + ); + }} + + ))}
{/* Additional content */} diff --git a/apps/web/lib/components/tooltip.tsx b/apps/web/lib/components/tooltip.tsx index 5961aedf0..7c1a08e80 100644 --- 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)} > - {label} + + {label} +
diff --git a/apps/web/lib/features/task/task-filters.tsx b/apps/web/lib/features/task/task-filters.tsx index 0b330739a..e1c95629a 100644 --- 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 ( -
+
handleInputChange(e)} placeholder={t('common.TYPE_SOMETHING') + '...'} - wrapperClassName="mb-0 dark:bg-transparent" + wrapperClassName="mb-0 dark:bg-transparent !w-full rounded-xl" /> -
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 index e8d944ca6..99f629688 100644 --- 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 ( <>
-
+
-
+ +
{/* */} - + ) : ( + <> + + - - - + + + )}
-
+ {/*
)} -
+
*/} ); diff --git a/apps/web/styles/globals.css b/apps/web/styles/globals.css index 3645fa0be..81354db4f 100644 --- 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;