Merge pull request #172 from sgcarstrends/107-maintenance-page

Add maintenance page
sgcarstrends · Nov 30, 2024 · 983a23a · 983a23a
2 parents 4066c1e + 1f53937
commit 983a23a
Show file tree

Hide file tree

Showing 41 changed files with 355 additions and 554 deletions.
diff --git a/app/(home)/page.tsx → app/(dashboard)/(home)/page.tsx b/app/(home)/page.tsx → app/(dashboard)/(home)/page.tsx
diff --git a/app/@breadcrumbs/[...slug]/page.tsx → ...ashboard)/@breadcrumbs/[...slug]/page.tsx b/app/@breadcrumbs/[...slug]/page.tsx → ...ashboard)/@breadcrumbs/[...slug]/page.tsx
@@ -50,7 +50,7 @@ const Breadcrumbs = async (props: { params: Params }) => {
       <BreadcrumbList>
         <BreadcrumbItem>
           <BreadcrumbLink asChild>
-            <Link href="/">Home</Link>
+            <Link href="/public">Home</Link>
           </BreadcrumbLink>
         </BreadcrumbItem>
         {breadcrumbs.map(({ isLastItem, href, label }) => (

diff --git a/app/@breadcrumbs/default.tsx → app/(dashboard)/@breadcrumbs/default.tsx b/app/@breadcrumbs/default.tsx → app/(dashboard)/@breadcrumbs/default.tsx
diff --git a/app/about/page.tsx → app/(dashboard)/about/page.tsx b/app/about/page.tsx → app/(dashboard)/about/page.tsx
diff --git a/app/cars/DistributionPieChart.tsx → ...(dashboard)/cars/DistributionPieChart.tsx b/app/cars/DistributionPieChart.tsx → ...(dashboard)/cars/DistributionPieChart.tsx
diff --git a/...cars/fuel-types/[fuelType]/TrendChart.tsx → ...cars/fuel-types/[fuelType]/TrendChart.tsx b/...cars/fuel-types/[fuelType]/TrendChart.tsx → ...cars/fuel-types/[fuelType]/TrendChart.tsx
diff --git a/app/cars/fuel-types/[fuelType]/page.tsx → ...oard)/cars/fuel-types/[fuelType]/page.tsx b/app/cars/fuel-types/[fuelType]/page.tsx → ...oard)/cars/fuel-types/[fuelType]/page.tsx
@@ -1,5 +1,5 @@
 import { Suspense } from "react";
-import { fetchMonths } from "@/app/cars/utils/fetchMonths";
+import { fetchMonths } from "@/app/(dashboard)/cars/utils/fetchMonths";
 import { CarOverviewTrends } from "@/app/components/CarOverviewTrends";
 import { EmptyData } from "@/components/EmptyData";
 import { MonthSelector } from "@/components/MonthSelector";

diff --git a/app/cars/makes/[make]/TrendChart.tsx → ...shboard)/cars/makes/[make]/TrendChart.tsx b/app/cars/makes/[make]/TrendChart.tsx → ...shboard)/cars/makes/[make]/TrendChart.tsx
diff --git a/app/cars/makes/[make]/columns.tsx → ...(dashboard)/cars/makes/[make]/columns.tsx b/app/cars/makes/[make]/columns.tsx → ...(dashboard)/cars/makes/[make]/columns.tsx
@@ -27,7 +27,9 @@ export const columns: ColumnDef<Car>[] = [
     cell: ({ row }) => {
       const type = row.getValue("fuel_type") as string;
       return (
-        <Link href={`/cars/fuel-types/${type.toLowerCase()}`}>{type}</Link>
+        <Link href={`/app/(dashboard)/cars/fuel-types/${type.toLowerCase()}`}>
+          {type}
+        </Link>
       );
     },
   },
@@ -37,7 +39,11 @@ export const columns: ColumnDef<Car>[] = [
     cell: ({ row }) => {
       const type = row.getValue("vehicle_type") as string;
       return (
-        <Link href={`/cars/vehicle-types/${type.toLowerCase()}`}>{type}</Link>
+        <Link
+          href={`/app/(dashboard)/cars/vehicle-types/${type.toLowerCase()}`}
+        >
+          {type}
+        </Link>
       );
     },
   },

diff --git a/app/cars/makes/[make]/page.tsx → app/(dashboard)/cars/makes/[make]/page.tsx b/app/cars/makes/[make]/page.tsx → app/(dashboard)/cars/makes/[make]/page.tsx
@@ -1,5 +1,5 @@
-import { TrendChart } from "@/app/cars/makes/[make]/TrendChart";
-import { columns } from "@/app/cars/makes/[make]/columns";
+import { TrendChart } from "@/app/(dashboard)/cars/makes/[make]/TrendChart";
+import { columns } from "@/app/(dashboard)/cars/makes/[make]/columns";
 import { MakeSelector } from "@/app/components/MakeSelector";
 import { EmptyData } from "@/components/EmptyData";
 import { StructuredData } from "@/components/StructuredData";

diff --git a/app/cars/opengraph-image.png → app/(dashboard)/cars/opengraph-image.png b/app/cars/opengraph-image.png → app/(dashboard)/cars/opengraph-image.png
diff --git a/app/cars/page.tsx → app/(dashboard)/cars/page.tsx b/app/cars/page.tsx → app/(dashboard)/cars/page.tsx
@@ -1,4 +1,3 @@
-import { Suspense } from "react";
 import { notFound } from "next/navigation";
 import { Leaderboard } from "@/components/Leaderboard";
 import { MonthSelector } from "@/components/MonthSelector";
@@ -91,7 +90,7 @@ const CarsPage = async (props: { searchParams: SearchParams }) => {
     }
 
     Object.assign(car, {
-      vehicle_type: VEHICLE_TYPE_MAP[vehicle_type] || vehicle_type,
+      vehicle_type: VEHICLE_TYPE_MAP[vehicle_type] ?? vehicle_type,
     });
 
     return car;
@@ -158,78 +157,76 @@ const CarsPage = async (props: { searchParams: SearchParams }) => {
           </Typography.H3>
         )}
         {cars.length > 0 && (
-          <>
-            <div className="flex flex-col gap-y-4">
-              <div className="grid grid-cols-1 gap-4 xl:grid-cols-3">
-                <Card>
-                  <CardHeader>
-                    <CardTitle>Total Registrations</CardTitle>
-                  </CardHeader>
-                  <CardContent>
-                    <p className="text-4xl font-bold text-primary">{total}</p>
-                  </CardContent>
-                </Card>
-                <Card>
-                  <CardHeader>
-                    <CardTitle>Top Fuel Type</CardTitle>
-                  </CardHeader>
-                  <CardContent>
-                    <p className="text-2xl font-bold text-green-600">
-                      {topFuelType} ({topFuelTypeValue})
-                    </p>
-                    <p className="text-gray-600">Highest adoption rate</p>
-                  </CardContent>
-                </Card>
-                <Card>
-                  <CardHeader>
-                    <CardTitle>Top Vehicle Type</CardTitle>
-                  </CardHeader>
-                  <CardContent>
-                    <p className="text-2xl font-bold text-pink-600">
-                      {topVehicleType} ({topVehicleTypeValue})
-                    </p>
-                    <p className="text-gray-600">Highest adoption rate</p>
-                  </CardContent>
-                </Card>
-                {/*<UnreleasedFeature>*/}
-                {/*  <Card>*/}
-                {/*    <CardHeader>*/}
-                {/*      <CardTitle>Trend</CardTitle>*/}
-                {/*    </CardHeader>*/}
-                {/*    <CardContent>*/}
-                {/*      <p className="text-2xl font-bold text-orange-600">*/}
-                {/*        Electric*/}
-                {/*      </p>*/}
-                {/*      <p className="text-gray-600">*/}
-                {/*        Steady increase in registrations*/}
-                {/*      </p>*/}
-                {/*    </CardContent>*/}
-                {/*  </Card>*/}
-                {/*</UnreleasedFeature>*/}
+          <div className="flex flex-col gap-y-4">
+            <div className="grid grid-cols-1 gap-4 xl:grid-cols-3">
+              <Card>
+                <CardHeader>
+                  <CardTitle>Total Registrations</CardTitle>
+                </CardHeader>
+                <CardContent>
+                  <p className="text-4xl font-bold text-primary">{total}</p>
+                </CardContent>
+              </Card>
+              <Card>
+                <CardHeader>
+                  <CardTitle>Top Fuel Type</CardTitle>
+                </CardHeader>
+                <CardContent>
+                  <p className="text-2xl font-bold text-green-600">
+                    {topFuelType} ({topFuelTypeValue})
+                  </p>
+                  <p className="text-gray-600">Highest adoption rate</p>
+                </CardContent>
+              </Card>
+              <Card>
+                <CardHeader>
+                  <CardTitle>Top Vehicle Type</CardTitle>
+                </CardHeader>
+                <CardContent>
+                  <p className="text-2xl font-bold text-pink-600">
+                    {topVehicleType} ({topVehicleTypeValue})
+                  </p>
+                  <p className="text-gray-600">Highest adoption rate</p>
+                </CardContent>
+              </Card>
+              {/*<UnreleasedFeature>*/}
+              {/*  <Card>*/}
+              {/*    <CardHeader>*/}
+              {/*      <CardTitle>Trend</CardTitle>*/}
+              {/*    </CardHeader>*/}
+              {/*    <CardContent>*/}
+              {/*      <p className="text-2xl font-bold text-orange-600">*/}
+              {/*        Electric*/}
+              {/*      </p>*/}
+              {/*      <p className="text-gray-600">*/}
+              {/*        Steady increase in registrations*/}
+              {/*      </p>*/}
+              {/*    </CardContent>*/}
+              {/*  </Card>*/}
+              {/*</UnreleasedFeature>*/}
+            </div>
+            <div className="grid gap-4 xl:grid-cols-12">
+              <div className="grid grid-cols-1 gap-4 xl:col-span-6">
+                <StatisticsCard
+                  title="By Fuel Type"
+                  description="Distribution of vehicles based on fuel type"
+                  data={numberByFuelType}
+                  total={total}
+                  linkPrefix="fuel-types"
+                />
+                <StatisticsCard
+                  title="By Vehicle Type"
+                  description="Distribution of vehicles based on vehicle type"
+                  data={numberByVehicleType}
+                  total={total}
+                  linkPrefix="vehicle-types"
+                />
               </div>
-              <div className="grid gap-4 xl:grid-cols-12">
-                <div className="grid grid-cols-1 gap-4 xl:col-span-6">
-                  <StatisticsCard
-                    title="By Fuel Type"
-                    description="Distribution of vehicles based on fuel type"
-                    data={numberByFuelType}
-                    total={total}
-                    linkPrefix="fuel-types"
-                  />
-                  <StatisticsCard
-                    title="By Vehicle Type"
-                    description="Distribution of vehicles based on vehicle type"
-                    data={numberByVehicleType}
-                    total={total}
-                    linkPrefix="vehicle-types"
-                  />
-                </div>
-                <div className="grid grid-cols-1 gap-4 xl:col-span-6">
-                  <Leaderboard cars={cars} />
-                </div>
+              <div className="grid grid-cols-1 gap-4 xl:col-span-6">
+                <Leaderboard cars={cars} />
               </div>
             </div>
-          </>
+          </div>
         )}
       </div>
     </>

diff --git a/app/cars/twitter-image.png → app/(dashboard)/cars/twitter-image.png b/app/cars/twitter-image.png → app/(dashboard)/cars/twitter-image.png
diff --git a/app/cars/utils/fetchMonths.ts → app/(dashboard)/cars/utils/fetchMonths.ts b/app/cars/utils/fetchMonths.ts → app/(dashboard)/cars/utils/fetchMonths.ts
diff --git a/...cars/vehicle-types/[vehicleType]/page.tsx → ...cars/vehicle-types/[vehicleType]/page.tsx b/...cars/vehicle-types/[vehicleType]/page.tsx → ...cars/vehicle-types/[vehicleType]/page.tsx
@@ -1,4 +1,4 @@
-import { fetchMonths } from "@/app/cars/utils/fetchMonths";
+import { fetchMonths } from "@/app/(dashboard)/cars/utils/fetchMonths";
 import { CarOverviewTrends } from "@/app/components/CarOverviewTrends";
 import { EmptyData } from "@/components/EmptyData";
 import { MonthSelector } from "@/components/MonthSelector";

diff --git a/app/coe/(prices)/TrendTable.tsx → app/(dashboard)/coe/(prices)/TrendTable.tsx b/app/coe/(prices)/TrendTable.tsx → app/(dashboard)/coe/(prices)/TrendTable.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useMemo } from "react";
-import { columns } from "@/app/coe/(prices)/columns";
+import { columns } from "@/app/(dashboard)/coe/(prices)/columns";
 import useStore from "@/app/store";
 import { DataTable } from "@/components/ui/data-table";
 import type { COEResult } from "@/types";

diff --git a/app/coe/(prices)/columns.tsx → app/(dashboard)/coe/(prices)/columns.tsx b/app/coe/(prices)/columns.tsx → app/(dashboard)/coe/(prices)/columns.tsx
diff --git a/app/coe/(prices)/opengraph-image.png → ...shboard)/coe/(prices)/opengraph-image.png b/app/coe/(prices)/opengraph-image.png → ...shboard)/coe/(prices)/opengraph-image.png
diff --git a/app/coe/(prices)/page.tsx → app/(dashboard)/coe/(prices)/page.tsx b/app/coe/(prices)/page.tsx → app/(dashboard)/coe/(prices)/page.tsx
@@ -1,4 +1,4 @@
-import { TrendTable } from "@/app/coe/(prices)/TrendTable";
+import { TrendTable } from "@/app/(dashboard)/coe/(prices)/TrendTable";
 import { COECategories } from "@/components/COECategories";
 import { COEPremiumChart } from "@/components/COEPremiumChart";
 import { StructuredData } from "@/components/StructuredData";

diff --git a/app/coe/(prices)/twitter-image.png → ...dashboard)/coe/(prices)/twitter-image.png b/app/coe/(prices)/twitter-image.png → ...dashboard)/coe/(prices)/twitter-image.png
diff --git a/app/coe/bidding/page.tsx → app/(dashboard)/coe/bidding/page.tsx b/app/coe/bidding/page.tsx → app/(dashboard)/coe/bidding/page.tsx
diff --git a/app/contact/page.tsx → app/(dashboard)/contact/page.tsx b/app/contact/page.tsx → app/(dashboard)/contact/page.tsx
diff --git a/app/layout.tsx → app/(dashboard)/layout.tsx b/app/layout.tsx → app/(dashboard)/layout.tsx
@@ -3,14 +3,14 @@ import { Inter } from "next/font/google";
 import Script from "next/script";
 import { GoogleAnalytics } from "@next/third-parties/google";
 import classNames from "classnames";
+import { Analytics } from "@/app/components/Analytics";
 import { Announcement } from "@/app/components/Announcement";
 // import { Footer } from "@/app/components/Footer";
 import { AppSidebar } from "@/components/AppSidebar";
 import { Header } from "@/components/Header";
 import { SidebarProvider, SidebarTrigger } from "@/components/ui/sidebar";
 import { ANNOUNCEMENT, SITE_TITLE, SITE_URL } from "@/config";
-import "./globals.css";
-import { Analytics } from "./components/Analytics";
+import "../globals.css";
 import type { Metadata } from "next";
 
 const inter = Inter({ subsets: ["latin"] });

diff --git a/app/opengraph-image.png → app/(dashboard)/opengraph-image.png b/app/opengraph-image.png → app/(dashboard)/opengraph-image.png
diff --git a/app/twitter-image.png → app/(dashboard)/twitter-image.png b/app/twitter-image.png → app/(dashboard)/twitter-image.png
diff --git a/app/components/CarOverviewTrends.tsx b/app/components/CarOverviewTrends.tsx
@@ -1,5 +1,5 @@
 import { Suspense } from "react";
-import { TrendChart } from "@/app/cars/fuel-types/[fuelType]/TrendChart";
+import { TrendChart } from "@/app/(dashboard)/cars/fuel-types/[fuelType]/TrendChart";
 import { DataTable } from "@/components/DataTable";
 import {
   Card,