Merge remote-tracking branch 'origin/master'

src/components/Navbar/Navbar.tsx

@@ -4,10 +4,12 @@ import {
     IconBarcode,
     IconBox,
     IconBuildingWarehouse,
-    IconCash, IconChartDots,
+    IconCash,
+    IconChartDots,
     IconDashboard,
     IconFileBarcode,
-    IconHome2, IconHomeEdit,
+    IconHome2,
+    IconHomeEdit,
     IconLogout,
     IconMan,
     IconMoon,
@@ -131,7 +133,7 @@ export function Navbar() {
             data = data.concat(adminMockdata);
         }
         return data;
-    }
+    };
 
     const links = getLinksData().map((link, index) => (
         <NavbarLink
@@ -163,11 +165,12 @@ export function Navbar() {
                 </Center>
 
                 <div className={classes.navbarMain}>
-                    <Stack
-                        justify="center"
-                        gap={rem(10)}>
+
+                    <Flex direction={"column"}>
+
                         {links}
-                    </Stack>
+                    </Flex>
+
                 </div>
             </Flex>
 

src/routeTree.gen.ts

@@ -22,6 +22,8 @@ const TestLazyImport = createFileRoute('/test')()
 const StatisticsLazyImport = createFileRoute('/statistics')()
 const ShippingwarehousesLazyImport = createFileRoute('/shipping_warehouses')()
 const ServicesLazyImport = createFileRoute('/services')()
+const ResiduesLazyImport = createFileRoute('/residues')()
+const ReceiptLazyImport = createFileRoute('/receipt')()
 const ProductsLazyImport = createFileRoute('/products')()
 const MarketplacesLazyImport = createFileRoute('/marketplaces')()
 const LoginLazyImport = createFileRoute('/login')()
@@ -59,6 +61,18 @@ const ServicesLazyRoute = ServicesLazyImport.update({
   getParentRoute: () => rootRoute,
 } as any).lazy(() => import('./routes/services.lazy').then((d) => d.Route))
 
+const ResiduesLazyRoute = ResiduesLazyImport.update({
+  id: '/residues',
+  path: '/residues',
+  getParentRoute: () => rootRoute,
+} as any).lazy(() => import('./routes/residues.lazy').then((d) => d.Route))
+
+const ReceiptLazyRoute = ReceiptLazyImport.update({
+  id: '/receipt',
+  path: '/receipt',
+  getParentRoute: () => rootRoute,
+} as any).lazy(() => import('./routes/receipt.lazy').then((d) => d.Route))
+
 const ProductsLazyRoute = ProductsLazyImport.update({
   id: '/products',
   path: '/products',
@@ -179,6 +193,20 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof ProductsLazyImport
       parentRoute: typeof rootRoute
     }
+    '/receipt': {
+      id: '/receipt'
+      path: '/receipt'
+      fullPath: '/receipt'
+      preLoaderRoute: typeof ReceiptLazyImport
+      parentRoute: typeof rootRoute
+    }
+    '/residues': {
+      id: '/residues'
+      path: '/residues'
+      fullPath: '/residues'
+      preLoaderRoute: typeof ResiduesLazyImport
+      parentRoute: typeof rootRoute
+    }
     '/services': {
       id: '/services'
       path: '/services'
@@ -247,6 +275,8 @@ export interface FileRoutesByFullPath {
   '/login': typeof LoginLazyRoute
   '/marketplaces': typeof MarketplacesLazyRoute
   '/products': typeof ProductsLazyRoute
+  '/receipt': typeof ReceiptLazyRoute
+  '/residues': typeof ResiduesLazyRoute
   '/services': typeof ServicesLazyRoute
   '/shipping_warehouses': typeof ShippingwarehousesLazyRoute
   '/statistics': typeof StatisticsLazyRoute
@@ -264,6 +294,8 @@ export interface FileRoutesByTo {
   '/login': typeof LoginLazyRoute
   '/marketplaces': typeof MarketplacesLazyRoute
   '/products': typeof ProductsLazyRoute
+  '/receipt': typeof ReceiptLazyRoute
+  '/residues': typeof ResiduesLazyRoute
   '/services': typeof ServicesLazyRoute
   '/shipping_warehouses': typeof ShippingwarehousesLazyRoute
   '/statistics': typeof StatisticsLazyRoute
@@ -282,6 +314,8 @@ export interface FileRoutesById {
   '/login': typeof LoginLazyRoute
   '/marketplaces': typeof MarketplacesLazyRoute
   '/products': typeof ProductsLazyRoute
+  '/receipt': typeof ReceiptLazyRoute
+  '/residues': typeof ResiduesLazyRoute
   '/services': typeof ServicesLazyRoute
   '/shipping_warehouses': typeof ShippingwarehousesLazyRoute
   '/statistics': typeof StatisticsLazyRoute
@@ -301,6 +335,8 @@ export interface FileRouteTypes {
     | '/login'
     | '/marketplaces'
     | '/products'
+    | '/receipt'
+    | '/residues'
     | '/services'
     | '/shipping_warehouses'
     | '/statistics'
@@ -317,6 +353,8 @@ export interface FileRouteTypes {
     | '/login'
     | '/marketplaces'
     | '/products'
+    | '/receipt'
+    | '/residues'
     | '/services'
     | '/shipping_warehouses'
     | '/statistics'
@@ -333,6 +371,8 @@ export interface FileRouteTypes {
     | '/login'
     | '/marketplaces'
     | '/products'
+    | '/receipt'
+    | '/residues'
     | '/services'
     | '/shipping_warehouses'
     | '/statistics'
@@ -351,6 +391,8 @@ export interface RootRouteChildren {
   LoginLazyRoute: typeof LoginLazyRoute
   MarketplacesLazyRoute: typeof MarketplacesLazyRoute
   ProductsLazyRoute: typeof ProductsLazyRoute
+  ReceiptLazyRoute: typeof ReceiptLazyRoute
+  ResiduesLazyRoute: typeof ResiduesLazyRoute
   ServicesLazyRoute: typeof ServicesLazyRoute
   ShippingwarehousesLazyRoute: typeof ShippingwarehousesLazyRoute
   StatisticsLazyRoute: typeof StatisticsLazyRoute
@@ -367,6 +409,8 @@ const rootRouteChildren: RootRouteChildren = {
   LoginLazyRoute: LoginLazyRoute,
   MarketplacesLazyRoute: MarketplacesLazyRoute,
   ProductsLazyRoute: ProductsLazyRoute,
+  ReceiptLazyRoute: ReceiptLazyRoute,
+  ResiduesLazyRoute: ResiduesLazyRoute,
   ServicesLazyRoute: ServicesLazyRoute,
   ShippingwarehousesLazyRoute: ShippingwarehousesLazyRoute,
   StatisticsLazyRoute: StatisticsLazyRoute,
@@ -392,6 +436,8 @@ export const routeTree = rootRoute
         "/login",
         "/marketplaces",
         "/products",
+        "/receipt",
+        "/residues",
         "/services",
         "/shipping_warehouses",
         "/statistics",
@@ -426,6 +472,12 @@ export const routeTree = rootRoute
     "/products": {
       "filePath": "products.lazy.tsx"
     },
+    "/receipt": {
+      "filePath": "receipt.lazy.tsx"
+    },
+    "/residues": {
+      "filePath": "residues.lazy.tsx"
+    },
     "/services": {
       "filePath": "services.lazy.tsx"
     },