frontend function consolidation part 2

resources/js/components/FilesView/DesktopToolbar.vue

@@ -184,7 +184,7 @@ export default {
                 this.$store.dispatch('deleteItem')
         },
         createFolder() {
-            this.$store.dispatch('createFolder', this.$t('popup_create_folder.folder_default_name'))
+            this.$store.dispatch('createFolder', {name: this.$t('popup_create_folder.folder_default_name')})
         },
         moveItem() {
             if (this.fileInfoDetail.length > 0)

resources/js/components/FilesView/FileInfoPanel.vue

@@ -119,7 +119,7 @@
                 }
             },
             isLocked() {
-                return this.fileInfoDetail[0].shared.protected
+                return this.fileInfoDetail[0].shared.is_protected
             }
         },
         methods: {

resources/js/components/Others/MoveItem.vue

@@ -11,12 +11,12 @@
 
             <!--Folder tree-->
             <div v-if="! isLoadingTree && navigation">
-                <ThumbnailItem v-if="fileInfoDetail.length < 2 || noSelectedItem" class="item-thumbnail" :item="pickedItem" info="location" />
+                <ThumbnailItem v-if="fileInfoDetail.length < 2 || isSelectedItem" class="item-thumbnail" :item="pickedItem" info="location" />
 
                 <MultiSelected class="multiple-selected"
                                :title="$t('file_detail.selected_multiple')"
                                :subtitle="this.fileInfoDetail.length + ' ' + $tc('file_detail.items', this.fileInfoDetail.length)"
-                               v-if="fileInfoDetail.length > 1 && !noSelectedItem" />
+                               v-if="fileInfoDetail.length > 1 && !isSelectedItem" />
                     
                 <TreeMenu :disabled-by-id="pickedItem" :depth="1" :nodes="items" v-for="items in navigation" :key="items.id" />
             </div>
@@ -74,7 +74,7 @@
                 selectedFolder: undefined,
                 pickedItem: undefined,
                 isLoadingTree: true,
-                noSelectedItem: false
+                isSelectedItem: false
             }
         },
         methods: {
@@ -82,18 +82,21 @@
                 // Prevent empty submit
                 if (!this.selectedFolder) return
 
-                //Prevent to move items to the same parent 
+                // Prevent to move items to the same parent
                 if (this.fileInfoDetail.find(item => item.parent_id === this.selectedFolder.id)) return
 
-                // Move item 
-                if (!this.noSelectedItem) {
-                    this.$store.dispatch('moveItem', {to_item: this.selectedFolder, noSelectedItem: null})
+                // Move item
+                if (!this.isSelectedItem) {
+                    this.$store.dispatch('moveItem', {to_item: this.selectedFolder, isSelectedItem: null})
                 }
 
-                if (this.noSelectedItem) {
-                    this.$store.dispatch('moveItem', {to_item: this.selectedFolder, noSelectedItem: this.pickedItem})
+                if (this.isSelectedItem) {
+                    this.$store.dispatch('moveItem', {to_item: this.selectedFolder, isSelectedItem: this.pickedItem})
                 }
 
+                console.log('to item:', this.selectedFolder);
+                console.log('isSelectedItem:', this.pickedItem);
+
                 // Close popup
                 events.$emit('popup:close')
 
@@ -130,12 +133,12 @@
                 // Store picked item
                 if (!this.fileInfoDetail.includes(args.item[0])) {
                     this.pickedItem = args.item[0]
-                    this.noSelectedItem = true
+                    this.isSelectedItem = true
                 }
 
                 if (this.fileInfoDetail.includes(args.item[0])) {
                     this.pickedItem = this.fileInfoDetail[0]
-                    this.noSelectedItem = false
+                    this.isSelectedItem = false
                 }
             })
 

resources/js/components/Others/RenameItem.vue

@@ -100,10 +100,10 @@ export default {
                     name: this.pickedItem.name,
                 }
 
-                if (this.folderIcon.emoji)
+                if (this.folderIcon && this.folderIcon.emoji)
                     item['emoji'] = this.folderIcon.emoji
 
-                if (this.folderIcon.color)
+                if (this.folderIcon && this.folderIcon.color)
                     item['color'] = this.folderIcon.color
 
                 // Rename item request

resources/js/components/Others/ShareCreate.vue

@@ -1,13 +1,13 @@
 <template>
     <PopupWrapper name="share-create">
         <!--Title-->
-        <PopupHeader :title="$t('popup_share_create.title', {item: itemTypeTitle})" icon="share"/>
+        <PopupHeader :title="$t('popup_share_create.title', {item: itemTypeTitle})" icon="share" />
 
         <!--Content-->
         <PopupContent>
 
             <!--Item Thumbnail-->
-            <ThumbnailItem class="item-thumbnail" :item="pickedItem" info="metadata"/>
+            <ThumbnailItem class="item-thumbnail" :item="pickedItem" info="metadata" />
 
             <!-- Infobox for successfull sended email -->
             <InfoBox v-if="isGeneratedShared && sharedViaEmail" class="info-box-wrapper">
@@ -20,12 +20,12 @@
                 <TabWrapper>
 
                     <!-- Share via link -->
-                    <TabOption :selected="true" :title="$t('shared_form.share_by_link')" icon="link"/>
+                    <TabOption :selected="true" :title="$t('shared_form.share_by_link')" icon="link" />
 
                     <!-- Share via Email -->
                     <TabOption :title="$t('shared_form.share_by_email')" icon="email">
                         <ValidationProvider tag="div" mode="passive" name="Email" rules="required" v-slot="{ errors }">
-                            <MultiEmailInput rules="required" v-model="shareOptions.emails" :label="$t('shared_form.recipients_label')" :isError="errors[0]"/>
+                            <MultiEmailInput rules="required" v-model="shareOptions.emails" :label="$t('shared_form.recipients_label')" :isError="errors[0]" />
                         </ValidationProvider>
                     </TabOption>
 
@@ -34,7 +34,7 @@
                 <!--Permision Select-->
                 <ValidationProvider v-if="isFolder" tag="div" mode="passive" class="input-wrapper" name="Permission" rules="required" v-slot="{ errors }">
                     <label class="input-label">{{ $t('shared_form.label_permission') }}:</label>
-                    <SelectInput v-model="shareOptions.permission" :options="permissionOptions" :placeholder="$t('shared_form.placeholder_permission')" :isError="errors[0]"/>
+                    <SelectInput v-model="shareOptions.permission" :options="permissionOptions" :placeholder="$t('shared_form.placeholder_permission')" :isError="errors[0]" />
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
 
@@ -42,7 +42,7 @@
                 <div class="input-wrapper">
                     <div class="inline-wrapper">
                         <label class="input-label">{{ $t('shared_form.label_password_protection') }}:</label>
-                        <SwitchInput v-model="shareOptions.isPassword" class="switch" :state="0"/>
+                        <SwitchInput v-model="shareOptions.isPassword" class="switch" :state="0" />
                     </div>
                 </div>
 
@@ -58,7 +58,7 @@
                     <!--Set expiration-->
                     <div class="input-wrapper">
                         <label class="input-label">{{ $t('shared_form.label_expiration') }}:</label>
-                        <SelectBoxInput v-model="shareOptions.expiration" :data="expirationList" class="box"/>
+                        <SelectBoxInput v-model="shareOptions.expiration" :data="expirationList" class="box" />
                     </div>
                 </div>
 
@@ -69,7 +69,7 @@
             <div v-if="isGeneratedShared" class="form-wrapper">
                 <div class="input-wrapper">
                     <label class="input-label">{{ this.sharedViaEmail ? $t('shared_form.label_share_vie_email') : $t('shared_form.label_shared_url') }}:</label>
-                    <CopyInput size="small" :item="pickedItem"/>
+                    <CopyInput size="small" :item="pickedItem" />
                 </div>
             </div>
         </PopupContent>
@@ -85,7 +85,7 @@
 </template>
 
 <script>
-import { ValidationProvider, ValidationObserver } from 'vee-validate/dist/vee-validate.full'
+import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
 import SelectBoxInput from '@/components/Others/Forms/SelectBoxInput'
 import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
 import PopupActions from '@/components/Others/Popup/PopupActions'
@@ -101,10 +101,10 @@ import TabWrapper from '@/components/Others/TabWrapper'
 import TabOption from '@/components/Others/TabOption'
 import ButtonBase from '@/components/FilesView/ButtonBase'
 import InfoBox from '@/components/Others/Forms/InfoBox'
-import { LinkIcon, MailIcon } from 'vue-feather-icons'
-import { required } from 'vee-validate/dist/rules'
-import { mapGetters } from 'vuex'
-import { events } from '@/bus'
+import {LinkIcon, MailIcon} from 'vue-feather-icons'
+import {required} from 'vee-validate/dist/rules'
+import {mapGetters} from 'vuex'
+import {events} from '@/bus'
 import axios from 'axios'
 
 export default {
@@ -192,7 +192,9 @@ export default {
 
             // Send request to get share link
             axios
-                .post('/api/share', this.shareOptions)
+                .post(`/api/share/${this.shareOptions.id}`,
+                    this.shareOptions
+                )
                 .then(response => {
 
                     // Show infobox and reset emails container

resources/js/components/Others/ShareEdit.vue

@@ -43,7 +43,9 @@
                         <label class="input-label">{{ $t('shared_form.label_password_protection') }}:</label>
                         <SwitchInput v-model="shareOptions.isProtected" :state="shareOptions.isProtected" class="switch"/>
                     </div>
-                    <ActionButton v-if="(pickedItem.shared.protected && canChangePassword) && shareOptions.isProtected" @click.native="changePassword" class="change-password">{{ $t('popup_share_edit.change_pass') }}</ActionButton>
+                    <ActionButton v-if="(pickedItem.shared.is_protected && canChangePassword) && shareOptions.isProtected" @click.native="changePassword" class="change-password">
+                        {{ $t('popup_share_edit.change_pass') }}
+                    </ActionButton>
                 </div>
 
                 <!--Set password-->
@@ -62,7 +64,9 @@
                     </div>
                 </div>
 
-                <ActionButton @click.native="moreOptions" :icon="isMoreOptions || shareOptions.expiration ? 'x' : 'pencil-alt'">{{ moreOptionsTitle }}</ActionButton>
+                <ActionButton @click.native="moreOptions" :icon="isMoreOptions || shareOptions.expiration ? 'x' : 'pencil-alt'">
+                    {{ moreOptionsTitle }}
+                </ActionButton>
 
             </ValidationObserver>
 
@@ -235,7 +239,6 @@
                     this.isDeleting = true
 
                     // Send delete request
-
                     await this.$store.dispatch('shareCancel' , this.pickedItem)
                         .then((response) => {
 
@@ -323,7 +326,7 @@
                 this.shareOptions = {
                     token: args.item.shared.token,
                     expiration: args.item.shared.expire_in,
-                    isProtected: args.item.shared.protected,
+                    isProtected: args.item.shared.is_protected,
                     permission: args.item.shared.permission,
                     password: undefined,
                 }
@@ -335,7 +338,7 @@
                     this.sendToRecipientsMenu = true
                     this.isEmailSended = false
 
-                this.canChangePassword = args.item.shared.protected
+                this.canChangePassword = args.item.shared.is_protected
             })
 
             // Close popup

resources/js/store/modules/fileBrowser.js

@@ -154,9 +154,9 @@ const actions = {
         // Get route
         let route = undefined
 
-        if (getters.sharedDetail && getters.sharedDetail.protected)
+        if (getters.sharedDetail && getters.sharedDetail.is_protected)
             route = '/api/browse/search/private'
-        else if (getters.sharedDetail && !getters.sharedDetail.protected)
+        else if (getters.sharedDetail && !getters.sharedDetail.is_protected)
             route = '/api/browse/search/public/' + router.currentRoute.params.token
         else
             route = '/api/browse/search'
@@ -177,9 +177,9 @@ const actions = {
             // Get route
             let route = undefined
 
-            if (getters.sharedDetail && getters.sharedDetail.protected)
+            if (getters.sharedDetail && getters.sharedDetail.is_protected)
                 route = '/api/browse/navigation/private'
-            else if (getters.sharedDetail && !getters.sharedDetail.protected)
+            else if (getters.sharedDetail && !getters.sharedDetail.is_protected)
                 route = '/api/browse/navigation/public/' + router.currentRoute.params.token
             else
                 route = '/api/browse/navigation'

resources/js/store/modules/fileFunctions.js

@@ -23,7 +23,7 @@ const actions = {
         })
 
         // Get route
-        let route = getters.sharedDetail && !getters.sharedDetail.protected
+        let route = getters.sharedDetail && !getters.sharedDetail.is_protected
             ? '/api/zip/folder/' + folder.id + '/public/' + router.currentRoute.params.token
             : '/api/zip/folder/' + folder.id
 
@@ -46,7 +46,7 @@ const actions = {
         getters.fileInfoDetail.forEach(file => files.push(file.id))
 
         // Get route
-        let route = getters.sharedDetail && !getters.sharedDetail.protected
+        let route = getters.sharedDetail && !getters.sharedDetail.is_protected
             ? '/api/zip/files/public/' + router.currentRoute.params.token
             : '/api/zip/files'
 
@@ -56,7 +56,7 @@ const actions = {
         })
 
         axios.post(route, {
-            files: files
+            items: files
         })
             .then(response => {
                 Vue.prototype.$downloadFile(response.data.url, response.data.name)
@@ -87,13 +87,15 @@ const actions = {
             commit('CLEAR_FILEINFO_DETAIL')
 
         // Get route
-        let route = getters.sharedDetail && !getters.sharedDetail.protected
+        let route = getters.sharedDetail && !getters.sharedDetail.is_protected
             ? '/api/editor/move/public/' + router.currentRoute.params.token
             : '/api/move'
 
+        console.log(to_item);
+
         axios
             .post(route, {
-                to_id: to_item.id,
+                to_id: to_item.id ? to_item.id : null,
                 items: itemsToMove
             })
             .then(() => {
@@ -112,7 +114,7 @@ const actions = {
     createFolder: ({commit, getters, dispatch}, folder) => {
 
         // Get route
-        let route = getters.sharedDetail && !getters.sharedDetail.protected
+        let route = getters.sharedDetail && !getters.sharedDetail.is_protected
             ? '/api/editor/create-folder/public/' + router.currentRoute.params.token
             : '/api/create-folder'
 
@@ -147,7 +149,7 @@ const actions = {
             commit('UPDATE_NAME_IN_FAVOURITES', data)
 
         // Get route
-        let route = getters.sharedDetail && !getters.sharedDetail.protected
+        let route = getters.sharedDetail && !getters.sharedDetail.is_protected
             ? '/api/editor/rename/' + data.id + '/public/' + router.currentRoute.params.token
             : '/api/rename/' + data.id
 
@@ -170,7 +172,7 @@ const actions = {
         return new Promise((resolve, reject) => {
 
             // Get route
-            let route = getters.sharedDetail && !getters.sharedDetail.protected
+            let route = getters.sharedDetail && !getters.sharedDetail.is_protected
                 ? '/api/editor/upload/public/' + router.currentRoute.params.token
                 : '/api/upload'
 
@@ -339,7 +341,7 @@ const actions = {
         }
 
         // Get route
-        let route = getters.sharedDetail && !getters.sharedDetail.protected
+        let route = getters.sharedDetail && !getters.sharedDetail.is_protected
             ? '/api/editor/remove/public/' + router.currentRoute.params.token
             : '/api/remove'
 

resources/js/store/modules/sharing.js

@@ -38,7 +38,7 @@ const actions = {
 
         payload.folder.location = 'public'
 
-        let route = getters.sharedDetail.protected
+        let route = getters.sharedDetail.is_protected
             ? '/api/browse/folders/' + payload.folder.id + '/private'
             : '/api/browse/folders/' + payload.folder.id + '/public/' + router.currentRoute.params.token
 
@@ -82,6 +82,7 @@ const actions = {
 
             axios
                 .post('/api/share/revoke', {
+                    _method: 'delete',
                     tokens: tokens
                 })
                 .then(() => {
@@ -110,7 +111,7 @@ const actions = {
     },
     getSingleFile: ({commit, state}) => {
 
-        let route = state.sharedDetail.protected
+        let route = state.sharedDetail.is_protected
             ? '/api/browse/files/private'
             : '/api/browse/files/' + router.currentRoute.params.token + '/public'
 

resources/js/views/Shared/SharedPage.vue

@@ -294,7 +294,7 @@
                     this.isPageLoading = false
 
                     // Show password page
-                    if (response.data.data.attributes.protected) {
+                    if (response.data.data.attributes.is_protected) {
                         this.currentPage = 'page-password'
                     } else {
                         this.currentPage = 'page-files'