Merge pull request #71 from modx-pro/refactor-ui

Refactor UI + улучшение линтеров и форматирования кода

Author: biz87

core/components/minishop3/controllers/category/update.class.php

@@ -90,6 +90,7 @@ public function loadCustomCssJs()
         $this->addLastJavascript($assetsUrl . 'js/mgr/category/update.js');
 
         // Vue Category Products Grid with VueTools dependency check
+        $this->addCss($assetsUrl . 'css/mgr/vue-dist/primeicons.min.css');
         $this->addCss($assetsUrl . 'css/mgr/vue-dist/category-products.min.css');
         $this->addVueModule($assetsUrl . 'js/mgr/vue-dist/category-products.min.js');
 

core/components/minishop3/controllers/mgr/customers.class.php

@@ -40,6 +40,7 @@ public function loadCustomCssJs()
         $config = $this->ms3->config;
         $this->addHtml('<script>Object.assign(ms3.config, ' . json_encode($config) . ');</script>');
 
+        $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/primeicons.min.css');
         $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/customers.min.css');
         // Vue module with VueTools dependency check
         $this->addVueModule($this->ms3->config['assetsUrl'] . 'js/mgr/vue-dist/customers.min.js');

core/components/minishop3/controllers/mgr/help.class.php

@@ -28,6 +28,7 @@ public function getLanguageTopics()
     public function loadCustomCssJs()
     {
         // Vue CSS
+        $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/primeicons.min.css');
         $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/help.min.css');
 
         // Vue module

core/components/minishop3/controllers/mgr/notifications.class.php

@@ -38,6 +38,7 @@ public function loadCustomCssJs()
         $config = $this->ms3->config;
         $this->addHtml('<script>Object.assign(ms3.config, ' . json_encode($config) . ');</script>');
 
+        $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/primeicons.min.css');
         $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/notifications.min.css');
         // Vue module with VueTools dependency check
         $this->addVueModule($this->ms3->config['assetsUrl'] . 'js/mgr/vue-dist/notifications.min.js');

core/components/minishop3/controllers/mgr/order.class.php

@@ -41,6 +41,7 @@ public function loadCustomCssJs()
 
         $this->addHtml('<script>Object.assign(ms3.config, ' . json_encode($config) . ');</script>');
 
+        $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/primeicons.min.css');
         $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/order.min.css');
         // Vue module with VueTools dependency check
         $this->addVueModule($this->ms3->config['assetsUrl'] . 'js/mgr/vue-dist/order.min.js');

core/components/minishop3/controllers/mgr/orders.class.php

@@ -40,6 +40,7 @@ public function loadCustomCssJs()
         $config = $this->ms3->config;
         $this->addHtml('<script>Object.assign(ms3.config, ' . json_encode($config) . ');</script>');
 
+        $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/primeicons.min.css');
         $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/orders.min.css');
         // Vue module with VueTools dependency check
         $this->addVueModule($this->ms3->config['assetsUrl'] . 'js/mgr/vue-dist/orders.min.js');

core/components/minishop3/controllers/mgr/settings.class.php

@@ -38,6 +38,8 @@ public function loadCustomCssJs()
         $this->addJavascript($this->ms3->config['jsUrl'] . 'mgr/misc/ms3.utils.js');
         $this->addJavascript($this->ms3->config['jsUrl'] . 'mgr/misc/ms3.combo.js');
 
+        // Vue shared CSS (variables + PrimeIcons)
+        $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/primeicons.min.css');
         // Vue shared components CSS
         $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/FileBrowser.min.css');
 

core/components/minishop3/controllers/product/update.class.php

@@ -62,6 +62,7 @@ public function loadCustomCssJs()
         $this->addLastJavascript($assetsUrl . 'js/mgr/product/update.js');
 
         // Product Tabs Vue module (contains Properties, Gallery, Categories, Links, Options tabs)
+        $this->addCss($assetsUrl . 'css/mgr/vue-dist/primeicons.min.css');
         $this->addCss($assetsUrl . 'css/mgr/vue-dist/product-tabs.min.css');
         $this->addVueModule($assetsUrl . 'js/mgr/vue-dist/product-tabs.min.js');
 

vueManager/.prettierignore

@@ -0,0 +1,6 @@
+node_modules
+dist
+coverage
+*.min.js
+*.min.css
+package-lock.json

vueManager/.prettierrc

@@ -0,0 +1,12 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "printWidth": 100,
+  "tabWidth": 2,
+  "useTabs": false,
+  "endOfLine": "lf",
+  "bracketSpacing": true,
+  "arrowParens": "avoid",
+  "vueIndentScriptAndStyle": false
+}