From dc51a0d39c053211240636bf1ff7f066f7c90774 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Thu, 18 Jul 2024 13:46:23 +0200 Subject: [PATCH 01/18] Merge `ErrorHander` logic from plugin --- .../plugins/angaza-shs/js/Helpers/ErrorHander.js | 14 -------------- Website/ui/src/plugins/angaza-shs/js/eventbus.js | 0 Website/ui/src/plugins/angaza-shs/js/routes.js | 9 --------- .../angaza-shs/js/services/CredentialService.js | 2 +- .../bulk-registration/js/Helpers/ErrorHander.js | 14 -------------- .../js/services/CsvUploadService.js | 2 +- .../plugins/calin-meter/js/Helpers/ErrorHander.js | 14 -------------- .../calin-meter/js/services/CredentialService.js | 2 +- .../calin-smart-meter/js/Helpers/ErrorHander.js | 14 -------------- .../js/services/CredentialService.js | 2 +- .../plugins/daly-bms/js/Helpers/ErrorHandler.js | 14 -------------- .../daly-bms/js/services/CredentialService.js | 2 +- .../gome-long-meter/js/Helpers/ErrorHander.js | 14 -------------- .../js/services/CredentialService.js | 2 +- .../ui/src/plugins/kelin-meter/js/Helpers/.gitkeep | 0 .../plugins/kelin-meter/js/Helpers/ErrorHander.js | 14 -------------- .../kelin-meter/js/services/CredentialService.js | 2 +- .../kelin-meter/js/services/CustomerService.js | 2 +- .../kelin-meter/js/services/MeterService.js | 2 +- .../kelin-meter/js/services/PaginateService.js | 2 +- .../kelin-meter/js/services/SettingService.js | 2 +- .../kelin-meter/js/services/StatusService.js | 2 +- .../kelin-meter/js/services/SyncSettingService.js | 2 +- .../micro-star-meter/js/Helpers/ErrorHander.js | 14 -------------- .../micro-star-meter/js/services/CertService.js | 2 +- .../js/services/CredentialService.js | 2 +- .../plugins/spark-meter/js/Helpers/ErrorHander.js | 14 -------------- .../spark-meter/js/services/CredentialService.js | 2 +- .../spark-meter/js/services/CustomerService.js | 2 +- .../spark-meter/js/services/MeterModelService.js | 2 +- .../spark-meter/js/services/PaginateService.js | 2 +- .../spark-meter/js/services/SalesAccountService.js | 2 +- .../spark-meter/js/services/SettingService.js | 2 +- .../plugins/spark-meter/js/services/SiteService.js | 2 +- .../js/services/SmFeedbackWordService.js | 2 +- .../spark-meter/js/services/SmsBodiesService.js | 2 +- .../spark-meter/js/services/SmsSettingService.js | 2 +- .../js/services/SmsVariableDefaultValueService.js | 2 +- .../spark-meter/js/services/SyncSettingService.js | 2 +- .../spark-meter/js/services/TariffService.js | 2 +- .../plugins/steama-meter/js/Helpers/ErrorHander.js | 14 -------------- .../steama-meter/js/services/AgentService.js | 2 +- .../steama-meter/js/services/CredentialService.js | 2 +- .../steama-meter/js/services/CustomerService.js | 2 +- .../js/services/FeedbackWordService.js | 2 +- .../steama-meter/js/services/MeterService.js | 2 +- .../steama-meter/js/services/PaginateService.js | 2 +- .../steama-meter/js/services/SettingService.js | 2 +- .../steama-meter/js/services/SiteService.js | 2 +- .../steama-meter/js/services/SmsBodiesService.js | 2 +- .../steama-meter/js/services/SmsSettingService.js | 2 +- .../js/services/SmsVariableDefaultValueService.js | 2 +- .../steama-meter/js/services/SyncSettingService.js | 2 +- .../plugins/stron-meter/js/Helpers/ErrorHander.js | 14 -------------- .../stron-meter/js/services/CredentialService.js | 2 +- .../plugins/sun-king-shs/js/Helpers/ErrorHander.js | 14 -------------- .../sun-king-shs/js/services/CredentialService.js | 2 +- .../js/Helpers/ErrorHander.js | 14 -------------- .../js/services/AuthenticationService.js | 2 +- .../viber-messaging/js/Helpers/ErrorHander.js | 14 -------------- .../js/services/CredentialService.js | 2 +- .../js/Helpers/ErrorHander.js | 14 -------------- .../js/services/CredentialService.js | 2 +- .../js/services/PaymentService.js | 2 +- .../wavecom-payment-provider/js/Helpers/.gitkeep | 0 65 files changed, 46 insertions(+), 265 deletions(-) delete mode 100644 Website/ui/src/plugins/angaza-shs/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/angaza-shs/js/eventbus.js delete mode 100644 Website/ui/src/plugins/angaza-shs/js/routes.js delete mode 100644 Website/ui/src/plugins/bulk-registration/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/calin-meter/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/calin-smart-meter/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/daly-bms/js/Helpers/ErrorHandler.js delete mode 100644 Website/ui/src/plugins/gome-long-meter/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/kelin-meter/js/Helpers/.gitkeep delete mode 100644 Website/ui/src/plugins/kelin-meter/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/micro-star-meter/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/spark-meter/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/steama-meter/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/stron-meter/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/sun-king-shs/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/swifta-payment-provider/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/viber-messaging/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/wave-money-payment-provider/js/Helpers/ErrorHander.js delete mode 100644 Website/ui/src/plugins/wavecom-payment-provider/js/Helpers/.gitkeep diff --git a/Website/ui/src/plugins/angaza-shs/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/angaza-shs/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/angaza-shs/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/angaza-shs/js/eventbus.js b/Website/ui/src/plugins/angaza-shs/js/eventbus.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/angaza-shs/js/routes.js b/Website/ui/src/plugins/angaza-shs/js/routes.js deleted file mode 100644 index 700ffecc2..000000000 --- a/Website/ui/src/plugins/angaza-shs/js/routes.js +++ /dev/null @@ -1,9 +0,0 @@ -let routes = [ - { - path: '/sun-king-shs/sun-king-overview', - component: - require('./plugins/sun-king-shs/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/angaza-shs/js/services/CredentialService.js b/Website/ui/src/plugins/angaza-shs/js/services/CredentialService.js index 362375867..d2bd142e0 100644 --- a/Website/ui/src/plugins/angaza-shs/js/services/CredentialService.js +++ b/Website/ui/src/plugins/angaza-shs/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CredentialRepository from '../repositories/CredentialRepository' export class CredentialService { diff --git a/Website/ui/src/plugins/bulk-registration/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/bulk-registration/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/bulk-registration/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/bulk-registration/js/services/CsvUploadService.js b/Website/ui/src/plugins/bulk-registration/js/services/CsvUploadService.js index a2e86e20d..d6e734a5e 100644 --- a/Website/ui/src/plugins/bulk-registration/js/services/CsvUploadService.js +++ b/Website/ui/src/plugins/bulk-registration/js/services/CsvUploadService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CsvUploadRepository from '../repositories/CsvUploadRepository' export class CsvUploadService { diff --git a/Website/ui/src/plugins/calin-meter/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/calin-meter/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/calin-meter/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/calin-meter/js/services/CredentialService.js b/Website/ui/src/plugins/calin-meter/js/services/CredentialService.js index 70feba075..5830e0c2e 100644 --- a/Website/ui/src/plugins/calin-meter/js/services/CredentialService.js +++ b/Website/ui/src/plugins/calin-meter/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CredentialRepository from '../repositories/CredentialRepository' export class CredentialService { diff --git a/Website/ui/src/plugins/calin-smart-meter/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/calin-smart-meter/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/calin-smart-meter/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/calin-smart-meter/js/services/CredentialService.js b/Website/ui/src/plugins/calin-smart-meter/js/services/CredentialService.js index 1c61f35ad..ee7eac950 100644 --- a/Website/ui/src/plugins/calin-smart-meter/js/services/CredentialService.js +++ b/Website/ui/src/plugins/calin-smart-meter/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CredentialRepository from '../repositories/CredentialRepository' export class CredentialService { diff --git a/Website/ui/src/plugins/daly-bms/js/Helpers/ErrorHandler.js b/Website/ui/src/plugins/daly-bms/js/Helpers/ErrorHandler.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/daly-bms/js/Helpers/ErrorHandler.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/daly-bms/js/services/CredentialService.js b/Website/ui/src/plugins/daly-bms/js/services/CredentialService.js index c6808508a..8644531ae 100644 --- a/Website/ui/src/plugins/daly-bms/js/services/CredentialService.js +++ b/Website/ui/src/plugins/daly-bms/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHandler' +import { ErrorHandler } from '@/Helpers/ErrorHander' import { convertObjectKeysToSnakeCase } from '@/Helpers/Utils' import CredentialRepository from '../repositories/CredentialRepository' diff --git a/Website/ui/src/plugins/gome-long-meter/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/gome-long-meter/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/gome-long-meter/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/gome-long-meter/js/services/CredentialService.js b/Website/ui/src/plugins/gome-long-meter/js/services/CredentialService.js index 2781f14d7..e2ecd58f0 100644 --- a/Website/ui/src/plugins/gome-long-meter/js/services/CredentialService.js +++ b/Website/ui/src/plugins/gome-long-meter/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CredentialRepository from '../repositories/CredentialRepository' export class CredentialService { diff --git a/Website/ui/src/plugins/kelin-meter/js/Helpers/.gitkeep b/Website/ui/src/plugins/kelin-meter/js/Helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/kelin-meter/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/kelin-meter/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/kelin-meter/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/kelin-meter/js/services/CredentialService.js b/Website/ui/src/plugins/kelin-meter/js/services/CredentialService.js index fc22b4106..cbf8bdb22 100644 --- a/Website/ui/src/plugins/kelin-meter/js/services/CredentialService.js +++ b/Website/ui/src/plugins/kelin-meter/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CredentialRepository from '../repositories/CredentialRepository' export class CredentialService { diff --git a/Website/ui/src/plugins/kelin-meter/js/services/CustomerService.js b/Website/ui/src/plugins/kelin-meter/js/services/CustomerService.js index 98098cb3d..d0c7baa89 100644 --- a/Website/ui/src/plugins/kelin-meter/js/services/CustomerService.js +++ b/Website/ui/src/plugins/kelin-meter/js/services/CustomerService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import { EventBus } from '../eventbus' import CustomerRepository from '../repositories/CustomerRepository' diff --git a/Website/ui/src/plugins/kelin-meter/js/services/MeterService.js b/Website/ui/src/plugins/kelin-meter/js/services/MeterService.js index 695a29ff3..bdfa315b5 100644 --- a/Website/ui/src/plugins/kelin-meter/js/services/MeterService.js +++ b/Website/ui/src/plugins/kelin-meter/js/services/MeterService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import MeterRepository from '@/repositories/MeterRepository' export class MeterService { diff --git a/Website/ui/src/plugins/kelin-meter/js/services/PaginateService.js b/Website/ui/src/plugins/kelin-meter/js/services/PaginateService.js index 78a9f704b..244448d2f 100644 --- a/Website/ui/src/plugins/kelin-meter/js/services/PaginateService.js +++ b/Website/ui/src/plugins/kelin-meter/js/services/PaginateService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import PaginatorRepository from '../repositories/PaginatorRepository' export class PaginateService { diff --git a/Website/ui/src/plugins/kelin-meter/js/services/SettingService.js b/Website/ui/src/plugins/kelin-meter/js/services/SettingService.js index 277c93ff2..2bb6c6adb 100644 --- a/Website/ui/src/plugins/kelin-meter/js/services/SettingService.js +++ b/Website/ui/src/plugins/kelin-meter/js/services/SettingService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import { SyncSettingService } from './SyncSettingService' import SettingRepository from '../repositories/SettingRepository' diff --git a/Website/ui/src/plugins/kelin-meter/js/services/StatusService.js b/Website/ui/src/plugins/kelin-meter/js/services/StatusService.js index f40518cfa..e3e5eb595 100644 --- a/Website/ui/src/plugins/kelin-meter/js/services/StatusService.js +++ b/Website/ui/src/plugins/kelin-meter/js/services/StatusService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import StatusRepository from '../repositories/StatusRepository' export class StatusService { diff --git a/Website/ui/src/plugins/kelin-meter/js/services/SyncSettingService.js b/Website/ui/src/plugins/kelin-meter/js/services/SyncSettingService.js index 013561363..c0e995cad 100644 --- a/Website/ui/src/plugins/kelin-meter/js/services/SyncSettingService.js +++ b/Website/ui/src/plugins/kelin-meter/js/services/SyncSettingService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SyncSettingRepository from '../repositories/SyncSettingRepository' export class SyncSettingService { diff --git a/Website/ui/src/plugins/micro-star-meter/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/micro-star-meter/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/micro-star-meter/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/micro-star-meter/js/services/CertService.js b/Website/ui/src/plugins/micro-star-meter/js/services/CertService.js index e1938d0a3..2947e6a6e 100644 --- a/Website/ui/src/plugins/micro-star-meter/js/services/CertService.js +++ b/Website/ui/src/plugins/micro-star-meter/js/services/CertService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CertRepository from '../repositories/CertRepository' export class CertService { diff --git a/Website/ui/src/plugins/micro-star-meter/js/services/CredentialService.js b/Website/ui/src/plugins/micro-star-meter/js/services/CredentialService.js index 0a3847c2d..4c5bc2abf 100644 --- a/Website/ui/src/plugins/micro-star-meter/js/services/CredentialService.js +++ b/Website/ui/src/plugins/micro-star-meter/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CredentialRepository from '../repositories/CredentialRepository' export class CredentialService { diff --git a/Website/ui/src/plugins/spark-meter/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/spark-meter/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/spark-meter/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/spark-meter/js/services/CredentialService.js b/Website/ui/src/plugins/spark-meter/js/services/CredentialService.js index 62b88fbb6..77f9f8b80 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/CredentialService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CredentialRepository from '../repositories/CredentialRepository' export class CredentialService { diff --git a/Website/ui/src/plugins/spark-meter/js/services/CustomerService.js b/Website/ui/src/plugins/spark-meter/js/services/CustomerService.js index d029535a3..11792e2a4 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/CustomerService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/CustomerService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import { EventBus } from '../eventbus' import CustomerRepository from '../repositories/CustomerRepository' diff --git a/Website/ui/src/plugins/spark-meter/js/services/MeterModelService.js b/Website/ui/src/plugins/spark-meter/js/services/MeterModelService.js index 064480ad6..3e35f3cf6 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/MeterModelService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/MeterModelService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import MeterModelRepository from '../repositories/MeterModelRepository' export class MeterModelService { diff --git a/Website/ui/src/plugins/spark-meter/js/services/PaginateService.js b/Website/ui/src/plugins/spark-meter/js/services/PaginateService.js index d80588555..7a343f319 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/PaginateService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/PaginateService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import PaginatorRepository from '../repositories/PaginatorRepository' export class PaginateService { diff --git a/Website/ui/src/plugins/spark-meter/js/services/SalesAccountService.js b/Website/ui/src/plugins/spark-meter/js/services/SalesAccountService.js index 7ffdc9dbc..e40a70e64 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/SalesAccountService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/SalesAccountService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SalesAccountRepository from '../repositories/SalesAccountRepository' export class SalesAccountService { diff --git a/Website/ui/src/plugins/spark-meter/js/services/SettingService.js b/Website/ui/src/plugins/spark-meter/js/services/SettingService.js index b8c83e768..295433d69 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/SettingService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/SettingService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import { SyncSettingService } from './SyncSettingService' import { SmsSettingService } from './SmsSettingService' import SettingRepository from '../repositories/SettingRepository' diff --git a/Website/ui/src/plugins/spark-meter/js/services/SiteService.js b/Website/ui/src/plugins/spark-meter/js/services/SiteService.js index 9da900133..73a75041d 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/SiteService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/SiteService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SiteRepository from '../repositories/SiteRepository' export class SiteService { diff --git a/Website/ui/src/plugins/spark-meter/js/services/SmFeedbackWordService.js b/Website/ui/src/plugins/spark-meter/js/services/SmFeedbackWordService.js index 1de725a61..85e8d0679 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/SmFeedbackWordService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/SmFeedbackWordService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SmFeedbackWordRepository from '../repositories/SmFeedbackWordRepository' export class SmFeedbackWordService { diff --git a/Website/ui/src/plugins/spark-meter/js/services/SmsBodiesService.js b/Website/ui/src/plugins/spark-meter/js/services/SmsBodiesService.js index edf827287..59fbacd7f 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/SmsBodiesService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/SmsBodiesService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SmsBodiesRepository from '../repositories/SmsBodiesRepository' export class SmsBodiesService { diff --git a/Website/ui/src/plugins/spark-meter/js/services/SmsSettingService.js b/Website/ui/src/plugins/spark-meter/js/services/SmsSettingService.js index e913659cd..de8db2678 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/SmsSettingService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/SmsSettingService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SmsSettingRepository from '../repositories/SmsSettingRepository' export class SmsSettingService { diff --git a/Website/ui/src/plugins/spark-meter/js/services/SmsVariableDefaultValueService.js b/Website/ui/src/plugins/spark-meter/js/services/SmsVariableDefaultValueService.js index 585e012d5..04fb82093 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/SmsVariableDefaultValueService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/SmsVariableDefaultValueService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SmsVariableDefaultValueRepository from '../repositories/SmsVariableDefaultValueRepository' export class SmsVariableDefaultValueService { diff --git a/Website/ui/src/plugins/spark-meter/js/services/SyncSettingService.js b/Website/ui/src/plugins/spark-meter/js/services/SyncSettingService.js index 0d6adb306..100a401f8 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/SyncSettingService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/SyncSettingService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SyncSettingRepository from '../repositories/SyncSettingRepository' export class SyncSettingService { diff --git a/Website/ui/src/plugins/spark-meter/js/services/TariffService.js b/Website/ui/src/plugins/spark-meter/js/services/TariffService.js index 0db8e4393..3f0d47857 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/TariffService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/TariffService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import TariffRepository from '../repositories/TariffRepository' export class TariffService { diff --git a/Website/ui/src/plugins/steama-meter/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/steama-meter/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/steama-meter/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/steama-meter/js/services/AgentService.js b/Website/ui/src/plugins/steama-meter/js/services/AgentService.js index 132acc002..d945d5252 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/AgentService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/AgentService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import AgentRepository from '../repositories/AgentRepository' export class AgentService { diff --git a/Website/ui/src/plugins/steama-meter/js/services/CredentialService.js b/Website/ui/src/plugins/steama-meter/js/services/CredentialService.js index 6c3ba6755..3234e953d 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/CredentialService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CredentialRepository from '../repositories/CredentialRepository' export class CredentialService { diff --git a/Website/ui/src/plugins/steama-meter/js/services/CustomerService.js b/Website/ui/src/plugins/steama-meter/js/services/CustomerService.js index 0b32bd033..678fefe5d 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/CustomerService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/CustomerService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import { EventBus } from '../eventbus' import CustomerRepository from '../repositories/CustomerRepository' diff --git a/Website/ui/src/plugins/steama-meter/js/services/FeedbackWordService.js b/Website/ui/src/plugins/steama-meter/js/services/FeedbackWordService.js index eb90c5f55..0693a87b0 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/FeedbackWordService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/FeedbackWordService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import FeedbackWordRepository from '../repositories/FeedbackWordRepository' export class FeedbackWordService { diff --git a/Website/ui/src/plugins/steama-meter/js/services/MeterService.js b/Website/ui/src/plugins/steama-meter/js/services/MeterService.js index 1f07687cc..1913d78a5 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/MeterService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/MeterService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import MeterRepository from '../repositories/MeterRepository' export class MeterService { diff --git a/Website/ui/src/plugins/steama-meter/js/services/PaginateService.js b/Website/ui/src/plugins/steama-meter/js/services/PaginateService.js index d80588555..7a343f319 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/PaginateService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/PaginateService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import PaginatorRepository from '../repositories/PaginatorRepository' export class PaginateService { diff --git a/Website/ui/src/plugins/steama-meter/js/services/SettingService.js b/Website/ui/src/plugins/steama-meter/js/services/SettingService.js index f4ecfe06e..dbea1b1b8 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/SettingService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/SettingService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import { SyncSettingService } from './SyncSettingService' import { SmsSettingService } from './SmsSettingService' import SettingRepository from '../repositories/SettingRepository' diff --git a/Website/ui/src/plugins/steama-meter/js/services/SiteService.js b/Website/ui/src/plugins/steama-meter/js/services/SiteService.js index 0676f6007..6aa41f6a3 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/SiteService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/SiteService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SiteRepository from '../repositories/SiteRepository' export class SiteService { diff --git a/Website/ui/src/plugins/steama-meter/js/services/SmsBodiesService.js b/Website/ui/src/plugins/steama-meter/js/services/SmsBodiesService.js index 3b8fecb42..1097be6c3 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/SmsBodiesService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/SmsBodiesService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SmsBodiesRepository from '../repositories/SmsBodiesRepository' export class SmsBodiesService { diff --git a/Website/ui/src/plugins/steama-meter/js/services/SmsSettingService.js b/Website/ui/src/plugins/steama-meter/js/services/SmsSettingService.js index e913659cd..de8db2678 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/SmsSettingService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/SmsSettingService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SmsSettingRepository from '../repositories/SmsSettingRepository' export class SmsSettingService { diff --git a/Website/ui/src/plugins/steama-meter/js/services/SmsVariableDefaultValueService.js b/Website/ui/src/plugins/steama-meter/js/services/SmsVariableDefaultValueService.js index 585e012d5..04fb82093 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/SmsVariableDefaultValueService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/SmsVariableDefaultValueService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SmsVariableDefaultValueRepository from '../repositories/SmsVariableDefaultValueRepository' export class SmsVariableDefaultValueService { diff --git a/Website/ui/src/plugins/steama-meter/js/services/SyncSettingService.js b/Website/ui/src/plugins/steama-meter/js/services/SyncSettingService.js index 0d6adb306..100a401f8 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/SyncSettingService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/SyncSettingService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import SyncSettingRepository from '../repositories/SyncSettingRepository' export class SyncSettingService { diff --git a/Website/ui/src/plugins/stron-meter/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/stron-meter/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/stron-meter/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/stron-meter/js/services/CredentialService.js b/Website/ui/src/plugins/stron-meter/js/services/CredentialService.js index 1ada7289b..303f2c5f8 100644 --- a/Website/ui/src/plugins/stron-meter/js/services/CredentialService.js +++ b/Website/ui/src/plugins/stron-meter/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CredentialRepository from '../repositories/CredentialRepository' export class CredentialService { diff --git a/Website/ui/src/plugins/sun-king-shs/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/sun-king-shs/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/sun-king-shs/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/sun-king-shs/js/services/CredentialService.js b/Website/ui/src/plugins/sun-king-shs/js/services/CredentialService.js index 362375867..d2bd142e0 100644 --- a/Website/ui/src/plugins/sun-king-shs/js/services/CredentialService.js +++ b/Website/ui/src/plugins/sun-king-shs/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CredentialRepository from '../repositories/CredentialRepository' export class CredentialService { diff --git a/Website/ui/src/plugins/swifta-payment-provider/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/swifta-payment-provider/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/swifta-payment-provider/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/swifta-payment-provider/js/services/AuthenticationService.js b/Website/ui/src/plugins/swifta-payment-provider/js/services/AuthenticationService.js index df28082be..ac81db8dd 100644 --- a/Website/ui/src/plugins/swifta-payment-provider/js/services/AuthenticationService.js +++ b/Website/ui/src/plugins/swifta-payment-provider/js/services/AuthenticationService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import AuthenticationRepository from '../repositories/AuthenticationRepository' diff --git a/Website/ui/src/plugins/viber-messaging/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/viber-messaging/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/viber-messaging/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/viber-messaging/js/services/CredentialService.js b/Website/ui/src/plugins/viber-messaging/js/services/CredentialService.js index 063577dd3..cd193230d 100644 --- a/Website/ui/src/plugins/viber-messaging/js/services/CredentialService.js +++ b/Website/ui/src/plugins/viber-messaging/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CredentialRepository from '../repositories/CredentialRepository' export class CredentialService { diff --git a/Website/ui/src/plugins/wave-money-payment-provider/js/Helpers/ErrorHander.js b/Website/ui/src/plugins/wave-money-payment-provider/js/Helpers/ErrorHander.js deleted file mode 100644 index 253d91460..000000000 --- a/Website/ui/src/plugins/wave-money-payment-provider/js/Helpers/ErrorHander.js +++ /dev/null @@ -1,14 +0,0 @@ -export class ErrorHandler { - constructor(_message, _type, _status_code) { - this.exception = { - message: _message, - type: _type, - status_code: _status_code, - } - this.throwException() - } - - throwException() { - throw this.exception - } -} diff --git a/Website/ui/src/plugins/wave-money-payment-provider/js/services/CredentialService.js b/Website/ui/src/plugins/wave-money-payment-provider/js/services/CredentialService.js index 249082064..b75610bcf 100644 --- a/Website/ui/src/plugins/wave-money-payment-provider/js/services/CredentialService.js +++ b/Website/ui/src/plugins/wave-money-payment-provider/js/services/CredentialService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import CredentialRepository from '../repositories/CredentialRepository' export class CredentialService { diff --git a/Website/ui/src/plugins/wave-money-payment-provider/js/services/PaymentService.js b/Website/ui/src/plugins/wave-money-payment-provider/js/services/PaymentService.js index 439440734..1b40c380e 100644 --- a/Website/ui/src/plugins/wave-money-payment-provider/js/services/PaymentService.js +++ b/Website/ui/src/plugins/wave-money-payment-provider/js/services/PaymentService.js @@ -1,4 +1,4 @@ -import { ErrorHandler } from '../Helpers/ErrorHander' +import { ErrorHandler } from '@/Helpers/ErrorHander' import PaymentRepository from '../repositories/PaymentRepository' export class PaymentService { diff --git a/Website/ui/src/plugins/wavecom-payment-provider/js/Helpers/.gitkeep b/Website/ui/src/plugins/wavecom-payment-provider/js/Helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 From d34d3b8b2863655bc76804bc6a2d05e2d3b15032 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Thu, 18 Jul 2024 13:49:37 +0200 Subject: [PATCH 02/18] Merge `routes` and `eventbus` to shared --- .../plugins/bulk-registration/js/eventbus.js | 0 .../plugins/bulk-registration/js/routes.js | 8 --- .../ui/src/plugins/calin-meter/js/eventbus.js | 0 .../ui/src/plugins/calin-meter/js/routes.js | 9 --- .../plugins/calin-smart-meter/js/eventbus.js | 0 .../plugins/calin-smart-meter/js/routes.js | 9 --- Website/ui/src/plugins/daly-bms/js/routes.js | 8 --- .../plugins/gome-long-meter/js/eventbus.js | 0 .../src/plugins/gome-long-meter/js/routes.js | 9 --- .../ui/src/plugins/kelin-meter/js/eventbus.js | 3 - .../ui/src/plugins/kelin-meter/js/routes.js | 48 ---------------- .../js/services/CustomerService.js | 2 +- .../plugins/micro-star-meter/js/eventbus.js | 0 .../src/plugins/micro-star-meter/js/routes.js | 9 --- .../ui/src/plugins/spark-meter/js/eventbus.js | 3 - .../ui/src/plugins/spark-meter/js/routes.js | 57 ------------------- .../js/services/CustomerService.js | 2 +- .../src/plugins/steama-meter/js/eventbus.js | 3 - .../ui/src/plugins/steama-meter/js/routes.js | 51 ----------------- .../js/services/CustomerService.js | 2 +- .../ui/src/plugins/stron-meter/js/eventbus.js | 0 .../ui/src/plugins/stron-meter/js/routes.js | 9 --- .../src/plugins/sun-king-shs/js/eventbus.js | 0 .../ui/src/plugins/sun-king-shs/js/routes.js | 9 --- .../swifta-payment-provider/js/eventbus.js | 0 .../plugins/viber-messaging/js/eventbus.js | 0 .../src/plugins/viber-messaging/js/routes.js | 9 --- .../js/eventbus.js | 0 .../wave-money-payment-provider/js/routes.js | 23 -------- .../wavecom-payment-provider/js/eventbus.js | 0 .../wavecom-payment-provider/js/routes.js | 9 --- 31 files changed, 3 insertions(+), 279 deletions(-) delete mode 100644 Website/ui/src/plugins/bulk-registration/js/eventbus.js delete mode 100644 Website/ui/src/plugins/bulk-registration/js/routes.js delete mode 100644 Website/ui/src/plugins/calin-meter/js/eventbus.js delete mode 100644 Website/ui/src/plugins/calin-meter/js/routes.js delete mode 100644 Website/ui/src/plugins/calin-smart-meter/js/eventbus.js delete mode 100644 Website/ui/src/plugins/calin-smart-meter/js/routes.js delete mode 100644 Website/ui/src/plugins/daly-bms/js/routes.js delete mode 100644 Website/ui/src/plugins/gome-long-meter/js/eventbus.js delete mode 100644 Website/ui/src/plugins/gome-long-meter/js/routes.js delete mode 100644 Website/ui/src/plugins/kelin-meter/js/eventbus.js delete mode 100644 Website/ui/src/plugins/kelin-meter/js/routes.js delete mode 100644 Website/ui/src/plugins/micro-star-meter/js/eventbus.js delete mode 100644 Website/ui/src/plugins/micro-star-meter/js/routes.js delete mode 100644 Website/ui/src/plugins/spark-meter/js/eventbus.js delete mode 100644 Website/ui/src/plugins/spark-meter/js/routes.js delete mode 100644 Website/ui/src/plugins/steama-meter/js/eventbus.js delete mode 100644 Website/ui/src/plugins/steama-meter/js/routes.js delete mode 100644 Website/ui/src/plugins/stron-meter/js/eventbus.js delete mode 100644 Website/ui/src/plugins/stron-meter/js/routes.js delete mode 100644 Website/ui/src/plugins/sun-king-shs/js/eventbus.js delete mode 100644 Website/ui/src/plugins/sun-king-shs/js/routes.js delete mode 100644 Website/ui/src/plugins/swifta-payment-provider/js/eventbus.js delete mode 100644 Website/ui/src/plugins/viber-messaging/js/eventbus.js delete mode 100644 Website/ui/src/plugins/viber-messaging/js/routes.js delete mode 100644 Website/ui/src/plugins/wave-money-payment-provider/js/eventbus.js delete mode 100644 Website/ui/src/plugins/wave-money-payment-provider/js/routes.js delete mode 100644 Website/ui/src/plugins/wavecom-payment-provider/js/eventbus.js delete mode 100644 Website/ui/src/plugins/wavecom-payment-provider/js/routes.js diff --git a/Website/ui/src/plugins/bulk-registration/js/eventbus.js b/Website/ui/src/plugins/bulk-registration/js/eventbus.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/bulk-registration/js/routes.js b/Website/ui/src/plugins/bulk-registration/js/routes.js deleted file mode 100644 index aa45a9201..000000000 --- a/Website/ui/src/plugins/bulk-registration/js/routes.js +++ /dev/null @@ -1,8 +0,0 @@ -let routes = [ - { - path: '/bulk-registration/bulk-registration', - component: require('./plugins/bulk-registration/js/components/Csv') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/calin-meter/js/eventbus.js b/Website/ui/src/plugins/calin-meter/js/eventbus.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/calin-meter/js/routes.js b/Website/ui/src/plugins/calin-meter/js/routes.js deleted file mode 100644 index 495d32964..000000000 --- a/Website/ui/src/plugins/calin-meter/js/routes.js +++ /dev/null @@ -1,9 +0,0 @@ -let routes = [ - { - path: '/calin-meters/calin-overview', - component: - require('./plugins/calin-meter/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/calin-smart-meter/js/eventbus.js b/Website/ui/src/plugins/calin-smart-meter/js/eventbus.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/calin-smart-meter/js/routes.js b/Website/ui/src/plugins/calin-smart-meter/js/routes.js deleted file mode 100644 index c9b532e25..000000000 --- a/Website/ui/src/plugins/calin-smart-meter/js/routes.js +++ /dev/null @@ -1,9 +0,0 @@ -let routes = [ - { - path: '/calin-smart-meters/calin-smart-overview', - component: - require('./plugins/calin-smart-meter/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/daly-bms/js/routes.js b/Website/ui/src/plugins/daly-bms/js/routes.js deleted file mode 100644 index fba8b048e..000000000 --- a/Website/ui/src/plugins/daly-bms/js/routes.js +++ /dev/null @@ -1,8 +0,0 @@ -let routes = [ - { - path: '/daly-bms/daly-bms-overview', - component: require('./plugins/daly-bms/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/gome-long-meter/js/eventbus.js b/Website/ui/src/plugins/gome-long-meter/js/eventbus.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/gome-long-meter/js/routes.js b/Website/ui/src/plugins/gome-long-meter/js/routes.js deleted file mode 100644 index 80973f06e..000000000 --- a/Website/ui/src/plugins/gome-long-meter/js/routes.js +++ /dev/null @@ -1,9 +0,0 @@ -let routes = [ - { - path: '/gome-long-meters/sun-king-overview', - component: - require('./plugins/gome-long-meter/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/kelin-meter/js/eventbus.js b/Website/ui/src/plugins/kelin-meter/js/eventbus.js deleted file mode 100644 index 8fb4236e1..000000000 --- a/Website/ui/src/plugins/kelin-meter/js/eventbus.js +++ /dev/null @@ -1,3 +0,0 @@ -import Vue from 'vue' - -export const EventBus = new Vue() diff --git a/Website/ui/src/plugins/kelin-meter/js/routes.js b/Website/ui/src/plugins/kelin-meter/js/routes.js deleted file mode 100644 index 5fff7edd2..000000000 --- a/Website/ui/src/plugins/kelin-meter/js/routes.js +++ /dev/null @@ -1,48 +0,0 @@ -let routes = [ - { - path: '/kelin-meters/kelin-overview', - component: - require('./plugins/kelin-meter/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, - { - path: '/kelin-meters/kelin-customer', - component: require('./plugins/kelin-meter/js/components/Customer/List') - .default, - meta: { layout: 'default' }, - }, - { - path: '/kelin-meters/kelin-meter', - component: require('./plugins/kelin-meter/js/components/Meter/List') - .default, - meta: { layout: 'default' }, - }, - { - path: '/kelin-meters/kelin-meter/status/:meter', - component: require('./plugins/kelin-meter/js/components/Meter/Status') - .default, - meta: { layout: 'default' }, - }, - { - path: '/kelin-meters/kelin-meter/daily-consumptions/:meter', - component: - require('./plugins/kelin-meter/js/components/Meter/Consumption/Daily') - .default, - meta: { layout: 'default' }, - }, - { - path: '/kelin-meters/kelin-meter/minutely-consumptions/:meter', - component: - require('./plugins/kelin-meter/js/components/Meter/Consumption/Minutely') - .default, - meta: { layout: 'default' }, - }, - { - path: '/kelin-meters/kelin-setting', - component: - require('./plugins/kelin-meter/js/components/Setting/Setting') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/kelin-meter/js/services/CustomerService.js b/Website/ui/src/plugins/kelin-meter/js/services/CustomerService.js index d0c7baa89..874432b0e 100644 --- a/Website/ui/src/plugins/kelin-meter/js/services/CustomerService.js +++ b/Website/ui/src/plugins/kelin-meter/js/services/CustomerService.js @@ -1,5 +1,5 @@ import { ErrorHandler } from '@/Helpers/ErrorHander' -import { EventBus } from '../eventbus' +import { EventBus } from '@/shared/eventbus' import CustomerRepository from '../repositories/CustomerRepository' export class CustomerService { diff --git a/Website/ui/src/plugins/micro-star-meter/js/eventbus.js b/Website/ui/src/plugins/micro-star-meter/js/eventbus.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/micro-star-meter/js/routes.js b/Website/ui/src/plugins/micro-star-meter/js/routes.js deleted file mode 100644 index c3bba8e25..000000000 --- a/Website/ui/src/plugins/micro-star-meter/js/routes.js +++ /dev/null @@ -1,9 +0,0 @@ -let routes = [ - { - path: '/micro-star-meters/calin-overview', - component: - require('./plugins/micro-star/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/spark-meter/js/eventbus.js b/Website/ui/src/plugins/spark-meter/js/eventbus.js deleted file mode 100644 index 8fb4236e1..000000000 --- a/Website/ui/src/plugins/spark-meter/js/eventbus.js +++ /dev/null @@ -1,3 +0,0 @@ -import Vue from 'vue' - -export const EventBus = new Vue() diff --git a/Website/ui/src/plugins/spark-meter/js/routes.js b/Website/ui/src/plugins/spark-meter/js/routes.js deleted file mode 100644 index 51a970449..000000000 --- a/Website/ui/src/plugins/spark-meter/js/routes.js +++ /dev/null @@ -1,57 +0,0 @@ -let routes = [ - { - path: '/spark-meters/sm-site', - component: require('./plugins/spark-meter/js/components/Site/SiteList') - .default, - meta: { layout: 'default' }, - }, - { - path: '/spark-meters/sm-meter-model', - component: - require('./plugins/spark-meter/js/components/MeterModel/MeterModelList') - .default, - meta: { layout: 'default' }, - }, - { - path: '/spark-meters/sm-customer', - component: - require('./plugins/spark-meter/js/components/Customer/CustomerList') - .default, - meta: { layout: 'default' }, - }, - { - path: '/spark-meters/sm-tariff', - component: - require('./plugins/spark-meter/js/components/Tariff/TariffList') - .default, - meta: { layout: 'default' }, - }, - { - path: '/spark-meters/sm-tariff/:id', - component: - require('./plugins/spark-meter/js/components/Tariff/TariffDetail') - .default, - meta: { layout: 'default' }, - }, - { - path: '/spark-meters/sm-overview', - component: - require('./plugins/spark-meter/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, - { - path: '/spark-meters/sm-sales-account', - component: - require('./plugins/spark-meter/js/components/SalesAccount/SalesAccountList') - .default, - meta: { layout: 'default' }, - }, - { - path: '/spark-meters/sm-setting', - component: - require('./plugins/spark-meter/js/components/Setting/Setting') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/spark-meter/js/services/CustomerService.js b/Website/ui/src/plugins/spark-meter/js/services/CustomerService.js index 11792e2a4..ce7b5e3d3 100644 --- a/Website/ui/src/plugins/spark-meter/js/services/CustomerService.js +++ b/Website/ui/src/plugins/spark-meter/js/services/CustomerService.js @@ -1,5 +1,5 @@ import { ErrorHandler } from '@/Helpers/ErrorHander' -import { EventBus } from '../eventbus' +import { EventBus } from '@/shared/eventbus' import CustomerRepository from '../repositories/CustomerRepository' export class CustomerService { diff --git a/Website/ui/src/plugins/steama-meter/js/eventbus.js b/Website/ui/src/plugins/steama-meter/js/eventbus.js deleted file mode 100644 index 8fb4236e1..000000000 --- a/Website/ui/src/plugins/steama-meter/js/eventbus.js +++ /dev/null @@ -1,3 +0,0 @@ -import Vue from 'vue' - -export const EventBus = new Vue() diff --git a/Website/ui/src/plugins/steama-meter/js/routes.js b/Website/ui/src/plugins/steama-meter/js/routes.js deleted file mode 100644 index 2d78373f7..000000000 --- a/Website/ui/src/plugins/steama-meter/js/routes.js +++ /dev/null @@ -1,51 +0,0 @@ -let routes = [ - { - path: '/steama-meters/steama-overview', - component: - require('./plugins/steama-meter/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, - { - path: '/steama-meters/steama-site', - component: require('./plugins/steama-meter/js/components/Site/SiteList') - .default, - meta: { layout: 'default' }, - }, - { - path: '/steama-meters/steama-customer', - component: - require('./plugins/steama-meter/js/components/Customer/CustomerList') - .default, - meta: { layout: 'default' }, - }, - { - path: '/steama-meters/steama-transaction/:customer_id', - component: - require('./plugins/steama-meter/js/components/Customer/CustomerMovements') - .default, - meta: { layout: 'default' }, - }, - { - path: '/steama-meters/steama-meter', - component: - require('./plugins/steama-meter/js/components/Meter/MeterList') - .default, - meta: { layout: 'default' }, - }, - - { - path: '/steama-meters/steama-agent', - component: - require('./plugins/steama-meter/js/components/Agent/AgentList') - .default, - meta: { layout: 'default' }, - }, - { - path: '/steama-meters/steama-setting', - component: - require('./plugins/steama-meter/js/components/Setting/Setting') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/steama-meter/js/services/CustomerService.js b/Website/ui/src/plugins/steama-meter/js/services/CustomerService.js index 678fefe5d..711d6e497 100644 --- a/Website/ui/src/plugins/steama-meter/js/services/CustomerService.js +++ b/Website/ui/src/plugins/steama-meter/js/services/CustomerService.js @@ -1,5 +1,5 @@ import { ErrorHandler } from '@/Helpers/ErrorHander' -import { EventBus } from '../eventbus' +import { EventBus } from '@/shared/eventbus' import CustomerRepository from '../repositories/CustomerRepository' export class CustomerService { diff --git a/Website/ui/src/plugins/stron-meter/js/eventbus.js b/Website/ui/src/plugins/stron-meter/js/eventbus.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/stron-meter/js/routes.js b/Website/ui/src/plugins/stron-meter/js/routes.js deleted file mode 100644 index 32bb3f3f3..000000000 --- a/Website/ui/src/plugins/stron-meter/js/routes.js +++ /dev/null @@ -1,9 +0,0 @@ -let routes = [ - { - path: '/stron-meters/stron-overview', - component: - require('./plugins/stron-meter/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/sun-king-shs/js/eventbus.js b/Website/ui/src/plugins/sun-king-shs/js/eventbus.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/sun-king-shs/js/routes.js b/Website/ui/src/plugins/sun-king-shs/js/routes.js deleted file mode 100644 index 700ffecc2..000000000 --- a/Website/ui/src/plugins/sun-king-shs/js/routes.js +++ /dev/null @@ -1,9 +0,0 @@ -let routes = [ - { - path: '/sun-king-shs/sun-king-overview', - component: - require('./plugins/sun-king-shs/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/swifta-payment-provider/js/eventbus.js b/Website/ui/src/plugins/swifta-payment-provider/js/eventbus.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/viber-messaging/js/eventbus.js b/Website/ui/src/plugins/viber-messaging/js/eventbus.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/viber-messaging/js/routes.js b/Website/ui/src/plugins/viber-messaging/js/routes.js deleted file mode 100644 index d2021508a..000000000 --- a/Website/ui/src/plugins/viber-messaging/js/routes.js +++ /dev/null @@ -1,9 +0,0 @@ -let routes = [ - { - path: '/viber-messaging/viber-overview', - component: - require('./plugins/viber-messaging/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/wave-money-payment-provider/js/eventbus.js b/Website/ui/src/plugins/wave-money-payment-provider/js/eventbus.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/wave-money-payment-provider/js/routes.js b/Website/ui/src/plugins/wave-money-payment-provider/js/routes.js deleted file mode 100644 index aa55f11a2..000000000 --- a/Website/ui/src/plugins/wave-money-payment-provider/js/routes.js +++ /dev/null @@ -1,23 +0,0 @@ -let routes = [ - { - path: '/wave-money/wave-money-overview', - component: - require('./plugins/wave-money-payment-provider/js/components/Overview/Overview') - .default, - meta: { layout: 'default' }, - }, - { - path: '/wave-money/payment/:name/:id', - component: - require('./plugins/wave-money-payment-provider/js/components/Payment/Payment') - .default, - meta: { layout: 'default' }, - }, - { - path: '/wave-money/result/:name/:id', - component: - require('./plugins/wave-money-payment-provider/js/components/Payment/Result') - .default, - meta: { layout: 'default' }, - }, -] diff --git a/Website/ui/src/plugins/wavecom-payment-provider/js/eventbus.js b/Website/ui/src/plugins/wavecom-payment-provider/js/eventbus.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/Website/ui/src/plugins/wavecom-payment-provider/js/routes.js b/Website/ui/src/plugins/wavecom-payment-provider/js/routes.js deleted file mode 100644 index 04df80564..000000000 --- a/Website/ui/src/plugins/wavecom-payment-provider/js/routes.js +++ /dev/null @@ -1,9 +0,0 @@ -let routes = [ - { - path: '/wavecom/transactions', - component: - require('./plugins/wave-money-payment-provider/js/components/Component') - .default, - meta: { layout: 'default' }, - }, -] From f4ae013b2769482220541deaf0721a2763726028 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Thu, 18 Jul 2024 13:56:21 +0200 Subject: [PATCH 03/18] Fix `EventBus` imports --- Website/ui/src/plugins/kelin-meter/js/modules/Customer/List.vue | 2 +- .../plugins/kelin-meter/js/modules/Meter/Consumption/Daily.vue | 2 +- .../kelin-meter/js/modules/Meter/Consumption/Minutely.vue | 2 +- Website/ui/src/plugins/kelin-meter/js/modules/Meter/List.vue | 2 +- .../ui/src/plugins/kelin-meter/js/modules/Shared/Paginator.vue | 2 +- Website/ui/src/plugins/kelin-meter/js/modules/Shared/Widget.vue | 2 +- .../plugins/spark-meter/js/modules/Customer/CustomerList.vue | 2 +- .../spark-meter/js/modules/MeterModel/MeterModelList.vue | 2 +- .../spark-meter/js/modules/SalesAccount/SalesAccountList.vue | 2 +- .../ui/src/plugins/spark-meter/js/modules/Shared/Paginator.vue | 2 +- Website/ui/src/plugins/spark-meter/js/modules/Shared/Widget.vue | 2 +- Website/ui/src/plugins/spark-meter/js/modules/Site/SiteList.vue | 2 +- .../ui/src/plugins/spark-meter/js/modules/Tariff/TariffList.vue | 2 +- .../ui/src/plugins/steama-meter/js/modules/Agent/AgentList.vue | 2 +- .../plugins/steama-meter/js/modules/Customer/CustomerList.vue | 2 +- .../steama-meter/js/modules/Customer/CustomerMovements.vue | 2 +- .../ui/src/plugins/steama-meter/js/modules/Meter/MeterList.vue | 2 +- .../src/plugins/steama-meter/js/modules/Overview/Credential.vue | 2 +- .../ui/src/plugins/steama-meter/js/modules/Shared/Paginator.vue | 2 +- .../ui/src/plugins/steama-meter/js/modules/Shared/Widget.vue | 2 +- .../ui/src/plugins/steama-meter/js/modules/Site/SiteList.vue | 2 +- .../src/plugins/stron-meter/js/modules/Overview/Credential.vue | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Website/ui/src/plugins/kelin-meter/js/modules/Customer/List.vue b/Website/ui/src/plugins/kelin-meter/js/modules/Customer/List.vue index 9e4676313..cf23920b1 100644 --- a/Website/ui/src/plugins/kelin-meter/js/modules/Customer/List.vue +++ b/Website/ui/src/plugins/kelin-meter/js/modules/Customer/List.vue @@ -52,7 +52,7 @@ - - diff --git a/Website/ui/src/plugins/spark-meter/js/modules/Customer/CustomerList.vue b/Website/ui/src/plugins/spark-meter/js/modules/Customer/CustomerList.vue index 40cd2b6c5..2eece9633 100644 --- a/Website/ui/src/plugins/spark-meter/js/modules/Customer/CustomerList.vue +++ b/Website/ui/src/plugins/spark-meter/js/modules/Customer/CustomerList.vue @@ -95,17 +95,17 @@ - - - diff --git a/Website/ui/src/plugins/spark-meter/js/modules/Site/SiteList.vue b/Website/ui/src/plugins/spark-meter/js/modules/Site/SiteList.vue index 1d663ab02..2e77b3fd6 100644 --- a/Website/ui/src/plugins/spark-meter/js/modules/Site/SiteList.vue +++ b/Website/ui/src/plugins/spark-meter/js/modules/Site/SiteList.vue @@ -124,16 +124,16 @@ - - - diff --git a/Website/ui/src/plugins/steama-meter/js/modules/Site/SiteList.vue b/Website/ui/src/plugins/steama-meter/js/modules/Site/SiteList.vue index 6c1a6332e..690f4f900 100644 --- a/Website/ui/src/plugins/steama-meter/js/modules/Site/SiteList.vue +++ b/Website/ui/src/plugins/steama-meter/js/modules/Site/SiteList.vue @@ -40,24 +40,24 @@ - - - diff --git a/Website/ui/src/plugins/kelin-meter/js/modules/Shared/Widget.vue b/Website/ui/src/plugins/kelin-meter/js/modules/Shared/Widget.vue index 9e8316280..56ca7ed79 100644 --- a/Website/ui/src/plugins/kelin-meter/js/modules/Shared/Widget.vue +++ b/Website/ui/src/plugins/kelin-meter/js/modules/Shared/Widget.vue @@ -108,7 +108,7 @@ - - diff --git a/Website/ui/src/plugins/steama-meter/js/modules/Shared/Widget.vue b/Website/ui/src/plugins/steama-meter/js/modules/Shared/Widget.vue index d0f537b67..ab4af7712 100644 --- a/Website/ui/src/plugins/steama-meter/js/modules/Shared/Widget.vue +++ b/Website/ui/src/plugins/steama-meter/js/modules/Shared/Widget.vue @@ -108,7 +108,7 @@ - - diff --git a/Website/ui/src/plugins/spark-meter/js/modules/Customer/CustomerList.vue b/Website/ui/src/plugins/spark-meter/js/modules/Customer/CustomerList.vue index 2eece9633..5f6137f43 100644 --- a/Website/ui/src/plugins/spark-meter/js/modules/Customer/CustomerList.vue +++ b/Website/ui/src/plugins/spark-meter/js/modules/Customer/CustomerList.vue @@ -104,7 +104,7 @@ - - diff --git a/Website/ui/src/plugins/spark-meter/js/modules/Site/SiteList.vue b/Website/ui/src/plugins/spark-meter/js/modules/Site/SiteList.vue index 2e77b3fd6..9a07036c3 100644 --- a/Website/ui/src/plugins/spark-meter/js/modules/Site/SiteList.vue +++ b/Website/ui/src/plugins/spark-meter/js/modules/Site/SiteList.vue @@ -137,7 +137,7 @@ import RedirectionModal from '@/shared/RedirectionModal' import { SiteService } from '../../services/SiteService' import { EventBus } from '@/shared/eventbus' import { CredentialService } from '../../services/CredentialService' -import Widget from '../Shared/Widget' +import Widget from '@/shared/WidgetLegacy' export default { name: 'SiteList', diff --git a/Website/ui/src/plugins/spark-meter/js/modules/Tariff/TariffDetail.vue b/Website/ui/src/plugins/spark-meter/js/modules/Tariff/TariffDetail.vue index 5e4ca1997..b63c4f32e 100644 --- a/Website/ui/src/plugins/spark-meter/js/modules/Tariff/TariffDetail.vue +++ b/Website/ui/src/plugins/spark-meter/js/modules/Tariff/TariffDetail.vue @@ -502,7 +502,7 @@