Skip to content
This repository has been archived by the owner on Nov 12, 2019. It is now read-only.

Commit

Permalink
-
Browse files Browse the repository at this point in the history
  • Loading branch information
@theangryangel
theangryangel committed Aug 18, 2013
1 parent 18e7e64 commit a64d34b
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 122 deletions.
11 changes: 8 additions & 3 deletions lib/cli/config.js
View file
Expand Up @@ -79,8 +79,13 @@ module.exports = function(target)
return filter_plugins(local, element);
}));
}

var r = [];

for (var i in a)
r.push({ path: a[i] });

res.json(a);
res.json(r);
});

// config
Expand All @@ -105,7 +110,7 @@ module.exports = function(target)
{
// list of config/connections
var c = config.read();
res.json(c.config/connections);
res.json(c.connections);
});

app.get('/config/connections/new', function(req, res)
Expand Down Expand Up @@ -145,7 +150,7 @@ module.exports = function(target)
{
// list of config/connections
var c = config.read();
res.json(c.config/plugins);
res.json(c.plugins);
});

app.get('/config/plugins/new', function(req, res)
Expand Down
152 changes: 56 additions & 96 deletions lib/cli/config/public/js/app.js
View file
Expand Up @@ -7,53 +7,51 @@ angular.module('config', ['ui.bootstrap', 'ngResource'])
.when('/', { controller: MainCtrl, templateUrl: '/partial/main.html' })
.otherwise({ redirectTo: '/' });
})
.factory('data', function($http)
.factory('AvailablePlugins', function($resource)
{
return $resource("/plugins");
})
.factory('ConfigVersion', function($http)
{
var conf = {};
var plugins = [];

return {
config: null,
plugins: [],
loaded: function()
{
return this.config != null;
},
load: function()
'query': function(cb)
{
var self = this;
$http({ method: 'GET', url: '/load' })
.success(function(data, status, headers, config)
{
self.config = data;
});

$http({ method: 'GET', url: '/plugins' })
.success(function(data, status, headers, config)
{
self.plugins = data;
});
$http({method: 'GET', url: '/config/version'})
.success(cb);
},
save: function()
'save': function(data)
{
$http.post('/save', this.config);
}
};
})
.factory('Version', function($resource)
.factory('ConfigConnections', function($resource)
{
return $resource("/config/version");
return $resource("/config/connections");
})
.factory('ConfigPlugins', function($resource)
{
return $resource("/config/plugins");
});

function MenuCtrl($scope, $http, $dialog, data, Version)
function MenuCtrl($scope, $http, $dialog, ConfigVersion, AvailablePlugins)
{
$scope.data = data;
$scope.plugins = [];
$scope.version = '';

Version.query({}, function(data) {
console.log(data[0]);
});
$scope.load = function()
{
AvailablePlugins.query(function(data)
{
$scope.plugins = data;
});

console.log($scope.version);
ConfigVersion.query(function(data)
{
$scope.version = data;
});
}

$scope.load();

$scope.quit = function()
{
Expand All @@ -73,21 +71,6 @@ function MenuCtrl($scope, $http, $dialog, data, Version)
});
}

$scope.ready = function()
{
return data.loaded();
}

$scope.load = function()
{
data.load();
}

$scope.save = function()
{
data.save();
}

$scope.openDialog = function(template)
{
var opts = {
Expand All @@ -101,25 +84,25 @@ function MenuCtrl($scope, $http, $dialog, data, Version)
var d = $dialog.dialog(opts);
d.open();
}

$scope.addPlugin = function(plugin)
{
var a = {
'alias': plugin + '-' + $scope.data.config.plugins.length,
'path': plugin,
'options': {}
};
$scope.data.config.plugins.push(a);
}
}

function MainCtrl($scope)
{
}

function PluginsCtrl($scope, $http, $dialog, data)
function PluginsCtrl($scope, $http, $dialog, ConfigPlugins)
{
$scope.data = data;
$scope.plugins = [];

$scope.load = function()
{
ConfigPlugins.query(function(data)
{
$scope.plugins = data;
});
}

$scope.load();

$scope.description = function(c)
{
Expand All @@ -128,33 +111,27 @@ function PluginsCtrl($scope, $http, $dialog, data)

$scope.delete = function(i)
{
var alias = $scope.data.config.plugins[i].alias;
for (var i in $scope.data.config.connections)
{
var idx = $scope.data.config.connections[i].use.indexOf(alias);
console.log(idx);
if (idx < 0)
continue;

$scope.data.config.connections[i].use.splice(idx, 1);
}

$scope.data.config.plugins.splice(i, 1);
}

$scope.edit = function(i)
{
}
}

function ConnectionsCtrl($scope, $http, $dialog, ConfigConnections)
{
$scope.connections = [];

$scope.addTo = function(alias, connection)
$scope.load = function()
{
$scope.data.config.connections[connection].use.push(alias);
ConfigConnections.query(function(data)
{
$scope.connections = data;
});
}
}

function ConnectionsCtrl($scope, $http, $dialog, data)
{
$scope.data = data;
$scope.load();


$scope.type = function(c)
{
Expand All @@ -175,38 +152,21 @@ function ConnectionsCtrl($scope, $http, $dialog, data)

$scope.delete = function(i)
{
$scope.data.config.connections.splice(i, 1);
}

$scope.edit = function(i)
{
}
}

function DebugCtrl($scope, data)
function DialogController($scope, dialog)
{
$scope.data = data;
}

function DialogController($scope, data, dialog)
{
$scope.data = data;

$scope.close = function(result)
{
if (result && result.talk && result[result.talk])
$scope.data.config.connections.push(result);
dialog.close(result);
}

$scope.plugins = function()
{
var a = [];
for (var i in $scope.data.config.plugins)
{
a.push($scope.data.config.plugins[i].alias);
}

return a;
}
}
17 changes: 2 additions & 15 deletions lib/cli/config/public/partial/main.html
View file
Expand Up @@ -10,7 +10,7 @@ <h3>Plugins</h3>
</tr>
</thead>
<tbody>
<tr ng-repeat="c in data.config.plugins">
<tr ng-repeat="c in plugins">
<td>{{description(c)}}</td>
<td>
<a ng-click="edit($index)"
Expand All @@ -37,7 +37,7 @@ <h3>Connections</h3>
</tr>
</thead>
<tbody>
<tr ng-repeat="c in data.config.connections">
<tr ng-repeat="c in connections">
<td>{{type(c)}}</td>
<td>{{description(c)}}</td>
<td>
Expand All @@ -54,16 +54,3 @@ <h3>Connections</h3>
</table>
</div>
</div>

<div class="row-fluid" ng-controller="DebugCtrl">
<div class="span6">
<h3>Config</h3>
<pre><code>{{data.config | json }}</code></pre>
</div>
<div class="span6">
<h3>Plugins</h3>
<pre><code>{{data.plugins | json }}</code></pre>
</div>
</div>
</div>
</div>
17 changes: 9 additions & 8 deletions lib/cli/config/views/index.html
View file
Expand Up @@ -30,7 +30,8 @@
<span class="pull-right">

<div class="btn-group">
<a class="btn dropdown-toggle" ng-click="plugin()" ng-disabled="!ready()"><i
<a class="btn dropdown-toggle"
ng-click="plugin()"><i
class="icon-plus-sign"></i> Add a New Connection
<span class="caret"></span></a>
<ul class="dropdown-menu">
Expand All @@ -42,19 +43,19 @@
</ul>
</div>
<div class="btn-group">
<a class="btn dropdown-toggle" ng-disabled="!ready()"><i
<a class="btn dropdown-toggle"><i
class="icon-plus-sign"></i> Add a New Plugin
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li ng-repeat="plugin in data.plugins">
<a ng-click="addPlugin(plugin)">{{plugin}}</a>
</li>
<li ng-repeat="plugin in plugins">
<a ng-click="addPlugin(plugin)">{{plugin.path}}</a>
</li>
<li class="divider"></li>
<li><a ng-click="load()"> <i
class="icon-refresh"></i> Refresh</a></li>
</ul>
</div>

<a class="btn" ng-click="load()"><i
class="icon-refresh"></i> Load / Reset</a>
<a class="btn btn-success" ng-click="save()" ng-disabled="!ready()">Save</a>
<a class="btn btn-danger" ng-click="quit()">Quit</a>
</span>
</div>
Expand Down

0 comments on commit a64d34b

Please sign in to comment.