refactor: fixed packages for monorepo

.gitignore

@@ -12,6 +12,7 @@ coverage
 .next/
 out/
 build
+dist
 
 # misc
 .DS_Store

apps/admin/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "cpg-admin",
+  "name": "admin",
   "version": "0.1.0",
   "private": true,
   "type": "module",

apps/admin/src/components/customers/Create.tsx

@@ -1,4 +1,4 @@
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import { ArrayInput, Create, FormTab, NumberInput, PasswordInput, SelectInput, SimpleFormIterator, TabbedForm, TextInput } from "react-admin";
 //@ts-ignore
 import { RichTextInput } from 'ra-input-rich-text';

apps/admin/src/components/customers/Edit.tsx

@@ -1,4 +1,4 @@
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import { Edit, FormTab, PasswordInput, AutocompleteInput, TabbedForm, TextInput, SelectInput, ArrayInput, SimpleFormIterator, NumberInput, ReferenceInput, useEditController } from "react-admin";
 //@ts-ignore
 import { RichTextInput } from 'ra-input-rich-text';

apps/admin/src/components/invoices/Create.tsx

@@ -12,7 +12,7 @@ import
 } from "react-admin";
 //@ts-ignore
 import { RichTextInput } from 'ra-input-rich-text';
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import RenderFullName from "../../lib/RenderFullName";
 import { getDate } from "../../lib/dateFormat";
 

apps/admin/src/components/invoices/Edit.tsx

@@ -11,7 +11,7 @@ import
     FormDataConsumer,
 } from "react-admin";
 import { RichTextInput } from 'ra-input-rich-text';
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import RenderFullName from "../../lib/RenderFullName";
 import { getDate } from "../../lib/dateFormat";
 

apps/admin/src/components/orders/Create.tsx

@@ -1,4 +1,4 @@
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import
 {
     ArrayInput,

apps/admin/src/components/orders/Edit.tsx

@@ -1,4 +1,4 @@
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import
 {
     ArrayInput,

apps/admin/src/components/products/Create.tsx

@@ -11,7 +11,7 @@ import
 } from "react-admin";
 //@ts-ignore
 import { RichTextInput } from 'ra-input-rich-text';
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 
 export const CreateProducts = (props: any) =>
 (

apps/admin/src/components/products/Edit.tsx

@@ -11,7 +11,7 @@ import
 } from "react-admin";
 //@ts-ignore
 import { RichTextInput } from 'ra-input-rich-text';
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 
 export const EditProducts = (props: any) =>
 (

apps/admin/src/components/transactions/Create.tsx

@@ -1,4 +1,4 @@
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import { Create, DateInput, FormDataConsumer, FormTab, NumberInput, AutocompleteInput, TabbedForm, TextInput, SelectInput, ReferenceInput, BooleanInput } from "react-admin";
 import { getDate } from "../../lib/dateFormat";
 import RenderFullName from "../../lib/RenderFullName";

apps/admin/src/components/transactions/Edit.tsx

@@ -1,4 +1,4 @@
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import { DateInput, Edit, FormDataConsumer, FormTab, NumberInput, ReferenceInput, AutocompleteInput, TabbedForm, TextInput } from "react-admin";
 import RenderFullName from "../../lib/RenderFullName";
 

apps/admin/src/inputs/CurrencyInput.tsx

@@ -1,4 +1,4 @@
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import { AutocompleteInput } from "react-admin";
 
 export default function CurrencyInput()

apps/api/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "cpg-api",
+  "name": "api",
   "version": "3.4.0",
   "private": true,
   "description": "Central Payment Gateway",
@@ -65,7 +65,6 @@
   "devDependencies": {
     "@types/bcryptjs": "^2.4.2",
     "@types/clear": "^0.1.2",
-    "@types/colors": "^1.2.1",
     "@types/common-tags": "^1.8.1",
     "@types/cors": "^2.8.12",
     "@types/cron": "^1.7.3",
@@ -95,8 +94,8 @@
     "eslint": "^8.14.0",
     "eslint-config-custom": "*",
     "interfaces": "*",
-    "tsconfig": "*",
     "lib": "*",
+    "tsconfig": "*",
     "typescript": "^4.3.5"
   }
 }

apps/api/src/Admin/AdminHandler.ts

@@ -1,4 +1,4 @@
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import chalk from "chalk";
 import clear from "clear";
 import figlet from "figlet";

apps/api/src/Admin/Commands/Admin.prompt.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-case-declarations */
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import prompt from "prompt";
 import AdminModel from "../../Database/Models/Administrators.model";
 import createAdmin from "../CreateAdmin";

apps/api/src/Admin/Commands/Company.prompt.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-case-declarations */
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import prompt from "prompt";
 import { CacheConfig } from "../../Cache/Configs.cache";
 import ConfigModel from "../../Database/Models/Configs.model";

apps/api/src/Admin/Commands/Cron.prompt.ts

@@ -1,6 +1,6 @@
 import { cron_chargeStripePayment, cron_notifyInvoices, cron_notifyLateInvoicePaid } from "../../Cron/Methods/Invoices.cron.methods";
 import { cron_createNewInvoicesFromOrders } from "../../Cron/Methods/Orders.cron.methods";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 
 export default
     {

apps/api/src/Admin/Commands/Email.prompt.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-case-declarations */
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import prompt from "prompt";
 import ConfigModel from "../../Database/Models/Configs.model";
 

apps/api/src/Admin/Commands/Invoices.prompt.ts

@@ -1,11 +1,11 @@
 /* eslint-disable no-case-declarations */
 import InvoiceModel from "../../Database/Models/Invoices.model";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import inquirer from 'inquirer';
 import { idInvoice } from "../../Lib/Generator";
 import { getDates30DaysAgo } from "../../Cron/Methods/Invoices.cron.methods";
 import { A_CC_Payments } from "interfaces/types/PaymentMethod";
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import CustomerModel from "../../Database/Models/Customers/Customer.model";
 import mainEvent from "../../Events/Main.event";
 import { sendInvoiceEmail } from "../../Lib/Invoices/SendEmail";

apps/api/src/Admin/Commands/Orders.prompt.ts

@@ -3,9 +3,9 @@ import CustomerModel from "../../Database/Models/Customers/Customer.model";
 import OrderModel from "../../Database/Models/Orders.model";
 import ProductModel from "../../Database/Models/Products.model";
 import PromotionCodeModel from "../../Database/Models/PromotionsCode.model";
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import { idOrder } from "../../Lib/Generator";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import { A_CC_Payments, A_RecurringMethod } from "interfaces/types/PaymentMethod";
 import dateFormat from "date-and-time";
 import nextRycleDate from "../../Lib/Dates/DateCycle";

apps/api/src/Admin/Commands/Smtp.prompt.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-case-declarations */
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import prompt from "prompt";
 import { CacheConfig } from "../../Cache/Configs.cache";
 import ConfigModel from "../../Database/Models/Configs.model";

apps/api/src/Admin/Commands/Transaction.prompt.ts

@@ -1,10 +1,10 @@
 import TransactionsModel from "../../Database/Models/Transactions.model";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import inquirer from 'inquirer';
 import CustomerModel from "../../Database/Models/Customers/Customer.model";
 import InvoiceModel from "../../Database/Models/Invoices.model";
 import { A_CC_Payments } from "interfaces/types/PaymentMethod";
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import dateFormat from "date-and-time";
 import mainEvent from "../../Events/Main.event";
 

apps/api/src/Admin/Commands/Webhook.prompt.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-case-declarations */
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import prompt from "prompt";
 import ConfigModel from "../../Database/Models/Configs.model";
 

apps/api/src/Admin/CreateAdmin.ts

@@ -2,7 +2,7 @@ import bcrypt from "bcryptjs";
 import { CacheAdmin, getAdminByUsername } from "../Cache/Admin.cache";
 import AdminModel from "../Database/Models/Administrators.model";
 import { idAdmin } from "../Lib/Generator";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 
 export default function createAdmin(username: string, password: string)
 {

apps/api/src/Cache/reCache.ts

@@ -5,7 +5,7 @@ import ImageModel from "../Database/Models/Images.model";
 import OrderModel from "../Database/Models/Orders.model";
 import ProductModel from "../Database/Models/Products.model";
 import TransactionsModel from "../Database/Models/Transactions.model";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import { CacheAdmin } from "./Admin.cache";
 import { CacheCategories } from "./Categories.cache";
 import { CacheCustomer } from "./Customer.cache";

apps/api/src/Cron/Invoices.cron.ts

@@ -1,5 +1,5 @@
 import { CronJob } from "cron";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import { Default_Language } from "../Config";
 import GetText from "../Translation/GetText";
 import

apps/api/src/Cron/Methods/Invoices.cron.methods.ts

@@ -1,13 +1,13 @@
 import { Company_Name, DebugMode, Default_Language, d_Days } from "../../Config";
 import InvoiceModel from "../../Database/Models/Invoices.model";
 import dateFormat from "date-and-time";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../Translation/GetText";
 import CustomerModel from "../../Database/Models/Customers/Customer.model";
 import { sendInvoiceEmail, sendLateInvoiceEmail } from "../../Lib/Invoices/SendEmail";
 import { ChargeCustomer } from "../../Payments/Stripe";
 import { InvoiceLateReport, InvoiceNotifiedReport } from "../../Email/Reports/InvoiceReport";
-import { convertCurrency } from "lib/Currencies";
+import { convertCurrency } from "lib";
 import { getInvoiceByIdAndMarkAsPaid } from "../../Lib/Invoices/MarkAsPaid";
 import sendEmailOnTransactionCreation from "../../Lib/Transaction/SendEmailOnCreation";
 import createCredit from "../../Lib/Customers/createCredit";

apps/api/src/Cron/Methods/Orders.cron.methods.ts

@@ -1,6 +1,6 @@
 import { Default_Language, d_Days } from "../../Config";
 import OrderModel from "../../Database/Models/Orders.model";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../Translation/GetText";
 import dateFormat from "date-and-time";
 import nextRecycleDate from "../../Lib/Dates/DateCycle";

apps/api/src/Database/GraphQL/ApolloServer.ts

@@ -4,7 +4,7 @@ import SchemaPoser from './SchemaPoser';
 import jwt from "jsonwebtoken";
 import bcrypt from "bcryptjs";
 import { CacheAdmin, getAdminByUsername } from '../../Cache/Admin.cache';
-import Logger from 'lib/Logger';
+import { Logger } from "lib";
 import { Application } from "express";
 import GetText from '../../Translation/GetText';
 

apps/api/src/Database/GraphQL/ResolverAccess.ts

@@ -1,5 +1,5 @@
 import { Resolver } from "graphql-compose";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../Translation/GetText";
 
 export function resolverAdminAccess(resolvers: {

apps/api/src/Database/GraphQL/SchemaPoser.ts

@@ -1,7 +1,7 @@
 import { SchemaComposer } from 'graphql-compose';
 import fs from "fs";
 import { HomeDir } from '../../Config';
-import Logger from 'lib/Logger';
+import { Logger } from "lib";
 import GetText from '../../Translation/GetText';
 
 const schemaComposer = new SchemaComposer();

apps/api/src/Database/Models/Category.model.ts

@@ -2,7 +2,7 @@ import { ICategory } from "interfaces/Categories.interface";
 import mongoose, { model, Schema } from "mongoose"
 import increment from "mongoose-auto-increment";
 import { Default_Language, MongoDB_URI } from "../../Config";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../Translation/GetText";
 
 const CategorySchema = new Schema

apps/api/src/Database/Models/ConfigurableOptions.model.ts

@@ -2,7 +2,7 @@ import mongoose, { model, Schema, Document } from "mongoose"
 import increment from "mongoose-auto-increment";
 import { Default_Language, MongoDB_URI } from "../../Config";
 import { IConfigurableOptions } from "interfaces/ConfigurableOptions.interface";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../Translation/GetText";
 
 const ConfigurableOptionsSchema = new Schema

apps/api/src/Database/Models/Customers/Customer.model.ts

@@ -2,9 +2,9 @@ import mongoose, { Document, model, Schema } from "mongoose"
 import increment from "mongoose-auto-increment";
 import { Default_Language, MongoDB_URI } from "../../../Config";
 import { ICustomer, ICustomerMethods } from "interfaces/Customer.interface";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../../Translation/GetText";
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 
 const CustomerSchema = new Schema
     (

apps/api/src/Database/Models/Customers/PasswordReset.model.ts

@@ -1,5 +1,5 @@
 import { Document, model, Schema } from "mongoose"
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 
 const PasswordResetSchema = new Schema
     (

apps/api/src/Database/Models/Images.model.ts

@@ -2,7 +2,7 @@ import mongoose, { Document, model, Schema } from "mongoose"
 import increment from "mongoose-auto-increment";
 import { Default_Language, MongoDB_URI } from "../../Config";
 import { IImage } from "interfaces/Images.interface";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../Translation/GetText";
 
 const ImageSchema = new Schema

apps/api/src/Database/Models/Invoices.model.ts

@@ -2,9 +2,9 @@ import mongoose, { Document, model, Schema } from "mongoose"
 import increment from "mongoose-auto-increment";
 import { Default_Language, MongoDB_URI } from "../../Config";
 import { extendedOrderStatus, IInvoice, IInvoiceMethods } from "interfaces/Invoice.interface";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../Translation/GetText";
-import { currencyCodes, GetCurrencySymbol } from "lib/Currencies";
+import { currencyCodes, GetCurrencySymbol } from "lib";
 
 export const A_InvoiceStatus: extendedOrderStatus[] = [
     "active",

apps/api/src/Database/Models/Orders.model.ts

@@ -2,10 +2,10 @@ import mongoose, { Document, model, Schema } from "mongoose"
 import increment from "mongoose-auto-increment";
 import { Default_Language, MongoDB_URI } from "../../Config";
 import { IOrder } from "interfaces/Orders.interface";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../Translation/GetText";
 import { A_CC_Payments, A_RecurringMethod } from "interfaces/types/PaymentMethod";
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 import { A_PaymentTypes } from "interfaces/types/PaymentTypes";
 
 

apps/api/src/Database/Models/Products.model.ts

@@ -2,11 +2,11 @@ import mongoose, { Document, model, Schema } from "mongoose"
 import increment from "mongoose-auto-increment";
 import { Default_Language, MongoDB_URI } from "../../Config";
 import { IProduct } from "interfaces/Products.interface";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../Translation/GetText";
 import { A_RecurringMethod } from "interfaces/types/PaymentMethod";
 import { A_PaymentTypes } from "interfaces/types/PaymentTypes";
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 
 
 const ProductSchema = new Schema

apps/api/src/Database/Models/PromotionsCode.model.ts

@@ -2,7 +2,7 @@ import mongoose, { Document, model, Schema } from "mongoose"
 import increment from "mongoose-auto-increment";
 import { Default_Language, MongoDB_URI } from "../../Config";
 import { IPromotionsCodes } from "interfaces/PromotionsCodes.interface";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../Translation/GetText";
 
 const PromotionCodeSchema = new Schema

apps/api/src/Database/Models/Quotes.model.ts

@@ -2,10 +2,10 @@ import mongoose, { Document, model, Schema } from "mongoose"
 import increment from "mongoose-auto-increment";
 import { Default_Language, MongoDB_URI } from "../../Config";
 import { IQuotes } from "interfaces/Quotes.interface";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../Translation/GetText";
 import { A_CC_Payments } from "interfaces/types/PaymentMethod";
-import { currencyCodes } from "lib/Currencies";
+import { currencyCodes } from "lib";
 
 const QuotesSchema = new Schema
     (

apps/api/src/Database/Models/Subscriptions.model.ts

@@ -3,7 +3,7 @@ import increment from "mongoose-auto-increment";
 import { MongoDB_URI } from "../../Config";
 import { IQuotes } from "interfaces/Quotes.interface";
 import { ISubscription } from "interfaces/Subscriptions.interface";
-import Logger from "lib/Logger";
+import { Logger } from "lib";
 import GetText from "../../Translation/GetText";
 import { A_RecurringMethod } from "interfaces/types/PaymentMethod";
 import { A_InvoiceStatus } from "./Invoices.model";