Initial attempt and renaming VPN to OpenVPN
diff --git a/views/ngXosViews/vpnDashboard/.bowerrc b/views/ngXosViews/openVPNDashboard/.bowerrc
similarity index 100%
rename from views/ngXosViews/vpnDashboard/.bowerrc
rename to views/ngXosViews/openVPNDashboard/.bowerrc
diff --git a/views/ngXosViews/vpnDashboard/.eslintrc b/views/ngXosViews/openVPNDashboard/.eslintrc
similarity index 100%
rename from views/ngXosViews/vpnDashboard/.eslintrc
rename to views/ngXosViews/openVPNDashboard/.eslintrc
diff --git a/views/ngXosViews/vpnDashboard/.gitignore b/views/ngXosViews/openVPNDashboard/.gitignore
similarity index 100%
rename from views/ngXosViews/vpnDashboard/.gitignore
rename to views/ngXosViews/openVPNDashboard/.gitignore
diff --git a/views/ngXosViews/vpnDashboard/bower.json b/views/ngXosViews/openVPNDashboard/bower.json
similarity index 87%
rename from views/ngXosViews/vpnDashboard/bower.json
rename to views/ngXosViews/openVPNDashboard/bower.json
index b7c354e..01b2715 100644
--- a/views/ngXosViews/vpnDashboard/bower.json
+++ b/views/ngXosViews/openVPNDashboard/bower.json
@@ -1,10 +1,10 @@
{
- "name": "xos-vpnDashboard",
+ "name": "xos-openVPNDashboard",
"version": "0.0.0",
"authors": [
"Jeremy Mowery <jermowery@email.arizona.edu>"
],
- "description": "The vpnDashboard view",
+ "description": "The OpenVPN Dashboard",
"license": "MIT",
"ignore": [
"**/.*",
diff --git a/views/ngXosViews/vpnDashboard/env/default.js b/views/ngXosViews/openVPNDashboard/env/default.js
similarity index 100%
rename from views/ngXosViews/vpnDashboard/env/default.js
rename to views/ngXosViews/openVPNDashboard/env/default.js
diff --git a/views/ngXosViews/vpnDashboard/gulp/build.js b/views/ngXosViews/openVPNDashboard/gulp/build.js
similarity index 84%
rename from views/ngXosViews/vpnDashboard/gulp/build.js
rename to views/ngXosViews/openVPNDashboard/gulp/build.js
index b7de9e5..625e3ee 100644
--- a/views/ngXosViews/vpnDashboard/gulp/build.js
+++ b/views/ngXosViews/openVPNDashboard/gulp/build.js
@@ -28,15 +28,15 @@
var csswring = require('csswring');
var TEMPLATE_FOOTER = `}]);
-angular.module('xos.vpnDashboard').run(function($location){$location.path('/')});
-angular.bootstrap(angular.element('#xosVpnDashboard'), ['xos.vpnDashboard']);`;
+angular.module('xos.openVPNDashboard').run(function($location){$location.path('/')});
+angular.bootstrap(angular.element('#xosOpenVPNDashboard'), ['xos.openVPNDashboard']);`;
module.exports = function(options){
// delete previous builded file
gulp.task('clean', function(){
return del(
- [options.dashboards + 'xosVpnDashboard.html'],
+ [options.dashboards + 'xosOpenVPNDashboard.html'],
{force: true}
);
});
@@ -59,7 +59,7 @@
gulp.task('copyCss', ['css'], function(){
return gulp.src([`${options.tmp}/css/*.css`])
- .pipe(concat('xosVpnDashboard.css'))
+ .pipe(concat('xosOpenVPNDashboard.css'))
.pipe(gulp.dest(options.static + 'css/'))
});
@@ -70,7 +70,7 @@
])
.pipe(ngAnnotate())
.pipe(angularFilesort())
- .pipe(concat('xosVpnDashboard.js'))
+ .pipe(concat('xosOpenVPNDashboard.js'))
.pipe(uglify())
.pipe(gulp.dest(options.static + 'js/'));
});
@@ -79,7 +79,7 @@
gulp.task('templates', function(){
return gulp.src('./src/templates/*.html')
.pipe(templateCache({
- module: 'xos.vpnDashboard',
+ module: 'xos.openVPNDashboard',
root: 'templates/',
templateFooter: TEMPLATE_FOOTER
}))
@@ -99,14 +99,14 @@
.pipe(
inject(
gulp.src([
- options.static + 'js/vendor/xosVpnDashboardVendor.js',
- options.static + 'js/xosVpnDashboard.js',
- options.static + 'css/xosVpnDashboard.css'
+ options.static + 'js/vendor/xosOpenVPNDashboardVendor.js',
+ options.static + 'js/xosOpenVPNDashboard.js',
+ options.static + 'css/xosOpenVPNDashboard.css'
]),
{ignorePath: '/../../../xos/core/xoslib'}
)
)
- .pipe(rename('xosVpnDashboard.html'))
+ .pipe(rename('xosOpenVPNDashboard.html'))
.pipe(gulp.dest(options.dashboards));
});
@@ -123,7 +123,7 @@
});
return gulp.src(bowerDeps)
- .pipe(concat('xosVpnDashboardVendor.js'))
+ .pipe(concat('xosOpenVPNDashboardVendor.js'))
.pipe(uglify())
.pipe(gulp.dest(options.static + 'js/vendor/'));
});
diff --git a/views/ngXosViews/vpnDashboard/gulp/server.js b/views/ngXosViews/openVPNDashboard/gulp/server.js
similarity index 100%
rename from views/ngXosViews/vpnDashboard/gulp/server.js
rename to views/ngXosViews/openVPNDashboard/gulp/server.js
diff --git a/views/ngXosViews/vpnDashboard/gulpfile.js b/views/ngXosViews/openVPNDashboard/gulpfile.js
similarity index 100%
rename from views/ngXosViews/vpnDashboard/gulpfile.js
rename to views/ngXosViews/openVPNDashboard/gulpfile.js
diff --git a/views/ngXosViews/vpnDashboard/karma.conf.js b/views/ngXosViews/openVPNDashboard/karma.conf.js
similarity index 100%
rename from views/ngXosViews/vpnDashboard/karma.conf.js
rename to views/ngXosViews/openVPNDashboard/karma.conf.js
diff --git a/views/ngXosViews/vpnDashboard/package.json b/views/ngXosViews/openVPNDashboard/package.json
similarity index 96%
rename from views/ngXosViews/vpnDashboard/package.json
rename to views/ngXosViews/openVPNDashboard/package.json
index a4d9e6f..412afec 100644
--- a/views/ngXosViews/vpnDashboard/package.json
+++ b/views/ngXosViews/openVPNDashboard/package.json
@@ -1,5 +1,5 @@
{
- "name": "xos-vpnDashboard",
+ "name": "xos-openVPNDashboard",
"version": "1.0.0",
"description": "Angular Application for XOS, created with generator-xos",
"scripts": {
diff --git a/views/ngXosViews/vpnDashboard/spec/sample.test.js b/views/ngXosViews/openVPNDashboard/spec/sample.test.js
similarity index 95%
rename from views/ngXosViews/vpnDashboard/spec/sample.test.js
rename to views/ngXosViews/openVPNDashboard/spec/sample.test.js
index ad20c13..822c114 100644
--- a/views/ngXosViews/vpnDashboard/spec/sample.test.js
+++ b/views/ngXosViews/openVPNDashboard/spec/sample.test.js
@@ -4,7 +4,7 @@
var scope, element, isolatedScope, httpBackend;
- beforeEach(module('xos.vpnDashboard'));
+ beforeEach(module('xos.openVPNDashboard'));
beforeEach(module('templates'));
beforeEach(inject(function($httpBackend, $compile, $rootScope){
diff --git a/views/ngXosViews/vpnDashboard/src/css/vpnDashboard.css b/views/ngXosViews/openVPNDashboard/src/css/openVPNDashboard.css
similarity index 87%
rename from views/ngXosViews/vpnDashboard/src/css/vpnDashboard.css
rename to views/ngXosViews/openVPNDashboard/src/css/openVPNDashboard.css
index 116051f..085d5d4 100644
--- a/views/ngXosViews/vpnDashboard/src/css/vpnDashboard.css
+++ b/views/ngXosViews/openVPNDashboard/src/css/openVPNDashboard.css
@@ -1,4 +1,4 @@
-#xosVpnDashboard{
+#xosOpenVPNDashboard{
width: 70%;
margin: auto;
}
diff --git a/views/ngXosViews/vpnDashboard/src/index.html b/views/ngXosViews/openVPNDashboard/src/index.html
similarity index 91%
rename from views/ngXosViews/vpnDashboard/src/index.html
rename to views/ngXosViews/openVPNDashboard/src/index.html
index 07f1017..83048df 100644
--- a/views/ngXosViews/vpnDashboard/src/index.html
+++ b/views/ngXosViews/openVPNDashboard/src/index.html
@@ -3,10 +3,10 @@
<link rel="stylesheet" href="vendor/bootstrap-css/css/bootstrap.css" />
<!-- endbower --><!-- endcss -->
<!-- inject:css -->
-<link rel="stylesheet" href="/css/vpnDashboard.css">
+<link rel="stylesheet" href="/css/openVPNDashboard.css">
<!-- endinject -->
-<div ng-app="xos.vpnDashboard" id="xosVpnDashboard">
+<div ng-app="xos.openVPNDashboard" id="xosOpenVPNDashboard">
<div ui-view></div>
</div>
diff --git a/views/ngXosViews/vpnDashboard/src/js/main.js b/views/ngXosViews/openVPNDashboard/src/js/main.js
similarity index 78%
rename from views/ngXosViews/vpnDashboard/src/js/main.js
rename to views/ngXosViews/openVPNDashboard/src/js/main.js
index 233051a..b59a701 100644
--- a/views/ngXosViews/vpnDashboard/src/js/main.js
+++ b/views/ngXosViews/openVPNDashboard/src/js/main.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('xos.vpnDashboard', [
+angular.module('xos.openVPNDashboard', [
'ngResource',
'ngCookies',
'ngLodash',
@@ -9,9 +9,9 @@
])
.config(($stateProvider) => {
$stateProvider
- .state('vpnList', {
+ .state('openVPNList', {
url: '/',
- template: '<vpn-list></vpn-list>'
+ template: '<openvpn-list></openvpn-list>'
});
})
.config(($compileProvider) => {
@@ -20,10 +20,10 @@
})
.service('Vpn', function($http, $q){
- this.getVpnTenants = () => {
+ this.getOpenVPNTenants = () => {
let deferred = $q.defer();
- $http.get('/xoslib/vpntenant/')
+ $http.get('/xoslib/openvpntenant/')
.then((res) => {
deferred.resolve(res.data)
})
@@ -37,15 +37,15 @@
.config(function($httpProvider){
$httpProvider.interceptors.push('NoHyperlinks');
})
-.directive('vpnList', function(){
+.directive('openVPNList', function(){
return {
restrict: 'E',
scope: {},
bindToController: true,
controllerAs: 'vm',
- templateUrl: 'templates/vpn-list.tpl.html',
+ templateUrl: 'templates/openvpn-list.tpl.html',
controller: function(Vpn){
- Vpn.getVpnTenants()
+ Vpn.getOpenVPNTenants()
.then((vpns) => {
this.vpns = vpns;
for (var i = 0; i < this.vpns.length; i++) {
diff --git a/views/ngXosViews/vpnDashboard/src/templates/vpn-list.tpl.html b/views/ngXosViews/openVPNDashboard/src/templates/openvpn-list.tpl.html
similarity index 100%
rename from views/ngXosViews/vpnDashboard/src/templates/vpn-list.tpl.html
rename to views/ngXosViews/openVPNDashboard/src/templates/openvpn-list.tpl.html