Skip to content

L
luna
Unverified Commit 03e0d61b authored by liuzheng712's avatar liuzheng712
Browse files
Options

feat: publish

parents 49145074 0a63c010
Hide whitespace changes
Inline Side-by-side
Showing with 219 additions and 139 deletions
mock.py
View file @ 03e0d61b
......@@ -104,11 +104,11 @@ def asset_groups_assets():
"comment": "Default asset group",
"assets_granted": [
{
"id": 2,
"id": 1,
"hostname": "192.168.1.6",
"ip": "192.168.2.6",
"port": 22,
"system": "linux",
"plantform": "Linux",
"system_users_granted": [
{
"id": 1,
......@@ -117,6 +117,14 @@ def asset_groups_assets():
"protocol": "ssh",
"auth_method": "P",
"auto_push": True
},
{
"id": 2,
"name": "liuzheng",
"username": "liuzheng",
"protocol": "ssh",
"auth_method": "P",
"auto_push": True
}
]
},
......@@ -125,7 +133,7 @@ def asset_groups_assets():
"hostname": "windows server",
"ip": "123.57.183.135",
"port": 3389,
"system": "windows",
"plantform": "Windows",
"assets_granted": [
{
"id": 1,
......
asciinema-player @ 9e8f949f
Subproject commit 9e8f949f64479cbfc4551dd81a20897de6121da5
package-lock.json
View file @ 03e0d61b
......@@ -5116,6 +5116,11 @@
"integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
"dev": true
},
"inconsolata": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/inconsolata/-/inconsolata-0.0.2.tgz",
"integrity": "sha1-uqFDP0PUKqHtsmvZ7odzjpKSUOs="
},
"indent-string": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
......@@ -10572,6 +10577,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
View file @ 03e0d61b
......@@ -32,6 +32,7 @@
"filetree-css": "^1.0.0",
"font-awesome": "^4.7.0",
"handlebars": "^4.0.11",
"inconsolata": "0.0.2",
"jquery": "^3.1.0",
"jquery-slimscroll": "^1.3.8",
"jquery-sparkline": "^2.4.0",
......@@ -44,6 +45,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
View file @ 03e0d61b
......@@ -34,7 +34,7 @@ label {
overflow: hidden;
}
.filetree > li input:checked ~ ul {
.filetree > li input:checked ~ ul, .filetree > li ul.insearch {
height: auto;
}
......@@ -51,7 +51,7 @@ label {
.search {
border-left-width: 0;
border-bottom: gold 2px inset;
border-bottom: #19aa8d 2px inset;
}
.left-search {
......@@ -67,7 +67,11 @@ label {
background: #2f2a2a;
font-size: 9pt;
border-top-width: 1px;
left: 0;
padding: 1px 20px 30px 20px;
left: 0px;
padding: 1px 20px 0 20px;
position: absolute;
}
.fa.fa-undefined:before {
content: "\f26c";
}
src/app/ControlPage/cleftbar/cleftbar.component.html
View file @ 03e0d61b
......@@ -8,9 +8,9 @@
<li *ngFor="let hostGroup of HostGroups | SearchFilter: q; let i = index ">
<input type="checkbox" id="hostgroup-{{i}}">
<label for="hostgroup-{{i}}">{{hostGroup.name}}</label>
<ul>
<ul [ngClass]="{'insearch': q }">
<li *ngFor="let host of hostGroup.assets_granted | SearchFilter: q" (click)="Connect(host)">
<i class="fa" [ngClass]="'fa-'+host.system" id="fa-{{i}}"></i>
<i class="fa" [ngClass]="'fa-'+(host.plantform||'undefined').toLowerCase()" id="fa-{{i}}"></i>
{{host.hostname}}
</li>
</ul>
......@@ -18,5 +18,5 @@
</ul>
</div>
<div class="footer">
Version: <strong>{{version}}</strong>
Version <strong>{{version}}</strong>
</div>
src/app/ControlPage/cleftbar/cleftbar.component.ts
View file @ 03e0d61b
......@@ -92,12 +92,32 @@ export class CleftbarComponent implements OnInit {
.map(res => res.json())
.subscribe(response => {
this.HostGroups = response;
this.autologin();
});
}
autologin() {
const id = this._appService.getQueryString('id');
if (id) {
for (let g of this.HostGroups) {
if (g['assets_granted']) {
for (let u of g['assets_granted']) {
if (u.id.toString() === id.toString()) {
this.Connect(u);
return;
}
}
}
}
}
}
Connect(host) {
console.log(host);
// console.log(host);
let userid: string;
const that = this;
if (host.system_users_granted.length > 1) {
let options = '';
for (let u of host.system_users_granted) {
......@@ -112,6 +132,7 @@ export class CleftbarComponent implements OnInit {
content: '<select id="selectuser">' + options + '</select>',
yes: function (index, layero) {
userid = jQuery('#selectuser').val();
that.login(host, userid);
layer.close(index);
},
btn2: function (index, layero) {
......@@ -123,15 +144,19 @@ export class CleftbarComponent implements OnInit {
});
} else if (host.system_users_granted.length === 1) {
userid = host.system_users_granted[0].id;
this.login(host, userid);
}
}
login(host, userid) {
if (userid === '') {
return;
}
if (host.system === 'linux') {
if (host.plantform.toLowerCase() === 'linux') {
jQuery('app-ssh').show();
jQuery('app-rdp').hide();
this._term.TerminalConnect(host, userid);
} else if (host.system === 'windows') {
} else if (host.plantform.toLowerCase() === 'windows') {
jQuery('app-ssh').hide();
jQuery('app-rdp').show();
this._rdp.Connect(host, userid);
......
src/app/ControlPage/control/controlnav/controlnav.component.css
View file @ 03e0d61b
#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;
border-bottom: 3px solid #19aa8d !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
View file @ 03e0d61b
<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
View file @ 03e0d61b
......@@ -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
View file @ 03e0d61b
......@@ -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';
......@@ -77,11 +77,11 @@ export class SshComponent implements OnInit {
screenKeys: true,
});
NavList.List.push(new View());
for (let _i = 0; _i < NavList.List.length; _i++) {
if (id === _i) {
for (let i = 0; i < NavList.List.length; i++) {
if (id === i) {
NavList.List[id].hide = false;
} else {
NavList.List[_i].hide = true;
NavList.List[i].hide = true;
}
}
......@@ -109,7 +109,7 @@ export class SshComponent implements OnInit {
});
socket.on('disconnect', function () {
this.TerminalDisconnect(NavList.List[id]);
SshComponent.TerminalDisconnect(NavList.List[id]);
// TermStore.term[id]["term"].destroy();
// TermStore.term[id]["connected"] = false;
});
......
src/app/ControlPage/controlpage.component.css
View file @ 03e0d61b
......@@ -7,6 +7,8 @@ div, term-leftbar, term-body {
div {
background-color: black;
margin: 0;
padding-top: 30px;
position: initial;
}
app-cleftbar {
......
src/app/app.component.html
View file @ 03e0d61b
<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/app.service.ts
View file @ 03e0d61b
......@@ -13,6 +13,7 @@ import {Logger} from 'angular2-logger/core';
import 'rxjs/add/operator/map';
import 'rxjs/add/operator/catch';
import {DataStore, User, Browser} from './globals';
declare function unescape(s: string): string;
@Injectable()
export class HttpService {
......@@ -174,6 +175,14 @@ export class AppService implements OnInit {
this._http.post('/api/browser', JSON.stringify(Browser)).map(res => res.json()).subscribe();
}
getQueryString(name) {
const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
const r = window.location.search.substr(1).match(reg);
if (r != null) {
return unescape(r[2]);
}
return null;
}
//
//
......
src/app/elements/nav/nav.component.html
View file @ 03e0d61b
<div class="nav">
<ul>
<li><a [routerLink]="['Index']"><img src="static/imgs/logo.png" height="26px"/></a>
<li><a [routerLink]="['']"><img src="static/imgs/logo.png" height="26px"/></a>
</li>
<li *ngFor="let v of DataStore.Nav" [ngClass]="{'dropdown': v.children}">
<a>{{v.name}}</a>
......
src/app/elements/nav/nav.component.ts
View file @ 03e0d61b
......@@ -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/elements/term/term.component.ts
View file @ 03e0d61b
import {AfterViewInit, Component, OnInit, ViewChild} from '@angular/core';
import {ElementRef, Renderer2} from '@angular/core';
import {ElementRef} from '@angular/core';
import {term} from '../../globals';
import {Terminal} from '../../globals';
import * as jQuery from 'jquery/dist/jquery.min.js';
@Component({
......@@ -13,7 +12,7 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
@ViewChild('term') el: ElementRef;
constructor(private rd: Renderer2) {
constructor() {
}
ngOnInit() {
......@@ -23,12 +22,13 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
ngAfterViewInit() {
term.col = Math.floor(jQuery(this.el.nativeElement).width() / jQuery('#liuzheng').width() * 8) - 3;
term.row = Math.floor(jQuery(this.el.nativeElement).height() / jQuery('#liuzheng').height()) - 5;
term.term = Terminal({
cols: term.col,
rows: term.row,
useStyle: true,
screenKeys: true,
});
console.log(term);
// term.term = Terminal({
// cols: term.col,
// rows: term.row,
// useStyle: true,
// screenKeys: true,
// });
term.term.open(this.el.nativeElement, true);
const that = this;
window.onresize = function () {
......
src/app/globals.ts
View file @ 03e0d61b
......@@ -11,7 +11,12 @@ export let term: {
col: number;
row: number;
} = {
term: Terminal({}),
term: Terminal({
cols: 80,
rows: 24,
useStyle: true,
screenKeys: true,
}),
col: 80,
row: 24,
};
......
src/app/monitor-page/linux/linux.component.ts
View file @ 03e0d61b
......@@ -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/app/replay-page/json/json.component.css
View file @ 03e0d61b
......@@ -21,3 +21,7 @@
#term .terminal div span {
min-width: 12px;
}
app-element-term {
position: absolute;
}
src/app/replay-page/json/json.component.html
View file @ 03e0d61b
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-stop" aria-hidden="true"></i>-->
<!--</button>-->
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-step-backward" aria-hidden="true"></i>-->
<!--</button>-->
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-backward" aria-hidden="true"></i>-->
<!--</button>-->
<button type="button" class="btn" (click)="pause()">
<i class="fa" aria-hidden="true" [ngClass]="{'fa-play':!toggle,'fa-pause': toggle}"></i>
</button>
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-forward" aria-hidden="true"></i>-->
<!--</button>-->
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-step-forward" aria-hidden="true"></i>-->
<!--</button>-->
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-expand" aria-hidden="true"></i>-->
<!--</button>-->
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-compress" aria-hidden="true"></i>-->
<!--</button>-->
<button type="button" class="btn" (click)="restart()">
<i class="fa fa-repeat" aria-hidden="true"></i>
</button>
<div>
<input id="scrubber" type="range" [(ngModel)]="setPercent" min=0 max=100 (mousedown)="stop()" (mouseup)="rununil()"/>
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-stop" aria-hidden="true"></i>-->
<!--</button>-->
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-step-backward" aria-hidden="true"></i>-->
<!--</button>-->
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-backward" aria-hidden="true"></i>-->
<!--</button>-->
<button type="button" class="btn" (click)="pause()">
<i class="fa" aria-hidden="true" [ngClass]="{'fa-play':!toggle,'fa-pause': toggle}"></i>
</button>
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-forward" aria-hidden="true"></i>-->
<!--</button>-->
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-step-forward" aria-hidden="true"></i>-->
<!--</button>-->
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-expand" aria-hidden="true"></i>-->
<!--</button>-->
<!--<button type="button" class="btn">-->
<!--<i class="fa fa-compress" aria-hidden="true"></i>-->
<!--</button>-->
<button type="button" class="btn" (click)="restart()">
<i class="fa fa-repeat" aria-hidden="true"></i>
</button>
{{time | utcDate | date:"HH:mm:ss"}}
<input id="scrubber" type="range" [(ngModel)]="setPercent" min=0 max=100 (mousedown)="stop()" (mouseup)="rununil()"/>
{{time | utcDate | date:"HH:mm:ss"}}
</div>
<app-element-term></app-element-term>
<!--<asciinema-player></asciinema-player>-->
src/app/replay-page/json/json.component.ts
View file @ 03e0d61b
import {Component, OnInit} from '@angular/core';
import {AfterViewInit, Component, OnInit} from '@angular/core';
import {Video} from '../../globals';
import {term} from '../../globals';
......@@ -9,7 +9,7 @@ import * as jQuery from 'jquery/dist/jquery.min.js';
templateUrl: './json.component.html',
styleUrls: ['./json.component.css']
})
export class JsonComponent implements OnInit {
export class JsonComponent implements OnInit, AfterViewInit {
speed = 1;
setPercent = 0;
toggle = false;
......@@ -27,6 +27,10 @@ export class JsonComponent implements OnInit {
this.restart();
}
ngAfterViewInit() {
this.restart();
}
setSpeed() {
if (this.speed === 0) {
......
src/app/replay-page/replay-page.component.html
View file @ 03e0d61b
<app-mp4 *ngIf='Video.type=="mp4"'></app-mp4>
<app-json *ngIf='Video.type=="json"'></app-json>
<app-json></app-json>
src/assets/inspinia/imports/_md-skin.scss
View file @ 03e0d61b
@import url("https://fonts.googleapis.com/css?family=Roboto:400,300,500,700");
$md-color-primary: #1AB394;
$md-shadow-main: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);
......
src/assets/inspinia/style.scss
View file @ 03e0d61b
......@@ -5,7 +5,6 @@
*
*/
// Google Fonts
@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700");
// Variables, Mixins
@import "imports/variables";
......
src/favicon.ico
View replaced file @ 49145074 View file @ 03e0d61b
src/favicon.ico

1.59 KB | W: | H:

src/favicon.ico

1.7 KB | W: | H:

src/favicon.ico
src/favicon.ico
src/favicon.ico
src/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
src/index.html
View file @ 03e0d61b
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>JumpServer</title>
<title>Jumpserver</title>
<base href="/luna">
<meta name="viewport" content="width=device-width, initial-scale=1">
......
src/sass/style.scss
View file @ 03e0d61b
......@@ -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";
src/styles.css
View file @ 03e0d61b
......@@ -4,9 +4,10 @@
* --------------------------------------------------
*/
@font-face {
font-family: iosevka;
src: url('assets/fonts/iosevka-term-ss07-1.13.3/woff2/iosevka-term-ss07-light.woff2') format("woff2");
font-family: Inconsolata;
src: url('assets/fonts/inconsolata.woff') format("woff");
font-weight: normal;
font-size: large;
}
html,
......@@ -29,11 +30,11 @@ app-root {
z-index: -1;
font-size: 11px !important;
padding-bottom: 16px !important;
font-family: 'Monaco', iosevka !important;
font-family: 'Monaco', Inconsolata !important;
}
.terminal {
font-family: 'Monaco', iosevka;
font-family: 'Monaco', Inconsolata;
font-size: 11px;
white-space: nowrap;
display: inline-block;
......
Markdown is supported
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