From ef32b67e6c618fd2000f7b6ef3b69666d2f0fae5 Mon Sep 17 00:00:00 2001 From: jeafreezy Date: Mon, 30 Sep 2024 16:31:48 +0200 Subject: [PATCH 01/26] chore: initialized models page --- frontend/src/app/router.tsx | 18 +++++------ frontend/src/app/routes/landing.tsx | 25 ++++++++-------- frontend/src/app/routes/models.tsx | 7 +++-- .../src/components/layouts/root-layout.tsx | 6 ++-- frontend/src/components/models/index.ts | 1 + frontend/src/components/models/model-card.tsx | 7 +++++ frontend/src/components/models/model-list.tsx | 7 +++++ frontend/src/components/models/skeleton.tsx | 30 +++++++++++++++++++ 8 files changed, 74 insertions(+), 27 deletions(-) create mode 100644 frontend/src/components/models/index.ts create mode 100644 frontend/src/components/models/model-card.tsx create mode 100644 frontend/src/components/models/model-list.tsx create mode 100644 frontend/src/components/models/skeleton.tsx diff --git a/frontend/src/app/router.tsx b/frontend/src/app/router.tsx index d7bfa9ed..d000a87c 100644 --- a/frontend/src/app/router.tsx +++ b/frontend/src/app/router.tsx @@ -10,15 +10,15 @@ import { ProtectedPage } from "@/app/routes/protected-route"; const router = createBrowserRouter([ { path: APPLICATION_ROUTES.HOMEPAGE, + lazy: async () => { + const { LandingPage } = await import("@/app/routes/landing"); + return { Component: LandingPage }; + }, + }, + { element: , children: [ - { - path: APPLICATION_ROUTES.HOMEPAGE, - lazy: async () => { - const { LandingPage } = await import("@/app/routes/landing"); - return { Component: LandingPage }; - }, - }, + { path: APPLICATION_ROUTES.LEARN, lazy: async () => { @@ -53,9 +53,7 @@ const router = createBrowserRouter([ const { ModelsPage } = await import("@/app/routes/models"); return { Component: () => ( - - - + ), }; }, diff --git a/frontend/src/app/routes/landing.tsx b/frontend/src/app/routes/landing.tsx index ddbdeb60..8c4d9f60 100644 --- a/frontend/src/app/routes/landing.tsx +++ b/frontend/src/app/routes/landing.tsx @@ -1,5 +1,5 @@ import { Footer } from "@/components/ui/footer"; -import { Header } from "@/components/ui/header"; +import { Header, NavBar } from "@/components/ui/header"; import WhatIsFAIR from "@/components/landing/about-fair/about-fair"; import CoreFeatures from "@/components/landing/core-features/core-features"; import Corevalues from "@/components/landing/core-values/core-values"; @@ -14,18 +14,17 @@ export const LandingPage = () => { return ( <> -
-
- - - - - - - - -
-
+ +
+ + + + + + + + +