Skip to content

Commit

Permalink
#351 - added intro page for the server settings
Browse files Browse the repository at this point in the history
  • Loading branch information
dziudek committed Feb 22, 2019
1 parent 03c58f6 commit 4093ced
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/back-end/builddata.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"0.33.3","build":11538,"status":"Beta"}
{"version":"0.33.3","build":11544,"status":"Beta"}
32 changes: 25 additions & 7 deletions app/src/components/ServerSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
class="content"
ref="content">
<div class="server-settings">
<p-header title="Server Settings">
<p-header
v-if="deploymentMethodSelected !== ''"
title="Server Settings">
<p-button
@click.native="visitWebsite"
slot="buttons"
Expand All @@ -19,7 +21,23 @@
</p-button>
</p-header>

<fields-group title="Destination Server">
<div
v-if="deploymentMethodSelected === ''"
class="server-settings-intro">
INTRO

<div @click="deploymentMethodSelected = 'github-pages'">
Select Github Pages
</div>

<div @click="deploymentMethodSelected = 's3'">
Select S3
</div>
</div>

<fields-group
v-if="deploymentMethodSelected !== ''"
title="Destination Server">
<field
id="domain"
label="Domain">
Expand Down Expand Up @@ -680,7 +698,7 @@
</field>
</fields-group>

<p-footer>
<p-footer v-if="deploymentMethodSelected !== ''">
<p-button
:onClick="save"
slot="buttons">
Expand Down Expand Up @@ -748,12 +766,12 @@ export default {
return this.$store.state.currentSite.config.domain.replace('http://', '').replace('https://', '').replace('file://', '');
},
currentHttpProtocol () {
if (this.$store.state.currentSite.config.domain.indexOf('https') === 0) {
return 'https';
if (this.$store.state.currentSite.config.domain.indexOf('file') === 0) {
return 'file';
} else if (this.$store.state.currentSite.config.domain.indexOf('http') === 0) {
return 'http';
} else {
return 'file';
return 'https';
}
},
siteIsOnline () {
Expand Down Expand Up @@ -784,7 +802,7 @@ export default {
mounted () {
this.domain = this.currentDomain;
this.httpProtocolSelected = this.currentHttpProtocol;
this.deploymentMethodSelected = this.$store.state.currentSite.config.deployment.protocol || 'github-pages';
this.deploymentMethodSelected = this.$store.state.currentSite.config.deployment.protocol || '';
this.deploymentSettings = Utils.deepMerge(this.deploymentSettings, JSON.parse(JSON.stringify(this.$store.state.currentSite.config.deployment)));
setTimeout(() => {
Expand Down

0 comments on commit 4093ced

Please sign in to comment.