nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 08:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into api

Browse Source 
# Conflicts:
#	.env.testing
#	public/mix-manifest.json
#	src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
This commit is contained in:
Čarodej
2022-05-11 09:00:42 +02:00
parent 4250e58370 000b5459f9
commit d2371e667f
83 changed files with 803 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/js/store/modules/fileFunctions.js vendored
View File

@@ -114,7 +114,7 @@ const actions = {
})
.catch((error) => {
events.$emit('alert:open', {
title: error.response.data.message,
title: error.response.data.message || i18n.t('popup_error.title'),
message: i18n.t('popup_error.message'),
})
})
@@ -179,6 +179,8 @@ const actions = {
if (response.data.data.id) {
commit('PROCESSING_FILE', false)
commit('INCREASE_FOLDER_ITEM', response.data.data.attributes.parent_id)
// Remove first file from file queue
commit('SHIFT_FROM_FILE_QUEUE')

8
resources/js/store/modules/userAuth.js vendored
View File

@@ -32,7 +32,7 @@ const actions = {
})
})
},
logOut: ({ commit }) => {
logOut: ({ commit, getters }) => {
let popup = setTimeout(() => {
commit('PROCESSING_POPUP', {
@@ -50,7 +50,11 @@ const actions = {
commit('DESTROY_DATA')
commit('SET_AUTHORIZED', false)
router.push({name: 'Homepage'})
// Get redirect location
let redirectLocation = getters.config.allowHomepage ? 'Homepage' : 'SignIn'
// Redirect user
router.push({name: redirectLocation})
})
},
socialiteRedirect: ({ commit }, provider) => {