Merge branch 'release/2.1.0'

Author: alexusmai

package.json

@@ -1,6 +1,6 @@
 {
   "name": "laravel-file-manager",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "description": "File manager for Laravel",
   "keywords": [
     "laravel",

src/components/manager/GridView.vue

@@ -17,7 +17,8 @@
                  v-on:dblclick.stop="selectDirectory(directory.path)"
                  v-on:contextmenu.prevent="contextMenu(directory, $event)">
                 <div class="fm-item-icon">
-                    <i class="far fa-folder fa-5x pb-2"></i>
+                    <i class="fa-5x pb-2"
+                       v-bind:class="(acl && directory.acl === 0) ? 'fas fa-unlock-alt' : 'far fa-folder'"></i>
                 </div>
                 <div class="fm-item-info">{{ directory.basename }}</div>
             </div>
@@ -31,7 +32,10 @@
                  v-on:dblclick="selectAction(file.path, file.extension)"
                  v-on:contextmenu.prevent="contextMenu(file, $event)">
                 <div class="fm-item-icon">
-                    <template v-if="thisImage(file.extension)">
+                    <template v-if="acl && file.acl === 0">
+                        <i class="fas fa-unlock-alt fa-5x pb-2"></i>
+                    </template>
+                    <template v-else-if="thisImage(file.extension)">
                         <img class="img-thumbnail"
                              v-bind:alt="file.filename"
                              v-bind:src="createImgUrl(file.path)">

src/components/manager/TableView.vue

@@ -53,6 +53,7 @@
                     v-on:click="selectItem('directories', directory.path, $event)"
                     v-on:contextmenu.prevent="contextMenu(directory, $event)">
                     <td class="fm-content-item unselectable"
+                        v-bind:class="(acl && directory.acl === 0) ? 'text-hidden' : ''"
                         v-on:dblclick="selectDirectory(directory.path)">
                         <i class="far fa-folder"></i> {{ directory.basename }}
                     </td>
@@ -68,7 +69,8 @@
                     v-on:click="selectItem('files', file.path, $event)"
                     v-on:dblclick="selectAction(file.path, file.extension)"
                     v-on:contextmenu.prevent="contextMenu(file, $event)">
-                    <td class="fm-content-item unselectable">
+                    <td class="fm-content-item unselectable"
+                        v-bind:class="(acl && file.acl === 0) ? 'text-hidden' : ''">
                         <i class="far"
                            v-bind:class="extensionToIcon(file.extension)"></i>
                         {{ file.filename ? file.filename : file.basename }}
@@ -158,5 +160,9 @@ export default {
         .fm-content-item {
             cursor: pointer;
         }
+
+        .text-hidden {
+            color: #cdcdcd;
+        }
     }
 </style>

src/components/manager/mixins/manager.js

@@ -42,6 +42,13 @@ export default {
     selected() {
       return this.$store.state.fm[this.manager].selected;
     },
+
+    /**
+     * ACL On/Off
+     */
+    acl() {
+      return this.$store.state.fm.settings.acl;
+    },
   },
   methods: {
     /**

src/components/modals/views/Properties.vue

@@ -26,6 +26,11 @@
                     <dt class="col-3">{{ lang.modal.properties.modified }}:</dt>
                     <dd class="col-9">{{ timestampToDate(selectedItem.timestamp) }}</dd>
                 </template>
+
+                <template v-if="selectedItem.hasOwnProperty('acl')">
+                    <dt class="col-3">{{ lang.modal.properties.access }}:</dt>
+                    <dd class="col-9">{{ lang.modal.properties['access_' + selectedItem.acl] }}</dd>
+                </template>
             </dl>
         </div>
     </div>

src/lang/ar.js

@@ -97,6 +97,10 @@ const ar = {
       size: 'حجم',
       title: 'خصائص',
       type: 'نوع',
+      access: 'Access',
+      access_0: 'Access denied',
+      access_1: 'Only Read',
+      access_2: 'Read and Write',
     },
     rename: {
       directoryExist: 'المجلد موجود',

src/lang/en.js

@@ -97,6 +97,10 @@ const en = {
       size: 'Size',
       title: 'Properties',
       type: 'Type',
+      access: 'Access',
+      access_0: 'Access denied',
+      access_1: 'Only Read',
+      access_2: 'Read and Write',
     },
     rename: {
       directoryExist: 'Directory exists',

src/lang/ru.js

@@ -97,6 +97,10 @@ const ru = {
       size: 'Размер',
       title: 'Свойства',
       type: 'Тип',
+      access: 'Доступ',
+      access_0: 'Нет доступа',
+      access_1: 'Только чтение',
+      access_2: 'Чтение и Запись',
     },
     rename: {
       directoryExist: 'Папка существует',

src/store/settings/mutations.js

@@ -63,5 +63,6 @@ export default {
   initSettings(state, data) {
     if (!state.lang) state.lang = data.lang;
     if (!state.windowsConfig) state.windowsConfig = data.windowsConfig;
+    state.acl = data.acl;
   },
 };

src/store/settings/store.js

@@ -10,8 +10,11 @@ export default {
   namespaced: true,
   state() {
     return {
+      // ACL
+      acl: null,
+
       // App version
-      version: '2.0.6',
+      version: '2.1.0',
 
       // this headers will be merged with default headers
       headers: {},