Merged in dev (pull request #18)

Dev

package-lock.json

@@ -10572,6 +10572,11 @@
         }
       }
     },
+    "npm-font-open-sans": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/npm-font-open-sans/-/npm-font-open-sans-1.1.0.tgz",
+      "integrity": "sha512-t1y5ShWm6a8FSLwBdINT47XYMcuKY2rkTBsTdz/76YB2MtX0YD89RUkY2eSS2/XOmlZfBe1HFBAwD+b9+/UfmQ=="
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",

package.json

@@ -44,6 +44,7 @@
     "ngx-bootstrap": "^1.6.6",
     "node": "^9.3.0",
     "npm": "^5.6.0",
+    "npm-font-open-sans": "^1.1.0",
     "peity": "^3.2.1",
     "popper.js": "^1.12.9",
     "roboto-fontface": "^0.8.0",

src/app/ControlPage/cleftbar/cleftbar.component.css

@@ -68,6 +68,6 @@ label {
   font-size: 9pt;
   border-top-width: 1px;
   left: 0;
-  padding: 1px 20px 30px 20px;
+  padding: 1px 20px 0 20px;
   position: absolute;
 }

src/app/ControlPage/cleftbar/cleftbar.component.ts

@@ -96,7 +96,7 @@ export class CleftbarComponent implements OnInit {
   }
 
   Connect(host) {
-    console.log(host);
+    // console.log(host);
     let userid: string;
     if (host.system_users_granted.length > 1) {
       let options = '';

src/app/ControlPage/control/controlnav/controlnav.component.css

-
-#tabs {
+.tabs {
   height: 30px;
-  width: 100%
+  overflow-y: hidden;
+  overflow-x: auto;
 }
 
-#tabs ul li.disconnected {
+.tabs ul li.disconnected {
   background-color: darkgray;
 }
 
-#tabs ul li.hidden {
+.tabs ul li.hidden {
   display: none;
 }
 
-#tabs ul {
+.tabs ul {
   list-style-type: none;
   height: 30px;
   background-color: #3a3333;
-  overflow-y: hidden;
-  overflow-x: auto;
-  width: 100%;
-  display: inline-flex;
-  position: absolute;
+  display: block;
+  min-width: 100%;
+  padding-left: 0;
 }
 
-#tabs ul li {
+.tabs ul li {
   display: inline-table;
   width: 150px;
   height: 30px;
   position: relative;
   box-sizing: content-box;
+  float: left;;
 }
 
-#tabs ul li.active {
+.tabs ul li.active {
   box-sizing: border-box;
   border-bottom: 3px solid #7f3f98 !important;
 }
 
-#tabs ul li span {
+.tabs ul li span {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -50,7 +49,7 @@
   height: 21px;
 }
 
-#tabs ul li a.close {
+.tabs ul li a.close {
   font-family: 'Roboto', sans-serif;
   font-size: 13px;
   position: absolute;
@@ -62,17 +61,17 @@
   display: inline-block;
 }
 
-#tabs ul li.active a {
+.tabs ul li.active a {
   color: white;
 }
 
-#tabs ul li.active span {
+.tabs ul li.active span {
   padding: 5px 20px 4px 15px;
   color: white;
   height: 18px;
 }
 
-#tabs ul li input {
+.tabs ul li input {
   font-family: 'Roboto', sans-serif;
   font-size: 13px;
   width: 115px;

src/app/ControlPage/control/controlnav/controlnav.component.html

-<div id="tabs">
-  <ul>
+<div class="tabs">
+  <ul [ngStyle]="{'width':150*NavList.List.length+'px'}">
     <li *ngFor="let m of NavList.List;let i = index"
         [ngClass]="{'active':i==NavList.Active,'disconnected':!m.connected, 'hidden': m.closed != false}"
         id="termnav-{{i}}" (click)="setActive(i)">

src/app/ControlPage/control/controlnav/controlnav.component.ts

@@ -34,7 +34,7 @@ export class ControlnavComponent implements OnInit {
     } else {
       NavList.Active = index;
     }
-    ControlnavComponent.setActive(NavList.Active)
+    ControlnavComponent.setActive(NavList.Active);
   }
 
   static setActive(index) {

src/app/ControlPage/control/ssh/ssh.component.ts

@@ -47,7 +47,7 @@ export class SshComponent implements OnInit {
   }
 
   TerminalConnect(host, userid) {
-    console.log(host, userid);
+    // console.log(host, userid);
     const socket = io.connect('/ssh');
     let cols = '80';
     let rows = '24';

src/app/ControlPage/controlpage.component.css

@@ -7,6 +7,7 @@ div, term-leftbar, term-body {
 div {
   background-color: black;
   margin: 0;
+  padding-top:30px;
 }
 
 app-cleftbar {

src/app/app.component.html

 <app-element-nav *ngIf="DataStore.NavShow"></app-element-nav>
-<nav *ngIf="DataStore.NavShow"></nav>
 <router-outlet></router-outlet>
 <!--<app-element-interactive></app-element-interactive>-->

src/app/elements/nav/nav.component.ts

@@ -129,18 +129,18 @@ export class ElementNavComponent implements OnInit {
       'id': 'File',
       'name': 'Server',
       'children': [
-        {
-          'id': 'NewConnection',
-          'href': '',
-          'name': 'New connection',
-          'disable': true
-        },
-        {
-          'id': 'Connect',
-          'click': 'Connect',
-          'name': 'Connect',
-          'disable': true
-        },
+        // {
+        //   'id': 'NewConnection',
+        //   'href': '',
+        //   'name': 'New connection',
+        //   'disable': true
+        // },
+        // {
+        //   'id': 'Connect',
+        //   'click': 'Connect',
+        //   'name': 'Connect',
+        //   'disable': true
+        // },
         {
           'id': 'Disconnect',
           'click': 'Disconnect',
@@ -151,35 +151,35 @@ export class ElementNavComponent implements OnInit {
           'click': 'DisconnectAll',
           'name': 'Disconnect all'
         },
-        {
-          'id': 'Duplicate',
-          'href': '',
-          'name': 'Duplicate',
-          'disable': true
-        },
-        {
-          'id': 'Upload',
-          'href': '',
-          'name': 'Upload',
-          'disable': true
-        },
-        {
-          'id': 'Download',
-          'href': '',
-          'name': 'Download',
-          'disable': true
-        },
-        {
-          'id': ' Search',
-          'href': '',
-          'name': 'Search',
-          'disable': true
-        },
-        {
-          'id': 'Reload',
-          'click': 'ReloadLeftbar',
-          'name': 'Reload'
-        }
+        // {
+        //   'id': 'Duplicate',
+        //   'href': '',
+        //   'name': 'Duplicate',
+        //   'disable': true
+        // },
+        // {
+        //   'id': 'Upload',
+        //   'href': '',
+        //   'name': 'Upload',
+        //   'disable': true
+        // },
+        // {
+        //   'id': 'Download',
+        //   'href': '',
+        //   'name': 'Download',
+        //   'disable': true
+        // },
+        // {
+        //   'id': ' Search',
+        //   'href': '',
+        //   'name': 'Search',
+        //   'disable': true
+        // },
+        // {
+        //   'id': 'Reload',
+        //   'click': 'ReloadLeftbar',
+        //   'name': 'Reload'
+        // }
       ]
     }, {
       'id': 'View',
@@ -218,11 +218,11 @@ export class ElementNavComponent implements OnInit {
       'id': 'Help',
       'name': 'Help',
       'children': [
-        {
-          'id': 'EnterLicense',
-          'click': 'EnterLicense',
-          'name': 'Enter License'
-        },
+        // {
+        //   'id': 'EnterLicense',
+        //   'click': 'EnterLicense',
+        //   'name': 'Enter License'
+        // },
         {
           'id': 'Website',
           'click': 'Website',

src/app/monitor-page/linux/linux.component.ts

@@ -20,12 +20,16 @@ export class LinuxComponent implements OnInit {
       Monitor.socket.emit('room', Monitor.sessionid);
       Monitor.socket.on('room', function (room) {
         Monitor.room = room;
+        console.log(room);
         Monitor.socket.emit('join', room);
         console.log(Monitor);
       });
       Monitor.socket.on('data', function (data) {
         term.term.write(data);
       });
+      Monitor.socket.on('error', function (data) {
+        alert(data);
+      });
     });
   }
 

src/sass/style.scss

@@ -4,3 +4,8 @@ $fa-font-path: "~font-awesome/fonts";
 
 // bootstrap
 @import "~bootstrap/scss/bootstrap";
+
+$FontPathOpenSans: "~npm-font-open-sans/fonts";
+@import '~npm-font-open-sans/open-sans';
+$roboto-font-path: "~roboto-fontface/fonts";
+@import "~roboto-fontface/css/mixins.scss";