jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add view for dns credentials in setup

Browse Source
This commit is contained in:
Johannes Zellner
2017-01-04 15:06:15 +01:00
parent 604faa6669
commit c0afff4d13
2 changed files with 87 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
webadmin/src/js/setup.js
View File

@@ -93,7 +93,23 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope
$scope.apiServerOrigin = '';
$scope.setupToken = '';
$scope.createAppstoreAccount = true;
$scope.showDNSSetup = false;
$scope.dnsProvider = [
{ name: 'Manual/Wildcard', value: 'manual' },
{ name: 'No-op', value: 'noop' },
{ name: 'AWS Route53', value: 'route53' },
{ name: 'Digital Ocean', value: 'digitalocean' }
];
$scope.dnsCredentials = {
error: null,
busy: false,
domain: '',
accessKeyId: '',
secretAccessKey: '',
digitalOceanToken: '',
provider: 'route53'
};
$scope.activateCloudron = function () {
$scope.busy = true;
@@ -133,6 +149,29 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope
});
};
$scope.setDNSCredentials = function () {
$scope.busy = true;
var data = {
provider: $scope.dnsCredentials.provider,
accessKeyId: $scope.dnsCredentials.accessKeyId,
secretAccessKey: $scope.dnsCredentials.secretAccessKey,
token: $scope.dnsCredentials.digitalOceanToken
};
Client.setDnsConfig(data, function (error) {
$scope.busy = false;
if (error) {
$scope.dnsCredentials.error = error.message;
return;
}
// TODO wait until domain is propagated and cert got acquired
window.location.href = '/';
});
};
Client.getStatus(function (error, status) {
if (error) {
window.location.href = '/error.html';

52
webadmin/src/setup.html
View File

@@ -37,7 +37,7 @@
Please use the setup link for this cloudron.
</center>
<div class="main-container ng-cloak" ng-hide="provider === 'caas' && !setupToken && !initialized">
<div class="main-container ng-cloak" ng-show="initialized">
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="card" style="max-width: none; padding: 20px;">
@@ -84,14 +84,58 @@
</div>
<div class="row">
<div class="col-md-12 text-center">
<input type="submit" class="btn btn-primary" ng-hide="provider === 'caas'" ng-disabled="setupForm.$invalid || busy" value="Next">
<input type="submit" class="btn btn-primary" ng-show="provider === 'caas'" ng-disabled="setupForm.$invalid || busy" value="Done">
<input type="submit" class="btn btn-primary" ng-hide="provider === 'caas'" ng-disabled="setupForm.$invalid" value="Next">
<input type="submit" class="btn btn-primary" ng-show="provider === 'caas'" ng-disabled="setupForm.$invalid" value="Done">
</div>
</div>
</form>
</div>
<div ng-show="showDNSSetup && !busy">
Now do DNS setup
<form name="dnsCredentialsForm" role="form" novalidate ng-submit="setDnsCredentials()" autocomplete="off">
<div class="row">
<div class="col-md-12 text-center">
<h1>Domain Setup</h1>
<h3>Specify the domain for your Cloudron</h3>
<p>Apps will be installed on subdomains of that domain.</p>
</div>
</div>
<div class="row">
<div class="col-md-4 col-md-offset-4 text-center">
<p class="has-error text-center" ng-show="dnsCredentials.error">{{ dnsCredentials.error }}</p>
<div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.domain.$invalid }">
<input type="text" class="form-control" ng-model="dnsCredentials.domain" name="domain" ng-minlength="4" ng-maxlength="128" placeholder="example.com" required autofocus>
</div>
<div class="form-group" ng-show="dnsConfig.provider !== 'caas'">
<label class="control-label">DNS API Provider</label>
<select class="form-control" ng-model="dnsCredentials.provider" ng-options="a.value as a.name for a in dnsProvider">
</select>
</div>
<!-- Route53 -->
<div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.accessKeyId.$invalid }" ng-show="dnsCredentials.provider === 'route53'">
<label class="control-label">Access Key Id</label>
<input type="text" class="form-control" ng-model="dnsCredentials.accessKeyId" name="accessKeyId" ng-minlength="16" ng-maxlength="32" ng-required="dnsCredentials.provider === 'route53'">
</div>
<div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.secretAccessKey.$invalid }" ng-show="dnsCredentials.provider === 'route53'">
<label class="control-label">Secret Access Key</label>
<input type="text" class="form-control" ng-model="dnsCredentials.secretAccessKey" name="secretAccessKey" ng-required="dnsCredentials.provider === 'route53'">
</div>
<!-- DigitalOcean -->
<div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.digitalOceanToken.$invalid }" ng-show="dnsCredentials.provider === 'digitalocean'">
<label class="control-label">API Token</label>
<input type="text" class="form-control" ng-model="dnsCredentials.digitalOceanToken" name="digitalOceanToken" ng-required="dnsCredentials.provider === 'digitalocean'">
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 text-center">
<input type="submit" class="btn btn-primary" ng-disabled="dnsCredentialsForm.$invalid" value="Done"/>
</div>
</div>
</form>
</div>
</div>
</div>