Merge branch 'landing-page' into router-transitions

thesis · Apr 22, 2024 · adde7d5 · adde7d5
2 parents d34c26b + 72f500c
commit adde7d5
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 6 deletions.
diff --git a/dapp/src/pages/ActivityPage/index.tsx b/dapp/src/pages/ActivityPage/index.tsx
@@ -18,7 +18,7 @@ export default function ActivityPage() {
 
   return (
     <Flex direction="column" gap={4} p={6}>
-      <ChakraLink as={ReactRouterLink} to={routerPath.overview}>
+      <ChakraLink as={ReactRouterLink} to={routerPath.dashboard}>
         <Icon
           as={ArrowLeft}
           boxSize={8}

diff --git a/...age/ActivityCarousel/ActivityCarousel.tsx → ...age/ActivityCarousel/ActivityCarousel.tsx b/...age/ActivityCarousel/ActivityCarousel.tsx → ...age/ActivityCarousel/ActivityCarousel.tsx
diff --git a/...tivityCarousel/ActivityCarouselArrows.tsx → ...tivityCarousel/ActivityCarouselArrows.tsx b/...tivityCarousel/ActivityCarouselArrows.tsx → ...tivityCarousel/ActivityCarouselArrows.tsx
diff --git a/...s/OverviewPage/ActivityCarousel/index.tsx → .../DashboardPage/ActivityCarousel/index.tsx b/...s/OverviewPage/ActivityCarousel/index.tsx → .../DashboardPage/ActivityCarousel/index.tsx
diff --git a/dapp/src/pages/OverviewPage/DocsCard.tsx → dapp/src/pages/DashboardPage/DocsCard.tsx b/dapp/src/pages/OverviewPage/DocsCard.tsx → dapp/src/pages/DashboardPage/DocsCard.tsx
diff --git a/...rc/pages/OverviewPage/PositionDetails.tsx → ...c/pages/DashboardPage/PositionDetails.tsx b/...rc/pages/OverviewPage/PositionDetails.tsx → ...c/pages/DashboardPage/PositionDetails.tsx
diff --git a/dapp/src/pages/OverviewPage/Statistics.tsx → dapp/src/pages/DashboardPage/Statistics.tsx b/dapp/src/pages/OverviewPage/Statistics.tsx → dapp/src/pages/DashboardPage/Statistics.tsx
diff --git a/...pages/OverviewPage/TransactionHistory.tsx → ...ages/DashboardPage/TransactionHistory.tsx b/...pages/OverviewPage/TransactionHistory.tsx → ...ages/DashboardPage/TransactionHistory.tsx
diff --git a/dapp/src/pages/OverviewPage/index.tsx → dapp/src/pages/DashboardPage/index.tsx b/dapp/src/pages/OverviewPage/index.tsx → dapp/src/pages/DashboardPage/index.tsx
@@ -9,7 +9,7 @@ import TransactionHistory from "./TransactionHistory"
 import { DocsCard } from "./DocsCard"
 import { ActivityCarousel } from "./ActivityCarousel"
 
-export default function OverviewPage() {
+export default function DashboardPage() {
   return (
     <Flex direction="column" p={6}>
       <HStack pb={3.5}>

diff --git a/dapp/src/pages/LandingPage/index.tsx b/dapp/src/pages/LandingPage/index.tsx
@@ -3,7 +3,14 @@ import { Flex } from "@chakra-ui/react"
 
 export default function LandingPage() {
   return (
-    <Flex w="full" flexFlow="column" px={10}>
+    <Flex
+      w="full"
+      flexFlow="column"
+      px={10}
+      pb={10}
+      maxW="100.625rem"
+      mx="auto"
+    >
       Content
     </Flex>
   )

diff --git a/dapp/src/router/index.tsx b/dapp/src/router/index.tsx
@@ -1,8 +1,8 @@
 import React from "react"
 import { BrowserRouter, Route, Routes } from "react-router-dom"
 import LandingPage from "#/pages/LandingPage"
-import OverviewPage from "#/pages/OverviewPage"
 import ActivityPage from "#/pages/ActivityPage"
+import DashboardPage from "#/pages/DashboardPage"
 import Layout from "#/components/shared/Layout"
 import { routerPath } from "./path"
 
@@ -12,7 +12,7 @@ export function Router() {
       <Routes>
         <Route path="/" element={<Layout />}>
           <Route index path={routerPath.home} element={<LandingPage />} />
-          <Route path={routerPath.overview} element={<OverviewPage />} />
+          <Route path={routerPath.dashboard} element={<DashboardPage />} />
           <Route
             path={`${routerPath.activity}/:activityId`}
             element={<ActivityPage />}

diff --git a/dapp/src/router/path.ts b/dapp/src/router/path.ts
@@ -1,5 +1,5 @@
 export const routerPath = {
   home: "/",
-  overview: "/overview",
+  dashboard: "/dashboard",
   activity: "/activity-details",
 }