Skip to content

L
luna
Unverified Commit 8b1789de authored by liuzheng712's avatar liuzheng712
Browse files
Options

Merge branch 'master' into test

parents d5acdb9b 012916b9
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 55 deletions
.angular-cli.json
View file @ 8b1789de
......@@ -22,6 +22,7 @@
"styles": [
"../node_modules/animate.css/animate.min.css",
"../node_modules/xterm/dist/xterm.css",
"../node_modules/elfinder/css/elfinder.min.css",
"sass/style.scss",
"styles.css"
],
......@@ -33,6 +34,7 @@
"../node_modules/bootstrap/dist/js/bootstrap.min.js",
"assets/inspinia/inspinia.js",
"assets/slimscroll/jquery.slimscroll.min.js",
"../node_modules/elfinder/js/elfinder.min.js",
"../node_modules/xterm/dist/xterm.js"
],
"environmentSource": "environments/environment.ts",
......
.gitignore
View file @ 8b1789de
......@@ -41,3 +41,7 @@ yarn-error.log
# System Files
.DS_Store
Thumbs.db
publish.sh
luna.tar.gz
luna/
package-lock.json
View file @ 8b1789de
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
View file @ 8b1789de
......@@ -24,6 +24,7 @@
"@angular/platform-browser-dynamic": "5.2.0",
"@angular/router": "5.2.0",
"@swimlane/ngx-datatable": "^11.1.7",
"ajv": "^6.2.1",
"animate.css": "^3.5.2",
"body-parser": "^1.18.2",
"bootstrap": "^4.0.0-beta.3",
......@@ -31,6 +32,7 @@
"compass-mixins": "^0.12.10",
"core-js": "2.5.3",
"directory-encoder": "^0.9.2",
"elfinder": "git+https://github.com/Studio-42/elFinder.git#2.1.33",
"filetree-css": "^1.0.0",
"font-awesome": "4.7.0",
"handlebars": "^4.0.11",
......@@ -55,6 +57,7 @@
"npm-font-open-sans": "^1.1.0",
"peity": "^3.2.1",
"popper.js": "1.12.9",
"requirejs": "^2.3.5",
"roboto-fontface": "^0.8.0",
"rxjs": "5.5.6",
"sass-math": "^1.0.0",
......@@ -68,9 +71,9 @@
"zone.js": "0.8.20"
},
"devDependencies": {
"@angular-devkit/core": "0.0.28",
"@angular-devkit/schematics": "0.0.42",
"@angular/cli": "^1.6.5",
"@angular-devkit/core": "^0.4.2",
"@angular-devkit/schematics": "^0.4.2",
"@angular/cli": "^1.7.3",
"@angular/compiler-cli": "5.2.0",
"@angular/language-service": "5.2.0",
"@types/jasmine": "2.8.4",
......
src/app/app-routing.module.ts
View file @ 8b1789de
......@@ -24,7 +24,7 @@ const appRoutes: Routes = [
// {path: 'users/login', component: LoginComponent},
{path: 'replay/:token', component: ReplayPageComponent},
{path: 'monitor/:token', component: MonitorPageComponent},
{path: 'test', component: TestPageComponent},
// {path: 'test', component: TestPageComponent},
{path: 'connect', component: ConnectPageComponent},
// {path: 'setting', component: SettingPageComponent},
{path: 'undefined', component: BlankPageComponent},
......
src/app/app.module.ts
View file @ 8b1789de
......@@ -29,6 +29,8 @@ import {ElementPopupComponent} from './elements/popup/popup.component';
import {ElementRdpComponent} from './elements/rdp/rdp.component';
import {ElementServerMenuComponent} from './elements/server-menu/server-menu.component';
import {ElementIframeComponent} from './elements/iframe/iframe.component';
import {ElementElfinderComponent} from './elements/elfinder/elfinder.component';
// pages
import {LoginComponent} from './BasicPage/login/login.component';
import {IleftbarComponent} from './IndexPage/ileftbar/ileftbar.component';
......@@ -94,6 +96,7 @@ import {ConnectPageComponent} from './connect-page/connect-page.component';
ElementLeftbarComponent,
ElementOfooterComponent,
ElementGuacamoleComponent,
ElementElfinderComponent,
LoginComponent,
SearchComponent,
SearchFilter,
......
src/app/elements/elfinder/elfinder.component.spec.ts 0 → 100644
View file @ 8b1789de
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ElementElfinderComponent } from './elfinder.component';
describe('ElementElfinderComponent', () => {
let component: ElementElfinderComponent;
let fixture: ComponentFixture<ElementElfinderComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ElementElfinderComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ElementElfinderComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/elements/elfinder/elfinder.component.ts 0 → 100644
View file @ 8b1789de
import {Component, OnInit} from '@angular/core';
import * as elfinder from 'elfinder/js/elfinder.min.js';
@Component({
selector: 'app-element-elfinder',
templateUrl: './elfinder.component.html',
styleUrls: ['./elfinder.component.scss']
})
export class ElementElfinderComponent implements OnInit {
constructor() {
}
ngOnInit() {
elfinder(document.getElementById('elfinder'), {});
}
}
src/app/test-page/test-page.component.html
View file @ 8b1789de
<!--<app-element-table-->
<!--[rows]="rows"-->
<!--[columns]="columns"-->
<!--[config]="config"-->
<!--&gt;</app-element-table>-->
<!--<button mat-raised-button (click)="test()">Test</button>-->
<app-element-leftbar></app-element-leftbar>
<app-element-elfinder></app-element-elfinder>
src/app/test-page/test-page.component.ts
View file @ 8b1789de
import {Component, OnInit} from '@angular/core';
import {DataStore} from '../globals';
import {Config} from '../elements/table/table.component';
import {DialogService} from '../elements/dialog/dialog.service';
// import {Mats, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
@Component({
selector: 'app-test-page',
......@@ -11,42 +7,12 @@ import {DialogService} from '../elements/dialog/dialog.service';
styleUrls: ['./test-page.component.scss']
})
export class TestPageComponent implements OnInit {
rows = [
{name: 'Austin', gender: 'Male', company: 'Swimlane'},
{name: 'Dany', gender: 'Male', company: 'KFC'},
{name: 'Molly', gender: 'Female', company: 'Burger King'},
{name: 'Dany', gender: 'Male', company: 'KFC'},
{name: 'Molly', gender: 'Female', company: 'Burger King'},
{name: 'Dany', gender: 'Male', company: 'KFC'},
{name: 'Molly', gender: 'Female', company: 'Burger King'},
{name: 'Dany', gender: 'Male', company: 'KFC'},
{name: 'Molly', gender: 'Female', company: 'Burger King'},
{name: 'Dany', gender: 'Male', company: 'KFC'},
{name: 'Molly', gender: 'Female', company: 'Burger King'},
{name: 'Dany', gender: 'Male', company: 'KFC'},
{name: 'Molly', gender: 'Female', company: 'Burger King'},
{name: 'Dany', gender: 'Male', company: 'KFC'},
{name: 'Molly', gender: 'Female', company: 'Burger King'},
{name: 'Dany', gender: 'Male', company: 'KFC'},
{name: 'Molly', gender: 'Female', company: 'Burger King'},
];
columns = [
{prop: 'name'},
{name: 'Gender'},
{name: 'Company'}
];
config = Config;
constructor(private _layer: DialogService) {
constructor() {
DataStore.NavShow = false;
this.config.search = true;
this.config.scrollbarH = true;
}
ngOnInit() {
}
test() {
this._layer.alert('sss');
}
}
src/environments/environment.prod.ts
View file @ 8b1789de
export const environment = {
production: true
};
export const version = '0.5.0-{{BUILD_NUMBER}} GPLv2.';
export const version = '1.0.0-{{BUILD_NUMBER}} GPLv2.';
src/sass/style.scss
View file @ 8b1789de
// font-awesome
$fa-font-path: "~font-awesome/fonts";
$fa-font-path: '~font-awesome/fonts';
@import '~font-awesome/scss/font-awesome';
// bootstrap
@import "~bootstrap/scss/bootstrap";
@import '~bootstrap/scss/bootstrap';
$FontPathOpenSans: "~npm-font-open-sans/fonts";
$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";
$roboto-font-path: '~roboto-fontface/fonts';
@import '~roboto-fontface/css/mixins.scss';
/*
*
......@@ -17,16 +17,15 @@ $roboto-font-path: "~roboto-fontface/fonts";
*
*/
$asset-path: '../static/imgs/inspinia';
@import "../assets/inspinia/style";
@import '../assets/inspinia/style';
@import '~@swimlane/ngx-datatable/release/index.css';
@import '~@swimlane/ngx-datatable/release/themes/material.css';
@import '~@swimlane/ngx-datatable/release/assets/icons.css';
@import './material.css';
$material-design-icons-font-path: '~/material-design-icons/iconfont/';
//@import "~material-design-icons/iconfont/material-icons";
//@import '~material-design-icons/iconfont/material-icons';
@font-face {
font-family: 'Material Icons';
font-style: normal;
......@@ -63,3 +62,4 @@ $material-design-icons-font-path: '~/material-design-icons/iconfont/';
/* Support for IE. */
font-feature-settings: 'liga';
}
src/typings.d.ts
View file @ 8b1789de
/* SystemJS module definition */
declare var module: NodeModule;
interface NodeModule {
id: string;
}
tsconfig.json
View file @ 8b1789de
{
"compileOnSave": false,
"compilerOptions": {
"allowJs": true,
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
......
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