The delay after first upload in file request when the interface wasn't showing was removed

This commit is contained in:
Čarodej
2022-04-06 10:35:13 +02:00
parent b0f1bb46d7
commit 657248aa43
9 changed files with 28 additions and 20 deletions

View File

@@ -1,6 +1,8 @@
## Version 2.0.15
#### Release date: 6. April 2022
- Wasabi region list updated
- The delay after first upload in file request when the interface wasn't showing was removed
- If adsense banner location isn't filled, the ads space won't be showed
## Version 2.0.14
#### Release date: 5. April 2022

View File

@@ -1,7 +1,7 @@
{
"/js/main.js": "/js/main.js",
"/chunks/request.js": "/chunks/request.js?id=fb2de02956f152b5",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=5b03d20350ef4737",
"/chunks/request.js": "/chunks/request.js?id=85f789002747959d",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=90e65cf84e0f186a",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
"/chunks/status-check.js": "/chunks/status-check.js?id=f82f9939c1326fe2",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=df5bd89528649783",
@@ -9,9 +9,9 @@
"/chunks/environment.js": "/chunks/environment.js?id=166cd302ba7338ae",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=15938ff1ad2d6ed2",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=916450217130f3b8",
"/chunks/shared.js": "/chunks/shared.js?id=ac88d110f7427ebf",
"/chunks/shared.js": "/chunks/shared.js?id=0ba057dedd034015",
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=d718abdaf5edb271",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=1487950970833eda",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=7b984fafdf569ceb",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=672e931a9fb0b672",
"/chunks/not-found.js": "/chunks/not-found.js?id=9f6ce23ce5d969f1",
"/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=f564565faa09d6d6",
@@ -48,7 +48,7 @@
"/chunks/app-adsense.js": "/chunks/app-adsense.js?id=a5dc9e715f8561bd",
"/chunks/app-server.js": "/chunks/app-server.js?id=3a41e04bde0d3536",
"/chunks/app-language.js": "/chunks/app-language.js?id=7e5f3d5ec447e397",
"/chunks/homepage.js": "/chunks/homepage.js?id=b6597181c9e4353d",
"/chunks/homepage.js": "/chunks/homepage.js?id=832072b46053df76",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=2504793131107b1f",
"/chunks/contact-us.js": "/chunks/contact-us.js?id=9adc7e145be4e160",
"/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=25b805ade5230382",
@@ -62,7 +62,7 @@
"/chunks/settings-password.js": "/chunks/settings-password.js?id=3755d41eaf50a5b1",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=994b669a56fd417b",
"/chunks/billing.js": "/chunks/billing.js?id=40e758c87bcf6e89",
"/chunks/platform.js": "/chunks/platform.js?id=490c3586a4dca9fb",
"/chunks/platform.js": "/chunks/platform.js?id=5f4f548e9fee7e0c",
"/chunks/files.js": "/chunks/files.js?id=133be06adc673d83",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=9d3391857f9c3503",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=53d2c6a72b895d68",

View File

@@ -39,7 +39,7 @@
/>
</MobileMultiSelectToolbar>
<ContextMenu v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling'">
<ContextMenu v-if="canShowUI">
<template v-slot:empty-select>
<OptionGroup>
<OptionUpload :title="$t('upload_files')" type="file" />
@@ -80,7 +80,7 @@
</template>
</ContextMenu>
<FileActionsMobile v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling'">
<FileActionsMobile v-if="canShowUI">
<!--I am Done-->
<button @click="uploadingDone" class="flex shrink-0 items-center mr-2 rounded-xl bg-theme-200 py-1 px-1 pr-3">
<MemberAvatar
@@ -121,7 +121,7 @@
</ButtonUpload>
</div>
<div v-if="['active', 'filled', 'expired'].includes(uploadRequest.data.attributes.status)">
<div v-if="['active', 'filled', 'expired'].includes(uploadRequest.data.attributes.status) && fileQueue.length === 0">
<div class="relative mx-auto mb-8 w-24 text-center">
<VueFolderIcon class="inline-block w-28" />
<MemberAvatar
@@ -197,7 +197,7 @@ export default {
Option,
},
computed: {
...mapGetters(['fastPreview', 'clipboard', 'config', 'user', 'uploadRequest']),
...mapGetters(['fastPreview', 'clipboard', 'config', 'user', 'uploadRequest', 'fileQueue']),
isFolder() {
return this.item && this.item.data.type === 'folder'
},
@@ -217,6 +217,9 @@ export default {
filled: this.$t('request_for_upload_unavailable'),
expired: this.$t('request_for_upload_unavailable'),
}[this.uploadRequest.data.attributes.status]
},
canShowUI() {
return this.uploadRequest && this.uploadRequest.data.attributes.status === 'filling' || this.fileQueue.length > 0
}
},
data() {

View File

@@ -11,7 +11,7 @@
<HeroScreenshot />
<!--Google Adsense banner-->
<div v-if="config.allowedAdsense" v-html="config.adsenseBanner03" class="mb-5 min-h-[120px]"></div>
<div v-if="config.allowedAdsense && config.adsenseBanner03" v-html="config.adsenseBanner03" class="mb-5 min-h-[120px]"></div>
<!--Main Features-->
<MainFeatures />

View File

@@ -42,7 +42,7 @@
<MobileToolbar />
<!--Google Adsense banner-->
<div v-if="config.allowedAdsense" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
<div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
<!--File list & info sidebar-->
<div class="flex space-x-3 lg:overflow-hidden">

View File

@@ -31,7 +31,7 @@
<MobileToolbar />
<!--Google Adsense banner-->
<div v-if="config.allowedAdsense" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
<div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
<!--File list & info sidebar-->
<div class="flex space-x-3 lg:overflow-hidden">

View File

@@ -73,7 +73,7 @@
</ButtonBase>
<!--Google Adsense banner-->
<div v-if="config.allowedAdsense" v-html="config.adsenseBanner02" class="mt-5 min-h-[120px]"></div>
<div v-if="config.allowedAdsense && config.adsenseBanner02" v-html="config.adsenseBanner02" class="mt-5 min-h-[120px]"></div>
</div>
</div>
</template>

View File

@@ -22,17 +22,17 @@
@contextmenu.prevent.capture="contextMenu($event, undefined)"
class="transition-transform duration-200 lg:grid lg:flex-grow lg:content-start lg:px-3.5"
>
<DesktopUploadRequestToolbar v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling'" />
<MobileUploadRequestToolBar v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling'" />
<DesktopUploadRequestToolbar v-if="canShowUI" />
<MobileUploadRequestToolBar v-if="canShowUI" />
<!--Google Adsense banner-->
<div v-if="config.allowedAdsense" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
<div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
<!--File list & info sidebar-->
<div class="flex space-x-3 lg:overflow-hidden">
<router-view id="file-view" class="relative w-full" :key="$route.fullPath" />
<InfoSidebarUploadRequest v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling' && isVisibleSidebar" />
<InfoSidebarUploadRequest v-if="canShowUI && isVisibleSidebar" />
</div>
</div>
</div>
@@ -73,7 +73,10 @@ export default {
DragUI,
},
computed: {
...mapGetters(['isVisibleSidebar', 'config', 'uploadRequest']),
...mapGetters(['isVisibleSidebar', 'config', 'uploadRequest', 'fileQueue']),
canShowUI() {
return (this.uploadRequest && this.uploadRequest.data.attributes.status === 'filling') || this.fileQueue.length > 0
}
},
data() {
return {

View File

@@ -206,7 +206,7 @@
{{--Adsense code--}}
@if(optional($settings)->allowed_adsense)
<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client={{ $settings->adsense_client_id }}" crossorigin="anonymous"></script>
<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client={{ $settings->adsense_client_id ?? '' }}" crossorigin="anonymous"></script>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});