Merge branch 'release/v2.5.0'

alexusmai · Jun 29, 2020 · bf8573d · bf8573d
2 parents 90b38f4 + e435c46
commit bf8573d
Show file tree

Hide file tree

Showing 51 changed files with 2,441 additions and 3,751 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -11,23 +11,27 @@ module.exports = {
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'no-param-reassign': [
-      "error",
+      'error',
       {
-        "props": true,
-        "ignorePropertyModificationsFor": [
-          "state",
-          "acc",
-          "e",
-          "ctx",
-          "req",
-          "request",
-          "res",
-          "response",
-          "$scope"
-        ]
-      }
+        'props': true,
+        'ignorePropertyModificationsFor': [
+          'state',
+          'acc',
+          'e',
+          'ctx',
+          'req',
+          'request',
+          'res',
+          'response',
+          '$scope',
+        ],
+      },
     ],
     'max-len': 'off',
+    'vue/no-use-v-if-with-v-for': [
+      'error', {
+        'allowUsingIterationVar': true,
+      }],
   },
   parserOptions: {
     parser: 'babel-eslint',

diff --git a/README.md b/README.md
@@ -142,8 +142,4 @@ MIX_LFM_BASE_URL=http://my-url.loc/file-manager/
 MIX_LFM_CSRF_TOKEN=OFF
 ```
 
-Warning! Package use axios (Promise) - use babel-polyfill for ie11
-
-## Contributors
-
-[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/0)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/0)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/1)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/1)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/2)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/2)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/3)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/3)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/4)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/4)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/5)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/5)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/6)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/6)[![](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/images/7)](https://sourcerer.io/fame/alexusmai/alexusmai/vue-laravel-file-manager/links/7)
+Warning! Package use axios (Promise) - use babel-polyfill for ie11
diff --git a/babel.config.js b/babel.config.js
@@ -1,7 +1,5 @@
 module.exports = {
   presets: [
-    [ '@vue/app', {
-      useBuiltIns: 'entry'
-    }]
+    '@vue/cli-plugin-babel/preset',
   ],
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "laravel-file-manager",
-  "version": "2.4.14",
+  "version": "2.5.0",
   "description": "File manager for Laravel",
   "keywords": [
     "laravel",
@@ -18,26 +18,27 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
-    "axios": "^0.18.0",
-    "codemirror": "^5.41.0",
+    "axios": "^0.19.2",
+    "codemirror": "^5.55.0",
+    "core-js": "^3.6.5",
     "cropperjs": "^1.4.3",
-    "plyr": "^3.4.7",
-    "vue": "^2.5.17",
-    "vue-codemirror": "^4.0.5",
-    "vuex": "^3.0.1"
+    "plyr": "^3.4.8",
+    "vue": "^2.6.11",
+    "vue-codemirror": "^4.0.6",
+    "vuex": "^3.4.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.0.5",
-    "@vue/cli-plugin-eslint": "^3.0.5",
-    "@vue/cli-plugin-unit-jest": "^3.0.5",
-    "@vue/cli-service": "^3.0.5",
-    "@vue/eslint-config-airbnb": "^3.0.5",
-    "@vue/test-utils": "^1.0.0-beta.20",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "^23.0.1",
-    "babel-polyfill": "^6.26.0",
-    "node-sass": "^4.9.0",
-    "sass-loader": "^7.0.1",
-    "vue-template-compiler": "^2.5.17"
+    "@vue/cli-plugin-babel": "~4.4.6",
+    "@vue/cli-plugin-eslint": "~4.4.6",
+    "@vue/cli-plugin-vuex": "~4.4.6",
+    "@vue/cli-service": "~4.4.6",
+    "@vue/eslint-config-airbnb": "^5.0.2",
+    "babel-eslint": "^10.1.0",
+    "eslint": "^6.8.0",
+    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-vue": "^6.2.2",
+    "node-sass": "^4.14.1",
+    "sass-loader": "^8.0.2",
+    "vue-template-compiler": "^2.6.11"
   }
 }
diff --git a/public/index.html b/public/index.html
@@ -16,7 +16,7 @@
     </strong>
 </noscript>
 <div class="container">
-    <div style="height: 400px;">
+    <div style="height: 600px;">
         <div id="fm"></div>
     </div>
 </div>

diff --git a/src/FileManager.vue b/src/FileManager.vue
@@ -1,17 +1,17 @@
 <template>
   <div class="fm d-flex flex-column"
        v-bind:class="{ 'fm-full-screen': fullScreen }">
-    <navbar></navbar>
+    <navbar/>
     <div class="fm-body">
-      <notification></notification>
-      <context-menu></context-menu>
-      <modal v-if="showModal"></modal>
+      <notification/>
+      <context-menu/>
+      <modal v-if="showModal"/>
       <template v-if="windowsConfig === 1">
-        <left-manager class="col" manager="left"></left-manager>
+        <left-manager class="col" manager="left"/>
       </template>
       <template v-else-if="windowsConfig === 2">
-        <folder-tree class="col-4 col-md-3"></folder-tree>
-        <left-manager class="col-8 col-md-9" manager="left"></left-manager>
+        <folder-tree class="col-4 col-md-3"/>
+        <left-manager class="col-8 col-md-9" manager="left"/>
       </template>
       <template v-else-if="windowsConfig === 3">
         <left-manager class="col-12 col-sm-6"
@@ -26,7 +26,7 @@
         </right-manager>
       </template>
     </div>
-    <info-block></info-block>
+    <info-block/>
   </div>
 </template>
 
@@ -105,10 +105,10 @@ export default {
   },
   computed: {
     ...mapState('fm', {
-      windowsConfig: state => state.settings.windowsConfig,
-      activeManager: state => state.settings.activeManager,
-      showModal: state => state.modal.showModal,
-      fullScreen: state => state.settings.fullScreen,
+      windowsConfig: (state) => state.settings.windowsConfig,
+      activeManager: (state) => state.settings.activeManager,
+      showModal: (state) => state.modal.showModal,
+      fullScreen: (state) => state.settings.fullScreen,
     }),
   },
   methods: {
@@ -297,4 +297,3 @@ export default {
     padding-bottom: 0;
   }
 </style>
-
diff --git a/src/components/blocks/ContextMenu.vue b/src/components/blocks/ContextMenu.vue
@@ -12,7 +12,7 @@
                 v-bind:key="`i-${index}`"
                 v-if="showMenuItem(item.name)"
                 v-on:click="menuAction(item.name)">
-                <i class="fa-fw" v-bind:class="item.icon"></i>
+                <i class="fa-fw" v-bind:class="item.icon"/>
                 {{ lang.contextMenu[item.name] }}
             </li>
         </ul>
@@ -21,7 +21,7 @@
 
 <script>
 /* eslint-disable no-param-reassign */
-import EventBus from './../../eventBus';
+import EventBus from '../../eventBus';
 import translate from '../../mixins/translate';
 import contextMenu from './mixins/contextMenu';
 import contextMenuRules from './mixins/contextMenuRules';
@@ -44,7 +44,7 @@ export default {
      * Listen events
      * 'contextMenu'
      */
-    EventBus.$on('contextMenu', event => this.showMenu(event));
+    EventBus.$on('contextMenu', (event) => this.showMenu(event));
   },
   computed: {
     /**
@@ -148,6 +148,10 @@ export default {
         box-shadow: 3px 2px 5px gray;
         border-radius: 5px;
 
+        &:focus {
+            outline: none;
+        }
+
         .list-unstyled {
             margin-bottom: 0;
             border-bottom: 1px solid rgba(0,0,0,.125);

diff --git a/src/components/blocks/InfoBlock.vue b/src/components/blocks/InfoBlock.vue
@@ -25,25 +25,25 @@
         </div>
         <div class="col-auto text-right">
             <span v-show="loadingSpinner">
-                <i class="fas fa-spinner fa-pulse"></i>
+                <i class="fas fa-spinner fa-pulse"/>
             </span>
             <span v-show="clipboardType"
                   v-on:click="showModal('Clipboard')"
                   v-bind:title="[ lang.clipboard.title + ' - ' + lang.clipboard[clipboardType] ]">
-                <i class="far fa-clipboard"></i>
+                <i class="far fa-clipboard"/>
             </span>
             <span v-on:click="showModal('Status')"
                   v-bind:class="[hasErrors ? 'text-danger' : 'text-success']"
                   v-bind:title="lang.modal.status.title">
-                <i class="fas fa-info-circle"></i>
+                <i class="fas fa-info-circle"/>
             </span>
         </div>
     </div>
 </template>
 
 <script>
-import translate from './../../mixins/translate';
-import helper from './../../mixins/helper';
+import translate from '../../mixins/translate';
+import helper from '../../mixins/helper';
 
 export default {
   name: 'InfoBlock',