coolaj86
/
goldilocks.js
1
0
Fork 1
Code Issues Pull Requests Releases Activity

retrieve ips, show priorities

This commit is contained in:
AJ ONeal 2017-03-04 00:25:20 -07:00
parent 22b7a1b880
commit 0103ae02d4
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
admin/public/index.html
View File

@ -5,6 +5,17 @@
</head> </head>
<body class="fade" ng-class="[ 'in' ]"> <body class="fade" ng-class="[ 'in' ]">
<ul>
<li>Change API format to verbose arrays and nested objects</li>
<li>Set Default Path, Module (dir, api)</li>
<li>Set Hostname, Path, Module (dir, api)</li>
<li>Show Device Name</li>
<li>Login to Daplie</li>
<li>Show domains (or ask purchase)</li>
<li>Tunnel On</li>
<li>Show configured domains</li>
</ul>
<div class="container" ng-controller="LoginController as vm" ng-init="vm.setSimple()"> <div class="container" ng-controller="LoginController as vm" ng-init="vm.setSimple()">
<h1 ng-if="!vm.authnUpdated">Initializing... {{vm.hello}}</h1> <h1 ng-if="!vm.authnUpdated">Initializing... {{vm.hello}}</h1>
<div ng-if="!vm.authnUpdated"> <div ng-if="!vm.authnUpdated">
@ -34,6 +45,20 @@
</div> </div>
<div ng-if="vm.config"> <div ng-if="vm.config">
<div class="input-group" ng-init="siteconf = vm.config.global">
<h1>Global Settings:</h1>
<br/>
<div ng-repeat="(pathname, modules) in siteconf.paths">Pathname:
<input class="form-control" ng-model="pathname" />
<div ng-repeat="(modulename, module) in modules">Modulename: {{modulename}}
<div ng-repeat="target in modules">Target:
<input class="form-control" ng-model="target" />
</div>
</div>
</div>
</div>
<h1>Per-Domain Settings:</h1>
<div class="input-group" ng-repeat="(sitename, siteconf) in vm.config.sites"> <div class="input-group" ng-repeat="(sitename, siteconf) in vm.config.sites">
<label>Hostname:</label> <input class="form-control" ng-model="sitename" /> <label>Hostname:</label> <input class="form-control" ng-model="sitename" />
<br/> <br/>
@ -51,13 +76,6 @@
<pre><code ng-bind="vm.config | json">{{vm.config}}</code></pre> <pre><code ng-bind="vm.config | json">{{vm.config}}</code></pre>
</div> </div>
<ul>
<li>Show Device Name</li>
<li>Login to Daplie</li>
<li>Show domains (or ask purchase)</li>
<li>Tunnel On</li>
<li>Show configured domains</li>
</ul>
<script src="/assets/com.jquery/jquery-3.1.1.js"></script> <script src="/assets/com.jquery/jquery-3.1.1.js"></script>
<script src="/assets/com.google/angular.1.6.2.min.js"></script> <script src="/assets/com.google/angular.1.6.2.min.js"></script>

5
bin/goldilocks.js
View File

@ -431,6 +431,9 @@ function run() {
opts.assetsPath = path.join(__dirname, '..', 'packages', 'assets'); opts.assetsPath = path.join(__dirname, '..', 'packages', 'assets');
opts.webRoot = defaultWebRoot; opts.webRoot = defaultWebRoot;
// ifaces
opts.ifaces = require('../lib/local-ip.js').find();
// TODO use arrays in all things // TODO use arrays in all things
opts._old_server_name = Object.keys(opts.sites)[0]; opts._old_server_name = Object.keys(opts.sites)[0];
opts.pubdir = defaultWebRoot.replace(/(:hostname|:servername).*/, ''); opts.pubdir = defaultWebRoot.replace(/(:hostname|:servername).*/, '');
@ -518,8 +521,6 @@ function run() {
// TODO what is this condition actually intending to test again? // TODO what is this condition actually intending to test again?
// (I think it can be replaced with if (!opts._externalHost) { ... } // (I think it can be replaced with if (!opts._externalHost) { ... }
// ifaces
opts.ifaces = require('../lib/local-ip.js').find();
promise = PromiseA.resolve(); promise = PromiseA.resolve();
} else { } else {
console.info("Attempting to resolve external connection for '" + opts._old_server_name + "'"); console.info("Attempting to resolve external connection for '" + opts._old_server_name + "'");

2
packages/assets/org.oauth3

@ -1 +1 @@
Subproject commit f179cfe3c9553718676db24f1203f67ea0427662 Subproject commit 356a2d3131bcc6d0f6199a1d2039dcdcee0e3481