3FE3LE · 3FE3LE · Oct 19, 2024 · Oct 19, 2024 · Oct 19, 2024 · Oct 19, 2024
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
@@ -63,7 +63,7 @@ knowledge_base:
   issues:
     scope: auto
   jira:
-    project_keys: []
+    project_keys: [SSS]
   linear:
     team_keys: []
   pull_requests:

diff --git a/apps/native/.expo-shared/assets.json b/apps/native/.expo-shared/assets.json
diff --git a/apps/native/.gitignore b/apps/native/.gitignore
diff --git a/apps/native/App.tsx b/apps/native/App.tsx
diff --git a/apps/native/README.md b/apps/native/README.md
diff --git a/apps/native/app.json b/apps/native/app.json
diff --git a/apps/native/assets/adaptive-icon.png b/apps/native/assets/adaptive-icon.png
diff --git a/apps/native/assets/favicon.png b/apps/native/assets/favicon.png
diff --git a/apps/native/assets/icon.png b/apps/native/assets/icon.png
diff --git a/apps/native/assets/splash.png b/apps/native/assets/splash.png
diff --git a/apps/native/babel.config.js b/apps/native/babel.config.js
diff --git a/apps/native/index.js b/apps/native/index.js
diff --git a/apps/native/metro.config.js b/apps/native/metro.config.js
diff --git a/apps/native/package.json b/apps/native/package.json
diff --git a/apps/native/tsconfig.json b/apps/native/tsconfig.json
diff --git a/apps/opt/app/[locale]/dashboard/page.tsx b/apps/opt/app/[locale]/dashboard/page.tsx
@@ -1,38 +1,12 @@
-import { Link } from '@opt/navigations';
-import { ActionButton } from '@repo/ui';
+import { DashboardContent } from '@opt/components/dashboard';
+import { TripsProvider } from '@opt/components/providers/TripsProvider';
 
-export default async function DashboardPage() {
+export default function Dashboard() {
   return (
-    <div>
-      <header>
-        <h2>Your trips</h2>
-        <ActionButton>new Trip</ActionButton>
-      </header>
-      <article>
-        <h3>Current trip</h3>
-        <p>You can see your past trips here.</p>
-        <p>
-          To create a new trip, click on <strong>New Trip</strong>.
-        </p>
-        <p>Click on a trip to view its details.</p>
-      </article>
-      <article>
-        <h3>Coming soon...</h3>
-        <p>You can see your past trips here.</p>
-        <p>
-          To create a new trip, click on <strong>New Trip</strong>.
-        </p>
-        <p>Click on a trip to view its details.</p>
-      </article>
-      <article>
-        <h3>Trips history</h3>
-        <p>You can see your past trips here.</p>
-        <p>
-          To create a new trip, click on <strong>New Trip</strong>.
-        </p>
-        <p>Click on a trip to view its details.</p>
-      </article>
-      <Link href={'/trips'}>See all trips</Link>
-    </div>
+    <TripsProvider>
+      <div className="dashboard">
+        <DashboardContent />
+      </div>
+    </TripsProvider>
   );
 }
diff --git a/apps/opt/app/[locale]/layout.tsx b/apps/opt/app/[locale]/layout.tsx
@@ -1,24 +1,36 @@
 import '@opt/styles/main.scss';
 
-import { getMessages, unstable_setRequestLocale } from 'next-intl/server';
+import { getMessages, setRequestLocale } from 'next-intl/server';
 
+import { auth } from '@opt/auth';
 import { AppWrapper, SWRProvider } from '@opt/components/UI';
+import { routing } from '@opt/i18n/routing';
 import { Navbar } from '@repo/ui';
-import { PageProps } from '@repo/ui/types';
+import { OPT_MENU_ITEMS } from '@repo/ui/constants';
 
 import { metadata } from '../metadata';
 
-const languages = ['en', 'es'];
-
 export async function generateStaticParams() {
-  return languages.map((locale) => ({ locale }));
+  return routing.locales.map((locale) => ({ locale }));
 }
 export default async function RootLayout({
   children,
-  params: { locale },
-}: PageProps) {
-  unstable_setRequestLocale(locale);
+  params,
+}: {
+  children: React.ReactNode;
+  params: { locale: 'es' | 'en' };
+}) {
+  const { locale } = await params;
+
+  setRequestLocale(locale);
+  const session = await auth();
+
   const messages = await getMessages();
+
+  const authenticated = !!session;
+
+  const menuItems = OPT_MENU_ITEMS;
+
   return (
     <html lang="en" suppressHydrationWarning>
       <body>
@@ -27,9 +39,7 @@ export default async function RootLayout({
             <main className="layout">
               <Navbar
                 title={'One Plan Trip'}
-                menuItems={[]}
-                authenticated
-                locale={locale}
+                {...{ authenticated, menuItems, locale }}
               />
               <div className="layout__content">
                 <section className="layout__section">{children}</section>

diff --git a/apps/opt/app/[locale]/not-found.tsx b/apps/opt/app/[locale]/not-found.tsx
@@ -1,7 +1,7 @@
 'use client';
 import { ArrowLeft } from 'lucide-react';
 
-import { useRouter } from '@opt/navigations';
+import { useRouter } from '@opt/i18n/routing';
 import { ActionButton } from '@repo/ui';
 
 export default function NotFound() {

diff --git a/apps/opt/app/[locale]/page.tsx b/apps/opt/app/[locale]/page.tsx
@@ -1,7 +1,24 @@
-export default function Web() {
+import { getTranslations } from 'next-intl/server';
+import Image from 'next/image';
+
+import { Link } from '@opt/i18n/routing';
+import landing_img from '@repo/ui/assets/animated/globalization-a.svg';
+
+export default async function HomePage() {
+  const t = await getTranslations('home');
+
   return (
-    <div>
-      <h1 className="heading-1">Este es One plan trip</h1>
+    <div className="home__container">
+      <div className="home__title">
+        <h1 className="heading--1">{t('title2')}</h1>
+        <h5 className="subtitle--1">{t('subtitle2')}</h5>
+        <Link href={`/dashboard`} className="home__button">
+          {t('tryNow')}
+        </Link>
+      </div>
+      <div className="home__title">
+        <Image src={landing_img} alt="traveling image" width={550} />
+      </div>
     </div>
   );
 }
diff --git a/apps/opt/app/[locale]/trips/[id]/page.tsx b/apps/opt/app/[locale]/trips/[id]/page.tsx
@@ -1,5 +1,8 @@
 import { TripDetails } from '@opt/components/trips';
 
-export default function Trip({ params }: { params: { id: string } }) {
-  return <TripDetails id={params.id} />;
+type IdParams = Promise<{ id: string }>;
+
+export default async function Trip({ params }: { params: IdParams }) {
+  const { id } = await params;
+  return <TripDetails id={id} />;
 }
diff --git a/apps/opt/app/[locale]/trips/page.tsx b/apps/opt/app/[locale]/trips/page.tsx
@@ -1,23 +1,10 @@
-import { redirect } from 'next/navigation';
-
-import { TripsContainer } from '@opt/components/trips';
-import { ActionButton } from '@repo/ui';
+import { TripsProvider } from '@opt/components/providers/TripsProvider';
+import { TripsContent } from '@opt/components/trips';
 
 export default async function Trips() {
   return (
-    <div>
-      <header>
-        <h2>Trips</h2>
-        <form
-          action={async () => {
-            'use server';
-            return redirect('/trips/new');
-          }}
-        >
-          <ActionButton variant="primary">Create new Trip</ActionButton>
-        </form>
-      </header>
-      <TripsContainer />
-    </div>
+    <TripsProvider>
+      <TripsContent />
+    </TripsProvider>
   );
 }
diff --git a/apps/opt/components/UI/StepperFlow.tsx b/apps/opt/components/UI/StepperFlow.tsx
@@ -3,8 +3,8 @@ import { signOut, useSession } from 'next-auth/react';
 import { toast } from 'react-hot-toast';
 
 import { Trip } from '@opt/core/interfaces';
+import { useRouter } from '@opt/i18n/routing';
 import { TripActions } from '@opt/integration/actions/';
-import { useRouter } from '@opt/navigations';
 import { useTripStore } from '@opt/store';
 import { ActionButton } from '@repo/ui/';
 

diff --git a/apps/opt/components/dashboard/DashboardContent.tsx b/apps/opt/components/dashboard/DashboardContent.tsx
@@ -0,0 +1,20 @@
+'use client';
+import { useTripsContext } from '../providers/TripsProvider';
+import { TripSearch, TripSections, TripStats } from '../trips';
+
+export const DashboardContent = () => {
+  const { trips, isLoading, isError } = useTripsContext();
+
+  if (isLoading) return <div>Loading...</div>;
+  if (isError) return <div>Error loading trips.</div>;
+
+  return (
+    <>
+      <div className="dashboard__search">
+        <TripSearch />
+      </div>
+      <TripStats trips={trips} />
+      <TripSections trips={trips} />
+    </>
+  );
+};
diff --git a/apps/opt/components/dashboard/index.tsx b/apps/opt/components/dashboard/index.tsx
@@ -0,0 +1 @@
+export { DashboardContent } from './DashboardContent';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { DashboardContent } from './DashboardContent';