6 changed files with 39 additions and 160 deletions
--- a/bin/telebit-remote.js
+++ b/bin/telebit-remote.js
@ -123,10 +123,13 @@ function askForConfig(state, mainCb) {
            return;
          }
          if (200 !== resp.statusCode || (Buffer.isBuffer(body) || 'object' !== typeof body) || !body.api_host) {
-            console.warn(TPLS.remote.setup.fail_relay_check
+            console.warn("===================");
-              .replace(/{{\s*status_code\s*}}/, resp.statusCode)
+            console.warn("      WARNING      ");
-              .replace(/{{\s*url\s*}}/, urlstr)
+            console.warn("===================");
-            );
+            console.warn("");
            console.warn("[" + resp.statusCode + "] '" + urlstr + "'");
            console.warn("This server does not describe a current telebit version (but it may still work).");
            console.warn("");
            console.warn(body);
          } else if (body && body.pair_request) {
            state._can_pair = true;
@ -155,7 +158,7 @@ function askForConfig(state, mainCb) {
    }
  ];
  var standardSet = [
-    // There are questions that we need to ask in the CLI
+    // There are questions that we need to aks in the CLI
    // if we can't guarantee that they are being asked in the web interface
    function askAgree(cb) {
      if (state.config.agreeTos) { cb(); return; }
--- a/bin/telebitd.js
+++ b/bin/telebitd.js
@ -400,12 +400,6 @@ function handleApi(req, res) {
      res.end('{"error":{"message":"module \'init\' needs more arguments"}}');
      return;
    }
    if (!Array.isArray(opts.body)) {
      // TODO
      res.statusCode = 500;
      res.end('{"error":{"message":"[internal error (our fault)] module \'init\' expected an array"}}');
      return;
    }
    // relay, email, agree_tos, servernames, ports
    //
    opts.body.forEach(function (opt) {
--- a/lib/admin/documentation/index.html
+++ b/lib/admin/documentation/index.html
@ -1,60 +0,0 @@
 <!DOCTYPE html>
 <html>
 <head>
  <title>Telebit Documentation</title>
 </head>
 <body>
  <div class="v-app">
    <h1>Telebit (Remote) Documentation</h1>
    <section>
      <h2>GET /api/config</h2>
      <pre><code>{{ config }}</code></pre>
    </section>
    <section>
      <h2>GET /api/status</h2>
      <pre><code>{{ status }}</code></pre>
    </section>
    <section>
      <h2>POST /api/init</h2>
      <form v-on:submit.stop.prevent="initialize">
        <label for="-email">Email:</label>
        <input id="-email" v-model="init.email" type="text" placeholder="john@example.com">
        <br>
        <label for="-teletos"><input id="-teletos" v-model="init.teletos" type="checkbox">
          Accept Telebit Terms of Service</label>
        <br>
        <label for="-letos"><input id="-letos" v-model="init.letos" type="checkbox">
          Accept Let's Encrypt Terms of Service</label>
        <br>
      </form>
      <pre><code>{{ init }}</code></pre>
    </section>
    <section>
      <h2>POST /api/http</h2>
      <pre><code>{{ http }}</code></pre>
    </section>
    <section>
      <h2>POST /api/tcp</h2>
      <pre><code>{{ tcp }}</code></pre>
    </section>
    <section>
      <h2>POST /api/ssh</h2>
      <pre><code>{{ ssh }}</code></pre>
    </section>
  </div>
  <script src="/js/vue.js"></script>
  <script src="/js/app.js"></script>
 </body>
 </html>
--- a/lib/admin/index.html
+++ b/lib/admin/index.html
@ -1,85 +1,60 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Telebit Setup</title>
+  <title>Telebit Admin</title>
 </head>
 <body>
  <div class="v-app">
-    <h1>Telebit (Remote) Setup</h1>
+    <h1>Telebit Admin</h1>
-    <section v-if="views.section.create">
+    <section>
-      <h2>Create Account</h2>
+      <h2>GET /api/config</h2>
      <pre><code>{{ config }}</code></pre>
    </section>
    <section>
      <h2>GET /api/status</h2>
      <pre><code>{{ status }}</code></pre>
    </section>
    <section>
      <h2>POST /api/init</h2>
      <form v-on:submit.stop.prevent="initialize">
        <label for="-email">Email:</label>
-        <input id="-email" v-model="init.email" type="text" placeholder="john@example.com" required>
+        <input id="-email" v-model="init.email" type="text" placeholder="john@example.com">
        <br>
-        <label for="-teletos"><input id="-teletos" v-model="init.teletos" type="checkbox" required>
+        <label for="-teletos"><input id="-teletos" v-model="init.teletos" type="checkbox">
          Accept Telebit Terms of Service</label>
        <br>
-        <label for="-letos"><input id="-letos" v-model="init.letos" type="checkbox" required>
+        <label for="-letos"><input id="-letos" v-model="init.letos" type="checkbox">
          Accept Let's Encrypt Terms of Service</label>
        <br>
        <label for="-notifications">Notification Preferences</label>
        <select id="-notifications" v-model="init.notifications">
          <option value="newsletter">Occassional Newsletter</option>
          <option value="important" default><strong>Important Messages Only</strong></option>
          <option value="required">Required Only</option>
        </select>
        <small>
        <p v-if="'newsletter' == init.notifications">
        You'll receive a friendly note now and then in addition to the important updates.
        </p>
        <p v-if="'important' == init.notifications">
        You'll only receive updates that we believe will be of the most value to you, and the required updates.
        </p>
        <p v-if="'required' == init.notifications">
        You'll only receive security updates, transactional and account-related messages, and legal notices.
        </p>
        </small>
        <label for="-relay">[Advanced] Relay:</label>
        <input id="-relay" v-model="init.relay" type="text" placeholder="telebit.cloud">
        <br>
        <button type="button" v-on:click="defaultRelay">Use Default</button>
        <button type="button" v-on:click="betaRelay">Use Beta</button>
        <br>
        <button type="submit">Accept &amp; Continue</button>
      </form>
      <pre><code>{{ init }}</code></pre>
    </section>
-    <section v-if="views.section.advanced">
+    <section>
-      <h2>Advanced Setup</h2>
+      <h2>POST /api/http</h2>
-      <form v-on:submit.stop.prevent="initialize">
+      <pre><code>{{ http }}</code></pre>
    </section>
-        <label for="-secret">Relay Secret:</label>
+    <section>
-        <input id="-secret" v-model="init.secret" type="text" placeholder="ex: xxxxxxxxxxxx">
+      <h2>POST /api/tcp</h2>
-        <br>
+      <pre><code>{{ tcp }}</code></pre>
    </section>
-        <label for="-telemetry"><input id="-telemetry" v-model="init.telemetry" type="checkbox">
+    <section>
-          Contribute to Telebit by sharing telemetry</label>
+      <h2>POST /api/ssh</h2>
-        <br>
+      <pre><code>{{ ssh }}</code></pre>
        <label for="-relay">[Advanced] Relay:</label>
        <input id="-relay" v-model="init.relay" type="text" placeholder="telebit.cloud">
        <br>
        <button type="submit">Accept &amp; Continue</button>
      </form>
      <pre><code>{{ init }}</code></pre>
    </section>
  </div>
-  <script src="/js/vue.js"></script>
+  <script src="js/vue.js"></script>
-  <script src="/js/app.js"></script>
+  <script src="js/app.js"></script>
 </body>
 </html>
--- a/lib/admin/js/app.js
+++ b/lib/admin/js/app.js
@ -23,42 +23,17 @@ api.status = function apiStatus() {
  });
 };
 // TODO test for internet connectivity (and telebit connectivity)
 var DEFAULT_RELAY = 'telebit.cloud';
 var BETA_RELAY = 'telebit.ppl.family';
 var appData = {
  config: null
 , status: null
-, init: {
+, init: {}
    teletos: true
  , letos: true
  , notifications: "important"
  , relay: DEFAULT_RELAY
  }
 , http: null
 , tcp: null
 , ssh: null
 , views: {
    section: {
      create: true
    }
  }
 };
 var appMethods = {
  initialize: function () {
    console.log("call initialize");
    if (!appData.init.relay) {
      appData.init.relay = DEFAULT_RELAY;
    }
    if (DEFAULT_RELAY !== appData.init.relay) {
      window.alert("TODO: Custom Relay Not Implemented Yet");
    }
  }
 , defaultRelay: function () {
    appData.init.relay = DEFAULT_RELAY;
  }
 , betaRelay: function () {
    appData.init.relay = BETA_RELAY;
  }
 };
--- a/lib/en-us.toml
+++ b/lib/en-us.toml
@ -476,13 +476,5 @@ By using Telebit you agree to:
 Enter your email to agree and login/create your account:
 "
 fail_relay_check = "===================
      WARNING
 ===================
 [{{status_code}}] '{{url}}'
 This server does not describe a current telebit version (but it may still work).
 "
 [daemon]
 version = "telebit daemon v{version}"