freifunk/ffffng
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Admin backend

Browse source
This commit is contained in:
baldo 2016-06-04 14:58:11 +02:00
parent bee528f1b8
commit 8f8d78d1df
13 changed files with 129 additions and 5 deletions

2
server/app.js
View file

@ -25,6 +25,7 @@ angular.module('ffffng').factory('app', function (fs, config, _) {
app.use(bodyParser.json());
var adminDir = __dirname + '/../admin';
var clientDir = __dirname + '/../client';
var templateDir = __dirname + '/templates';
@ -54,6 +55,7 @@ angular.module('ffffng').factory('app', function (fs, config, _) {
return next();
});
app.use('/internal/admin', express.static(adminDir + '/'));
app.use('/', express.static(clientDir + '/'));
return app;

7
server/resources/taskResource.js
View file

@ -11,8 +11,9 @@ angular.module('ffffng').factory('TaskResource', function (
) {
var isValidId = Validator.forConstraint(Constraints.id);
function toExternalTask(task) {
function toExternalTask(task, id) {
return {
id: id,
name: task.name,
schedule: task.schedule,
runningSince: task.runningSince && task.runningSince.unix(),
@ -23,7 +24,7 @@ angular.module('ffffng').factory('TaskResource', function (
return {
getAll: function (req, res) {
var tasks = Scheduler.getTasks();
return Resources.success(res, _.mapValues(tasks, toExternalTask));
return Resources.success(res, _.map(tasks, toExternalTask));
},
run: function (req, res) {
@ -46,7 +47,7 @@ angular.module('ffffng').factory('TaskResource', function (
task.run();
return Resources.success(res, toExternalTask(task));
return Resources.success(res, toExternalTask(task, id));
}
};
});

4
server/router.js
View file

@ -16,8 +16,8 @@ angular.module('ffffng').factory('Router', function (
app.put('/api/monitoring/confirm/:token', MonitoringResource.confirm);
app.put('/api/monitoring/disable/:token', MonitoringResource.disable);
app.get('/internal/api/task/all', TaskResource.getAll);
app.put('/internal/api/task/run/:id', TaskResource.run);
app.get('/internal/api/tasks', TaskResource.getAll);
app.put('/internal/api/tasks/run/:id', TaskResource.run);
}
};
});