Moved diagnostic server script to allow sass
diff --git a/views/ngXosViews/diagnostic/env/local.js b/views/ngXosViews/diagnostic/env/local.js
index bf5af60..3a17b94 100644
--- a/views/ngXosViews/diagnostic/env/local.js
+++ b/views/ngXosViews/diagnostic/env/local.js
@@ -7,7 +7,7 @@
// (works only for local environment as both application are served on the same domain)
module.exports = {
- host: 'http://xos.local:9999/',
- xoscsrftoken: 'lu7LFTapqkGQqrqjupArNvyfd5LUoOk5',
- xossessionid: 'mjzzv7u1q68tfsp8s807h0qzv0qdriaj'
+ host: 'http://xos.dev:9999/',
+ xoscsrftoken: 'oPSbkruovBQoKcAOUVdX39Ncxt9E93MO',
+ xossessionid: 'cy1kwat93lomok0d180c4c0cwvi5fpnn'
};
diff --git a/views/ngXosViews/diagnostic/gulp/build.js b/views/ngXosViews/diagnostic/gulp/build.js
index cf2b40e..00b3e78 100644
--- a/views/ngXosViews/diagnostic/gulp/build.js
+++ b/views/ngXosViews/diagnostic/gulp/build.js
@@ -26,12 +26,7 @@
var autoprefixer = require('autoprefixer');
var mqpacker = require('css-mqpacker');
var csswring = require('csswring');
-
-var TEMPLATE_FOOTER = `
-angular.module('xos.diagnostic').run(function($location){
- $location.path('/')
-});
-angular.bootstrap(angular.element('#xosDiagnostic'), ['xos.diagnostic']);`;
+var sass = require('gulp-sass');
module.exports = function(options){
@@ -75,7 +70,7 @@
.pipe(angularFilesort())
.pipe(concat('xosDiagnostic.js'))
.pipe(concat.header('//Autogenerated, do not edit!!!\n'))
- .pipe(concat.footer(TEMPLATE_FOOTER))
+ // .pipe(concat.footer(TEMPLATE_FOOTER))
// .pipe(uglify())
.pipe(gulp.dest(options.static + 'js/'));
});
@@ -97,7 +92,7 @@
// remove dev dependencies from html
.pipe(replace(/<!-- bower:css -->(\n.*)*\n<!-- endbower --><!-- endcss -->/, ''))
.pipe(replace(/<!-- bower:js -->(\n.*)*\n<!-- endbower --><!-- endjs -->/, ''))
- .pipe(replace(/ng-app=".*"\s/, ''))
+ // .pipe(replace(/ng-app=".*"\s/, ''))
// injecting minified files
.pipe(
inject(
diff --git a/views/ngXosViews/diagnostic/gulp/server.js b/views/ngXosViews/diagnostic/gulp/server.js
index 7605294..194bd45 100644
--- a/views/ngXosViews/diagnostic/gulp/server.js
+++ b/views/ngXosViews/diagnostic/gulp/server.js
@@ -9,6 +9,7 @@
var wiredep = require('wiredep').stream;
var httpProxy = require('http-proxy');
var del = require('del');
+var sass = require('gulp-sass');
const environment = process.env.NODE_ENV;
@@ -78,8 +79,24 @@
gulp.watch(options.src + '**/*.html', function(){
browserSync.reload();
});
+ gulp.watch(options.css + '**/*.css', function(){
+ browserSync.reload();
+ });
+ gulp.watch(`${options.sass}/**/*.scss`, ['sass'], function(){
+ browserSync.reload();
+ });
});
+ gulp.task('sass', function () {
+ return gulp.src(`${options.sass}/**/*.scss`)
+ .pipe(sass().on('error', sass.logError))
+ .pipe(gulp.dest(options.css));
+ });
+
+ // gulp.task('sass:watch', function () {
+ // gulp.watch('./sass/**/*.scss', ['sass']);
+ // });
+
// transpile js with sourceMaps
gulp.task('babel', function(){
return gulp.src(options.scripts + '**/*.js')
@@ -137,6 +154,7 @@
gulp.task('serve', function() {
runSequence(
+ 'sass',
'bower',
'injectScript',
'injectCss',
diff --git a/views/ngXosViews/diagnostic/gulpfile.js b/views/ngXosViews/diagnostic/gulpfile.js
index 7bdc6e0..3f1e899 100644
--- a/views/ngXosViews/diagnostic/gulpfile.js
+++ b/views/ngXosViews/diagnostic/gulpfile.js
@@ -6,6 +6,7 @@
var options = {
src: 'src/',
css: 'src/css/',
+ sass: 'src/sass/',
scripts: 'src/js/',
tmp: 'src/.tmp',
dist: 'dist/',
diff --git a/views/ngXosViews/diagnostic/package.json b/views/ngXosViews/diagnostic/package.json
index d7694bc..e5437b9 100644
--- a/views/ngXosViews/diagnostic/package.json
+++ b/views/ngXosViews/diagnostic/package.json
@@ -42,6 +42,7 @@
"gulp-postcss": "^6.0.1",
"gulp-rename": "^1.2.2",
"gulp-replace": "^0.5.4",
+ "gulp-sass": "^2.2.0",
"gulp-uglify": "^1.4.2",
"http-proxy": "^1.12.0",
"ink-docstrap": "^0.5.2",
diff --git a/views/ngXosViews/diagnostic/src/css/dev.css b/views/ngXosViews/diagnostic/src/css/dev.css
deleted file mode 100644
index 7ff2305..0000000
--- a/views/ngXosViews/diagnostic/src/css/dev.css
+++ /dev/null
@@ -1,15 +0,0 @@
-
-html, body {
- margin: 0;
- padding: 0;
- max-height: 100%;
- height: 100%;
-}
-
-#xosServiceTopology{
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
-}
\ No newline at end of file
diff --git a/views/ngXosViews/diagnostic/src/css/main.css b/views/ngXosViews/diagnostic/src/css/main.css
new file mode 100644
index 0000000..1cf0848
--- /dev/null
+++ b/views/ngXosViews/diagnostic/src/css/main.css
@@ -0,0 +1,281 @@
+/* CONTAINER */
+#xosDiagnostic, [ui-view] {
+ min-height: 700px;
+ position: relative; }
+
+diagnostic-container .form-control.small-padding {
+ padding: 6px; }
+
+diagnostic-container .half-height {
+ position: relative;
+ height: 50%; }
+
+diagnostic-container .onethird-height {
+ position: relative;
+ height: 33%;
+ border-bottom: 1px solid #999; }
+
+diagnostic-container .twothird-height {
+ position: relative;
+ height: 67%; }
+
+diagnostic-container .subscriber-select {
+ max-width: 200px;
+ position: absolute;
+ top: 20px;
+ right: 20px;
+ z-index: 1; }
+
+diagnostic-container .onethird-height .well,
+diagnostic-container .twothird-height .well {
+ font-weight: bold;
+ max-width: 165px;
+ text-align: center;
+ margin-top: 15px;
+ background: #eee;
+ border-color: steelblue;
+ padding: 10px; }
+
+diagnostic-container .onethird-height .well.pull-right {
+ position: absolute;
+ right: 0px;
+ top: -15px;
+ cursor: pointer;
+ z-index: 200; }
+
+/* subscriber-status-modal */
+subscriber-status-modal .row + .row {
+ margin-top: 20px; }
+
+.half-height + .half-height {
+ border-top: 1px solid black; }
+
+service-topology,
+logic-topology {
+ height: 100%;
+ width: 100%;
+ display: block;
+ position: absolute;
+ top: 0; }
+
+logic-topology .subscriber circle,
+logic-topology .device circle {
+ fill: #fff;
+ stroke: green;
+ stroke-width: 1px; }
+
+logic-topology > svg {
+ position: absolute;
+ top: 0; }
+
+/* CLOUDS */
+logic-topology .network .cloud {
+ fill: #fff;
+ stroke: green;
+ stroke-width: 1px; }
+
+/* RACK */
+logic-topology .node.rack > g > rect {
+ fill: #ccc;
+ stroke: steelblue;
+ stroke-width: 1px; }
+
+/* CP NODE */
+logic-topology .compute-node > rect {
+ fill: #fff;
+ stroke: steelblue;
+ stroke-width: 1px; }
+
+logic-topology .compute-node > text {
+ font-size: 16px; }
+
+/* INSTANCE */
+logic-topology .instance > rect {
+ fill: #eee;
+ stroke: steelblue;
+ stroke-width: 1px; }
+
+logic-topology .node .instance.active rect {
+ fill: lightsteelblue;
+ stroke: steelblue;
+ stroke-width: 1px; }
+
+logic-topology .node .instance.active.good > rect {
+ fill: green; }
+
+logic-topology .node .instance.active.provisioning > rect {
+ fill: yellow; }
+
+logic-topology .node .instance.active.bad > rect {
+ fill: red; }
+
+/* INSTANCE STATS */
+logic-topology .node .instance .stats-container rect {
+ fill: white; }
+
+logic-topology .node .instance .stats-container text.name {
+ font-weight: bold; }
+
+logic-topology .node .instance .stats-container text.ip {
+ font-style: italic;
+ font-size: 10px; }
+
+/* CONTAINERS */
+logic-topology .node .instance .stats-container .container rect {
+ fill: #eee;
+ stroke: steelblue;
+ stroke-width: 1px; }
+
+/* LEGEND */
+.legend {
+ fill: #fff;
+ stroke: #ccc;
+ stroke-width: 1px;
+ position: relative; }
+
+.legend text {
+ stroke: #000; }
+
+.node {
+ cursor: pointer; }
+
+.node circle,
+.node rect {
+ fill: #fff;
+ stroke: steelblue;
+ stroke-width: 1px; }
+
+.node.subscriber circle,
+.node.subscriber rect,
+.node.router circle,
+.node.router rect {
+ stroke: #05ffcb; }
+
+.node.slice rect {
+ stroke: #b01dff; }
+
+.node.instance rect {
+ stroke: #ccc; }
+
+.node.instance rect.active {
+ stroke: #ff8b00; }
+
+.node rect.slice-detail {
+ fill: #fff;
+ stroke: steelblue;
+ stroke-width: 3px; }
+
+.node text {
+ font: 18px sans-serif; }
+
+.node .instance text {
+ font: 12px sans-serif; }
+
+.node text.small {
+ font-size: 10px; }
+
+.link, .device-link {
+ fill: none;
+ stroke: #ccc;
+ stroke-width: 2px; }
+
+.link.slice {
+ stroke: rgba(157, 4, 183, 0.29); }
+
+.link.instance {
+ stroke: #ccc; }
+
+.link.instance.active {
+ stroke: rgba(255, 138, 0, 0.65); }
+
+.service-details {
+ width: 200px;
+ position: absolute;
+ top: 20px;
+ right: 20px; }
+
+/* when showing the thing */
+.animate.ng-hide-remove {
+ animation: 0.5s bounceInRight ease; }
+
+/* when hiding the picture */
+.animate.ng-hide-add {
+ animation: 0.5s bounceOutRight ease; }
+
+/* LOADER */
+.loader {
+ font-size: 10px;
+ margin: 150px auto;
+ text-indent: -9999em;
+ width: 11em;
+ height: 11em;
+ border-radius: 50%;
+ background: #ffffff;
+ background: -moz-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
+ background: -webkit-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
+ background: -o-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
+ background: -ms-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
+ background: linear-gradient(to right, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
+ position: relative;
+ animation: load3 1.4s infinite linear;
+ transform: translateZ(0); }
+
+.loader:before {
+ width: 50%;
+ height: 50%;
+ background: #105E9E;
+ border-radius: 100% 0 0 0;
+ position: absolute;
+ top: 0;
+ left: 0;
+ content: ''; }
+
+.loader:after {
+ background: #fff;
+ width: 75%;
+ height: 75%;
+ border-radius: 50%;
+ content: '';
+ margin: auto;
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0; }
+
+@keyframes load3 {
+ 0% {
+ -webkit-transform: rotate(0deg);
+ transform: rotate(0deg); }
+ 100% {
+ -webkit-transform: rotate(360deg);
+ transform: rotate(360deg); } }
+
+/* MODALS */
+.modal.fade.in {
+ display: block; }
+
+/* ANIMATIONS */
+@keyframes bounceInRight {
+ from, 60%, 75%, 90%, to {
+ animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); }
+ from {
+ opacity: 0;
+ transform: translate3d(3000px, 0, 0); }
+ 60% {
+ opacity: 1;
+ transform: translate3d(-25px, 0, 0); }
+ 75% {
+ transform: translate3d(10px, 0, 0); }
+ 90% {
+ transform: translate3d(-5px, 0, 0); }
+ to {
+ transform: none; } }
+
+@keyframes bounceOutRight {
+ 20% {
+ opacity: 1;
+ transform: translate3d(-20px, 0, 0); }
+ to {
+ opacity: 0;
+ transform: translate3d(2000px, 0, 0); } }
diff --git a/views/ngXosViews/diagnostic/src/index.html b/views/ngXosViews/diagnostic/src/index.html
index dcba923..bcf9fe2 100644
--- a/views/ngXosViews/diagnostic/src/index.html
+++ b/views/ngXosViews/diagnostic/src/index.html
@@ -5,6 +5,7 @@
<!-- inject:css -->
<link rel="stylesheet" href="/css/dev.css">
<link rel="stylesheet" href="/css/diagnostic.css">
+<link rel="stylesheet" href="/css/main.css">
<!-- endinject -->
<div ng-app="xos.diagnostic" id="xosDiagnostic">
@@ -26,6 +27,8 @@
<!-- endbower --><!-- endjs -->
<!-- inject:js -->
<script src="/xosHelpers/src/xosHelpers.module.js"></script>
+<script src="/xosHelpers/src/ui_components/table/table.component.js"></script>
+<script src="/xosHelpers/src/ui_components/ui-components.module.js"></script>
<script src="/xosHelpers/src/services/noHyperlinks.interceptor.js"></script>
<script src="/xosHelpers/src/services/csrfToken.interceptor.js"></script>
<script src="/xosHelpers/src/services/api.services.js"></script>
diff --git a/views/ngXosViews/diagnostic/src/css/diagnostic.css b/views/ngXosViews/diagnostic/src/sass/main.scss
similarity index 100%
rename from views/ngXosViews/diagnostic/src/css/diagnostic.css
rename to views/ngXosViews/diagnostic/src/sass/main.scss