Merge pull request #2020 from ever-co/develop

Release
ever-co · Dec 25, 2023 · 0c4ff12 · 0c4ff12
2 parents f407dfa + 9dc357f
commit 0c4ff12
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/apps/web/app/[locale]/kanban/page.tsx b/apps/web/app/[locale]/kanban/page.tsx
@@ -13,13 +13,17 @@ import { KanbanView } from 'lib/features/team-members-kanban-view';
 import { MainLayout } from 'lib/layout';
 import Image from 'next/image';
 import { useState } from 'react';
+import { useTranslations } from 'next-intl';
 
 const Kanban = () => {
 	const { data } = useKanban();
 	const { activeTeam } = useOrganizationTeams();
+	const t = useTranslations();
 
 	const [activeTab, setActiveTab] = useState(KanbanTabs.TODAY);
 
+	const breadcrumbPath = [{title: JSON.parse(t('pages.home.BREADCRUMB')), href: '/'}, activeTeam?.name || '', 'Kanban Board'];
+
 	const imageRadius = 20;
 	const numberOfImagesDisplayed = 4;
 	const activeTeamMembers = activeTeam?.members ? activeTeam.members : [];
@@ -29,10 +33,10 @@ const Kanban = () => {
 		<>
 			<MainLayout>
 				<div className={'relative bg-white dark:bg-dark--theme pt-20 -mt-8 px-[32px] mx-[0px] w-full'}>
-					<Breadcrumb paths={['Dashboard', 'Team Page']} className="text-sm" />
+					<Breadcrumb paths={breadcrumbPath} className="text-sm" />
 					<div className="flex flex-row items-center justify-between mt-[24px]">
 						<div>
-							<h1 className="text-[35px] font-bold text-[#282048] dark:text-white">Kanban Board</h1>
+
 						</div>
 						<div className="flex flex-row items-center gap-[12px]">
 							<p>08:00 ( UTC +04:30 )</p>

diff --git a/apps/web/app/[locale]/page.tsx b/apps/web/app/[locale]/page.tsx
@@ -50,7 +50,7 @@ function MainPage({ pageProps }: AppProps<MyAppProps>) {
 	const t = useTranslations();
 	const { isTeamMember, isTrackingEnabled, activeTeam } = useOrganizationTeams();
 
-	const breadcrumb = [...JSON.parse(t('pages.home.BREADCRUMB')), activeTeam?.name || ''];
+	const breadcrumb = [{title: JSON.parse(t('pages.home.BREADCRUMB')), href: '/'}, activeTeam?.name || ''];
 	const [view, setView] = useState<IssuesView>(IssuesView.CARDS);
 	const { online } = useNetworkState();
 

diff --git a/apps/web/lib/layout/auth-layout.tsx b/apps/web/lib/layout/auth-layout.tsx
@@ -3,7 +3,7 @@ import { Meta, Text } from 'lib/components';
 import { EverTeamsLogo } from 'lib/components/svgs';
 import Image from 'next/legacy/image';
 import { PropsWithChildren, ReactNode } from 'react';
-import { useTranslation } from 'react-i18next';
+import { useTranslations } from 'next-intl';
 import { Footer } from './footer';
 
 type Props = {
@@ -13,7 +13,7 @@ type Props = {
 } & PropsWithChildren;
 
 export function AuthLayout({ children, title, description, isAuthPage = true }: Props) {
-	const { t } = useTranslation();
+	const t = useTranslations();
 	return (
 		<>
 			<Meta title={title} />

diff --git a/apps/web/lib/layout/footer.tsx b/apps/web/lib/layout/footer.tsx
@@ -1,10 +1,10 @@
 import { IClassName } from '@app/interfaces';
 import { clsxm } from '@app/utils';
 import { Text, ThemeToggler } from 'lib/components';
-import { useTranslation } from 'react-i18next';
+import { useTranslations } from 'next-intl';
 
 export function Footer({ className }: IClassName) {
-	const { t } = useTranslation();
+	const t = useTranslations();
 
 	return (
 		<footer className={clsxm('flex flex-col xs:flex-row justify-around items-center w-full py-6 px-3', className)}>