diff --git a/package-lock.json b/package-lock.json index 97bf9a8..77607da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "laravel-file-manager", - "version": "3.0.2", + "name": "laravel-frontend-file-manager", + "version": "3.0.142", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "laravel-file-manager", - "version": "3.0.2", + "name": "laravel-frontend-file-manager", + "version": "3.0.142", "license": "MIT", "dependencies": { "axios": "^0.25.0", @@ -1537,9 +1537,9 @@ } }, "node_modules/get-intrinsic": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz", - "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", + "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", "dev": true, "dependencies": { "function-bind": "^1.1.1", @@ -3999,9 +3999,9 @@ "dev": true }, "get-intrinsic": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz", - "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", + "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", "dev": true, "requires": { "function-bind": "^1.1.1", diff --git a/package.json b/package.json index 9ba977c..600e0ef 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "name": "laravel-file-manager", - "version": "3.0.3", + "name": "laravel-frontend-file-manager", + "version": "3.0.169", "description": "File manager for Laravel", "keywords": [ "laravel", "file", "manager" ], - "author": "Aleksandr Manekin ", + "author": "Mohammad Ashrafuddin Ferdousi ", "private": false, "license": "MIT", "main": "src/init.js", @@ -37,5 +37,13 @@ "prettier": "^2.5.1", "sass": "^1.49.7", "vite": "^3.0.0" - } + }, + "repository": { + "type": "git", + "url": "git+https://github.com/codeperl/vue-laravel-file-manager.git" + }, + "bugs": { + "url": "https://github.com/codeperl/vue-laravel-file-manager/issues" + }, + "homepage": "https://github.com/codeperl/vue-laravel-file-manager#readme" } diff --git a/src/FileManager.vue b/src/FileManager.vue index ed25791..037bfc2 100644 --- a/src/FileManager.vue +++ b/src/FileManager.vue @@ -50,6 +50,7 @@ import ContextMenu from './components/blocks/ContextMenu.vue'; import NotificationBlock from './components/blocks/NotificationBlock.vue'; // Mixins import translate from './mixins/translate'; +import localstore from "./mixins/localstore"; export default { name: 'FileManager', @@ -84,17 +85,27 @@ export default { }; }, created() { - // manual settings - this.$store.commit('fm/settings/manualSettings', this.settings); - - // initiate Axios - this.$store.commit('fm/settings/initAxiosSettings'); - this.setAxiosConfig(); - this.requestInterceptor(); - this.responseInterceptor(); - - // initialize app settings - this.$store.dispatch('fm/initializeApp'); + new Promise(resolve => { + // manual settings + this.$store.commit('fm/settings/manualSettings', this.settings); + resolve(); + }).then(() => { + // initiate Axios + this.$store.commit('fm/settings/initAxiosSettings'); + }).then(() => { + this.setAxiosConfig(); + }).then(() => { + this.requestInterceptor(); + }).then(() => { + this.responseInterceptor(); + }).then(() => { + // initialize app settings + // Mohammad Ashrafuddin Ferdousi : 1 + // Mohammad Ashrafuddin Ferdousi : 2 + this.$store.dispatch('fm/initializeApp'); + }).catch(err => { + Promise.reject(err); + }); }, destroyed() { // reset state @@ -119,9 +130,16 @@ export default { /** * Axios default config */ - setAxiosConfig() { + async setAxiosConfig() { HTTP.defaults.baseURL = this.$store.getters['fm/settings/baseUrl']; + HTTP.defaults.withCredentials = this.$store.getters['fm/settings/withCredentials']; HTTP.defaults.headers = this.$store.getters['fm/settings/headers']; + HTTP.defaults.headers.common = {}; + HTTP.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; + let token = await new Promise(resolve => { + resolve(window.localStorage.getItem('_token')); + }); + HTTP.defaults.headers.Authorization = `Bearer ${token}`; }, /** diff --git a/src/components/blocks/NavbarBlock.vue b/src/components/blocks/NavbarBlock.vue index 07667ca..cd90fc8 100644 --- a/src/components/blocks/NavbarBlock.vue +++ b/src/components/blocks/NavbarBlock.vue @@ -252,7 +252,9 @@ export default { /** * Refresh file manager */ + // Mohammad Ashrafuddin Ferdousi : 2 refreshAll() { + // Mohammad Ashrafuddin Ferdousi : 2 this.$store.dispatch('fm/refreshAll'); }, @@ -294,7 +296,9 @@ export default { /** * Paste */ + // Mohammad Ashrafuddin Ferdousi : 17 paste() { + // Mohammad Ashrafuddin Ferdousi : 17 this.$store.dispatch('fm/paste'); }, diff --git a/src/components/blocks/mixins/contextMenuActions.js b/src/components/blocks/mixins/contextMenuActions.js index 9f50929..f6e78fd 100644 --- a/src/components/blocks/mixins/contextMenuActions.js +++ b/src/components/blocks/mixins/contextMenuActions.js @@ -64,8 +64,10 @@ export default { /** * Select file */ + // Mohammad Ashrafuddin Ferdousi : 5 selectAction() { // file callback + // Mohammad Ashrafuddin Ferdousi : 5 this.$store .dispatch('fm/url', { disk: this.selectedDisk, @@ -81,6 +83,7 @@ export default { /** * Download file */ + // Mohammad Ashrafuddin Ferdousi : 10 downloadAction() { const tempLink = document.createElement('a'); tempLink.style.display = 'none'; @@ -88,6 +91,7 @@ export default { // download file with authorization if (this.$store.getters['fm/settings/authHeader']) { + // Mohammad Ashrafuddin Ferdousi : 10 HTTP.download(this.selectedDisk, this.selectedItems[0].path).then((response) => { tempLink.href = window.URL.createObjectURL(new Blob([response.data])); document.body.appendChild(tempLink); @@ -134,8 +138,10 @@ export default { /** * Paste copied or cut items */ + // Mohammad Ashrafuddin Ferdousi : 17 pasteAction() { // paste items in the selected folder + // Mohammad Ashrafuddin Ferdousi : 17 this.$store.dispatch('fm/paste'); }, diff --git a/src/components/manager/DiskList.vue b/src/components/manager/DiskList.vue index 555d1c8..a001fa8 100644 --- a/src/components/manager/DiskList.vue +++ b/src/components/manager/DiskList.vue @@ -43,8 +43,12 @@ export default { * Select disk * @param disk */ + // Mohammad Ashrafuddin Ferdousi : 3 + // Mohammad Ashrafuddin Ferdousi : 2 selectDisk(disk) { if (this.selectedDisk !== disk) { + // Mohammad Ashrafuddin Ferdousi : 2 + // Mohammad Ashrafuddin Ferdousi : 3 this.$store.dispatch('fm/selectDisk', { disk, manager: this.manager, diff --git a/src/components/manager/Thumbnail.vue b/src/components/manager/Thumbnail.vue index 243fbc9..f65197d 100644 --- a/src/components/manager/Thumbnail.vue +++ b/src/components/manager/Thumbnail.vue @@ -1,7 +1,9 @@