Merge tag 'v2.3.0' into develop

Author: alexusmai

package.json

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

src/components/modals/views/About.vue

@@ -14,26 +14,14 @@
                 <dd class="col-9">{{ version }}</dd>
 
                 <dt class="col-3">{{ lang.modal.about.developer }}:</dt>
-                <dd class="col-9">Aleksandr Manekin</dd>
-
-                <dt class="col-3">Email:</dt>
-                <dd class="col-9">
-                    <a href="mailto:[email protected]">[email protected]</a>
-                </dd>
+                <dd class="col-9">Aleksandr Manekin ([email protected])</dd>
 
                 <dt class="col-3">GitHub:</dt>
                 <dd class="col-9">
                     <a href="https://github.com/alexusmai/laravel-file-manager" target="_blank">
                         alexusmai/laravel-file-manager
                     </a>
                 </dd>
-
-                <dt class="col-3">Home:</dt>
-                <dd class="col-9">
-                    <a href="http://webmai.ru/projects/file-manager" target="_blank">
-                        Laravel File Manager (RU)
-                    </a>
-                </dd>
             </dl>
         </div>
     </div>

src/store/actions.js

@@ -27,7 +27,11 @@ export default {
           ? response.data.config.rightDisk
           : getters.diskList[0];
 
-        // find disk settings in URL
+        // paths
+        let leftPath = response.data.config.leftPath;
+        let rightPath = response.data.config.rightPath;
+
+        // find disk and path settings in the URL
         if (window.location.search) {
           const params = new URLSearchParams(window.location.search);
 
@@ -38,33 +42,58 @@ export default {
           if (params.get('rightDisk')) {
             rightDisk = params.get('rightDisk');
           }
+
+          if (params.get('leftPath')) {
+            leftPath = params.get('leftPath');
+          }
+
+          if (params.get('rightPath')) {
+            rightPath = params.get('rightPath');
+          }
         }
 
         // left manager - set default disk
         commit('left/setDisk', leftDisk);
 
+        // if leftPath not null
+        if (leftPath) {
+          commit('left/setSelectedDirectory', leftPath);
+          commit('left/addToHistory', leftPath);
+        }
+
         // load content to the left file manager
         dispatch('getLoadContent', {
           manager: 'left',
           disk: leftDisk,
-          path: null,
+          path: leftPath,
         });
 
         // initialize the app depending on the settings
         if (state.settings.windowsConfig === 3) {
           // if selected left and right managers
           commit('right/setDisk', rightDisk);
 
+          // if rightPath not null
+          if (rightPath) {
+            commit('right/setSelectedDirectory', rightPath);
+            commit('right/addToHistory', rightPath);
+          }
+
           // load content to the right file manager
           dispatch('getLoadContent', {
             manager: 'right',
             disk: rightDisk,
-            path: null,
+            path: rightPath,
           });
         } else if (state.settings.windowsConfig === 2) {
           // if selected left manager and directories tree
           // init directories tree
-          dispatch('tree/initTree', leftDisk);
+          dispatch('tree/initTree', leftDisk).then(() => {
+            if (leftPath) {
+              // reopen folders if path not null
+              dispatch('tree/reopenPath', leftPath);
+            }
+          });
         }
       }
     });

src/store/settings/store.js

@@ -14,7 +14,7 @@ export default {
       acl: null,
 
       // App version
-      version: '2.2.3',
+      version: '2.3.0',
 
       // axios headers
       headers: null,