nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 08:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ftp setup added

Browse Source
This commit is contained in:
Čarodej
2022-04-12 10:43:23 +02:00
parent e71810a9bb
commit 8df7794484
13 changed files with 203 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
resources/js/components/Setup/StorageSetup.vue
View File

@@ -21,12 +21,12 @@
</AppInputText>
</ValidationProvider>
<div v-if="storage.driver !== 'local' && storage.driver">
<div v-if="s3PredefinedList.includes(storage.driver)">
<ValidationProvider tag="div" mode="passive" name="Key" rules="required" v-slot="{ errors }">
<AppInputText title="Key" :error="errors[0]">
<input
class="focus-border-theme input-dark"
v-model="storage.key"
v-model="storage.s3.key"
placeholder="Paste your key"
type="text"
:class="{ '!border-rose-600': errors[0] }"
@@ -38,7 +38,7 @@
<AppInputText title="Secret" :error="errors[0]">
<input
class="focus-border-theme input-dark"
v-model="storage.secret"
v-model="storage.s3.secret"
placeholder="Paste your secret"
type="text"
:class="{ '!border-rose-600': errors[0] }"
@@ -54,9 +54,8 @@
:error="errors[0]"
>
<SelectInput
v-model="storage.region"
v-model="storage.s3.region"
:options="regionList"
:default="storage.region"
placeholder="Select your region"
:isError="errors[0]"
/>
@@ -72,7 +71,7 @@
>
<input
class="focus-border-theme input-dark"
v-model="storage.region"
v-model="storage.s3.region"
placeholder="Type your region"
type="text"
:class="{ '!border-rose-600': errors[0] }"
@@ -91,7 +90,7 @@
<AppInputText title="Endpoint URL" :description="endpointUrlDescription" :error="errors[0]">
<input
class="focus-border-theme input-dark"
v-model="storage.endpoint"
v-model="storage.s3.endpoint"
placeholder="Type your endpoint"
type="text"
:class="{ '!border-rose-600': errors[0] }"
@@ -109,7 +108,7 @@
>
<input
class="focus-border-theme input-dark"
v-model="storage.bucket"
v-model="storage.s3.bucket"
placeholder="Type your bucket name"
type="text"
:class="{ '!border-rose-600': errors[0] }"
@@ -117,6 +116,42 @@
</AppInputText>
</ValidationProvider>
</div>
<div v-if="storage.driver === 'ftp'">
<ValidationProvider tag="div" mode="passive" name="FTP Host" rules="required" v-slot="{ errors }">
<AppInputText title="FTP Host" :error="errors[0]">
<input
class="focus-border-theme input-dark"
v-model="storage.ftp.host"
placeholder="Type your ftp host..."
type="text"
:class="{ '!border-rose-600': errors[0] }"
/>
</AppInputText>
</ValidationProvider>
<ValidationProvider tag="div" mode="passive" name="FTP Username" rules="required" v-slot="{ errors }">
<AppInputText title="FTP Username" :error="errors[0]">
<input
class="focus-border-theme input-dark"
v-model="storage.ftp.user"
placeholder="Type your ftp username..."
type="text"
:class="{ '!border-rose-600': errors[0] }"
/>
</AppInputText>
</ValidationProvider>
<ValidationProvider tag="div" mode="passive" name="FTP Password" rules="required" v-slot="{ errors }">
<AppInputText title="FTP Password" :error="errors[0]" :is-last="true">
<input
class="focus-border-theme input-dark"
v-model="storage.ftp.password"
placeholder="Type your ftp password..."
type="text"
:class="{ '!border-rose-600': errors[0] }"
/>
</AppInputText>
</ValidationProvider>
</div>
</div>
</template>
@@ -143,10 +178,10 @@
deep: true
},
'storage.driver': function () {
this.storage.region = undefined
this.storage.s3.region = undefined
},
'storage.region': function (val) {
this.storage.endpoint = {
'storage.s3.region': function (val) {
this.storage.s3.endpoint = {
storj: 'https://gateway.' + val + '.storjshare.io',
spaces: 'https://' + val + '.digitaloceanspaces.com',
wasabi: 'https://s3.' + val + '.wasabisys.com',
@@ -180,11 +215,18 @@
return {
storage: {
driver: undefined,
key: undefined,
secret: undefined,
endpoint: undefined,
region: undefined,
bucket: undefined,
s3: {
key: undefined,
secret: undefined,
endpoint: undefined,
region: undefined,
bucket: undefined,
},
ftp: {
host: undefined,
user: undefined,
password: undefined,
}
},
ossRegions: [
{
@@ -336,6 +378,15 @@
value: 'fra1',
},
],
s3PredefinedList: [
's3',
'storj',
'spaces',
'wasabi',
'backblaze',
'oss',
'other',
],
storageServiceList: [
{
label: 'Local Driver',
@@ -369,6 +420,10 @@
label: 'Other S3 Compatible Service',
value: 'other',
},
{
label: 'FTP',
value: 'ftp',
},
],
}
}

4
resources/js/views/Admin/AppSettings/AppSettingsTabs/Environment.vue
View File

@@ -309,9 +309,9 @@ export default {
})
})
.catch((error) => {
if (error.response.status === 401 && error.response.data.type === 's3-connection-error') {
if ([401, 500].includes(error.response.status)) {
events.$emit('alert:open', {
title: 'S3 Connection Error - Wrong Credentials or Not Permitted',
title: error.response.data.title || this.$t('popup_error.title'),
message: error.response.data.message,
})
} else {

18
resources/js/views/SetupWizard/EnvironmentSetup.vue
View File

@@ -316,19 +316,11 @@ export default {
this.$router.push({ name: 'AppSetup' })
})
.catch((error) => {
if (error.response.status === 401 && error.response.data.type === 's3-connection-error') {
events.$emit('alert:open', {
title: 'S3 Connection Error - Wrong Credentials or Not Permitted',
message: error.response.data.message,
})
} else if (
error.response.status === 401 &&
error.response.data.type === 'mailer-connection-error'
) {
events.$emit('alert:open', {
title: 'Mailer Connection Error - Wrong Credentials',
message: error.response.data.message,
})
if ([401, 500].includes(error.response.status)) {
events.$emit('alert:open', {
title: error.response.data.title || 'Whooops, something went wrong!',
message: error.response.data.message,
})
} else {
this.isError = true
}