Merge pull request #92 from Tolfix/develop

v1.2.0

Author: Tolfx

.deepsource.toml

@@ -0,0 +1,14 @@
+version = 1
+
+[[analyzers]]
+name = "shell"
+enabled = true
+
+[[analyzers]]
+name = "javascript"
+enabled = true
+
+  [analyzers.meta]
+  plugins = ["react"]
+  dialect = "typescript"
+  

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

@@ -53,7 +53,7 @@ export const CreateProducts = (props: any) =>
                     { id: "one_time", name: "one_time" },
                     { id: "recurring", name: "recurring" },
                 ]} />
-                <AutocompleteInput isRequired={false} source="recurring_method" choices={[
+                <AutocompleteInput isRequired={false} defaultValue={undefined} source="recurring_method" choices={[
                     { id: "monthly", name: "monthly" },
                     { id: "quarterly", name: "quarterly" },
                     { id: "semi_annually", name: "semi_annually" },

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

@@ -52,7 +52,7 @@ export const EditProducts = (props: any) =>
                     { id: "one_time", name: "one_time" },
                     { id: "recurring", name: "recurring" },
                 ]} />
-                <AutocompleteInput isRequired={false} source="recurring_method" choices={[
+                <AutocompleteInput isRequired={false} defaultValue={undefined} source="recurring_method" choices={[
                     { id: "monthly", name: "monthly" },
                     { id: "quarterly", name: "quarterly" },
                     { id: "semi_annually", name: "semi_annually" },

apps/api/.env.example

@@ -1,9 +1,7 @@
 # Secret JWT token for authentication, don't share this with anyone.
 JWT_ACCESS_TOKEN=
 
-# If in debug mode or note
-# (optional)
-DEBUG=
+DEBUG=cpg*
 
 # The mongo database uri to use, if not set it will use the default: mongodb://localhost/cpg
 MONGO_URI=

apps/api/Dockerfile

@@ -4,38 +4,57 @@ FROM node:16-alpine as BUILDER
 # Caching
 RUN apk add --no-cache libc6-compat
 
-WORKDIR /app
-
 RUN apk update && \
     apk upgrade && \
     apk add git
 
 RUN npm install -g @types/node \
     && npm install -g [email protected] 
 
+WORKDIR /app
+
 RUN npm i -g turbo
 
 COPY . .
 
-RUN npm install -w=api --force
+RUN turbo prune --scope=api --docker
 
-RUN npm run build -w=packages
+##########################
 
-RUN npm run build -w=api
+FROM node:16-alpine as INSTALLER
+RUN apk add --no-cache libc6-compat
+RUN apk update
+RUN apk add git
+WORKDIR /app
 
-##########################
+COPY .gitignore .gitignore
+COPY --from=BUILDER /app/out/json/ .
+COPY --from=BUILDER /app/out/package-lock.json ./package-lock.json
+
+RUN npm i --force
+RUN npm i -w=api --force
+
+COPY --from=builder /app/out/full/ .
+
+COPY turbo.json turbo.json
+
+RUN npm run build --filter=api...
 
 # APP
 FROM node:16-alpine as APP
 
+RUN apk add --no-cache libc6-compat
+RUN apk update
+
 ENV NODE_ENV=production
 
-COPY --from=BUILDER /app/ .
+WORKDIR /app
+
+# Currently idk how to get this to work, so copying root ig? with some files ignored from pruning at least.
+COPY --from=INSTALLER /app .
 
 WORKDIR /app/apps/api
 
-COPY --from=BUILDER /app/apps/api/ .
-
 RUN apk update && \
     apk upgrade && \
     apk add git
@@ -49,4 +68,4 @@ ENV DISABLE_JSON_ERROR "true"
 
 EXPOSE 3001
 
-CMD [ "node", "./build/Main.js" ]
+CMD ["node", "./build/Main.js"]

apps/api/package.json

@@ -44,11 +44,12 @@
     "request": "^2.88.2",
     "sequelize": "^6.15.0",
     "lib": "*",
-    "stripe": "^8.186.1"
+    "stripe": "^8.186.1",
+    "@cpg/logger": "*"
   },
   "scripts": {
     "start": "node ./build/Main.js",
-    "build": "tsc -b",
+    "build": "tsc",
     "dev": "nodemon ./build/Main.js",
     "lint": "eslint ./src --ext .ts"
   },

apps/api/src/Admin/AdminHandler.ts

@@ -1,10 +1,12 @@
-import { Logger } from "lib";
+import Logger from "@cpg/logger";
 import chalk from "chalk";
 import clear from "clear";
 import figlet from "figlet";
 import Prompt, { cacheCommands } from "./Commands/Prompt";
 import inquirer from 'inquirer';
 
+const log = new Logger("cpg:api:admin:AdminHandler");
+
 export default class AdminHandler
 {
 
@@ -52,7 +54,7 @@ export default class AdminHandler
             }
         }).catch((error) =>
         {
-            Logger.error(error);
+            log.error(error);
             this.action();
         });
     }

apps/api/src/Admin/CreateAdmin.ts

@@ -2,19 +2,21 @@ 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";
+import Logger from "@cpg/logger";
+
+const log = new Logger("cpg:api:admin:CreateAdmin");
 
 export default function createAdmin(username: string, password: string)
 {
     if (CacheAdmin.get(getAdminByUsername(username) ?? 'ADM_'))
-        return Logger.warning(`Administrator ${username} already exists`);
+        return log.warn(`Administrator ${username} already exists`);
 
     bcrypt.genSalt(10, (err, salt) =>
     {
         bcrypt.hash(password, salt, (err, hash) =>
         {
             if (err)
-                return Logger.error(err);
+                return log.error(err);
 
             const info = {
                 username,

apps/api/src/Cache/reCache.ts

@@ -5,7 +5,6 @@ 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";
 import { CacheAdmin } from "./Admin.cache";
 import { CacheCategories } from "./Categories.cache";
 import { CacheCustomer } from "./Customer.cache";
@@ -16,19 +15,22 @@ import InvoiceModel from "../Database/Models/Invoices.model";
 import { CacheInvoice } from "./Invoices.cache";
 import { Company_Currency } from "../Config";
 import { TPaymentCurrency } from "interfaces/types/Currencies";
+import Logger from "@cpg/logger";
+
+const log = new Logger("cpg:api:cache:reCache");
 
 /**
  * @deprecated
  */
 export function reCache_Categories()
 {
-    Logger.info(`Starting caching on categories..`);
+    log.info(`Starting caching on categories..`);
     return new Promise(async (resolve) =>
     {
         const categories = await CategoryModel.find();
         for (const c of categories)
         {
-            Logger.cache(`Caching category ${c.uid}`);
+            log.debug(`Caching category ${c.uid}`);
             CacheCategories.set(c.uid, c);
         }
         return resolve(true);
@@ -37,13 +39,13 @@ export function reCache_Categories()
 
 export async function reCache_Admin()
 {
-    Logger.info(`Starting caching on admins..`);
+    log.info(`Starting caching on admins..`);
     return new Promise(async (resolve) =>
     {
         const admin = await AdminModel.find();
         for (const a of admin)
         {
-            Logger.cache(`Caching admin ${a.uid}`);
+            log.debug(`Caching admin ${a.uid}`);
             CacheAdmin.set(a.uid, a);
         }
         return resolve(true);
@@ -52,7 +54,7 @@ export async function reCache_Admin()
 
 export async function reCache_Customers()
 {
-    Logger.info(`Starting caching on customers..`);
+    log.info(`Starting caching on customers..`);
     return new Promise(async (resolve) =>
     {
         const customer = await CustomerModel.find();
@@ -65,7 +67,7 @@ export async function reCache_Customers()
                 c.currency = companyCurrency.toLocaleUpperCase() as TPaymentCurrency;
                 await c.save();
             }
-            // Logger.cache(`Caching customer ${c.uid}`);
+            // log.cache(`Caching customer ${c.uid}`);
             CacheCustomer.set(c.uid, c);
         }
         return resolve(true);
@@ -74,7 +76,7 @@ export async function reCache_Customers()
 
 export async function reCache_Product()
 {
-    Logger.info(`Starting caching on products..`);
+    log.info(`Starting caching on products..`);
     return new Promise(async (resolve) =>
     {
         const product = await ProductModel.find();
@@ -100,7 +102,7 @@ export async function reCache_Product()
 
 export async function reCache_Transactions()
 {
-    Logger.info(`Starting caching on transactions..`);
+    log.info(`Starting caching on transactions..`);
     return new Promise(async (resolve) =>
     {
         const transactions = await TransactionsModel.find();
@@ -124,7 +126,7 @@ export async function reCache_Transactions()
 
 export async function reCache_Orders()
 {
-    Logger.info(`Starting caching on orders..`);
+    log.info(`Starting caching on orders..`);
     return new Promise(async (resolve) =>
     {
         const order = await OrderModel.find();
@@ -143,11 +145,11 @@ export async function reCache_Orders()
 
 export async function reCache_Configs()
 {
-    Logger.info(`Starting caching on configs..`);
+    log.info(`Starting caching on configs..`);
     return new Promise(async (resolve) =>
     {
         const config = await ConfigModel.find();
-        // Logger.debug(config);
+        // log.debug(config);
         if (!config[0])
         {
             const smtpData = {
@@ -162,15 +164,15 @@ export async function reCache_Configs()
             }
             await new ConfigModel(smtpData).save();
 
-            Logger.cache(`Caching config`);
+            log.debug(`Caching config`);
 
             CacheConfig.set("smtp", smtpData.smtp);
             CacheConfig.set("smtp_emails", smtpData.smtp_emails);
 
             return resolve(true);
         }
 
-        Logger.cache(`Caching config`);
+        log.debug(`Caching config`);
         const c = config[0];
 
         // Check if c has payment_methods
@@ -199,13 +201,13 @@ export async function reCache_Configs()
 
 export async function reCache_Images()
 {
-    Logger.info(`Starting caching on images..`);
+    log.info(`Starting caching on images..`);
     return new Promise(async (resolve) =>
     {
         const image = await ImageModel.find();
         for (const o of image)
         {
-            Logger.cache(`Caching image ${o.id}`);
+            log.debug(`Caching image ${o.id}`);
             CacheImages.set(o.id, o);
         }
         return resolve(true);
@@ -215,7 +217,7 @@ export async function reCache_Images()
 
 export async function reCache_Invoices()
 {
-    Logger.info(`Starting caching on invoices..`);
+    log.info(`Starting caching on invoices..`);
     return new Promise(async (resolve) =>
     {
         const invoice = await InvoiceModel.find();
@@ -243,7 +245,7 @@ export async function reCache_Invoices()
                 await o.save();
             }
 
-            Logger.cache(`Caching invoice ${o.uid}`);
+            log.debug(`Caching invoice ${o.uid}`);
             CacheInvoice.set(o.uid, o);
         }
         return resolve(true);

apps/api/src/Config.ts

@@ -6,7 +6,7 @@ import { IAllLanguages } from "interfaces/Lang/AllLang.interface";
  * @description
  * Used if this service is running in debug mode.
  */
-export const DebugMode = process.env.DEBUG === "true";
+export const DebugMode = process.env.DEBUG_MODE === "true";
 export const HomeDir = ((__dirname.replace("\\build", "")).replace("/build", ""));
 export const JWT_Access_Token = process.env.JWT_ACCESS_TOKEN ?? "";
 export const d_Days = parseInt(process.env.D_DAYS ?? "30");