Skip to content

L
luna
Commit 68412c3b authored by liuzheng712's avatar liuzheng712
Browse files
Options

feat: public

parent c77c955e
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 8 deletions
README.md
View file @ 68412c3b
...@@ -26,3 +26,28 @@ Before running the tests make sure you are serving the app via `ng serve`. ...@@ -26,3 +26,28 @@ Before running the tests make sure you are serving the app via `ng serve`.
## Further help ## Further help
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
## Running On Your Server
Untar the luna release tar file, and put it under the folder you like.
Nginx config:
```
location /luna/ {
index index.html;
alias /path/of/your/luna/;
}
location ^~ /ws/ {
proxy_pass http://localhost:3000/ws/;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# WebSocket support (nginx 1.4)
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
```
package.json
View file @ 68412c3b
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --proxy-config proxy.conf.json", "start": "ng serve --proxy-config proxy.conf.json",
"build": "ng build", "build": "ng build -prod --base-href=/luna/ --deploy '/luna/'",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
"e2e": "ng e2e" "e2e": "ng e2e"
......
src/app/ControlPage/cleftbar/cleftbar.component.css
View file @ 68412c3b
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
.filetree li { .filetree li {
list-style: none; list-style: none;
cursor: pointer; cursor: pointer;
color: #ffffff;
} }
.filetree label { .filetree label {
...@@ -69,4 +70,5 @@ ...@@ -69,4 +70,5 @@
width: 100%; width: 100%;
border: none; border: none;
height: 28px; height: 28px;
background: #2f2a2a;
} }
src/app/ControlPage/control/rdp/rdp.component.html
View file @ 68412c3b
<div id="rdp"> <div id="rdp">
<div *ngFor="let m of NavList.List;let i=index" <div *ngFor="let m of NavList.List;let i=index"
[ngClass]="{'disconnected':!m.connected,'hidden': m.hide,'hidden':m.type!='rdp'}" id="rdp-{{i}}"> [ngClass]="{'disconnected':!m.connected,'hidden': m.hide || m.type!='rdp'}" id="rdp-{{i}}">
<canvas id="canvas-{{i}}"></canvas> <canvas id="canvas-{{i}}"></canvas>
</div> </div>
</div> </div>
src/app/ControlPage/control/ssh/ssh.component.html
View file @ 68412c3b
<div id="term"> <div id="term">
<div *ngFor="let m of NavList.List;let i=index" <div *ngFor="let m of NavList.List;let i=index"
[ngClass]="{'disconnected':!m.connected,'hidden': m.hide,'hidden':m.type!='ssh'}" id="term-{{i}}"> [ngClass]="{'disconnected':!m.connected,'hidden': m.hide || m.type!='ssh'}" id="term-{{i}}">
</div> </div>
</div> </div>
<span id="liuzheng">liuzheng</span> <span id="liuzheng">liuzheng</span>
src/app/ControlPage/controlpage.component.css
View file @ 68412c3b
...@@ -10,8 +10,9 @@ div { ...@@ -10,8 +10,9 @@ div {
} }
app-cleftbar { app-cleftbar {
background-color: white;
padding: 0; padding: 0;
background: #2f2a2a;
color: #d6cbcb;
} }
app-control { app-control {
......
src/app/ControlPage/search/search.component.ts
View file @ 68412c3b
...@@ -19,7 +19,7 @@ export let Q: string = ''; ...@@ -19,7 +19,7 @@ export let Q: string = '';
styleUrls: ['./search.component.css'] styleUrls: ['./search.component.css']
}) })
export class SearchComponent implements OnChanges { export class SearchComponent implements OnChanges {
q: string;
@Input() input; @Input() input;
searchrequest: any; searchrequest: any;
......
src/app/app-routing.module.ts
View file @ 68412c3b
...@@ -20,10 +20,9 @@ const appRoutes: Routes = [ ...@@ -20,10 +20,9 @@ const appRoutes: Routes = [
// { path: 'crisis-center', component: CrisisListComponent }, // { path: 'crisis-center', component: CrisisListComponent },
// {path: 'welcome', component: IndexPageComponent}, // <-- delete this line // {path: 'welcome', component: IndexPageComponent}, // <-- delete this line
{path: 'users/login', component: LoginComponent}, {path: 'users/login', component: LoginComponent},
{path: 'control', component: ControlPageComponent},
{path: 'rdp/:token', component: RdppageComponent}, {path: 'rdp/:token', component: RdppageComponent},
{path: 'term/:token', component: TermpageComponent}, {path: 'term/:token', component: TermpageComponent},
{path: '', redirectTo: '/control', pathMatch: 'full'}, {path: '', component: ControlPageComponent},
{path: '**', component: NotFoundComponent} {path: '**', component: NotFoundComponent}
]; ];
......
src/index.html
View file @ 68412c3b
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>JumpServer</title> <title>JumpServer</title>
<base href="/"> <base href="/luna">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
......
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