Procházet zdrojové kódy

simplify activation page

pull/1/head
Jonathan Cobb před 5 roky
rodič
revize
89a819baba
1 změnil soubory, kde provedl 21 přidání a 24 odebrání
  1. +21
    -24
      src/auth/ActivationPage.vue

+ 21
- 24
src/auth/ActivationPage.vue Zobrazit soubor

@@ -17,11 +17,6 @@
<input type="text" v-model="description" name="description" class="form-control" :class="{ 'is-invalid': submitted && errors.has('description') }" /> <input type="text" v-model="description" name="description" class="form-control" :class="{ 'is-invalid': submitted && errors.has('description') }" />
<div v-if="submitted && errors.has('description')" class="invalid-feedback d-block">{{ errors.first('description') }}</div> <div v-if="submitted && errors.has('description')" class="invalid-feedback d-block">{{ errors.first('description') }}</div>
</div> </div>
<div class="form-group">
<label for="networkName">{{messages.field_label_network_name}}</label>
<input type="text" v-model="networkName" name="networkName" class="form-control" :class="{ 'is-invalid': submitted && errors.has('networkName') }" />
<div v-if="submitted && errors.has('networkName')" class="invalid-feedback d-block">{{ errors.first('networkName') }}</div>
</div>


<!-- DNS --> <!-- DNS -->
<div class="form-group"> <div class="form-group">
@@ -62,9 +57,9 @@
<h3>{{messages.form_section_title_storage}}</h3> <h3>{{messages.form_section_title_storage}}</h3>
<div v-if="submitted && errors.has('storage')" class="invalid-feedback d-block"><h5>{{ errors.first('storage') }}</h5></div> <div v-if="submitted && errors.has('storage')" class="invalid-feedback d-block"><h5>{{ errors.first('storage') }}</h5></div>
<label for="storageName">{{messages.field_label_storage_service}}</label> <label for="storageName">{{messages.field_label_storage_service}}</label>
<select v-model="storageName" name="storage" class="form-control">
<option v-for="opt in storageTemplates" v-bind:value="opt.name">{{messages['driver_'+opt.driverClass]}}</option>
</select>
<!-- <select v-model="storageName" name="storage" class="form-control">-->
<!-- <option v-for="opt in storageTemplates" v-bind:value="opt.name">{{messages['driver_'+opt.driverClass]}}</option>-->
<!-- </select>-->
<span v-html="messages['description_'+storageByName[storageName].driverClass]"></span> <span v-html="messages['description_'+storageByName[storageName].driverClass]"></span>
</div> </div>


@@ -96,16 +91,6 @@
<script> <script>
import { mapState, mapActions } from 'vuex' import { mapState, mapActions } from 'vuex'


const DNS_GODADDY = {
name: 'GoDaddyDns',
driverClass: 'bubble.cloud.dns.godaddy.GoDaddyDnsDriver',
credentials: {
params: [
{name: 'GODADDY_API_KEY', value: null},
{name: 'GODADDY_API_SECRET', value: null},
]
}
};
const DNS_ROUTE53 = { const DNS_ROUTE53 = {
name: 'Route53Dns', name: 'Route53Dns',
driverClass: 'bubble.cloud.dns.route53.Route53DnsDriver', driverClass: 'bubble.cloud.dns.route53.Route53DnsDriver',
@@ -114,12 +99,24 @@
{name: 'AWS_ACCESS_KEY_ID', value: null}, {name: 'AWS_ACCESS_KEY_ID', value: null},
{name: 'AWS_SECRET_KEY', value: null}, {name: 'AWS_SECRET_KEY', value: null},
] ]
}
},
template: true
};
const DNS_GODADDY = {
name: 'GoDaddyDns',
driverClass: 'bubble.cloud.dns.godaddy.GoDaddyDnsDriver',
credentials: {
params: [
{name: 'GODADDY_API_KEY', value: null},
{name: 'GODADDY_API_SECRET', value: null},
]
},
template: true
}; };
const DNS_TEMPLATES = [ DNS_GODADDY, DNS_ROUTE53 ];
const DNS_TEMPLATES = [ DNS_ROUTE53, DNS_GODADDY ];
const DNS_BY_NAME = {}; const DNS_BY_NAME = {};
DNS_BY_NAME[DNS_GODADDY.name] = DNS_GODADDY;
DNS_BY_NAME[DNS_ROUTE53.name] = DNS_ROUTE53; DNS_BY_NAME[DNS_ROUTE53.name] = DNS_ROUTE53;
DNS_BY_NAME[DNS_GODADDY.name] = DNS_GODADDY;


const STORAGE_S3 = { const STORAGE_S3 = {
name: "S3_US_Standard", name: "S3_US_Standard",
@@ -146,7 +143,8 @@
driverConfig: { baseDir: '.bubble_local_storage' }, driverConfig: { baseDir: '.bubble_local_storage' },
template: false template: false
}; };
const STORAGE_TEMPLATES = [ STORAGE_S3, STORAGE_LOCAL ];
// const STORAGE_TEMPLATES = [ STORAGE_S3, STORAGE_LOCAL ];
const STORAGE_TEMPLATES = [ STORAGE_S3 ];
const STORAGE_BY_NAME = {}; const STORAGE_BY_NAME = {};
STORAGE_BY_NAME[STORAGE_S3.name] = STORAGE_S3; STORAGE_BY_NAME[STORAGE_S3.name] = STORAGE_S3;
STORAGE_BY_NAME[STORAGE_LOCAL.name] = STORAGE_LOCAL; STORAGE_BY_NAME[STORAGE_LOCAL.name] = STORAGE_LOCAL;
@@ -169,7 +167,6 @@
name: 'root', name: 'root',
password: null, password: null,
description: 'root user', description: 'root user',
networkName: null,


dnsName: DNS_TEMPLATES[0].name, dnsName: DNS_TEMPLATES[0].name,
dnsCredentials: toCredentialsMap(DNS_TEMPLATES[0].credentials), dnsCredentials: toCredentialsMap(DNS_TEMPLATES[0].credentials),
@@ -243,7 +240,7 @@
name: this.name, name: this.name,
password: this.password, password: this.password,
description: this.description, description: this.description,
networkName: this.networkName,
networkName: 'boot-network',
dns: this.cloudActivationObject(this.dnsByName[this.dnsName], this.dnsCredentials, this.dnsConfig), dns: this.cloudActivationObject(this.dnsByName[this.dnsName], this.dnsCredentials, this.dnsConfig),
storage: this.cloudActivationObject(this.storageByName[this.storageName], this.storageCredentials, this.storageConfig), storage: this.cloudActivationObject(this.storageByName[this.storageName], this.storageCredentials, this.storageConfig),
domain: this.domainActivationObject() domain: this.domainActivationObject()


Načítá se…
Zrušit
Uložit