Skip to content

Commit

Permalink
Revert to box prefix and remove skip button
Browse files Browse the repository at this point in the history
  • Loading branch information
benfrancis committed Jun 28, 2017
1 parent 5f0a555 commit f3f3673
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module.exports = {
ssltunnel: {
enabled: true,
registration_endpoint: 'mozilla-iot.org',
domain: 'mozilla-iot.org',
domain: 'box.mozilla-iot.org',
pagekite_cmd: './pagekite.py',
port: 443
}
Expand Down
7 changes: 5 additions & 2 deletions static/js/setup_subdomain.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
const subdomain = document.getElementById('subdomain');
const email = document.getElementById('email');
const createDomainButton = document.getElementById('create-domain-button');
const skipButton = document.getElementById('skip-subdomain-button');
// https://github.com/mozilla-iot/gateway/issues/159
//const skipButton = document.getElementById('skip-subdomain-button');
const errorMessage = document.getElementById('error-setup');

function displayMessage(errorMsg, type){
Expand Down Expand Up @@ -61,6 +62,8 @@ createDomainButton.addEventListener('click', function() {
});
});

/*
* https://github.com/mozilla-iot/gateway/issues/159
skipButton.addEventListener('click', function() {
// call the settings controller to skip the domain subscription
displayMessage('Processing...', 'message');
Expand All @@ -80,4 +83,4 @@ skipButton.addEventListener('click', function() {
}).catch(function(error) {
displayMessage(error, 'error');
});
});
});*/
5 changes: 3 additions & 2 deletions views/tunnel_setup.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
<form id="create-subdomain-form" class="subdomain-form">
<h1>Welcome</h1>
<p>Choose a secure web address for your gateway:</p>
<input type="text" id="subdomain" placeholder="subdomain" required/><div id="label-subdomain">.mozilla-iot.org</div>
<input type="text" id="subdomain" placeholder="subdomain" required/><div id="label-subdomain">.box.mozilla-iot.org</div>
<input type="email" id="email" placeholder="Email" required/><br>
<div id="error-setup" class="error hidden">
An error occured when setting up the subdomain
</div><br>
<button id="skip-subdomain-button" type="button">Skip</button>
<!-- https://github.com/mozilla-iot/gateway/issues/159 -->
<!--<button id="skip-subdomain-button" type="button">Skip</button>-->
<button id="create-domain-button" type="button">Create</button>
</form>
<script src="/js/setup_subdomain.js"></script>
Expand Down

0 comments on commit f3f3673

Please sign in to comment.