Skip to content
Snippets Groups Projects
Commit 42c6eaaf authored by Allen Gilliland's avatar Allen Gilliland
Browse files

reintroduce superadmin section. this is just a stub for now, more work needed... 

reintroduce superadmin section.  this is just a stub for now, more work needed to clean things up.  also, deleting old files no longer needed.
parent f2a2189f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 386 deletions
resources/frontend_client/app/app.js
+ 3
− 2
View file @ 42c6eaaf
......@@ -33,7 +33,8 @@ var Corvus = angular.module('corvus', [
'corvusadmin.query',
'corvusadmin.annotation',
'corvusadmin.search',
'corvusadmin.settings'
'corvusadmin.settings',
'superadmin.index'
]);
Corvus.config(['$routeProvider', '$locationProvider', function($routeProvider, $locationProvider) {
$locationProvider.html5Mode({
......@@ -90,4 +91,4 @@ if (document.location.hostname != "localhost") {
}).run(function(Angularytics) {
Angularytics.init();
});
}
\ No newline at end of file
}
resources/frontend_client/app/controllers.js
+ 2
− 0
View file @ 42c6eaaf
......@@ -94,6 +94,8 @@ CorvusControllers.controller('Nav', ['$scope', '$routeParams', '$location', func
$scope.nav = 'admin'
} else if ($location.path().indexOf('setup') >0 ) {
$scope.nav = 'setup'
} else if ($location.path().indexOf('superadmin') >0 ) {
$scope.nav = 'superadmin'
} else {
$scope.nav = 'main'
}
......
resources/frontend_client/app/superadmin/datamarts/datamarts.controllers.js deleted 100644 → 0
+ 0
− 78
View file @ f2a2189f
"use strict";
/*global _*/
var DatamartsControllers = angular.module('superadmin.datamarts.controllers', []);
DatamartsControllers.controller('DatamartList', ['$scope', 'Datamart', function($scope, Datamart) {
Datamart.list(function (datamarts) {
$scope.datamarts = datamarts;
}, function (error) {
console.log('error getting datamarts list', error);
});
$scope.delete = function (datamartId) {
if ($scope.datamarts) {
Datamart.delete({
'datamartId': datamartId
}, function (result) {
$scope.datamarts = _.filter($scope.datamarts, function(datamart){
return datamart.id != datamartId;
});
}, function (error) {
console.log('error deleting datamart', error);
});
}
};
}]);
DatamartsControllers.controller('DatamartEdit', ['$scope', '$routeParams', '$location', 'Datamart', function($scope, $routeParams, $location, Datamart) {
Datamart.form_input(function (form_input) {
$scope.form_input = form_input;
}, function (error) {
console.log('error getting datamart form_input', error);
});
if ($routeParams.datamartId) {
// load existing datamart for editing
Datamart.get({
'datamartId': $routeParams.datamartId
}, function (datamart) {
$scope.datamart = datamart;
}, function (error) {
console.log('error loading datamart', error);
if (error.status == 404) {
$location.path('/superadmin/datamarts/');
}
});
} else {
// prepare an empty datamart for creation
$scope.datamart = {
"name": "",
"engine": "postgres",
"details": {}
};
}
$scope.save = function (datamart) {
if ($routeParams.datamartId) {
// updating existing datamart
Datamart.update(datamart, function (updated_datamart) {
$scope.datamart = updated_datamart;
}, function (error) {
console.log('error loading datamart', error);
if (error.status == 404) {
$location.path('/superadmin/datamarts/');
}
});
} else {
// creating a new datamart
Datamart.create(datamart, function (new_datamart) {
$location.path('/superadmin/datamarts/' + new_datamart.id);
}, function (error) {
console.log('error creating datamart', error);
});
}
};
}]);
resources/frontend_client/app/superadmin/datamarts/datamarts.module.js deleted 100644 → 0
+ 0
− 28
View file @ f2a2189f
'use strict';
var SuperAdminDatamarts = angular.module('superadmin.datamarts', [
'ngRoute',
'ngCookies',
'corvus.filters',
'corvus.directives',
'corvus.services',
'corvus.components',
'superadmin.datamarts.controllers',
'superadmin.datamarts.services'
]);
SuperAdminDatamarts.config(['$routeProvider', function ($routeProvider) {
$routeProvider.otherwise({redirectTo: '/superadmin/'});
$routeProvider.when('/superadmin/datamarts/', {
templateUrl: '/app/superadmin/datamarts/partials/datamart_list.html',
controller: 'DatamartList'
});
$routeProvider.when('/superadmin/datamarts/create', {
templateUrl: '/app/superadmin/datamarts/partials/datamart_edit.html',
controller: 'DatamartEdit'
});
$routeProvider.when('/superadmin/datamarts/:datamartId', {
templateUrl: '/app/superadmin/datamarts/partials/datamart_edit.html',
controller: 'DatamartEdit'
});
}]);
resources/frontend_client/app/superadmin/datamarts/datamarts.services.js deleted 100644 → 0
+ 0
− 37
View file @ f2a2189f
'use strict';
// Datamart Services
var DatamartsServices = angular.module('superadmin.datamarts.services', ['ngResource', 'ngCookies']);
DatamartsServices.factory('Datamart', ['$resource', '$cookies', function($resource, $cookies) {
return $resource('/api/datamart/:datamartId', {}, {
form_input: {
url:'/api/datamart/form_input',
method:'GET',
},
list: {
url:'/api/datamart/',
method:'GET',
isArray:true
},
create: {
url:'/api/datamart/',
method:'POST',
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }},
},
get: {
method:'GET',
params:{datamartId:'@datamartId'}
},
update: {
method:'PUT',
params:{datamartId:'@id'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }},
},
delete: {
method:'DELETE',
params:{datamartId:'@datamartId'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }},
}
});
}]);
resources/frontend_client/app/superadmin/datamarts/partials/datamart_edit.html deleted 100644 → 0
+ 0
− 35
View file @ f2a2189f
<div class="wrapper">
<div class="border-bottom">
<h2 ng-if="!datamart.id">Create DataMart</h2>
<h2 ng-if="datamart.id">{{datamart.name}}</h2>
</div>
<form novalidate>
<div class="py1">
<div class="py1">
<label>Name:</label>
<input class="input block full" type="text" ng-model="datamart.name"/>
</div>
<div class="py1">
<label>Postgres Connection String:</label>
<input class="input block full" type="text" ng-model="datamart.details.conn_str"/>
<span>ex: host=[ip address] port=5432 dbname=examples user=corvus password=******</span>
</div>
<div class="py1">
<label>Timezone:</label>
<select class="block" ng-model="datamart.details.timezone" ng-options="tz for tz in form_input['timezones']">
<option value="">----------</option>
</select>
</div>
</div>
<div class="py2 border-top">
<div class="inline-block">
<input class="Button Button--primary" type="button" value="Save" ng-click="save(datamart)"/>
</div>
</div>
</form>
</div>
resources/frontend_client/app/superadmin/datamarts/partials/datamart_list.html deleted 100644 → 0
+ 0
− 28
View file @ f2a2189f
<div class="wrapper">
<div class="py2 border-bottom">
<div class="float-right">
<a class="Button Button--primary" href="/superadmin/datamarts/create">Create Datamart</a>
</div>
<h2>DataMarts</h2>
</div>
<div>
<div ng-if="!datamarts">
<h3 class="text-normal text-centered">Loading ...</h3>
</div>
<ul>
<li class="py2 border-bottom" ng-repeat="datamart in datamarts">
<div class="my1 float-right">
<a class="Button" ng-click="delete(datamart.id)" delete-confirm>Delete</a>
</div>
<div>
<h4><a class="link" href="/superadmin/datamarts/{{datamart.id}}">{{datamart.name}}</a></h4>
<span>{{datamart.engine}}</span>
</div>
</li>
</ul>
</div>
</div>
resources/frontend_client/app/superadmin/datamarts/partials/postgres.html deleted 100644 → 0
+ 0
− 12
View file @ f2a2189f
<div>
<div class="py1">
<label for="id_desc">Description:</label>
<textarea class="input block full" id="id_desc" rows="5" ng-model="organization.description"></textarea>
</div>
<div class="py1">
<label for="id_logo">Logo Url:</label>
<input class="input block full" id="id_logo" type="text" ng-model="organization.logo_url"/>
</div>
</div>
resources/frontend_client/app/superadmin/index/index.module.js
+ 1
− 9
View file @ 42c6eaaf
'use strict';
// Admin
var SuperAdminIndex = angular.module('superadmin.index', [
'ngRoute',
'ngCookies',
'corvus.filters',
'corvus.directives',
'corvus.services',
'corvus.components',
'superadmin.index.controllers'
]);
var SuperAdminIndex = angular.module('superadmin.index', ['superadmin.index.controllers']);
SuperAdminIndex.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/superadmin/',
......
resources/frontend_client/app/superadmin/superadmin.app.js deleted 100644 → 0
+ 0
− 48
View file @ f2a2189f
'use strict';
/*jslint browser:true*/
// Declare app level module which depends on filters, and services
var SuperAdmin = angular.module('superadmin', [
'ngAnimate',
'ngRoute',
'ngCookies',
'ngSanitize',
'xeditable', // inplace editing capabilities
'angularytics', // google analytics
'ui.bootstrap', // bootstrap LIKE widgets via angular directives
'gridster', // used for dashboard grids
'corvus.filters',
'corvus.directives',
'corvus.services',
'corvus.components',
'superadmin.controllers',
'superadmin.index',
'superadmin.datamarts'
]);
SuperAdmin.config(['$routeProvider', '$locationProvider', function ($routeProvider, $locationProvider) {
$routeProvider.otherwise({redirectTo: '/superadmin/'});
$locationProvider.html5Mode({
enabled: true,
requireBase: false
});
}]);
SuperAdmin.run(function(editableOptions, editableThemes) {
// set `default` theme
editableOptions.theme = 'default';
// overwrite submit button template
editableThemes['default'].submitTpl = '<button class="Button Button--primary" type="submit">Save</button>';
editableThemes['default'].cancelTpl = '<button class="Button" ng-click="$form.$cancel()">cancel</button>';
});
if (document.location.hostname != "localhost") {
// Only set up logging in production
SuperAdmin.config(function(AngularyticsProvider) {
AngularyticsProvider.setEventHandlers(['Console', 'GoogleUniversal']);
}).run(function(Angularytics) {
Angularytics.init();
});
}
resources/frontend_client/app/superadmin/superadmin.controllers.js deleted 100644 → 0
+ 0
− 54
View file @ f2a2189f
'use strict';
/*jslint browser:true*/
/*jslint devel:true */
/*global _*/
/*global $*/
// Global Controllers
var SuperAdminControllers = angular.module('superadmin.controllers', ['http-auth-interceptor']);
SuperAdminControllers.controller('SuperAdminBase', ['$scope', '$location', '$window', 'CorvusCore', 'CorvusAlert', 'User', function($scope, $location, $window, CorvusCore, CorvusAlert, User) {
// make our utilities object available throughout the application
$scope.utils = CorvusCore;
$scope.alerts = CorvusAlert.alerts;
//keep track of changes to the hash so we can update the UI accordingly (i.e. to show comments)
$scope.$on("$locationChangeSuccess", function() {
$scope.hash = $location.hash();
});
$scope.$on("event:auth-loginRequired", function() {
$window.location.href = "/accounts/login/";
});
$scope.closeAlert = function(index) {
CorvusAlert.closeAlert(index);
};
$scope.alertInfo = function(message) {
CorvusAlert.alertInfo(message);
};
$scope.alertError = function(message) {
CorvusAlert.alertError(message);
};
$scope.refreshCurrentUser = function() {
// authentication check
CorvusCore.currentUser(function (result) {
if (result && !result.error) {
$scope.user = result;
} else {
// TODO: error handling. no user bject available.
console.log(result);
}
}, function (error) {
console.log('unable to get current user', error);
});
};
// always refresh current user at page load
$scope.refreshCurrentUser();
}]);
resources/frontend_client/app/temp deleted 100644 → 0
+ 0
− 17
View file @ f2a2189f
"use strict";
var UserAdmin = angular.module('corvus.user', [
'ngRoute',
'ngCookies',
'corvus.filters',
'corvus.directives',
'corvus.services',
'corvus.metabase.services',
'corvus.user.controllers',
'corvus.user.directives'
]);
UserAdmin.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/user/edit_current', {templateUrl: '/app/user/partials/edit_current_user.html', controller: 'EditCurrentUser'});
$routeProvider.otherwise({redirectTo: '/'});
}]);
resources/frontend_client/superadmin_index.html deleted 100644 → 0
+ 0
− 38
View file @ f2a2189f
{% load compress %}
<!DOCTYPE html>
<html ng-app="superadmin" class="no-js">
<head>
{% include "meta.html" %}
<title>Corvus - Admin</title>
{% compress css %}
<link rel="stylesheet" href="/static/app/dist/corvus.css">
{% endcompress %}
</head>
<body ng-controller="SuperAdminBase">
<div class="wrapper">
<div class="border-bottom bg-white py1 clearfix">
<div class="mx1 my2 float-right">
<a class="link inline-block" href="/" target="_self">Exit SuperAdmin</a>
</div>
<h3 class="AdminPageTitle my2">Site Administration</h3>
</div>
<div class="clearfix">
<nav class="col col-sm-3">
<ul class="CoreNav">
<li>
<a class="NavItem NavItem--large" href="/superadmin/">Global Settings</a>
</li>
<li>
<a class="NavItem NavItem--large" href="/superadmin/organizations/">Organizations</a>
</li>
<li>
<a class="NavItem NavItem--large" href="/superadmin/datamarts/">DataMarts</a>
</li>
</ul>
</nav>
<div class="col col-sm-9" ng-view></div>
</div>
</div>
</body>
{% include "js.html" %}
</html>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment