refactor: move components closer towards their instantiation areas (#402

)

src/components/add-rental/index.tsx

@@ -3,7 +3,6 @@ import { useQuery } from "@tanstack/react-query";
 import { Link } from "@tanstack/react-router";
 import { useAuth } from "react-oidc-context";
 
-import { RentalSummary } from "@/components/primary-module/summary/rental-summary";
 import { Button } from "@/components/ui/button";
 import { icons } from "@/components/ui/icons";
 import { Separator } from "@/components/ui/separator";
@@ -26,6 +25,8 @@ import { fetchTaxesListOptions } from "@/lib/query/tax";
 import { fetchVehiclesSearchListOptions } from "@/lib/query/vehicle";
 import { fetchVehicleTypesListOptions } from "@/lib/query/vehicle-type";
 
+import { RentalSummary } from "@/routes/_auth/-modules/summary/rental-summary";
+
 import { getAuthFromAuthHook } from "@/lib/utils/auth";
 import { localDateTimeWithoutSecondsToQueryYearMonthDay } from "@/lib/utils/date";
 

src/components/dialog/select-customer.tsx

@@ -3,7 +3,7 @@ import { useQuery } from "@tanstack/react-query";
 import { createColumnHelper } from "@tanstack/react-table";
 import { useAuth } from "react-oidc-context";
 
-import { CommonTable } from "@/components/common/common-table";
+import { CommonTable } from "@/components/common-table";
 import {
   Dialog,
   DialogContent,

src/components/dialog/select-vehicle.tsx

@@ -3,7 +3,7 @@ import { useQuery } from "@tanstack/react-query";
 import { createColumnHelper } from "@tanstack/react-table";
 import { useAuth } from "react-oidc-context";
 
-import { CommonTable } from "@/components/common/common-table";
+import { CommonTable } from "@/components/common-table";
 import {
   Dialog,
   DialogContent,

src/routes/-components/feature-toggles-dialog.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 
+import { EmptyState } from "@/components/empty-state";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
@@ -33,8 +34,6 @@ import {
 } from "@/lib/hooks/useLocalStorage";
 import { useGlobalDialogContext } from "@/lib/context/modals";
 
-import { EmptyState } from "@/routes/-components/empty-state";
-
 import {
   featureFlags,
   type DropdownFeatureFlag,

src/routes/__root.tsx

@@ -9,6 +9,9 @@ import {
 import { useTranslation } from "react-i18next";
 import type { AuthContextProps } from "react-oidc-context";
 
+import { RouterDevTools } from "@/components/router-devtools";
+import { TailwindScreenDevTool } from "@/components/tailwind-screen-dev-tool";
+
 import { useDocumentTitle } from "@/lib/hooks/useDocumentTitle";
 
 import { titleMaker } from "@/lib/utils/title-maker";
@@ -18,8 +21,6 @@ import type { queryClient } from "@/lib/config/tanstack-query";
 import { Container } from "./-components/container";
 import { FeatureTogglesDialog } from "./-components/feature-toggles-dialog";
 import { PageNotFound } from "./-components/page-not-found";
-import { RouterDevTools } from "./-components/router-devtools";
-import { TailwindScreenDevTool } from "./-components/tailwind-screen-dev-tool";
 
 export interface MyRouterContext {
   queryClient: typeof queryClient;

src/routes/_auth/(agreements)/agreements.$agreementId._details.exchanges.tsx

@@ -4,7 +4,8 @@ import { createFileRoute, Link } from "@tanstack/react-router";
 import { createColumnHelper, type ColumnDef } from "@tanstack/react-table";
 import { useTranslation } from "react-i18next";
 
-import { CommonTable } from "@/components/common/common-table";
+import { CommonTable } from "@/components/common-table";
+import { EmptyState } from "@/components/empty-state";
 import { Badge } from "@/components/ui/badge";
 import { buttonVariants } from "@/components/ui/button";
 import { icons } from "@/components/ui/icons";
@@ -13,7 +14,6 @@ import type { TVehicleExchangeListItemParsed } from "@/lib/schemas/vehicle-excha
 import { fetchAgreementExchangesByIdOptions } from "@/lib/query/agreement";
 
 import { Container } from "@/routes/-components/container";
-import { EmptyState } from "@/routes/-components/empty-state";
 
 import { parseISO } from "@/lib/config/date-fns";
 

src/routes/_auth/(agreements)/agreements.$agreementId._details.notes.tsx

@@ -1,10 +1,9 @@
 import * as React from "react";
 import { createFileRoute } from "@tanstack/react-router";
 
-import ModuleNotesTabContent from "@/components/primary-module/tabs/notes-content";
-
 import { fetchAgreementNotesByIdOptions } from "@/lib/query/agreement";
 
+import ModuleNotesTabContent from "@/routes/_auth/-modules/tabs/notes-content";
 import { Container } from "@/routes/-components/container";
 
 export const Route = createFileRoute(

src/routes/_auth/(agreements)/agreements.$agreementId._details.summary.tsx

@@ -2,12 +2,12 @@ import * as React from "react";
 import { useSuspenseQuery } from "@tanstack/react-query";
 import { createFileRoute } from "@tanstack/react-router";
 
-import CustomerInformation from "@/components/primary-module/information-block/customer-information";
-import RentalInformation from "@/components/primary-module/information-block/rental-information";
-import VehicleInformation from "@/components/primary-module/information-block/vehicle-information";
-import { RentalSummary } from "@/components/primary-module/summary/rental-summary";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
+import CustomerInformation from "@/routes/_auth/-modules/information-block/customer-information";
+import RentalInformation from "@/routes/_auth/-modules/information-block/rental-information";
+import VehicleInformation from "@/routes/_auth/-modules/information-block/vehicle-information";
+import { RentalSummary } from "@/routes/_auth/-modules/summary/rental-summary";
 import { Container } from "@/routes/-components/container";
 
 export const Route = createFileRoute(

src/routes/_auth/(agreements)/agreements.$agreementId._details.tsx

@@ -7,7 +7,6 @@ import {
   useChildMatches,
 } from "@tanstack/react-router";
 
-import AgreementStatBlock from "@/components/primary-module/statistic-block/agreement-stat-block";
 import { Button, buttonVariants } from "@/components/ui/button";
 import {
   DropdownMenu,
@@ -24,6 +23,7 @@ import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 import { useDocumentTitle } from "@/lib/hooks/useDocumentTitle";
 
+import AgreementStatBlock from "@/routes/_auth/-modules/statistic-block/agreement-stat-block";
 import { Container } from "@/routes/-components/container";
 
 import { titleMaker } from "@/lib/utils/title-maker";

src/routes/_auth/(customers)/customers.$customerId._details.notes.tsx

@@ -1,9 +1,8 @@
 import { createFileRoute } from "@tanstack/react-router";
 
-import ModuleNotesTabContent from "@/components/primary-module/tabs/notes-content";
-
 import { fetchCustomerNotesByIdOptions } from "@/lib/query/customer";
 
+import ModuleNotesTabContent from "@/routes/_auth/-modules/tabs/notes-content";
 import { Container } from "@/routes/-components/container";
 
 export const Route = createFileRoute(

src/routes/_auth/(customers)/customers.$customerId._details.summary.tsx

@@ -1,8 +1,7 @@
 import { useSuspenseQuery } from "@tanstack/react-query";
 import { createFileRoute } from "@tanstack/react-router";
 
-import { CustomerSummary } from "@/components/primary-module/summary/customer";
-
+import { CustomerSummary } from "@/routes/_auth/-modules/summary/customer";
 import { Container } from "@/routes/-components/container";
 
 import { sortObjectKeys } from "@/lib/utils";

src/routes/_auth/(dashboard)/-components/widget-grid/widgets/vehicle-status.tsx

@@ -2,6 +2,7 @@ import * as React from "react";
 import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import { Link } from "@tanstack/react-router";
 
+import { EmptyState } from "@/components/empty-state";
 import { Button, buttonVariants } from "@/components/ui/button";
 import { icons } from "@/components/ui/icons";
 import { Progress } from "@/components/ui/progress";
@@ -31,7 +32,6 @@ import {
 } from "@/lib/query/vehicle";
 
 import { useWidgetName } from "@/routes/_auth/(dashboard)/-components/useWidgetName";
-import { EmptyState } from "@/routes/-components/empty-state";
 
 import { STORAGE_DEFAULTS, STORAGE_KEYS } from "@/lib/utils/constants";
 import {

src/routes/_auth/(dashboard)/index.tsx

@@ -3,7 +3,7 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { createFileRoute, Link } from "@tanstack/react-router";
 import { useAuth } from "react-oidc-context";
 
-import DashboardStatsBlock from "@/components/dashboard/stats-block-display";
+import { EmptyState } from "@/components/empty-state";
 import { Badge } from "@/components/ui/badge";
 import { Button, buttonVariants } from "@/components/ui/button";
 import {
@@ -41,8 +41,8 @@ import {
 import type { Auth } from "@/lib/query/helpers";
 import { fetchLocationsListOptions } from "@/lib/query/location";
 
+import DashboardStatsBlock from "@/routes/_auth/(dashboard)/-components/stats-block-display";
 import { Container } from "@/routes/-components/container";
-import { EmptyState } from "@/routes/-components/empty-state";
 
 import {
   getAuthFromAuthHook,

src/routes/_auth/(fleet)/fleet.$vehicleId._details.agreements.tsx

@@ -4,7 +4,7 @@ import { createFileRoute, Link, redirect } from "@tanstack/react-router";
 import { createColumnHelper, type ColumnDef } from "@tanstack/react-table";
 import { useTranslation } from "react-i18next";
 
-import { CommonTable } from "@/components/common/common-table";
+import { CommonTable } from "@/components/common-table";
 import { Badge } from "@/components/ui/badge";
 import { DataTableColumnHeader } from "@/components/ui/data-table";
 

src/routes/_auth/(fleet)/fleet.$vehicleId._details.notes.tsx

@@ -1,9 +1,8 @@
 import { createFileRoute } from "@tanstack/react-router";
 
-import ModuleNotesTabContent from "@/components/primary-module/tabs/notes-content";
-
 import { fetchVehiclesByIdOptions } from "@/lib/query/vehicle";
 
+import ModuleNotesTabContent from "@/routes/_auth/-modules/tabs/notes-content";
 import { Container } from "@/routes/-components/container";
 
 export const Route = createFileRoute(

src/routes/_auth/(fleet)/fleet.$vehicleId._details.reservations.tsx

@@ -4,7 +4,7 @@ import { createFileRoute, Link, redirect } from "@tanstack/react-router";
 import { createColumnHelper, type ColumnDef } from "@tanstack/react-table";
 import { useTranslation } from "react-i18next";
 
-import { CommonTable } from "@/components/common/common-table";
+import { CommonTable } from "@/components/common-table";
 import { Badge } from "@/components/ui/badge";
 import { DataTableColumnHeader } from "@/components/ui/data-table";
 

src/routes/_auth/(fleet)/fleet.$vehicleId._details.summary.tsx

@@ -2,13 +2,13 @@ import * as React from "react";
 import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import { createFileRoute } from "@tanstack/react-router";
 
-import CustomerInformation from "@/components/primary-module/information-block/customer-information";
-import VehicleInformation from "@/components/primary-module/information-block/vehicle-information";
-import { VehicleSummary } from "@/components/primary-module/summary/vehicle";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 import { fetchAgreementByIdOptions } from "@/lib/query/agreement";
 
+import CustomerInformation from "@/routes/_auth/-modules/information-block/customer-information";
+import VehicleInformation from "@/routes/_auth/-modules/information-block/vehicle-information";
+import { VehicleSummary } from "@/routes/_auth/-modules/summary/vehicle";
 import { Container } from "@/routes/-components/container";
 
 export const Route = createFileRoute(

src/routes/_auth/(fleet)/fleet.$vehicleId._details.tsx

@@ -7,7 +7,6 @@ import {
   useChildMatches,
 } from "@tanstack/react-router";
 
-import VehicleStatBlock from "@/components/primary-module/statistic-block/vehicle-stat-block";
 import { Button, buttonVariants } from "@/components/ui/button";
 import {
   DropdownMenu,
@@ -22,6 +21,7 @@ import { icons } from "@/components/ui/icons";
 import { Separator } from "@/components/ui/separator";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
+import VehicleStatBlock from "@/routes/_auth/-modules/statistic-block/vehicle-stat-block";
 import { Container } from "@/routes/-components/container";
 
 import { cn } from "@/lib/utils";

src/routes/_auth/(reports)/-components/reports-list.tsx

@@ -3,6 +3,7 @@ import { useSuspenseQuery } from "@tanstack/react-query";
 import { Link, useNavigate, useRouteContext } from "@tanstack/react-router";
 import { useTranslation } from "react-i18next";
 
+import { EmptyState } from "@/components/empty-state";
 import { buttonVariants } from "@/components/ui/button";
 import { icons } from "@/components/ui/icons";
 import { Label } from "@/components/ui/label";
@@ -18,8 +19,6 @@ import {
 
 import type { TReportsListItem } from "@/lib/schemas/report";
 
-import { EmptyState } from "@/routes/-components/empty-state";
-
 import { cn } from "@/lib/utils";
 
 const PAYMENT_BREAKDOWN_REPORT_ID = "117";

src/routes/_auth/(reports)/-components/view-report/page.tsx

@@ -1,14 +1,14 @@
 import React from "react";
 import { Link } from "@tanstack/react-router";
 
+import { EmptyState } from "@/components/empty-state";
 import { icons } from "@/components/ui/icons";
 import { Separator } from "@/components/ui/separator";
 
 import { useDocumentTitle } from "@/lib/hooks/useDocumentTitle";
 
 import { ReportFilters } from "@/routes/_auth/(reports)/-components/view-report/page-filters";
 import { useReportContext } from "@/routes/_auth/(reports)/-components/view-report/view-report-context";
-import { EmptyState } from "@/routes/-components/empty-state";
 
 import { titleMaker } from "@/lib/utils/title-maker";
 

src/routes/_auth/(reports)/-components/view-report/presentation/default-view.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import type { ColumnDef, VisibilityState } from "@tanstack/react-table";
 import { useTranslation } from "react-i18next";
 
+import { EmptyState } from "@/components/empty-state";
 import { icons } from "@/components/ui/icons";
 
 import type { TReportDetail, TReportResult } from "@/lib/schemas/report";
@@ -12,7 +13,6 @@ import { ReportTable } from "@/routes/_auth/(reports)/-components/view-report/pl
 import { ViewColumns } from "@/routes/_auth/(reports)/-components/view-report/plugin/view-columns";
 import { useReportValueFormatter } from "@/routes/_auth/(reports)/-components/view-report/useReportValueFormatter";
 import { useReportContext } from "@/routes/_auth/(reports)/-components/view-report/view-report-context";
-import { EmptyState } from "@/routes/-components/empty-state";
 
 import type { ReportTablePlugin } from "@/lib/types/report";
 

src/routes/_auth/(reservations)/reservations.$reservationId._details.notes.tsx

@@ -1,9 +1,8 @@
 import { createFileRoute } from "@tanstack/react-router";
 
-import ModuleNotesTabContent from "@/components/primary-module/tabs/notes-content";
-
 import { fetchReservationNotesByIdOptions } from "@/lib/query/reservation";
 
+import ModuleNotesTabContent from "@/routes/_auth/-modules/tabs/notes-content";
 import { Container } from "@/routes/-components/container";
 
 export const Route = createFileRoute(

src/routes/_auth/(reservations)/reservations.$reservationId._details.summary.tsx

@@ -1,11 +1,10 @@
 import { useSuspenseQuery } from "@tanstack/react-query";
 import { createFileRoute } from "@tanstack/react-router";
 
-import CustomerInformation from "@/components/primary-module/information-block/customer-information";
-import RentalInformation from "@/components/primary-module/information-block/rental-information";
-import VehicleInformation from "@/components/primary-module/information-block/vehicle-information";
-import { RentalSummary } from "@/components/primary-module/summary/rental-summary";
-
+import CustomerInformation from "@/routes/_auth/-modules/information-block/customer-information";
+import RentalInformation from "@/routes/_auth/-modules/information-block/rental-information";
+import VehicleInformation from "@/routes/_auth/-modules/information-block/vehicle-information";
+import { RentalSummary } from "@/routes/_auth/-modules/summary/rental-summary";
 import { Container } from "@/routes/-components/container";
 
 export const Route = createFileRoute(

src/routes/_auth/(reservations)/reservations.$reservationId._details.tsx

@@ -7,7 +7,6 @@ import {
   useChildMatches,
 } from "@tanstack/react-router";
 
-import ReservationStatBlock from "@/components/primary-module/statistic-block/reservation-stat-block";
 import { Button, buttonVariants } from "@/components/ui/button";
 import {
   DropdownMenu,
@@ -24,6 +23,7 @@ import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 import { useDocumentTitle } from "@/lib/hooks/useDocumentTitle";
 
+import ReservationStatBlock from "@/routes/_auth/-modules/statistic-block/reservation-stat-block";
 import { Container } from "@/routes/-components/container";
 
 import { titleMaker } from "@/lib/utils/title-maker";

src/routes/_auth/(settings)/settings.application.locations.tsx

@@ -3,6 +3,7 @@ import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import { createFileRoute, Link } from "@tanstack/react-router";
 import { useTranslation } from "react-i18next";
 
+import { EmptyState } from "@/components/empty-state";
 import { badgeVariants } from "@/components/ui/badge";
 import { Button, buttonVariants } from "@/components/ui/button";
 import {
@@ -41,8 +42,6 @@ import {
   fetchLocationStatesByCountryIdListOptions,
 } from "@/lib/query/location";
 
-import { EmptyState } from "@/routes/-components/empty-state";
-
 import { titleMaker } from "@/lib/utils/title-maker";
 
 import { cn } from "@/lib/utils";

src/routes/_auth/(settings)/settings.application.permissions-and-roles.tsx

@@ -4,6 +4,7 @@ import { createFileRoute, Link } from "@tanstack/react-router";
 import { t } from "i18next";
 import { useTranslation } from "react-i18next";
 
+import { EmptyState } from "@/components/empty-state";
 import { Button, buttonVariants } from "@/components/ui/button";
 import {
   Card,
@@ -36,8 +37,6 @@ import { useDocumentTitle } from "@/lib/hooks/useDocumentTitle";
 import type { RoleListItem } from "@/lib/schemas/role";
 import { fetchRoleByIdOptions, fetchRolesListOptions } from "@/lib/query/role";
 
-import { EmptyState } from "@/routes/-components/empty-state";
-
 import { titleMaker } from "@/lib/utils/title-maker";
 
 import { cn } from "@/lib/utils";

src/components/primary-module/statistic-block/agreement-stat-block.tsx → src/routes/_auth/-modules/statistic-block/agreement-stat-block.tsx

@@ -1,6 +1,6 @@
 import { useTranslation } from "react-i18next";
 
-import { type AgreementDataParsed } from "../../../lib/schemas/agreement";
+import { type AgreementDataParsed } from "../../../../lib/schemas/agreement";
 import { ModuleStatBlock, ModuleStatBlockContainer } from "./common";
 
 const AgreementStatBlock = ({