v1.5-beta.3

This commit is contained in:
carodej
2020-05-19 17:49:49 +02:00
parent 5df0fa93b3
commit 65f902fbcf
12 changed files with 55 additions and 34 deletions
+1 -1
View File
@@ -80,7 +80,7 @@ return [
| |
*/ */
'locale' => 'sk', 'locale' => 'en',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
+1 -1
View File
@@ -17,5 +17,5 @@ return [
'limit_storage_by_capacity' => true, 'limit_storage_by_capacity' => true,
// Define user storage capacity in MB. E.g. value 2000 is 2.00GB // Define user storage capacity in MB. E.g. value 2000 is 2.00GB
'user_storage_capacity' => 150, 'user_storage_capacity' => 5000,
]; ];
+1 -1
View File
File diff suppressed because one or more lines are too long
@@ -181,6 +181,14 @@
{{ $t('context_menu.move') }} {{ $t('context_menu.move') }}
</div> </div>
</li> </li>
<li class="menu-option" @click="deleteItem">
<div class="icon">
<trash-2-icon size="17"></trash-2-icon>
</div>
<div class="text-label">
{{ $t('context_menu.delete') }}
</div>
</li>
</ul> </ul>
<ul class="menu-option-group"> <ul class="menu-option-group">
@@ -291,14 +299,12 @@
} }
}, },
downloadItem() { downloadItem() {
// Download file
this.$downloadFile( this.$downloadFile(
this.fileInfoDetail.file_url, this.fileInfoDetail.file_url,
this.fileInfoDetail.name + '.' + this.fileInfoDetail.mimetype this.fileInfoDetail.name + '.' + this.fileInfoDetail.mimetype
) )
}, },
deleteItem() { deleteItem() {
// Dispatch remove item
this.$store.dispatch('deleteItem', this.fileInfoDetail) this.$store.dispatch('deleteItem', this.fileInfoDetail)
}, },
renameItem() { renameItem() {
@@ -137,6 +137,7 @@
input { input {
min-width: initial; min-width: initial;
width: 100%; width: 100%;
max-width: initial;
padding: 9px 20px 9px 30px; padding: 9px 20px 9px 30px;
&:focus { &:focus {
@@ -1,6 +1,6 @@
<template> <template>
<ul class="link-group"> <ul class="link-group">
<router-link :to="{name: link.routeName}" v-for="(link, i) in navigation" :key="i" :class="link.icon" class="link-item" @click.native="$emit('menu', link.icon)"> <router-link :to="{name: link.routeName}" v-for="(link, i) in navigation" :key="i" v-if="link.isVisible" :class="link.icon" class="link-item" @click.native="$emit('menu', link.icon)">
<div class="menu-icon"> <div class="menu-icon">
<hard-drive-icon v-if="link.icon === 'hard-drive'" size="17"></hard-drive-icon> <hard-drive-icon v-if="link.icon === 'hard-drive'" size="17"></hard-drive-icon>
<share-icon v-if="link.icon === 'share'" size="17"></share-icon> <share-icon v-if="link.icon === 'share'" size="17"></share-icon>
@@ -44,31 +44,37 @@
icon: 'hard-drive', icon: 'hard-drive',
title: this.$t('menu.files'), title: this.$t('menu.files'),
routeName: 'Files', routeName: 'Files',
isVisible: true,
}, },
{ {
icon: 'latest', icon: 'latest',
title: this.$t('menu.latest'), title: this.$t('menu.latest'),
routeName: 'Files', routeName: 'Files',
isVisible: true,
}, },
{ {
icon: 'share', icon: 'share',
title: this.$t('menu.shared'), title: this.$t('menu.shared'),
routeName: 'SharedFiles', routeName: 'SharedFiles',
isVisible: true,
}, },
{ {
icon: 'trash', icon: 'trash',
title: this.$t('menu.trash'), title: this.$t('menu.trash'),
routeName: 'Trash', routeName: 'Trash',
isVisible: true,
}, },
{ {
icon: 'settings', icon: 'settings',
title: this.$t('menu.settings'), title: this.$t('menu.settings'),
routeName: 'MobileSettings', routeName: 'MobileSettings',
isVisible: true,
}, },
{ {
icon: 'power', icon: 'power',
title: this.$t('menu.logout'), title: this.$t('menu.logout'),
routeName: 'LogOut', routeName: 'LogOut',
isVisible: true,
}, },
] ]
} }
+2 -2
View File
@@ -86,8 +86,8 @@
return { return {
isLoading: false, isLoading: false,
checkedAccount: undefined, checkedAccount: undefined,
loginPassword: 'secret', loginPassword: '',
loginEmail: 'howdy@hi5ve.digital', loginEmail: '',
} }
}, },
methods: { methods: {
+1 -1
View File
@@ -51,7 +51,7 @@
<a @click.stop="openFolder(folder)" <a @click.stop="openFolder(folder)"
class="menu-list-item" class="menu-list-item"
:class="{'is-current': folder && currentFolder.unique_id === folder.unique_id}" :class="{'is-current': (folder && currentFolder) && (currentFolder.unique_id === folder.unique_id)}"
v-for="folder in app.favourites" v-for="folder in app.favourites"
:key="folder.unique_id"> :key="folder.unique_id">
<div> <div>
+28 -17
View File
@@ -14,6 +14,7 @@
<script> <script>
import MenuItemList from '@/components/Mobile/MenuItemList' import MenuItemList from '@/components/Mobile/MenuItemList'
import MobileHeader from '@/components/Mobile/MobileHeader' import MobileHeader from '@/components/Mobile/MobileHeader'
import { mapGetters } from 'vuex'
export default { export default {
name: 'MobileSettings', name: 'MobileSettings',
@@ -21,27 +22,37 @@
MenuItemList, MenuItemList,
MobileHeader, MobileHeader,
}, },
computed: {
...mapGetters(['config']),
},
data() { data() {
return { return {
navigation: [ navigation: undefined
{
icon: 'user',
title: this.$t('menu.profile'),
routeName: 'Profile',
},
{
icon: 'lock',
title: this.$t('menu.password'),
routeName: 'Password',
},
{
icon: 'hard-drive',
title: this.$t('menu.storage'),
routeName: 'Storage',
},
]
} }
}, },
created() {
this.navigation = [
{
icon: 'user',
title: this.$t('menu.profile'),
routeName: 'Profile',
isVisible: true,
},
{
icon: 'lock',
title: this.$t('menu.password'),
routeName: 'Password',
isVisible: true,
},
{
icon: 'hard-drive',
title: this.$t('menu.storage'),
routeName: 'Storage',
isVisible: this.config.storageLimit,
},
]
}
} }
</script> </script>
+5 -1
View File
@@ -25,7 +25,7 @@
{{ $t('menu.password') }} {{ $t('menu.password') }}
</div> </div>
</router-link> </router-link>
<router-link :to="{name: 'Storage'}" class="menu-list-item link"> <router-link v-if="config.storageLimit" :to="{name: 'Storage'}" class="menu-list-item link">
<div class="icon"> <div class="icon">
<hard-drive-icon size="17"></hard-drive-icon> <hard-drive-icon size="17"></hard-drive-icon>
</div> </div>
@@ -45,6 +45,7 @@
import ContentSidebar from '@/components/Sidebar/ContentSidebar' import ContentSidebar from '@/components/Sidebar/ContentSidebar'
import ContentGroup from '@/components/Sidebar/ContentGroup' import ContentGroup from '@/components/Sidebar/ContentGroup'
import UserHeadline from '@/components/Sidebar/UserHeadline' import UserHeadline from '@/components/Sidebar/UserHeadline'
import { mapGetters } from 'vuex'
import { import {
HardDriveIcon, HardDriveIcon,
UserIcon, UserIcon,
@@ -53,6 +54,9 @@
export default { export default {
name: 'Settings', name: 'Settings',
computed: {
...mapGetters(['config']),
},
components: { components: {
ContentSidebar, ContentSidebar,
HardDriveIcon, HardDriveIcon,
-7
View File
@@ -23,11 +23,4 @@ mix.js('resources/js/main.js', 'public/js')
} }
}, },
}) })
.options({
hmrOptions: {
host: '172.20.10.5',
//host: '192.168.1.131',
port: '8080'
},
})
.disableNotifications(); .disableNotifications();