s3 configuration fix

This commit is contained in:
Čarodej
2022-03-25 07:38:22 +01:00
parent bb1d775585
commit df05eb0433
14 changed files with 88 additions and 96 deletions

View File

@@ -5,7 +5,7 @@
</FormLabel>
<div v-if="user.data.relationships.alert">
<b class="-mt-3 mb-0.5 block flex items-center text-3xl font-extrabold">
<b class="-mt-3 mb-0.5 block flex items-center text-2xl font-extrabold sm:text-3xl">
{{ user.data.relationships.alert.data.attributes.formatted }}
<edit2-icon
v-if="!showUpdateBillingAlertForm"

View File

@@ -181,7 +181,6 @@
</ValidationProvider>
<ValidationProvider
v-if="storage.driver !== 's3'"
tag="div"
mode="passive"
name="Endpoint"
@@ -482,6 +481,7 @@ export default {
wasabi: 'https://s3.' + val + '.wasabisys.com',
backblaze: 'https://s3.' + val + '.backblazeb2.com',
oss: 'https://' + val + '.aliyuncs.com',
s3: 'https://s3.amazonaws.com',
}[this.storage.driver]
},
},

View File

@@ -158,17 +158,10 @@
<AppInputSwitch
title="Allow User Registration"
description="You can disable public registration for new users. You will still able to create new users in administration panel."
:is-last="true"
>
<SwitchInput v-model="app.userRegistration" class="switch" :state="app.userRegistration" />
</AppInputSwitch>
<AppInputSwitch
:title="$t('require_email_verification')"
:description="$t('require_email_verification_note')"
:is-last="true"
>
<SwitchInput v-model="app.userVerification" class="switch" :state="app.userVerification" />
</AppInputSwitch>
</div>
<div v-if="isExtended" class="card text-left shadow-card">
@@ -268,7 +261,6 @@ export default {
defaultStorage: '5',
userRegistration: 1,
storageLimitation: 1,
userVerification: 0,
},
}
},
@@ -294,7 +286,6 @@ export default {
formData.append('title', this.app.title)
formData.append('description', this.app.description)
formData.append('contactMail', this.app.contactMail)
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)

View File

@@ -88,7 +88,7 @@
rules="required"
v-slot="{ errors }"
>
<AppInputText v-if="storage.driver !== 's3'" title="Endpoint URL" :error="errors[0]">
<AppInputText title="Endpoint URL" :error="errors[0]">
<input
class="focus-border-theme input-dark"
v-model="storage.endpoint"
@@ -535,7 +535,8 @@ export default {
wasabi: 'https://s3.' + val + '.wasabisys.com',
backblaze: 'https://s3.' + val + '.backblazeb2.com',
oss: 'https://' + val + '.aliyuncs.com',
}[this.storage.driver]
s3: 'https://s3.amazonaws.com',
}[this.storage.driver]
},
},
computed: {