Merge branch 'master' into feature/api-refactoring-roles

# Conflicts: # package-lock.json # src/modules/permissions/modules/roles/api/roles.js
webitel · Nov 6, 2023 · 0b88384 · 0b88384
2 parents f99570e + fda27ce
commit 0b88384
Show file tree

Hide file tree

Showing 562 changed files with 30,588 additions and 38,412 deletions.
diff --git a/.env b/.env
@@ -1,13 +1,14 @@
-VUE_APP_API_URL = '/api'
-VUE_APP_CHAT_URL = '/chat'
+VITE_API_URL = '/api'
+VITE_CHAT_URL = '/chat'
 
-VUE_APP_AUTH_MODULE_URL = '/app/auth'
+VITE_AUTH_MODULE_URL = '/app/auth'
 
-VUE_APP_ADMIN_URL = '/admin'
-VUE_APP_AGENT_URL = '/workspace'
-VUE_APP_SUPERVISOR_URL = '/supervisor'
-VUE_APP_AUDIT_URL = '/audit'
-VUE_APP_HISTORY_URL = '/history'
-VUE_APP_GRAFANA_URL = '/grafana'
-VUE_APP_OMNI_WIDGET_URL = '/omni-widget'
-VUE_APP_FLOW_DIAGRAM_URL = '/flow-diagram'
+VITE_ADMIN_URL = '/admin'
+VITE_AGENT_URL = '/workspace'
+VITE_SUPERVISOR_URL = '/supervisor'
+VITE_AUDIT_URL = '/audit'
+VITE_HISTORY_URL = '/history'
+VITE_GRAFANA_URL = '/grafana'
+VITE_CRM_URL = '/crm'
+VITE_OMNI_WIDGET_URL = '/omni-widget'
+VITE_FLOW_DIAGRAM_URL = '/flow-diagram'
diff --git a/.env.development b/.env.development
@@ -1,13 +1,14 @@
-VUE_APP_API_URL = 'https://dev.webitel.com/api'
-VUE_APP_CHAT_URL = 'chat'
+VITE_API_URL = 'https://dev.webitel.com/api'
+VITE_CHAT_URL = 'chat'
 
-VUE_APP_AUTH_MODULE_URL = 'http://dev.webitel.com/app/auth'
+VITE_AUTH_MODULE_URL = 'http://dev.webitel.com/app/auth'
 
-VUE_APP_ADMIN_URL = 'https://dev.webitel.com/admin'
-VUE_APP_AGENT_URL = 'https://dev.webitel.com/workspace'
-VUE_APP_SUPERVISOR_URL ='https://dev.webitel.com/supervisor'
-VUE_APP_AUDIT_URL = 'https://dev.webitel.com/audit'
-VUE_APP_HISTORY_URL = 'https://dev.webitel.com/history'
-VUE_APP_GRAFANA_URL = 'https://dev.webitel.com/grafana'
-VUE_APP_OMNI_WIDGET_URL = 'https://dev.webitel.com/omni-widget'
-VUE_APP_FLOW_DIAGRAM_URL = 'https://dev.webitel.com/flow-diagram'
+VITE_ADMIN_URL = 'https://dev.webitel.com/admin'
+VITE_AGENT_URL = 'https://dev.webitel.com/workspace'
+VITE_SUPERVISOR_URL ='https://dev.webitel.com/supervisor'
+VITE_AUDIT_URL = 'https://dev.webitel.com/audit'
+VITE_HISTORY_URL = 'https://dev.webitel.com/history'
+VITE_GRAFANA_URL = 'https://dev.webitel.com/grafana'
+VITE_CRM_URL = 'https://dev.webitel.com/crm'
+VITE_OMNI_WIDGET_URL = 'https://dev.webitel.com/omni-widget'
+VITE_FLOW_DIAGRAM_URL = 'https://dev.webitel.com/flow-diagram'
diff --git a/.eslintignore b/.eslintignore
@@ -1,4 +1,3 @@
 src/router
 src/store
 src/assets/js/loginAnimation.js
-vue.config.js
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,17 +2,14 @@ module.exports = {
   root: true,
   env: {
     node: true,
+    es2022: true,
   },
   extends: [
-    'plugin:vue/essential',
-    '@vue/airbnb',
+    'plugin:vue/vue3-recommended',
   ],
-  parserOptions: {
-    parser: '@babel/eslint-parser',
-  },
   rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-console': 'off',
+    'no-debugger': 'off',
     'no-useless-catch': 'off',
     'no-shadow': 'off',
     'no-empty': 'off',

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,20 @@
+name: Admin CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '18.x'
+    - run: npm ci
+    - run: npm run test:unit
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@ unused
 /dist
 /coverage
 .eslintignore
-jest.json
 
 # local env files
 .env.local

diff --git a/.husky/pre-push b/.husky/pre-push
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run test:unit
+# npm run test:unit
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dockerfile b/Dockerfile
diff --git a/babel.config.js b/babel.config.js
diff --git a/public/index.html → index.html b/public/index.html → index.html
@@ -4,14 +4,14 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="/favicon.ico">
     <title>web-client</title>
   </head>
   <body>
     <noscript>
       <strong>We're sorry but web-client doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
-    <!-- built files will be auto injected -->
+    <script type="module" src="/src/main.js"></script>
   </body>
 </html>
diff --git a/jest.config.js b/jest.config.js