Organize imports

Author: MrBartusek

apps/api/src/app.module.ts

@@ -5,15 +5,15 @@ import { join } from 'path';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
 import { AuthModule } from './auth/auth.module';
+import { ImagesModule } from './images/images.module';
 import { InventoryModule } from './models/inventory/inventory.module';
 import { OrganizationsModule } from './models/organizations/organizations.module';
 import { ProductsModule } from './models/products/products.module';
 import { UsersModule } from './models/users/users.module';
 import { WarehousesModule } from './models/warehouses/warehouses.module';
-import { S3Module } from './s3/s3.module';
-import { ImagesModule } from './images/images.module';
 import { RedisModule } from './redis/redis.module';
 import { S3CacheModule } from './s3-cache/s3-cache.module';
+import { S3Module } from './s3/s3.module';
 
 const FrontendModule = ServeStaticModule.forRoot({
 	rootPath: join(__dirname, '../../..', 'client', 'dist'),

apps/api/src/main.ts

@@ -1,15 +1,15 @@
 import { INestApplication, ValidationPipe } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
+import { NestExpressApplication } from '@nestjs/platform-express';
 import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
 import RedisStore from 'connect-redis';
+import { json } from 'express';
 import * as session from 'express-session';
 import * as passport from 'passport';
+import { join } from 'path';
 import { AppModule } from './app.module';
 import Utils from './helpers/utils';
 import redisClient from './redis/connect';
-import { json } from 'express';
-import { NestExpressApplication } from '@nestjs/platform-express';
-import { join } from 'path';
 
 async function bootstrap() {
 	const app = await NestFactory.create<NestExpressApplication>(AppModule);

apps/api/src/redis/redis.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
-import { RedisService } from './redis.service';
 import client from './connect';
+import { RedisService } from './redis.service';
 
 @Module({
 	providers: [{ provide: 'CLIENT', useValue: client }, RedisService],

apps/api/src/s3-cache/s3-cache.service.ts

@@ -1,8 +1,8 @@
 import { Injectable, Logger } from '@nestjs/common';
-import { S3Service } from '../s3/s3.service';
-import { RedisService } from '../redis/redis.service';
 import { Readable } from 'stream';
 import Utils from '../helpers/utils';
+import { RedisService } from '../redis/redis.service';
+import { S3Service } from '../s3/s3.service';
 
 const ONE_DAY = 24 * 60 * 60;
 const REDIS_PREFIX = 's3-cache:';

apps/api/src/s3/s3.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
-import { S3Service } from './s3.service';
 import * as S3Lib from 'nestjs-s3';
+import { S3Service } from './s3.service';
 
 const { AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_DEFAULT_REGION } = process.env;
 

apps/api/src/s3/s3.service.ts

@@ -1,12 +1,8 @@
 import {
-	DeleteObjectCommandInput,
-	GetObjectCommand,
-	GetObjectCommandInput,
-	HeadObjectCommand,
-	HeadObjectCommandInput,
-	PutObjectCommandInput,
+    DeleteObjectCommandInput,
+    GetObjectCommandInput,
+    PutObjectCommandInput
 } from '@aws-sdk/client-s3';
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { Injectable } from '@nestjs/common';
 import { InjectS3, S3 } from 'nestjs-s3';
 import * as crypto from 'node:crypto';

apps/api/src/types/index.d.ts

@@ -1,6 +1,6 @@
 import UserSessionData from '../auth/types/userSessionData';
 
-export {};
+export { };
 
 declare global {
 	namespace Express {

apps/client/src/components/InventoryItem/InventoryAddForm.tsx

@@ -5,9 +5,9 @@ import toast from 'react-hot-toast';
 import { BsArrowLeftRight } from 'react-icons/bs';
 import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import { CreateInventoryItemDto, OrganizationDto } from 'shared-types';
+import { CurrentAppContext } from '../../context/CurrentAppContext';
 import useProductsDetails from '../../hooks/useProductsDetails';
 import { Utils } from '../../utils';
-import { CurrentAppContext } from '../../context/CurrentAppContext';
 import Form from '../Form/Form';
 import FormError from '../Form/FormError';
 import FormField from '../Form/FormField';

apps/client/src/components/InventoryItem/InventoryEntityInfo.tsx

@@ -2,8 +2,8 @@ import { useContext } from 'react';
 import { BsPencil, BsTagFill, BsTrash } from 'react-icons/bs';
 import { Link } from 'react-router-dom';
 import { InventoryItemDto } from 'shared-types';
-import { Utils } from '../../utils';
 import { CurrentAppContext } from '../../context/CurrentAppContext';
+import { Utils } from '../../utils';
 import EntityActionsRow from '../Entity/EntityActionsRow';
 import EntityContainer from '../Entity/EntityContainer';
 import EntityImageColumn from '../Entity/EntityImageColumn';

apps/client/src/components/InventoryItem/InventoryItemActions.tsx

@@ -2,8 +2,8 @@ import React, { useContext } from 'react';
 import { BsInfoCircleFill, BsPencilFill, BsTrashFill } from 'react-icons/bs';
 import { useNavigate } from 'react-router-dom';
 import { BasicInventoryItemDto } from 'shared-types';
-import ActionButton from '../ActionButton';
 import { CurrentAppContext } from '../../context/CurrentAppContext';
+import ActionButton from '../ActionButton';
 import TableActionsWrapper from '../TableActionsWrapper';
 
 export interface ProductActionsProps {

apps/client/src/components/InventoryItem/InventoryItemUpdateForm.tsx

@@ -4,8 +4,8 @@ import toast from 'react-hot-toast';
 import { useQueryClient } from 'react-query';
 import { useNavigate } from 'react-router-dom';
 import { InventoryItemDto, ProductDto, UpdateInventoryItemDto } from 'shared-types';
-import { Utils } from '../../utils';
 import { CurrentAppContext } from '../../context/CurrentAppContext';
+import { Utils } from '../../utils';
 import Form from '../Form/Form';
 import FormError from '../Form/FormError';
 import FormField from '../Form/FormField';

apps/client/src/components/OrganizationSettingsSection.tsx

@@ -1,7 +1,7 @@
 import { BsSliders } from 'react-icons/bs';
-import IconButton from './IconButton';
 import { Link } from 'react-router-dom';
 import { OrganizationDto } from 'shared-types';
+import IconButton from './IconButton';
 
 export interface OrganizationSettingsSectionProps {
 	organization: OrganizationDto;

apps/client/src/components/Pages/DashboardHomePage.tsx

@@ -1,9 +1,9 @@
 import { useContext } from 'react';
+import { CurrentAppContext } from '../../context/CurrentAppContext';
 import { Utils } from '../../utils';
 import BigNumberCard from '../BigNumberCard';
 import Card from '../Card';
 import ChartCard from '../ChartCard';
-import { CurrentAppContext } from '../../context/CurrentAppContext';
 import DashboardContent from '../DashboardContent';
 import TotalSalesChart from '../TotalSalesChart';
 import WarehousesValueChart from '../Warehouse/WarehousesValueChart';

apps/client/src/components/Pages/DashboardPage.tsx

@@ -1,7 +1,7 @@
 import { Outlet } from 'react-router-dom';
-import usePageInfo from '../../hooks/usePageInfo';
-import useCurrentAppContext from '../../hooks/useAppContext';
 import { CurrentAppContext } from '../../context/CurrentAppContext';
+import useCurrentAppContext from '../../hooks/useAppContext';
+import usePageInfo from '../../hooks/usePageInfo';
 import Loader from '../Loader';
 import Sidebar from '../Sidebar/Sidebar';
 

apps/client/src/components/Pages/Inventory/InventoryListPage.tsx

@@ -1,8 +1,8 @@
 import { useContext } from 'react';
 import { BsPlusCircle } from 'react-icons/bs';
 import { Link } from 'react-router-dom';
-import useInventoryList from '../../../hooks/useInventoryList';
 import { CurrentAppContext } from '../../../context/CurrentAppContext';
+import useInventoryList from '../../../hooks/useInventoryList';
 import IconButton from '../../IconButton';
 import InventoryTable from '../../InventoryItem/InventoryTable';
 import Loader from '../../Loader';

apps/client/src/components/Pages/Inventory/OrganizationViewPage.tsx

@@ -1,6 +1,5 @@
 import { BsBuildingGear, BsPencil, BsTrash } from 'react-icons/bs';
 import { Link, useNavigate, useParams } from 'react-router-dom';
-import OrganizationSettingsSection from '../../OrganizationSettingsSection';
 import useOrganizationDetails from '../../../hooks/useOrganisationDetails';
 import { Utils } from '../../../utils';
 import Container from '../../Container';
@@ -11,6 +10,7 @@ import HeaderWithHint from '../../HeaderWithHint';
 import IconButton from '../../IconButton';
 import DashboardLayout from '../../Layout/DasboardLayout';
 import Loader from '../../Loader';
+import OrganizationSettingsSection from '../../OrganizationSettingsSection';
 import { SecondaryNavbar } from '../../SecondaryNavbar';
 import WarehousesList from '../../Warehouse/WarehousesList';
 

apps/client/src/components/Pages/Product/ProductsListPage.tsx

@@ -1,8 +1,8 @@
 import { useContext } from 'react';
 import { BsPlusCircle } from 'react-icons/bs';
 import { Link } from 'react-router-dom';
-import useProductsList from '../../../hooks/useProductsList';
 import { CurrentAppContext } from '../../../context/CurrentAppContext';
+import useProductsList from '../../../hooks/useProductsList';
 import IconButton from '../../IconButton';
 import Loader from '../../Loader';
 import ProductsTable from '../../Product/ProductsTable';

apps/client/src/components/WarehouseEntityInfo.tsx

@@ -3,10 +3,10 @@ import { BsCheckCircle, BsPencil, BsTrash } from 'react-icons/bs';
 import { Link, useNavigate } from 'react-router-dom';
 import { WarehouseDto } from 'shared-types';
 import { CurrentAppContext } from '../context/CurrentAppContext';
+import { Utils } from '../utils';
 import EntityActionsRow from './Entity/EntityActionsRow';
 import EntityInfoTable from './Entity/EntityInfoTable';
 import IconButton from './IconButton';
-import { Utils } from '../utils';
 
 export interface WarehouseEntityInfoProps {
 	warehouse: WarehouseDto;

apps/client/src/hooks/useAppContext.tsx

@@ -2,8 +2,8 @@ import { useEffect, useMemo } from 'react';
 import toast from 'react-hot-toast';
 import { useNavigate } from 'react-router-dom';
 import { BasicWarehouseDto, OrganizationDto } from 'shared-types';
-import useOrganizationDetails from './useOrganisationDetails';
 import { Utils } from '../utils';
+import useOrganizationDetails from './useOrganisationDetails';
 
 export interface CurrentAppContextType {
 	isLoading: boolean;