api refactoring

This commit is contained in:
Čarodej
2022-05-11 09:19:55 +02:00
parent d2371e667f
commit c0e431b384
76 changed files with 1142 additions and 690 deletions

View File

@@ -116,11 +116,8 @@ export default {
config: this.$root.$data.config,
})
// Get installation state
let installation = this.$root.$data.config.installation
// Redirect to setup wizard
if (installation === 'installation-needed') {
if (this.$root.$data.config.installation === 'installation-needed') {
this.isLoaded = true
if (window.location.pathname.split('/')[1] !== 'setup-wizard') {

View File

@@ -50,7 +50,7 @@ export default {
reader.readAsDataURL(file)
// Update user avatar
this.$updateImage('/user/settings', 'avatar', event.target.files[0])
this.$updateAvatar(event.target.files[0])
} else {
alert(this.$t('wrong_image_error'))
}

View File

@@ -105,7 +105,7 @@ export default {
// Get route
let route = {
RequestUpload: `/api/upload-request/${this.$router.currentRoute.params.token}/upload/remote`,
RequestUpload: `/api/file-request/${this.$router.currentRoute.params.token}/upload/remote`,
Public: `/api/editor/upload/remote/${this.$router.currentRoute.params.token}`,
}[this.$router.currentRoute.name] || '/api/upload/remote'

View File

@@ -152,7 +152,7 @@ export default {
this.isSendingBillingAlert = true
axios
.patch(`/api/subscriptions/billing-alerts/${this.user.data.relationships.alert.data.id}`, {
.put('/api/subscriptions/billing-alert', {
amount: this.billingAlertAmount,
})
.then(() => {
@@ -184,7 +184,7 @@ export default {
this.isSendingBillingAlert = true
axios
.post('/api/subscriptions/billing-alerts', {
.post('/api/subscriptions/billing-alert', {
amount: this.billingAlertAmount,
})
.then(() => {
@@ -222,7 +222,7 @@ export default {
events.$on('action:confirmed', (data) => {
if (data.operation === 'delete-billing-alert')
axios
.delete(`/api/subscriptions/billing-alerts/${this.user.data.relationships.alert.data.id}`)
.delete('/api/subscriptions/billing-alert')
.then(() => {
this.$store.dispatch('getAppData')

View File

@@ -164,7 +164,7 @@ export default {
// Send request to get share link
axios
.post(`/api/upload-request`, this.form)
.post(`/api/file-request`, this.form)
.then((response) => {
this.generatedUploadRequest = response.data
})

View File

@@ -63,6 +63,27 @@ const FunctionHelpers = {
})
}
Vue.prototype.$updateAvatar = function (image) {
// Create form
let formData = new FormData()
// Add image to form
formData.append('avatar', image)
axios
.post(`${store.getters.api}/user/avatar`, formData, {
headers: {
'Content-Type': 'multipart/form-data',
},
})
.catch(() => {
events.$emit('alert:open', {
title: this.$t('popup_error.title'),
message: this.$t('popup_error.message'),
})
})
}
Vue.prototype.$scrollTop = function () {
const container = document.getElementsByTagName('html')[0]
@@ -226,17 +247,21 @@ const FunctionHelpers = {
'.part'
do {
let isLast = chunks.length === 1,
let isLastChunk = chunks.length === 1 ? 1 : 0,
chunk = chunks.shift(),
attempts = 0
// Set form data
formData.set('name', item.file.name)
formData.set('file', chunk, source_name)
formData.set('path', item.path)
formData.set('parent_id', item.parent_id)
formData.set('chunk', chunk, source_name)
formData.set('extension', item.file.name.split('.').pop())
formData.set('is_last', isLast)
formData.set('is_last_chunk', isLastChunk)
if (item.path && item.path !== '/')
formData.set('path', item.path)
if (item.parent_id)
formData.set('parent_id', item.parent_id)
// Upload chunks
do {

View File

@@ -19,7 +19,7 @@ const actions = {
commit('LOADING_STATE', { loading: true, data: [] })
axios
.get(`${getters.api}/browse/folders/${id}${getters.sorting.URI}`)
.get(`${getters.api}/browse/folders/${id || 'all'}${getters.sorting.URI}`)
.then((response) => {
let folders = response.data.folders.data
let files = response.data.files.data
@@ -85,7 +85,7 @@ const actions = {
commit('LOADING_STATE', { loading: true, data: [] })
axios
.get(`${getters.api}/browse/trash/${id}${getters.sorting.URI}`)
.get(`${getters.api}/browse/trash/${id || 'all'}${getters.sorting.URI}`)
.then((response) => {
let folders = response.data.folders.data
let files = response.data.files.data
@@ -104,7 +104,7 @@ const actions = {
return new Promise((resolve, reject) => {
// Get route
let route = {
RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/navigation`,
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/navigation`,
Public: `/api/browse/navigation/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || '/api/browse/navigation'

View File

@@ -59,7 +59,7 @@ const actions = {
// Get route
let route = {
RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/move`,
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/move`,
Public: `/api/editor/move/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || '/api/move'
@@ -87,7 +87,7 @@ const actions = {
createFolder: ({ commit, getters, dispatch }, folder) => {
// Get route
let route = {
RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/create-folder`,
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/create-folder`,
Public: `/api/editor/create-folder/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || '/api/create-folder'
@@ -126,7 +126,7 @@ const actions = {
// Get route
let route = {
RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/rename/${data.id}`,
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/rename/${data.id}`,
Public: `/api/editor/rename/${data.id}/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || `/api/rename/${data.id}`
@@ -149,9 +149,9 @@ const actions = {
return new Promise((resolve, reject) => {
// Get route
let route = {
RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/upload`,
Public: `/api/editor/upload/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || '/api/upload'
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/upload/chunks`,
Public: `/api/editor/upload/chunks/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || '/api/upload/chunks'
// Create cancel token for axios cancellation
const CancelToken = axios.CancelToken,
@@ -319,7 +319,7 @@ const actions = {
// Get route
let route = {
RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/remove`,
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/remove`,
Public: `/api/editor/remove/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || '/api/remove'

View File

@@ -17,7 +17,7 @@ const actions = {
}
axios
.get(`${getters.api}/teams/folders/${id}${getters.sorting.URI}`)
.get(`${getters.api}/teams/folders/${id || 'all'}${getters.sorting.URI}`)
.then((response) => {
let folders = response.data.folders.data
let files = response.data.files.data
@@ -59,7 +59,7 @@ const actions = {
}
axios
.get(`${getters.api}/teams/shared-with-me/${id}${getters.sorting.URI}`)
.get(`${getters.api}/teams/shared-with-me/${id || 'all'}${getters.sorting.URI}`)
.then((response) => {
let folders = response.data.folders.data
let files = response.data.files.data

View File

@@ -13,7 +13,7 @@ const actions = {
return new Promise((resolve, reject) => {
axios
.get(`/api/upload-request/${router.currentRoute.params.token}/browse/${id}${getters.sorting.URI}`)
.get(`/api/file-request/${router.currentRoute.params.token}/browse/${id || 'all'}${getters.sorting.URI}`)
.then((response) => {
let folders = response.data.folders.data
let files = response.data.files.data
@@ -37,7 +37,7 @@ const actions = {
},
getUploadRequestDetail: ({ commit }) => {
return new Promise((resolve, reject) => {
axios.get(`/api/upload-request/${router.currentRoute.params.token}`)
axios.get(`/api/file-request/${router.currentRoute.params.token}`)
.then((response) => {
resolve(response)
@@ -56,7 +56,7 @@ const actions = {
},
closeUploadRequest: ({ commit }) => {
axios
.delete(`/api/upload-request/${router.currentRoute.params.token}`)
.delete(`/api/file-request/${router.currentRoute.params.token}`)
.then((response) => {
commit('LOADING_STATE', { loading: false, data: [] })
commit('SET_UPLOAD_REQUEST', response.data)

View File

@@ -93,7 +93,7 @@ const actions = {
context.commit('ADD_TO_FAVOURITES', favouritesWidget)
axios
.post(context.getters.api + '/folders/favourites', {
.post(context.getters.api + '/favourites', {
ids: itemsToFavourites,
})
.catch(() => {
@@ -105,19 +105,19 @@ const actions = {
commit('REMOVE_ITEM_FROM_FAVOURITES', folder)
axios
.post(getters.api + '/folders/favourites/' + folder.data.id, {
.post(getters.api + '/favourites/' + folder.data.id, {
_method: 'delete',
})
.catch(() => Vue.prototype.$isSomethingWrong())
},
readAllNotifications: ({ commit }) => {
axios.post('/api/user/notifications/read')
axios.post('/api/notifications/read')
.then(() => {
commit('UPDATE_NOTIFICATION_COUNT', 0)
})
},
deleteAllNotifications: ({ commit }) => {
axios.delete('/api/user/notifications')
axios.delete('/api/notifications')
.then(() => {
commit('FLUSH_NOTIFICATIONS')
})

View File

@@ -119,7 +119,7 @@ export default {
// Send request to get user reset link
axios
.post('/api/password/email', {
.post('/api/password/recover', {
email: this.recoverEmail,
})
.then(() => {

View File

@@ -275,7 +275,7 @@ export default {
},
resendEmail() {
axios
.post('/api/user/email/verify/resend', {
.post('/api/user/verify', {
email: this.loginEmail,
})
.then(() => {