feat: remove path alias.

feat: remove Webpack and depend on nodemon. feat: refactoring expenses. feat: optimize system users with caching. feat: architecture tenant optimize.
2026-02-17 13:20:31 +00:00 · 2020-09-15 00:51:39 +02:00
parent ad00f140d1
commit a22c8395f3
293 changed files with 3391 additions and 1637 deletions
--- a/server/src/models/Account.js
+++ b/server/src/models/Account.js
@@ -1,13 +1,13 @@
 /* eslint-disable global-require */
 import { Model } from 'objection';
 import { flatten } from 'lodash';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';
 import {
  buildFilterQuery,
  buildSortColumnQuery,
-} from '@/lib/ViewRolesBuilder';
-import { flatToNestedArray } from '@/utils';
-import DependencyGraph from '@/lib/DependencyGraph';
+} from 'lib/ViewRolesBuilder';
+import { flatToNestedArray } from 'utils';
+import DependencyGraph from 'lib/DependencyGraph';

 export default class Account extends TenantModel {
  /**
@@ -54,8 +54,8 @@ export default class Account extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const AccountType = require('@/models/AccountType');
-    const AccountTransaction = require('@/models/AccountTransaction');
+    const AccountType = require('models/AccountType');
+    const AccountTransaction = require('models/AccountTransaction');

    return {
      /**
--- a/server/src/models/AccountTransaction.js
+++ b/server/src/models/AccountTransaction.js
@@ -1,6 +1,6 @@
 import { Model } from 'objection';
 import moment from 'moment';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class AccountTransaction extends TenantModel {
  /**
@@ -83,7 +83,7 @@ export default class AccountTransaction extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Account = require('@/models/Account');
+    const Account = require('models/Account');

    return {
      account: {
--- a/server/src/models/AccountType.js
+++ b/server/src/models/AccountType.js
@@ -1,6 +1,6 @@
 // import path from 'path';
 import { Model, mixin } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class AccountType extends TenantModel {
  /**
@@ -14,7 +14,7 @@ export default class AccountType extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Account = require('@/models/Account');
+    const Account = require('models/Account');

    return {
      /**
--- a/server/src/models/Bill.js
+++ b/server/src/models/Bill.js
@@ -1,6 +1,6 @@
 import { Model } from 'objection';
 import { difference } from 'lodash';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class Bill extends TenantModel {
  /**
@@ -36,8 +36,8 @@ export default class Bill extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Vendor = require('@/models/Vendor');
-    const ItemEntry = require('@/models/ItemEntry');
+    const Vendor = require('models/Vendor');
+    const ItemEntry = require('models/ItemEntry');

    return {
      vendor: {
--- a/server/src/models/BillPayment.js
+++ b/server/src/models/BillPayment.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class BillPayment extends TenantModel {
  /**
@@ -20,10 +20,10 @@ export default class BillPayment extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const BillPaymentEntry = require('@/models/BillPaymentEntry');
-    const AccountTransaction = require('@/models/AccountTransaction');
-    const Vendor = require('@/models/Vendor');
-    const Account = require('@/models/Account');
+    const BillPaymentEntry = require('models/BillPaymentEntry');
+    const AccountTransaction = require('models/AccountTransaction');
+    const Vendor = require('models/Vendor');
+    const Account = require('models/Account');

    return {
      entries: {
--- a/server/src/models/BillPaymentEntry.js
+++ b/server/src/models/BillPaymentEntry.js
@@ -1,5 +1,5 @@
 import { mixin } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class BillPaymentEntry extends TenantModel {
  /**
--- a/server/src/models/Contact.js
+++ b/server/src/models/Contact.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class Contact extends TenantModel {
  /**
@@ -39,8 +39,8 @@ export default class Contact extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const SaleInvoice = require('@/models/SaleInvoice');
-    const Bill = require('@/models/Bill');
+    const SaleInvoice = require('models/SaleInvoice');
+    const Bill = require('models/Bill');

    return {
      salesInvoices: {
--- a/server/src/models/Currency.js
+++ b/server/src/models/Currency.js
@@ -1,4 +1,4 @@
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class Currency extends TenantModel {
  /**
--- a/server/src/models/Customer.js
+++ b/server/src/models/Customer.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class Customer extends TenantModel {
  /**
--- a/server/src/models/ExchangeRate.js
+++ b/server/src/models/ExchangeRate.js
@@ -1,6 +1,6 @@
 import bcrypt from 'bcryptjs';
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class ExchangeRate extends TenantModel {
  /**
--- a/server/src/models/Expense.js
+++ b/server/src/models/Expense.js
@@ -1,6 +1,6 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
-import { viewRolesBuilder } from '@/lib/ViewRolesBuilder';
+import TenantModel from 'models/TenantModel';
+import { viewRolesBuilder } from 'lib/ViewRolesBuilder';

 export default class Expense extends TenantModel {
  /**
@@ -70,9 +70,9 @@ export default class Expense extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Account = require('@/models/Account');
-    const User = require('@/models/TenantUser');
-    const ExpenseCategory = require('@/models/ExpenseCategory');
+    const Account = require('models/Account');
+    const User = require('models/TenantUser');
+    const ExpenseCategory = require('models/ExpenseCategory');
    
    return {
      paymentAccount: {
--- a/server/src/models/ExpenseCategory.js
+++ b/server/src/models/ExpenseCategory.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class ExpenseCategory extends TenantModel {
  /**
@@ -13,7 +13,7 @@ export default class ExpenseCategory extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Account = require('@/models/Account');
+    const Account = require('models/Account');
    
    return {
      expenseAccount: {
--- a/server/src/models/InventoryCostLotTracker.js
+++ b/server/src/models/InventoryCostLotTracker.js
@@ -1,6 +1,6 @@
 import { Model } from 'objection';
 import moment from 'moment';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class InventoryCostLotTracker extends TenantModel {
  /**
@@ -52,7 +52,7 @@ export default class InventoryCostLotTracker extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Item = require('@/models/Item');
+    const Item = require('models/Item');

    return {
      item: {
--- a/server/src/models/InventoryTransaction.js
+++ b/server/src/models/InventoryTransaction.js
@@ -1,6 +1,6 @@
 import { Model } from 'objection';
 import moment from 'moment';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class InventoryTransaction extends TenantModel {
  /**
@@ -41,7 +41,7 @@ export default class InventoryTransaction extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Item = require('@/models/Item');
+    const Item = require('models/Item');

    return {
      item: {
--- a/server/src/models/Item.js
+++ b/server/src/models/Item.js
@@ -1,8 +1,8 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';
 import {
  buildFilterQuery,
-} from '@/lib/ViewRolesBuilder';
+} from 'lib/ViewRolesBuilder';

 export default class Item extends TenantModel {
  /**
@@ -39,9 +39,9 @@ export default class Item extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Media = require('@/models/Media');
-    const Account = require('@/models/Account');
-    const ItemCategory = require('@/models/ItemCategory');
+    const Media = require('models/Media');
+    const Account = require('models/Account');
+    const ItemCategory = require('models/ItemCategory');

    return {
      /**
--- a/server/src/models/ItemCategory.js
+++ b/server/src/models/ItemCategory.js
@@ -1,6 +1,6 @@
 import path from 'path';
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class ItemCategory extends TenantModel {
  /**
@@ -14,7 +14,7 @@ export default class ItemCategory extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Item = require('@/models/Item');
+    const Item = require('models/Item');

    return {
      /**
--- a/server/src/models/ItemEntry.js
+++ b/server/src/models/ItemEntry.js
@@ -1,6 +1,6 @@
 import path from 'path';
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class ItemEntry extends TenantModel {
  /**
@@ -33,7 +33,7 @@ export default class ItemEntry extends TenantModel {
  }

  static get relationMappings() {
-    const Item = require('@/models/Item');
+    const Item = require('models/Item');

    return {
      item: {
--- a/server/src/models/ManualJournal.js
+++ b/server/src/models/ManualJournal.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class ManualJournal extends TenantModel {
  /**
@@ -20,7 +20,7 @@ export default class ManualJournal extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Media = require('@/models/Media');
+    const Media = require('models/Media');

    return {
      media: {
--- a/server/src/models/Media.js
+++ b/server/src/models/Media.js
@@ -1,4 +1,4 @@
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class Media extends TenantModel {
  /**
--- a/server/src/models/MediaLink.js
+++ b/server/src/models/MediaLink.js
@@ -1,4 +1,4 @@
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class MediaLink extends TenantModel {
  /**
--- a/server/src/models/Metable.js
+++ b/server/src/models/Metable.js
@@ -1,4 +1,4 @@
-import knex from '@/database/knex';
+import knex from 'database/knex';
 // import cache from 'memory-cache';

 // Metadata
--- a/server/src/models/Model.js
+++ b/server/src/models/Model.js
@@ -1,8 +1,8 @@
 import { Model, mixin } from 'objection';
 import { snakeCase, each } from 'lodash';
-import { mapKeysDeep } from '@/utils';
-import PaginationQueryBuilder from '@/models/Pagination';
-import DateSession from '@/models/DateSession';
+import { mapKeysDeep } from 'utils';
+import PaginationQueryBuilder from 'models/Pagination';
+import DateSession from 'models/DateSession';

 export default class ModelBase extends mixin(Model, [DateSession]) {

--- a/server/src/models/Option.js
+++ b/server/src/models/Option.js
@@ -1,5 +1,5 @@
-import TenantModel from '@/models/TenantModel';
-import definedOptions from '@/data/options';
+import TenantModel from 'models/TenantModel';
+import definedOptions from 'data/options';


 export default class Option extends TenantModel {
--- a/server/src/models/PaymentReceive.js
+++ b/server/src/models/PaymentReceive.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class PaymentReceive extends TenantModel {
  /**
@@ -20,10 +20,10 @@ export default class PaymentReceive extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const PaymentReceiveEntry = require('@/models/PaymentReceiveEntry');
-    const AccountTransaction = require('@/models/AccountTransaction');
-    const Customer = require('@/models/Customer');
-    const Account = require('@/models/Account');
+    const PaymentReceiveEntry = require('models/PaymentReceiveEntry');
+    const AccountTransaction = require('models/AccountTransaction');
+    const Customer = require('models/Customer');
+    const Account = require('models/Account');

    return {
      customer: {
--- a/server/src/models/PaymentReceiveEntry.js
+++ b/server/src/models/PaymentReceiveEntry.js
@@ -1,5 +1,5 @@
 import { Model, mixin } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class PaymentReceiveEntry extends TenantModel {
  /**
@@ -20,8 +20,8 @@ export default class PaymentReceiveEntry extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const PaymentReceive = require('@/models/PaymentReceive');
-    const SaleInvoice = require('@/models/SaleInvoice');
+    const PaymentReceive = require('models/PaymentReceive');
+    const SaleInvoice = require('models/SaleInvoice');

    return {
      /**
--- a/server/src/models/Resource.js
+++ b/server/src/models/Resource.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class Resource extends TenantModel {
  /**
@@ -20,8 +20,8 @@ export default class Resource extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const View = require('@/models/View');
-    const ResourceField = require('@/models/ResourceField');
+    const View = require('models/View');
+    const ResourceField = require('models/ResourceField');

    return {
      /**
--- a/server/src/models/ResourceField.js
+++ b/server/src/models/ResourceField.js
@@ -1,7 +1,7 @@
 import { snakeCase } from 'lodash';
 import { Model } from 'objection';
 import path from 'path';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class ResourceField extends TenantModel {
  /**
@@ -51,7 +51,7 @@ export default class ResourceField extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Resource = require('@/models/Resource');
+    const Resource = require('models/Resource');

    return {
      /**
--- a/server/src/models/ResourceFieldMetadata.js
+++ b/server/src/models/ResourceFieldMetadata.js
@@ -1,4 +1,4 @@
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class ResourceFieldMetadata extends TenantModel {
  /**
--- a/server/src/models/SaleEstimate.js
+++ b/server/src/models/SaleEstimate.js
@@ -1,5 +1,5 @@
 import { Model, mixin } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class SaleEstimate extends TenantModel {
  /**
@@ -20,8 +20,8 @@ export default class SaleEstimate extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const ItemEntry = require('@/models/ItemEntry');
-    const Customer = require('@/models/Customer');
+    const ItemEntry = require('models/ItemEntry');
+    const Customer = require('models/Customer');

    return {
      customer: {
--- a/server/src/models/SaleEstimateEntry.js
+++ b/server/src/models/SaleEstimateEntry.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';


 export default class SaleEstimateEntry extends TenantModel {
@@ -14,7 +14,7 @@ export default class SaleEstimateEntry extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const SaleEstimate = require('@/models/SaleEstimate');
+    const SaleEstimate = require('models/SaleEstimate');

    return {
      estimate: {
--- a/server/src/models/SaleInvoice.js
+++ b/server/src/models/SaleInvoice.js
@@ -1,6 +1,6 @@
 import { Model, mixin } from 'objection';
 import moment from 'moment';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class SaleInvoice extends TenantModel {
  /**
@@ -55,10 +55,10 @@ export default class SaleInvoice extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const AccountTransaction = require('@/models/AccountTransaction');
-    const ItemEntry = require('@/models/ItemEntry');
-    const Customer = require('@/models/Customer');
-    const InventoryCostLotTracker = require('@/models/InventoryCostLotTracker');
+    const AccountTransaction = require('models/AccountTransaction');
+    const ItemEntry = require('models/ItemEntry');
+    const Customer = require('models/Customer');
+    const InventoryCostLotTracker = require('models/InventoryCostLotTracker');

    return {
      entries: {
--- a/server/src/models/SaleInvoiceEntry.js
+++ b/server/src/models/SaleInvoiceEntry.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class SaleInvoiceEntry extends TenantModel {
  /**
@@ -13,7 +13,7 @@ export default class SaleInvoiceEntry extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const SaleInvoice = require('@/models/SaleInvoice');
+    const SaleInvoice = require('models/SaleInvoice');

    return {
      saleInvoice: {
--- a/server/src/models/SaleReceipt.js
+++ b/server/src/models/SaleReceipt.js
@@ -1,5 +1,5 @@
 import { Model, mixin } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class SaleReceipt extends TenantModel {
  /**
@@ -20,10 +20,10 @@ export default class SaleReceipt extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Customer = require('@/models/Customer');
-    const Account = require('@/models/Account');
-    const AccountTransaction = require('@/models/AccountTransaction');
-    const ItemEntry = require('@/models/ItemEntry');
+    const Customer = require('models/Customer');
+    const Account = require('models/Account');
+    const AccountTransaction = require('models/AccountTransaction');
+    const ItemEntry = require('models/ItemEntry');

    return {
      customer: {
--- a/server/src/models/SaleReceiptEntry.js
+++ b/server/src/models/SaleReceiptEntry.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class SaleReceiptEntry extends TenantModel {
  /**
@@ -13,7 +13,7 @@ export default class SaleReceiptEntry extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const SaleReceipt = require('@/models/SaleReceipt');
+    const SaleReceipt = require('models/SaleReceipt');

    return {
      saleReceipt: {
--- a/server/src/models/Setting.js
+++ b/server/src/models/Setting.js
@@ -1,4 +1,4 @@
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';
 import Auth from './Auth';

 export default class Setting extends TenantModel {
--- a/server/src/models/TenantModel.js
+++ b/server/src/models/TenantModel.js
@@ -1,4 +1,4 @@
-import BaseModel from '@/models/Model';
+import BaseModel from 'models/Model';

 export default class TenantModel extends BaseModel {

--- a/server/src/models/TenantUser.js
+++ b/server/src/models/TenantUser.js
@@ -1,5 +1,5 @@
 import bcrypt from 'bcryptjs';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class TenantUser extends TenantModel {
  /**
--- a/server/src/models/Vendor.js
+++ b/server/src/models/Vendor.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class Vendor extends TenantModel {
  /**
--- a/server/src/models/View.js
+++ b/server/src/models/View.js
@@ -1,5 +1,5 @@
 import { Model, mixin } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class View extends TenantModel {
  /**
@@ -40,9 +40,9 @@ export default class View extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const Resource = require('@/models/Resource');
-    const ViewColumn = require('@/models/ViewColumn');
-    const ViewRole = require('@/models/ViewRole');
+    const Resource = require('models/Resource');
+    const ViewColumn = require('models/ViewColumn');
+    const ViewRole = require('models/ViewRole');

    return {
      /**
--- a/server/src/models/ViewColumn.js
+++ b/server/src/models/ViewColumn.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class ViewColumn extends TenantModel {
  /**
@@ -13,7 +13,7 @@ export default class ViewColumn extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const ResourceField = require('@/models/ResourceField');
+    const ResourceField = require('models/ResourceField');

    return {
      /**
--- a/server/src/models/ViewRole.js
+++ b/server/src/models/ViewRole.js
@@ -1,5 +1,5 @@
 import { Model } from 'objection';
-import TenantModel from '@/models/TenantModel';
+import TenantModel from 'models/TenantModel';

 export default class ViewRole extends TenantModel {

@@ -27,8 +27,8 @@ export default class ViewRole extends TenantModel {
   * Relationship mapping.
   */
  static get relationMappings() {
-    const ResourceField = require('@/models/ResourceField');
-    const View = require('@/models/View');
+    const ResourceField = require('models/ResourceField');
+    const View = require('models/View');

    return {
      /**