This commit is contained in:
Čarodej
2022-03-20 19:00:46 +01:00
parent 73ef6e6c1f
commit 42245317f4
10 changed files with 44 additions and 24 deletions

View File

@@ -1,7 +1,7 @@
<?php <?php
return [ return [
'version' => '2.0.0-Rc.9', 'version' => '2.0.0',
'is_demo' => env('APP_DEMO', false), 'is_demo' => env('APP_DEMO', false),

View File

@@ -1,7 +1,7 @@
{ {
"/js/main.js": "/js/main.js", "/js/main.js": "/js/main.js",
"/chunks/request.js": "/chunks/request.js?id=dfe723f178024684", "/chunks/request.js": "/chunks/request.js?id=c9d2f9bbd26bc486",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=adb096eca092cfdf", "/chunks/request-upload.js": "/chunks/request-upload.js?id=b1aaf8357a30794a",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec", "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
"/chunks/status-check.js": "/chunks/status-check.js?id=ca27b637120e086a", "/chunks/status-check.js": "/chunks/status-check.js?id=ca27b637120e086a",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=df5bd89528649783", "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=df5bd89528649783",
@@ -9,13 +9,13 @@
"/chunks/environment-setup.js": "/chunks/environment-setup.js?id=fc9b6215ce43229b", "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=fc9b6215ce43229b",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=77937d105dfa28ba", "/chunks/app-setup.js": "/chunks/app-setup.js?id=77937d105dfa28ba",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=6dbc3fe81f957a59", "/chunks/admin-account.js": "/chunks/admin-account.js?id=6dbc3fe81f957a59",
"/chunks/shared.js": "/chunks/shared.js?id=b7a9b097ce035686", "/chunks/shared.js": "/chunks/shared.js?id=ced6031b3b7f7ace",
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=855a1efa8bc5a5cd", "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=3dc8fdb008b6ff5f",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=9ccb8bb19b95a23f", "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=9ccb8bb19b95a23f",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=672e931a9fb0b672", "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=672e931a9fb0b672",
"/chunks/not-found.js": "/chunks/not-found.js?id=9f6ce23ce5d969f1", "/chunks/not-found.js": "/chunks/not-found.js?id=9f6ce23ce5d969f1",
"/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=f564565faa09d6d6", "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=f564565faa09d6d6",
"/chunks/admin.js": "/chunks/admin.js?id=40ae44d319d3322b", "/chunks/admin.js": "/chunks/admin.js?id=cbdb3d8a852a5478",
"/chunks/dashboard.js": "/chunks/dashboard.js?id=c7fa2f0dc8ed949c", "/chunks/dashboard.js": "/chunks/dashboard.js?id=c7fa2f0dc8ed949c",
"/chunks/invoices.js": "/chunks/invoices.js?id=1416cbf6d1a593ac", "/chunks/invoices.js": "/chunks/invoices.js?id=1416cbf6d1a593ac",
"/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5bf6704f5b599f36", "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5bf6704f5b599f36",
@@ -57,18 +57,18 @@
"/chunks/sign-up.js": "/chunks/sign-up.js?id=77351b7631a6ee6c", "/chunks/sign-up.js": "/chunks/sign-up.js?id=77351b7631a6ee6c",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=50a1bc5e4ed86ec9", "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=50a1bc5e4ed86ec9",
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=f652de052dba55c1", "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=f652de052dba55c1",
"/chunks/settings.js": "/chunks/settings.js?id=db0f876b7f1229bb", "/chunks/settings.js": "/chunks/settings.js?id=c7d7a638582f9e9f",
"/chunks/profile.js": "/chunks/profile.js?id=5b2ed82815320625", "/chunks/profile.js": "/chunks/profile.js?id=5b2ed82815320625",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=c912a79595c2efcb", "/chunks/settings-password.js": "/chunks/settings-password.js?id=c912a79595c2efcb",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=6fec7aac1a5280c7", "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=6fec7aac1a5280c7",
"/chunks/billing.js": "/chunks/billing.js?id=2a2cd66f503a9fc0", "/chunks/billing.js": "/chunks/billing.js?id=2a2cd66f503a9fc0",
"/chunks/platform.js": "/chunks/platform.js?id=409b7dc2a080e93e", "/chunks/platform.js": "/chunks/platform.js?id=0e813871f320e99c",
"/chunks/files.js": "/chunks/files.js?id=7ba4274a7b63f15b", "/chunks/files.js": "/chunks/files.js?id=060b1a34dfdbe97c",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=aeb9ea7f43a75aa1", "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=0f63bbc02ad8f3e1",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=ed296d2d8f6b4302", "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=0a06d32b4cf8b52c",
"/chunks/trash.js": "/chunks/trash.js?id=b671a56c6cfb99da", "/chunks/trash.js": "/chunks/trash.js?id=ac5389500f8f7912",
"/chunks/team-folders.js": "/chunks/team-folders.js?id=7518e54deade41d3", "/chunks/team-folders.js": "/chunks/team-folders.js?id=c0a03c6937856ca1",
"/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=52f03c48445091e5", "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=88fa008db0c6a4f6",
"/chunks/invitation.js": "/chunks/invitation.js?id=9ed8456c9d6d5ce1", "/chunks/invitation.js": "/chunks/invitation.js?id=9ed8456c9d6d5ce1",
"/css/tailwind.css": "/css/tailwind.css", "/css/tailwind.css": "/css/tailwind.css",
"/css/app.css": "/css/app.css" "/css/app.css": "/css/app.css"

View File

@@ -33,3 +33,9 @@
.page-link { .page-link {
@apply block flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg text-sm font-bold transition duration-200 hover:bg-light-background; @apply block flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg text-sm font-bold transition duration-200 hover:bg-light-background;
} }
@layer utilities {
.overflow-initial {
overflow: initial;
}
}

View File

@@ -1,8 +1,8 @@
<template> <template>
<div <div
class="sticky top-14 z-[19] overflow-x-auto whitespace-nowrap bg-white px-4 pb-3 dark:bg-dark-background lg:hidden" class="sticky top-14 z-[19] whitespace-nowrap bg-white dark:bg-dark-background lg:hidden"
> >
<div class="flex items-center"> <div class="flex items-center overflow-x-auto pb-3 pl-4">
<!--Show Buttons--> <!--Show Buttons-->
<slot v-if="!isMultiSelectMode" /> <slot v-if="!isMultiSelectMode" />

View File

@@ -9,7 +9,7 @@
spellcheck="false" spellcheck="false"
> >
<!--MultiSelecting for the mobile version--> <!--MultiSelecting for the mobile version-->
<CheckBox v-if="isMultiSelectMode" v-model="isClicked" :is-clicked="isClicked" class="mr-5" /> <CheckBox v-if="isMultiSelectMode" v-model="isChecked" :is-clicked="isClicked" class="mr-5" />
<!--Item thumbnail--> <!--Item thumbnail-->
<div class="relative w-16 shrink-0"> <div class="relative w-16 shrink-0">
@@ -125,11 +125,21 @@ export default {
Emoji, Emoji,
}, },
props: ['mobileHandler', 'highlight', 'entry'], props: ['mobileHandler', 'highlight', 'entry'],
watch: {
isChecked: function (val) {
if (val) {
this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.entry)
} else {
this.$store.commit('REMOVE_ITEM_FROM_CLIPBOARD', this.entry.data.id)
}
}
},
data() { data() {
return { return {
mobileMultiSelect: false, mobileMultiSelect: false,
itemName: undefined, itemName: undefined,
isSelected: false, isSelected: false,
isChecked: false,
} }
}, },
computed: { computed: {

View File

@@ -4,7 +4,7 @@
<PopupHeader :title="$t('create_language')" icon="edit" /> <PopupHeader :title="$t('create_language')" icon="edit" />
<!--Content--> <!--Content-->
<PopupContent> <PopupContent class="!overflow-initial">
<!--Form to set sharing--> <!--Form to set sharing-->
<ValidationObserver @submit.prevent="createLanguage" ref="createForm" v-slot="{ invalid }" tag="form"> <ValidationObserver @submit.prevent="createLanguage" ref="createForm" v-slot="{ invalid }" tag="form">
<ValidationProvider <ValidationProvider

View File

@@ -10,14 +10,14 @@
<!--Folder tree--> <!--Folder tree-->
<div v-if="!isLoadingTree && navigation"> <div v-if="!isLoadingTree && navigation">
<ThumbnailItem v-if="clipboard.length < 2 || isSelectedItem" class="mb-5" :item="pickedItem" /> <ThumbnailItem v-if="clipboard.length === 1 || isSelectedItem" class="mb-5" :item="pickedItem" />
<TitlePreview <TitlePreview
class="mb-4" class="mb-4"
icon="check-square" icon="check-square"
:title="$t('selected_multiple')" :title="$t('selected_multiple')"
:subtitle="this.clipboard.length + ' ' + $tc('items', this.clipboard.length)" :subtitle="clipboard.length + ' ' + $tc('items', clipboard.length)"
v-if="clipboard.length > 1 && !isSelectedItem" v-if="clipboard.length > 1 || !isSelectedItem"
/> />
<TreeMenu <TreeMenu

View File

@@ -4,7 +4,7 @@
<PopupHeader :title="$t('popup_share_create.title', { item: itemTypeTitle })" icon="share" /> <PopupHeader :title="$t('popup_share_create.title', { item: itemTypeTitle })" icon="share" />
<!--Content--> <!--Content-->
<PopupContent> <PopupContent class="!overflow-initial">
<!--Item Thumbnail--> <!--Item Thumbnail-->
<ThumbnailItem class="mb-5" :item="pickedItem" /> <ThumbnailItem class="mb-5" :item="pickedItem" />

View File

@@ -1,6 +1,7 @@
import i18n from '../i18n' import i18n from '../i18n'
import store from '../store/index' import store from '../store/index'
import { events } from '../bus' import { events } from '../bus'
import {isArray} from "lodash";
const itemHelpers = { const itemHelpers = {
install(Vue) { install(Vue) {
@@ -39,7 +40,10 @@ const itemHelpers = {
} }
Vue.prototype.$moveFileOrFolder = function (entry) { Vue.prototype.$moveFileOrFolder = function (entry) {
events.$emit('popup:open', { name: 'move', item: [entry] })
let item = isArray(entry) ? [...entry] : [entry]
events.$emit('popup:open', { name: 'move', item: item })
} }
Vue.prototype.$createFolderByPopup = function () { Vue.prototype.$createFolderByPopup = function () {

View File

@@ -24,7 +24,7 @@ class SeedDefaultLanguageTranslationsAction
$translations = $translations[strtolower($license)] $translations = $translations[strtolower($license)]
->map(fn ($value, $key) => [ ->map(fn ($value, $key) => [
'lang' => $locale, 'lang' => $locale,
'value' => '____', 'value' => $value,
'key' => $key, 'key' => $key,
])->toArray(); ])->toArray();