Merged in dev (pull request #90)

Dev

package.json

 {
   "name": "luna",
-  "version": "0.5.0",
+  "version": "1.0.0",
   "license": "GPLv3",
   "scripts": {
     "ng": "ng",
@@ -36,7 +36,6 @@
     "filetree-css": "^1.0.0",
     "font-awesome": "4.7.0",
     "handlebars": "^4.0.11",
-    "inconsolata": "0.0.2",
     "intl": "1.2.5",
     "jquery": "3.2.1",
     "jquery-slimscroll": "^1.3.8",

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

@@ -85,3 +85,18 @@ label {
   position: absolute;
   width: 100%;
 }
+
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  border-radius: 10px;
+}
+
+::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
+}

src/app/app.module.ts

@@ -24,7 +24,7 @@ import {DialogService, ElementDialogAlertComponent} from './elements/dialog/dial
 import {ElementFooterComponent} from './elements/footer/footer.component';
 import {ElementTermComponent} from './elements/term/term.component';
 import {ElementInteractiveComponent} from './elements/interactive/interactive.component';
-import {ElementNavComponent} from './elements/nav/nav.component';
+import {ChangLanWarningDialogComponent, ElementNavComponent} from './elements/nav/nav.component';
 import {ElementPopupComponent} from './elements/popup/popup.component';
 import {ElementRdpComponent} from './elements/rdp/rdp.component';
 import {ElementServerMenuComponent} from './elements/server-menu/server-menu.component';
@@ -83,7 +83,7 @@ import {ConnectPageComponent} from './connect-page/connect-page.component';
   ],
   declarations: [
     AppComponent,
-    ElementNavComponent,
+    ElementNavComponent, ChangLanWarningDialogComponent,
     ElementFooterComponent,
     ElementPopupComponent,
     ElementTermComponent,
@@ -128,6 +128,7 @@ import {ConnectPageComponent} from './connect-page/connect-page.component';
   entryComponents: [
     CleftbarDialogComponent,
     ElementDialogAlertComponent,
+    ChangLanWarningDialogComponent,
   ],
   bootstrap: [AppComponent],
   providers: [

src/app/app.service.ts

@@ -264,7 +264,7 @@ export class AppService implements OnInit {
   checklogin() {
     this._logger.log('service.ts:AppService,checklogin');
     if (DataStore.Path) {
-      if (DataStore.Path['name'] === 'FOF' || DataStore.Path['name'] === 'Forgot') {
+      if (document.location.pathname === '/luna/connect') {
       } else {
         if (User.logined) {
           if (document.location.pathname === '/login') {
@@ -273,53 +273,51 @@ export class AppService implements OnInit {
             this._router.navigate([document.location.pathname]);
           }
           // jQuery('angular2').show();
-        } else if (document.location.pathname === '/luna/connect') {
-          User.logined = true;
         } else {
           this._http.get_user_profile()
-              .subscribe(
-                data => {
-                  User.id = data['id'];
-                  User.name = data['name'];
-                  User.username = data['username'];
-                  User.email = data['email'];
-                  User.is_active = data['is_active'];
-                  User.is_superuser = data['is_superuser'];
-                  User.role = data['role'];
-                  // User.groups = data['groups'];
-                  User.wechat = data['wechat'];
-                  User.comment = data['comment'];
-                  User.date_expired = data['date_expired'];
-                  if (data['phone']) {
-                    User.phone = data['phone'].toString();
-                  }
-                  User.logined = data['logined'];
-                  this._logger.debug(User);
-                  this._localStorage.set('user', data['id']);
-                },
-                err => {
-                  // this._logger.error(err);
-                  User.logined = false;
-                  window.location.href = document.location.origin + '/users/login?next=' +
-                    document.location.pathname + document.location.search;
-                  // this._router.navigate(['login']);
-                },
-                // () => {
-                //   if (User.logined) {
-                //     if (document.location.pathname === '/login') {
-                //       this._router.navigate(['']);
-                //     } else {
-                //       this._router.navigate([document.location.pathname]);
-                //     }
-                //   } else {
-                //     this._router.navigate(['login']);
-                //   }
-                // jQuery('angular2').show();
-                // }
+            .subscribe(
+              data => {
+                User.id = data['id'];
+                User.name = data['name'];
+                User.username = data['username'];
+                User.email = data['email'];
+                User.is_active = data['is_active'];
+                User.is_superuser = data['is_superuser'];
+                User.role = data['role'];
+                // User.groups = data['groups'];
+                User.wechat = data['wechat'];
+                User.comment = data['comment'];
+                User.date_expired = data['date_expired'];
+                if (data['phone']) {
+                  User.phone = data['phone'].toString();
+                }
+                User.logined = data['logined'];
+                this._logger.debug(User);
+                this._localStorage.set('user', data['id']);
+              },
+              err => {
+                // this._logger.error(err);
+                User.logined = false;
+                window.location.href = document.location.origin + '/users/login?next=' +
+                  document.location.pathname + document.location.search;
+                // this._router.navigate(['login']);
+              },
+              // () => {
+              //   if (User.logined) {
+              //     if (document.location.pathname === '/login') {
+              //       this._router.navigate(['']);
+              //     } else {
+              //       this._router.navigate([document.location.pathname]);
+              //     }
+              //   } else {
+              //     this._router.navigate(['login']);
+              //   }
+              // jQuery('angular2').show();
+              // }
             );
+        }
       }
-    }
-  } else {
+    } else {
       this._router.navigate(['FOF']);
       // jQuery('angular2').show();
     }

src/app/elements/elfinder/elfinder.component.ts

 import {Component, OnInit} from '@angular/core';
-import * as elfinder from 'elfinder/js/elfinder.min.js';
+// import * as elfinder from 'elfinder/js/elfinder.min.js';
 
 @Component({
   selector: 'app-element-elfinder',
@@ -12,7 +12,7 @@ export class ElementElfinderComponent implements OnInit {
   }
 
   ngOnInit() {
-    elfinder(document.getElementById('elfinder'), {});
+    // elfinder(document.getElementById('elfinder'), {});
   }
 
 }

src/app/elements/nav/changeLanWarning.html

+<h1 mat-dialog-title>{{"Warning"|trans}}</h1>
+
+<h2>
+  {{"The page will be reload, can you acceptable?"|trans}}
+</h2>
+<div style="float: right">
+  <button mat-raised-button (click)="onNoClick()">{{"Cancel"|trans}}</button>
+  <button mat-raised-button color="primary" [mat-dialog-close]="selected" cdkFocusInitial>{{"Confirm"|trans}}</button>
+</div>

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

@@ -5,12 +5,14 @@
  * @date     2017-11-07
  * @author   liuzheng <liuzheng712@gmail.com>
  */
-import {Component, OnInit} from '@angular/core';
+import {Component, Inject, OnInit} from '@angular/core';
 import {AppService, HttpService, LocalStorageService, LogService} from '../../app.service';
 import {CleftbarComponent} from '../../ControlPage/cleftbar/cleftbar.component';
 import {ControlComponent, NavList} from '../../ControlPage/control/control.component';
 import {DataStore, i18n} from '../../globals';
 import * as jQuery from 'jquery/dist/jquery.min.js';
+import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material';
+import {FormControl, Validators} from '@angular/forms';
 // import * as layer from 'layui-layer/src/layer.js';
 declare let layer: any;
 
@@ -21,6 +23,7 @@ declare let layer: any;
 })
 export class ElementNavComponent implements OnInit {
   DataStore = DataStore;
+  ChangeLanWarningDialog: any;
 
   static Hide() {
     jQuery('app-element-nav').hide();
@@ -29,6 +32,7 @@ export class ElementNavComponent implements OnInit {
   constructor(private _appService: AppService,
               private _http: HttpService,
               private _logger: LogService,
+              public _dialog: MatDialog,
               private _localStorage: LocalStorageService) {
     this._logger.log('nav.ts:NavComponent');
     this.getnav();
@@ -95,11 +99,33 @@ export class ElementNavComponent implements OnInit {
         break;
       }
       case 'English': {
-        this.English();
+        this.ChangeLanWarningDialog = this._dialog.open(
+          ChangLanWarningDialogComponent,
+          {
+            height: '200px',
+            width: '300px',
+          });
+        this.ChangeLanWarningDialog.afterClosed().subscribe(
+          result => {
+            if (result) {
+              this.English();
+            }
+          });
         break;
       }
       case 'Chinese': {
-        this.Language('cn');
+        this.ChangeLanWarningDialog = this._dialog.open(
+          ChangLanWarningDialogComponent,
+          {
+            height: '200px',
+            width: '300px',
+          });
+        this.ChangeLanWarningDialog.afterClosed().subscribe(
+          result => {
+            if (result) {
+              this.Language('cn');
+            }
+          });
         break;
       }
       default: {
@@ -304,3 +330,21 @@ export class ElementNavComponent implements OnInit {
     location.reload();
   }
 }
+
+
+@Component({
+  selector: 'app-element-nav-dialog',
+  templateUrl: 'changeLanWarning.html',
+})
+export class ChangLanWarningDialogComponent implements OnInit {
+
+  constructor(public dialogRef: MatDialogRef<ChangLanWarningDialogComponent>) {
+  }
+
+  ngOnInit() {
+  }
+
+  onNoClick(): void {
+    this.dialogRef.close();
+  }
+}

src/styles.css

@@ -3,14 +3,6 @@
  * Style tweaks
  * --------------------------------------------------
  */
-@font-face {
-  font-family: Inconsolata;
-  src: url('assets/fonts/inconsolata.woff') format("woff");
-  font-weight: normal;
-  font-size: large;
-}
-
-
 html,
 body {
   overflow-x: hidden; /* Prevent scroll on narrow devices */
@@ -31,12 +23,12 @@ app-root {
   z-index: -1;
   font-size: 11px !important;
   padding-bottom: 16px !important;
-  font-family: 'Monaco', Inconsolata !important;
+  font-family: 'Monaco', 'Consolas' !important;
   color: white;
 }
 
 .terminal {
-  font-family: 'Monaco', Inconsolata;
+  font-family: 'Monaco', 'Consolas' !important;
   font-size: 11px;
   white-space: nowrap;
   display: inline-block;