diff --git a/config/language-translations.php b/config/language-translations.php
index 8d60d7a3..2a22f698 100644
--- a/config/language-translations.php
+++ b/config/language-translations.php
@@ -947,7 +947,8 @@ return [
'remote_links' => 'Remote Links',
'remote_links_help' => 'For every new line paste one link and we will give a try to download the file.',
'paste_remote_links_here' => 'Paste your links to the files here...',
- 'remote_download_submitted' => 'Your links will be downloaded as soon as possible',
- 'remote_download_processed' => 'Links was added to the queue and will be downloaded soon',
+ 'remote_download_finished' => 'Remote upload was successfully finished',
+ 'remote_upload_progress' => 'Uploading Remotely - {processed} / {total}',
+ 'remote_upload_failed_count' => 'Failed: {count}',
],
];
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 6051c791..cdb182db 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,6 +1,6 @@
{
"/js/main.js": "/js/main.js",
- "/chunks/request.js": "/chunks/request.js?id=3904f27eff940fdc",
+ "/chunks/request.js": "/chunks/request.js?id=a3bdfcbe94393de5",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=3bc3423d2305cd30",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
"/chunks/status-check.js": "/chunks/status-check.js?id=9239a586761b912d",
@@ -9,13 +9,13 @@
"/chunks/environment.js": "/chunks/environment.js?id=e4fdb87ff173d48a",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=cbe7bfed06400736",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=78d257775f5fc485",
- "/chunks/shared.js": "/chunks/shared.js?id=1d98332d75f89854",
+ "/chunks/shared.js": "/chunks/shared.js?id=06cf22489fae4d66",
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=3fd9baddb7333c24",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=a6063bed9be75a09",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=b5519d193bce2339",
"/chunks/not-found.js": "/chunks/not-found.js?id=d31bd699138cf828",
"/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=26798085f527d955",
- "/chunks/admin.js": "/chunks/admin.js?id=70e9dc019ac56c11",
+ "/chunks/admin.js": "/chunks/admin.js?id=6ca770da2ac79bb2",
"/chunks/dashboard.js": "/chunks/dashboard.js?id=5ab55a12214433c8",
"/chunks/invoices.js": "/chunks/invoices.js?id=799928609f57ca10",
"/chunks/subscriptions.js": "/chunks/subscriptions.js?id=a0c4f59d0ec4aee0",
@@ -57,13 +57,13 @@
"/chunks/sign-up.js": "/chunks/sign-up.js?id=3d7559511768cd0e",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=27cda9364b6593d8",
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=2f0401ee2fc148c4",
- "/chunks/settings.js": "/chunks/settings.js?id=ee47f96c6c7d8a5c",
+ "/chunks/settings.js": "/chunks/settings.js?id=8f946a3099bf6d34",
"/chunks/profile.js": "/chunks/profile.js?id=3e24bb5e1f52d4bb",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=d00bf503d8126dc4",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=092e324aad54656b",
"/chunks/billing.js": "/chunks/billing.js?id=115c25478cee576d",
- "/chunks/platform.js": "/chunks/platform.js?id=79cbc00b09b132d7",
- "/chunks/files.js": "/chunks/files.js?id=b09c3f8b8b6aabcc",
+ "/chunks/platform.js": "/chunks/platform.js?id=42e33a69f54ac326",
+ "/chunks/files.js": "/chunks/files.js?id=a74bc8acc7ea876a",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=c6ed26eaace65f01",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=6adbb309c700eaf7",
"/chunks/trash.js": "/chunks/trash.js?id=32b84e2c25561372",
diff --git a/resources/js/App.vue b/resources/js/App.vue
index cfbc83a3..dd21256e 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -4,6 +4,7 @@
+
@@ -22,8 +23,9 @@
+
+
\ No newline at end of file
diff --git a/resources/js/store/modules/broadcasting.js b/resources/js/store/modules/broadcasting.js
index f691ad3a..720da4fc 100644
--- a/resources/js/store/modules/broadcasting.js
+++ b/resources/js/store/modules/broadcasting.js
@@ -1,6 +1,8 @@
import { events } from '../../bus'
+import i18n from "../../i18n"
const defaultState = {
+ remoteUploadQueue: undefined,
isBroadcasting: false,
}
@@ -10,13 +12,23 @@ const actions = {
Echo.private(`App.Users.Models.User.${getters.user.data.id}`)
.listen('.file.created', (event) => {
+ commit('UPDATE_REMOTE_UPLOAD_QUEUE', event.payload)
+
// If user is located in same directory as remote upload was called, then show the files
if (
- (!getters.currentFolder && !event.file.data.attributes.parent_id) ||
- (getters.currentFolder && event.file.data.attributes.parent_id === getters.currentFolder.data.id)
+ event.payload.file &&
+ (!getters.currentFolder && !event.payload.file.data.attributes.parent_id) ||
+ (getters.currentFolder && event.payload.file.data.attributes.parent_id === getters.currentFolder.data.id)
) {
// Add received item into view
- commit('ADD_NEW_ITEMS', event.file)
+ commit('ADD_NEW_ITEMS', event.payload.file)
+ }
+
+ if (event.payload.progress.total === event.payload.progress.processed) {
+ events.$emit('toaster', {
+ type: 'success',
+ message: i18n.t('remote_download_finished'),
+ })
}
})
.notification((notification) => {
@@ -47,9 +59,20 @@ const mutations = {
SET_RUNNING_COMMUNICATION(state) {
state.isBroadcasting = true
},
+ UPDATE_REMOTE_UPLOAD_QUEUE(state, payload) {
+ if (payload.progress.total !== payload.progress.processed) {
+ state.remoteUploadQueue = {
+ total: payload.progress.total,
+ processed: payload.progress.processed,
+ }
+ } else {
+ state.remoteUploadQueue = undefined
+ }
+ },
}
const getters = {
+ remoteUploadQueue: (state) => state.remoteUploadQueue,
isBroadcasting: (state) => state.isBroadcasting,
}
diff --git a/resources/js/views/FileView/Files.vue b/resources/js/views/FileView/Files.vue
index 06bfe741..4294cdfb 100644
--- a/resources/js/views/FileView/Files.vue
+++ b/resources/js/views/FileView/Files.vue
@@ -217,7 +217,6 @@