Fix building issues, organize imports

apps/api/src/app.module.ts

@@ -1,15 +1,15 @@
 import { Module } from '@nestjs/common';
-import { AppController } from './app.controller';
-import { AppService } from './app.service';
+import { MongooseModule } from '@nestjs/mongoose';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { join } from 'path';
-import { ProductsModule } from './models/products/products.module';
-import { MongooseModule } from '@nestjs/mongoose';
-import { UsersModule } from './models/users/users.module';
+import { AppController } from './app.controller';
+import { AppService } from './app.service';
 import { AuthModule } from './auth/auth.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 { InventoryModule } from './models/inventory/inventory.module';
 
 const FrontendModule = ServeStaticModule.forRoot({
 	rootPath: join(__dirname, '../..', 'client', 'dist'),

apps/api/src/database/entity.repository.ts

@@ -1,5 +1,5 @@
-import { Document, Model, FilterQuery, UpdateQuery } from 'mongoose';
 import * as mongoose from 'mongoose';
+import { Document, FilterQuery, Model, UpdateQuery } from 'mongoose';
 
 const DEFAULT_PROJECTIONS = {
 	__v: 0,

apps/api/src/main.ts

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

apps/api/src/models/inventory/inventory.controller.spec.ts

@@ -3,18 +3,18 @@ import { InventoryController } from './inventory.controller';
 import { InventoryService } from './inventory.service';
 
 describe('InventoryController', () => {
-  let controller: InventoryController;
+	let controller: InventoryController;
 
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      controllers: [InventoryController],
-      providers: [InventoryService],
-    }).compile();
+	beforeEach(async () => {
+		const module: TestingModule = await Test.createTestingModule({
+			controllers: [InventoryController],
+			providers: [InventoryService],
+		}).compile();
 
-    controller = module.get<InventoryController>(InventoryController);
-  });
+		controller = module.get<InventoryController>(InventoryController);
+	});
 
-  it('should be defined', () => {
-    expect(controller).toBeDefined();
-  });
+	it('should be defined', () => {
+		expect(controller).toBeDefined();
+	});
 });

apps/api/src/models/inventory/inventory.controller.ts

@@ -15,10 +15,10 @@ import { Types } from 'mongoose';
 import { AddInventoryItemDto, BasicInventoryItemDto, InventoryItemDto } from 'shared-types';
 import { AuthenticatedGuard } from '../../auth/guards/authenticated.guard';
 import { ParseObjectIdPipe } from '../../pipes/prase-object-id.pipe';
+import { ProductsService } from '../products/products.service';
+import { WarehousesService } from '../warehouses/warehouses.service';
 import { InventoryService } from './inventory.service';
 import { InventoryItem } from './schemas/inventory-item.schema';
-import { WarehousesService } from '../warehouses/warehouses.service';
-import { ProductsService } from '../products/products.service';
 
 @ApiTags('inventory')
 @UseGuards(AuthenticatedGuard)

apps/api/src/models/inventory/inventory.module.ts

@@ -1,11 +1,11 @@
 import { Module } from '@nestjs/common';
-import { InventoryService } from './inventory.service';
-import { InventoryController } from './inventory.controller';
 import { MongooseModule } from '@nestjs/mongoose';
-import { InventoryItem, InventoryItemSchema } from './schemas/inventory-item.schema';
-import { InventoryRepository } from './inventory.repository';
 import { ProductsModule } from '../products/products.module';
 import { WarehousesModule } from '../warehouses/warehouses.module';
+import { InventoryController } from './inventory.controller';
+import { InventoryRepository } from './inventory.repository';
+import { InventoryService } from './inventory.service';
+import { InventoryItem, InventoryItemSchema } from './schemas/inventory-item.schema';
 
 @Module({
 	imports: [

apps/api/src/models/inventory/inventory.service.ts

@@ -1,9 +1,8 @@
 import { Injectable } from '@nestjs/common';
-import { Types } from 'mongoose';
+import { FilterQuery, Types } from 'mongoose';
+import { AddInventoryItemDto } from 'shared-types';
 import { InventoryRepository } from './inventory.repository';
 import { InventoryItemDocument } from './schemas/inventory-item.schema';
-import { FilterQuery } from 'mongoose';
-import { AddInventoryItemDto } from 'shared-types';
 
 @Injectable()
 export class InventoryService {

apps/api/src/models/organizations/organizations.module.ts

@@ -1,10 +1,10 @@
 import { Module } from '@nestjs/common';
-import { OrganizationsService } from './organizations.service';
+import { MongooseModule } from '@nestjs/mongoose';
+import { WarehousesModule } from '../warehouses/warehouses.module';
 import { OrganizationsController } from './organizations.controller';
 import { OrganizationRepository } from './organizations.repository';
+import { OrganizationsService } from './organizations.service';
 import { Organization, OrganizationSchema } from './schemas/organization.schema';
-import { MongooseModule } from '@nestjs/mongoose';
-import { WarehousesModule } from '../warehouses/warehouses.module';
 
 @Module({
 	imports: [

apps/api/src/models/organizations/schemas/org-warehouse-reference.schema.ts

@@ -1,6 +1,6 @@
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
-import { HydratedDocument } from 'mongoose';
 import * as mongoose from 'mongoose';
+import { HydratedDocument } from 'mongoose';
 import { Warehouse } from '../../warehouses/schemas/warehouse.schema';
 
 export type OrgWarehouseReferenceDocument = HydratedDocument<OrgWarehouseReference>;

apps/api/src/models/organizations/schemas/organization.schema.ts

@@ -1,12 +1,12 @@
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 import { HydratedDocument } from 'mongoose';
+import { OrganizationDto } from 'shared-types';
+import { OrgAcl, OrgAclSchema } from './org-acl';
+import { OrgStats, OrgStatsSchema } from './org-stats';
 import {
 	OrgWarehouseReference,
 	OrgWarehouseReferenceSchema,
 } from './org-warehouse-reference.schema';
-import { OrgAcl, OrgAclSchema } from './org-acl';
-import { OrganizationDto } from 'shared-types';
-import { OrgStats, OrgStatsSchema } from './org-stats';
 
 export type OrganizationDocument = HydratedDocument<Organization>;
 

apps/api/src/models/products/products.controller.ts

@@ -10,12 +10,12 @@ import {
 	ValidationPipe,
 } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { ProductsService } from './products.service';
-import { Product } from './schemas/product.schema';
+import mongoose from 'mongoose';
 import { BasicProductDto, CreateProductDto, ProductDto } from 'shared-types';
 import { AuthenticatedGuard } from '../../auth/guards/authenticated.guard';
-import mongoose from 'mongoose';
 import { OrganizationsService } from '../organizations/organizations.service';
+import { ProductsService } from './products.service';
+import { Product } from './schemas/product.schema';
 
 @ApiTags('products')
 @Controller('products')

apps/api/src/models/products/products.module.ts

@@ -1,10 +1,10 @@
 import { Module } from '@nestjs/common';
-import { ProductsService } from './products.service';
-import { ProductsController } from './products.controller';
 import { MongooseModule } from '@nestjs/mongoose';
+import { OrganizationsModule } from '../organizations/organizations.module';
+import { ProductsController } from './products.controller';
 import { ProductsRepository } from './products.repository';
+import { ProductsService } from './products.service';
 import { Product, ProductSchema } from './schemas/product.schema';
-import { OrganizationsModule } from '../organizations/organizations.module';
 
 @Module({
 	imports: [

apps/api/src/models/products/products.service.ts

@@ -1,9 +1,8 @@
 import { Injectable } from '@nestjs/common';
+import mongoose, { Types } from 'mongoose';
+import { CreateProductDto } from 'shared-types';
 import { ProductsRepository } from './products.repository';
-import mongoose from 'mongoose';
 import { ProductDocument } from './schemas/product.schema';
-import { CreateProductDto } from 'shared-types';
-import { Types } from 'mongoose';
 
 @Injectable()
 export class ProductsService {

apps/api/src/models/products/schemas/product.schema.ts

@@ -1,7 +1,7 @@
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 import mongoose, { HydratedDocument } from 'mongoose';
-import { Organization } from '../../organizations/schemas/organization.schema';
 import { BasicProductDto, ProductDto } from 'shared-types';
+import { Organization } from '../../organizations/schemas/organization.schema';
 
 export type ProductDocument = HydratedDocument<Product>;
 

apps/api/src/models/users/schemas/user.schema.ts

@@ -1,8 +1,8 @@
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 import { HydratedDocument } from 'mongoose';
-import { UserProfile } from './profile.schema copy';
-import { UserAuth } from './auth.schema';
 import { PrivateUserDto, UserDto } from 'shared-types';
+import { UserAuth } from './auth.schema';
+import { UserProfile } from './profile.schema copy';
 
 export type UserDocument = HydratedDocument<User>;
 

apps/api/src/pipes/prase-object-id.pipe.ts

@@ -1,4 +1,4 @@
-import { PipeTransform, Injectable, ArgumentMetadata, BadRequestException } from '@nestjs/common';
+import { ArgumentMetadata, BadRequestException, Injectable, PipeTransform } from '@nestjs/common';
 import { Types } from 'mongoose';
 
 @Injectable()

apps/api/test/app.e2e-spec.ts

@@ -1,5 +1,5 @@
-import { Test, TestingModule } from '@nestjs/testing';
 import { INestApplication } from '@nestjs/common';
+import { Test, TestingModule } from '@nestjs/testing';
 import * as request from 'supertest';
 import { AppModule } from './../src/app.module';
 

apps/client/src/components/Button.tsx

@@ -1,6 +1,5 @@
 import classNames from 'classnames';
 import React from 'react';
-import { IconType } from 'react-icons';
 
 type HTMLButtonProps = React.DetailedHTMLProps<
 	React.ButtonHTMLAttributes<HTMLButtonElement>,

apps/client/src/components/Dropdown/DropdownMenu.tsx

@@ -1,6 +1,6 @@
+import classNames from 'classnames';
 import { useContext } from 'react';
 import { DropdownContext } from './Dropdown';
-import classNames from 'classnames';
 
 type DivProps = React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>;
 

apps/client/src/components/Errors/ApplicationError.tsx

@@ -1,7 +1,7 @@
 import { useRouteError } from 'react-router-dom';
 import FullFocusContainer from '../FullFocusContainer';
-import NotFound from './NotFound';
 import Default from './Default';
+import NotFound from './NotFound';
 
 function ApplicationError() {
 	const error = useRouteError() as any;

apps/client/src/components/Errors/NotFound.tsx

@@ -1,7 +1,7 @@
-import SideBySideImage from '../SideBySideImage';
-import UndrawNotFound from '../../assets/undraw_not_found.svg';
 import { useNavigate } from 'react-router-dom';
+import UndrawNotFound from '../../assets/undraw_not_found.svg';
 import Button from '../Button';
+import SideBySideImage from '../SideBySideImage';
 
 function NotFound() {
 	const navigate = useNavigate();

apps/client/src/components/Form/FancyInput.tsx

@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import React, { useState, forwardRef, useEffect } from 'react';
+import React, { forwardRef, useEffect, useState } from 'react';
 import { IconType } from 'react-icons';
 
 type InputProps = React.DetailedHTMLProps<

apps/client/src/components/IconButton.tsx

@@ -1,8 +1,8 @@
-import { IconType } from 'react-icons';
-import Button, { ButtonProps } from './Button';
 import classNames from 'classnames';
 import React from 'react';
+import { IconType } from 'react-icons';
 import { BsPlusCircle } from 'react-icons/bs';
+import Button, { ButtonProps } from './Button';
 
 export interface IconButtonProps extends ButtonProps {
 	icon?: IconType;

apps/client/src/components/InventoryAddForm.tsx

@@ -1,3 +1,4 @@
+import classNames from 'classnames';
 import { useContext, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import toast from 'react-hot-toast';
@@ -10,7 +11,6 @@ import Button from './Button';
 import { CurrentAppContext } from './Context/CurrentAppContext';
 import FormError from './Form/FormError';
 import FormInput from './Form/FormInput';
-import classNames from 'classnames';
 
 type Inputs = {
 	quantity: number;

apps/client/src/components/InventoryItemActions.tsx

@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
 import { BsInfoCircleFill, BsPencilFill, BsTrashFill } from 'react-icons/bs';
 import { useNavigate } from 'react-router-dom';
-import { BasicInventoryItemDto, BasicProductDto } from 'shared-types';
+import { BasicInventoryItemDto } from 'shared-types';
 import ActionButton from './ActionButton';
 import { CurrentAppContext } from './Context/CurrentAppContext';
 import TableActionsWrapper from './TableActionsWrapper';

apps/client/src/components/LoginForm.tsx

@@ -1,14 +1,12 @@
+import { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { BsPerson, BsShieldLock } from 'react-icons/bs';
 import { Link, useNavigate } from 'react-router-dom';
 import { UserLoginDto } from 'shared-types';
 import { HTTPResponseError, Utils } from '../utils';
+import Alert from './Alert';
 import Button from './Button';
 import TextInput from './Form/FancyInput';
-import { useContext, useState } from 'react';
-import { UserContext } from './Context/UserContext';
-import FormError from './Form/FormError';
-import Alert from './Alert';
 
 type Inputs = {
 	username: string;

apps/client/src/components/OrganizationActions.tsx

@@ -1,16 +1,17 @@
-import React, { useContext } from 'react';
-import { BsGear, BsInfoCircleFill, BsPencilFill, BsSliders, BsTrashFill } from 'react-icons/bs';
-import { useNavigate } from 'react-router-dom';
-import { BasicProductDto, OrganizationDto } from 'shared-types';
+import { BsSliders } from 'react-icons/bs';
+import { OrganizationDto } from 'shared-types';
 import ActionButton from './ActionButton';
-import { CurrentAppContext } from './Context/CurrentAppContext';
-import TableActionsWrapper from './TableActionsWrapper';
+import { Link } from 'react-router-dom';
 
 export interface OrganizationSettingsButtonProps {
 	organization: OrganizationDto;
 }
 
 function OrganizationSettingsButton({ organization }: OrganizationSettingsButtonProps) {
-	return <ActionButton icon={BsSliders} />;
+	return (
+		<Link to={organization.id + '/settings'}>
+			<ActionButton icon={BsSliders} />
+		</Link>
+	);
 }
 export default OrganizationSettingsButton;

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

@@ -1,11 +1,9 @@
 import { useContext } from 'react';
+import { Utils } from '../../utils';
 import BigNumberCard from '../BigNumberCard';
-import DashboardContent from '../DashboardContent';
-import humanFormat from 'human-format';
-import { CurrentAppContext } from '../Context/CurrentAppContext';
 import Card from '../Card';
-import TotalSoldChart from '../TotalSoldChart';
-import { Utils } from '../../utils';
+import { CurrentAppContext } from '../Context/CurrentAppContext';
+import DashboardContent from '../DashboardContent';
 
 function DashboardHomePage() {
 	const { organization } = useContext(CurrentAppContext);

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

@@ -1,9 +1,9 @@
 import { Outlet } from 'react-router-dom';
-import Sidebar from '../Sidebar/Sidebar';
-import { CurrentAppContext } from '../Context/CurrentAppContext';
-import useCurrentAppContext from '../../useAppContext';
 import usePageInfo from '../../hooks/usePageInfo';
+import useCurrentAppContext from '../../useAppContext';
+import { CurrentAppContext } from '../Context/CurrentAppContext';
 import Loader from '../Loader';
+import Sidebar from '../Sidebar/Sidebar';
 
 function DashboardPage() {
 	const { warehouseId, organizationId } = usePageInfo();

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

@@ -1,10 +1,10 @@
-import { Link } from 'react-router-dom';
-import TableTopBar from '../TableTopBar';
-import IconButton from '../IconButton';
-import { BsChevronLeft } from 'react-icons/bs';
 import { useContext } from 'react';
+import { BsChevronLeft } from 'react-icons/bs';
+import { Link } from 'react-router-dom';
 import { CurrentAppContext } from '../Context/CurrentAppContext';
+import IconButton from '../IconButton';
 import InventoryAddForm from '../InventoryAddForm';
+import TableTopBar from '../TableTopBar';
 
 function InventoryAddPage() {
 	const appContext = useContext(CurrentAppContext);

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

@@ -4,9 +4,9 @@ import { Link } from 'react-router-dom';
 import useInventoryList from '../../hooks/useInventoryList';
 import { CurrentAppContext } from '../Context/CurrentAppContext';
 import IconButton from '../IconButton';
+import InventoryTable from '../InventoryTable';
 import Loader from '../Loader';
 import TableTopBar from '../TableTopBar';
-import InventoryTable from '../InventoryTable';
 
 function InventoryListPage() {
 	const appContext = useContext(CurrentAppContext);