This commit is contained in:
Čarodej
2022-03-14 08:45:26 +01:00
parent 5e48af22a2
commit f835c6a7c2
11 changed files with 86 additions and 89 deletions

View File

@@ -109,7 +109,6 @@ export default {
})
}
} else {
console.log(data.data.type)
// Get id from current folder
const id = data.data.type !== 'folder' ? this.currentFolder?.data.id : data.data.id

View File

@@ -1,7 +1,7 @@
<template>
<div
:class="type"
class="absolute top-16 bottom-24 left-0 right-0 h-auto overflow-x-auto overflow-y-auto px-6 md:relative md:top-0 md:bottom-0"
class="absolute top-16 bottom-24 left-0 right-0 h-auto lg:overflow-visible overflow-auto px-6 md:relative md:top-0 md:bottom-0"
>
<slot />
</div>

View File

@@ -56,12 +56,12 @@
<!--Create metered plan alert-->
<div
v-if="config.subscriptionType === 'metered' && config.isEmptyPlans"
class="mb-6 flex items-center rounded-xl bg-rose-200 p-5 shadow-card"
class="mb-6 flex items-center rounded-xl dark:bg-rose-700/30 bg-rose-200 p-5 shadow-card"
>
<alert-octagon-icon size="18" class="vue-feather mr-4 shrink-0 text-rose-700" />
<p class="text-sm text-rose-700">
<alert-octagon-icon size="18" class="vue-feather mr-4 shrink-0 dark:text-rose-500 text-rose-700" />
<p class="text-sm dark:text-rose-500 text-rose-700">
As you installed app with metered subscription type, you have to
<router-link :to="{ name: 'CreateMeteredPlan' }" class="text-sm font-bold underline"
<router-link :to="{ name: 'CreateMeteredPlan' }" class="dark:text-rose-500 text-sm font-bold underline"
>create your plan</router-link
>
as soon as possible to prevent new user registration without automatically assigned subscription
@@ -72,10 +72,10 @@
<!--Cron Alert-->
<div
v-if="!data.app.isRunningCron && !config.isDev"
class="mb-6 flex items-center rounded-xl bg-rose-200 p-5 shadow-card"
class="mb-6 flex items-center rounded-xl dark:bg-rose-700/30 bg-rose-200 p-5 shadow-card"
>
<alert-octagon-icon size="18" class="vue-feather mr-4 shrink-0 text-rose-700" />
<p class="text-sm text-rose-700">
<alert-octagon-icon size="18" class="vue-feather mr-4 shrink-0 dark:text-rose-500 text-rose-700" />
<p class="text-sm dark:text-rose-500 text-rose-700">
We detect your cron jobs probably doesn't work correctly, please check it, you need it for running
app correctly. If you set your cron job, please get back one minute later.
</p>

View File

@@ -339,7 +339,6 @@ export default {
}
})
.catch((error) => {
console.log(error)
events.$emit('toaster', {
type: 'danger',
message: this.$t('popup_error.title'),

View File

@@ -1,5 +1,5 @@
<template>
<router-view class="dark:bg-dark-background bg-light-background" />
<router-view />
</template>
<script>

View File

@@ -294,12 +294,13 @@ export default {
formData.append('title', this.app.title)
formData.append('description', this.app.description)
formData.append('contactMail', this.app.contactMail)
formData.append('subscriptionType', this.app.subscriptionType)
formData.append('userVerification', Boolean(this.app.userVerification) ? 1 : 0)
formData.append('userRegistration', Boolean(this.app.userRegistration) ? 1 : 0)
formData.append('storageLimitation', Boolean(this.app.storageLimitation) ? 1 : 0)
if (this.app.googleAnalytics) formData.append('googleAnalytics', this.app.googleAnalytics)
if (this.app.subscriptionType) formData.append('subscriptionType', this.app.subscriptionType)
if (this.app.googleAnalytics) formData.append('googleAnalytics', this.app.googleAnalytics)
if (this.app.defaultStorage) formData.append('defaultStorage', this.app.defaultStorage)

View File

@@ -117,8 +117,6 @@ export default {
// End loading
this.isLoading = false
console.log(response)
if (response.data === 'b6896a44017217c36f4a6fdc56699728') {
this.isExtended = true
localStorage.setItem('license', 'Extended')

View File

@@ -28,7 +28,7 @@
@endphp
<!DOCTYPE html>
<html style="min-height: 100%" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<html class="{{ $installation === 'installation-needed' ? 'dark:bg-dark-background bg-light-background' : '' }}" style="min-height: 100%" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<!-- <meta name="theme-color" content="{{ $settings->app_color ?? '#00BC7E' }}">-->
@@ -66,7 +66,7 @@
@include('vuefilemanager.others.color-template')
</head>
<body style="min-height: 100%" class="{{ $installation === 'installation-needed' ? 'bg-light-background' : '' }} {{ is_dev() ? 'debug-screens' : '' }}">
<body style="min-height: 100%">
<div id="app"></div>