Skip to content

Feature/format frontend code #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilhelmguo merged 3 commits into from
Nov 30, 2018
Merged

Feature/format frontend code #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c79784b
frontend: update tslint.json from angular standard project
wilhelmguo Nov 30, 2018
5702ee3
frontend: format all frontend code base on tslint
wilhelmguo Nov 30, 2018
917a63e
Merge branch 'master' into feature/format_frontend_code
BennieMeng Nov 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
48 changes: 25 additions & 23 deletions src/frontend/src/_requestAnimationFrame.polyfill.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,31 @@
* @link http://my.opera.com/emoller/blog/2011/12/20/requestanimationframe-for-smart-er-animating
* @license MIT
*/
(function() {
var lastTime = 0;
var vendors = ['ms', 'moz', 'o', 'webkit'];
for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame'];
window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame'] ||
window[vendors[x]+'CancelRequestAnimationFrame'];
}
(function () {
var lastTime = 0;
var vendors = ['ms', 'moz', 'o', 'webkit'];
for (var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
window.requestAnimationFrame = window[vendors[x] + 'RequestAnimationFrame'];
window.cancelAnimationFrame = window[vendors[x] + 'CancelAnimationFrame'] ||
window[vendors[x] + 'CancelRequestAnimationFrame'];
}

if (!window.requestAnimationFrame) {
window.requestAnimationFrame = (callback) => {
var currTime = new Date().getTime();
var timeToCall = Math.max(0, 16 - (currTime - lastTime));
var id = window.setTimeout(function() { callback(currTime + timeToCall); },
timeToCall);
lastTime = currTime + timeToCall;
return id;
};
}
if (!window.requestAnimationFrame) {
window.requestAnimationFrame = (callback) => {
var currTime = new Date().getTime();
var timeToCall = Math.max(0, 16 - (currTime - lastTime));
var id = window.setTimeout(function () {
callback(currTime + timeToCall);
},
timeToCall);
lastTime = currTime + timeToCall;
return id;
};
}

if (!window.cancelAnimationFrame) {
window.cancelAnimationFrame = function(id) {
clearTimeout(id);
};
}
if (!window.cancelAnimationFrame) {
window.cancelAnimationFrame = function (id) {
clearTimeout(id);
};
}
}());
108 changes: 54 additions & 54 deletions src/frontend/src/app/admin/admin-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
import {AdminComponent} from './admin.component';
import {DeploymentComponent} from './deployment/deployment.component';
import {AppComponent} from './app/app.component';
import {TrashAppComponent} from './app/trash-app/trash-app.component';
import {TrashDeploymentComponent} from './deployment/trash-deployment/trash-deployment.component';
import {DeploymentTplComponent} from './deploymenttpl/deploymenttpl.component';
import {TrashDeploymentTplComponent} from './deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component';
import {ClusterComponent} from './cluster/cluster.component';
import {TrashClusterComponent} from './cluster/trash-cluster/trash-cluster.component';
import {NamespaceComponent} from './namespace/namespace.component';
import {UserComponent} from './user/user.component';
import {GroupComponent} from './group/group.component';
import {PermissionComponent} from './permission/permission.component';
import {SecretComponent} from './secret/secret.component';
import {TrashSecretComponent} from './secret/trash-secret/trash-secret.component';
import {SecretTplComponent} from './secrettpl/secrettpl.component';
import {TrashSecretTplComponent} from './secrettpl/trash-secrettpl/trash-secrettpl.component';
import {TrashNamespaceComponent} from './namespace/trash-namespace/trash-namespace.component';
import {ConfigMapComponent} from './configmap/configmap.component';
import {TrashConfigMapComponent} from './configmap/trash-configmap/trash-configmap.component';
import {ConfigMapTplComponent} from './configmaptpl/configmaptpl.component';
import {TrashConfigMapTplComponent} from './configmaptpl/trash-configmaptpl/trash-configmaptpl.component';
import {CronjobComponent} from './cronjob/cronjob.component';
import {TrashCronjobComponent} from './cronjob/trash-cronjob/trash-cronjob.component';
import {CronjobTplComponent} from './cronjobtpl/cronjobtpl.component';
import {TrashCronjobTplComponent} from './cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component';
import {AdminAuthCheckGuard} from '../shared/auth/admin-auth-check-guard.service';
import {PersistentVolumeComponent} from './persistentvolume/persistentvolume.component';
import {PersistentVolumeClaimComponent} from './persistentvolumeclaim/persistentvolumeclaim.component';
import {TrashPersistentVolumeClaimComponent} from './persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component';
import {PersistentVolumeClaimTplComponent} from './persistentvolumeclaimtpl/persistentvolumeclaimtpl.component';
import {TrashPersistentVolumeClaimTplComponent} from './persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component';
import {AuditLogComponent} from './auditlog/auditlog.component';
import {CreateEditPersistentVolumeComponent} from './persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component';
import {ApiKeyComponent} from './apikey/apikey.component';
import {AppReportFormComponent} from './reportform/app/app-reportform.component';
import {OverviewComponent} from './reportform/overview/overview.component';
import {DeployComponent} from './reportform/deploy/deploy.component';
import {StatefulsetComponent} from './statefulset/statefulset.component';
import {TrashStatefulsetComponent} from './statefulset/trash-statefulset/trash-statefulset.component';
import {StatefulsettplComponent} from './statefulsettpl/statefulsettpl.component';
import {TrashStatefulsettplComponent} from './statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component';
import {DaemonsetComponent} from './daemonset/daemonset.component';
import {TrashDaemonsetComponent} from './daemonset/trash-daemonset/trash-daemonset.component';
import {DaemonsettplComponent} from './daemonsettpl/daemonsettpl.component';
import {TrashDaemonsettplComponent} from './daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component';
import {ConfigComponent} from './config/config.component';
import {ConfigSystemComponent} from './config/list-config-system/config-system.component';
import {KubernetesDashboardComponent} from './kubernetes-dashboard/kubernetes-dashboard.component';
import {NotificationComponent} from './notification/notification.component';
import {NodesComponent} from './node/nodes.component';
import {ADMINROUTES} from "../../../lib/admin/library-routing-admin";
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { AdminComponent } from './admin.component';
import { DeploymentComponent } from './deployment/deployment.component';
import { AppComponent } from './app/app.component';
import { TrashAppComponent } from './app/trash-app/trash-app.component';
import { TrashDeploymentComponent } from './deployment/trash-deployment/trash-deployment.component';
import { DeploymentTplComponent } from './deploymenttpl/deploymenttpl.component';
import { TrashDeploymentTplComponent } from './deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component';
import { ClusterComponent } from './cluster/cluster.component';
import { TrashClusterComponent } from './cluster/trash-cluster/trash-cluster.component';
import { NamespaceComponent } from './namespace/namespace.component';
import { UserComponent } from './user/user.component';
import { GroupComponent } from './group/group.component';
import { PermissionComponent } from './permission/permission.component';
import { SecretComponent } from './secret/secret.component';
import { TrashSecretComponent } from './secret/trash-secret/trash-secret.component';
import { SecretTplComponent } from './secrettpl/secrettpl.component';
import { TrashSecretTplComponent } from './secrettpl/trash-secrettpl/trash-secrettpl.component';
import { TrashNamespaceComponent } from './namespace/trash-namespace/trash-namespace.component';
import { ConfigMapComponent } from './configmap/configmap.component';
import { TrashConfigMapComponent } from './configmap/trash-configmap/trash-configmap.component';
import { ConfigMapTplComponent } from './configmaptpl/configmaptpl.component';
import { TrashConfigMapTplComponent } from './configmaptpl/trash-configmaptpl/trash-configmaptpl.component';
import { CronjobComponent } from './cronjob/cronjob.component';
import { TrashCronjobComponent } from './cronjob/trash-cronjob/trash-cronjob.component';
import { CronjobTplComponent } from './cronjobtpl/cronjobtpl.component';
import { TrashCronjobTplComponent } from './cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component';
import { AdminAuthCheckGuard } from '../shared/auth/admin-auth-check-guard.service';
import { PersistentVolumeComponent } from './persistentvolume/persistentvolume.component';
import { PersistentVolumeClaimComponent } from './persistentvolumeclaim/persistentvolumeclaim.component';
import { TrashPersistentVolumeClaimComponent } from './persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component';
import { PersistentVolumeClaimTplComponent } from './persistentvolumeclaimtpl/persistentvolumeclaimtpl.component';
import { TrashPersistentVolumeClaimTplComponent } from './persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component';
import { AuditLogComponent } from './auditlog/auditlog.component';
import { CreateEditPersistentVolumeComponent } from './persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component';
import { ApiKeyComponent } from './apikey/apikey.component';
import { AppReportFormComponent } from './reportform/app/app-reportform.component';
import { OverviewComponent } from './reportform/overview/overview.component';
import { DeployComponent } from './reportform/deploy/deploy.component';
import { StatefulsetComponent } from './statefulset/statefulset.component';
import { TrashStatefulsetComponent } from './statefulset/trash-statefulset/trash-statefulset.component';
import { StatefulsettplComponent } from './statefulsettpl/statefulsettpl.component';
import { TrashStatefulsettplComponent } from './statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component';
import { DaemonsetComponent } from './daemonset/daemonset.component';
import { TrashDaemonsetComponent } from './daemonset/trash-daemonset/trash-daemonset.component';
import { DaemonsettplComponent } from './daemonsettpl/daemonsettpl.component';
import { TrashDaemonsettplComponent } from './daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component';
import { ConfigComponent } from './config/config.component';
import { ConfigSystemComponent } from './config/list-config-system/config-system.component';
import { KubernetesDashboardComponent } from './kubernetes-dashboard/kubernetes-dashboard.component';
import { NotificationComponent } from './notification/notification.component';
import { NodesComponent } from './node/nodes.component';
import { ADMINROUTES } from '../../../lib/admin/library-routing-admin';


const routes: Routes = [
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/src/app/admin/admin.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<clr-main-container class="main-container">
<global-message></global-message>

<wayne-nav ></wayne-nav>
<wayne-nav></wayne-nav>
<div class="content-container">
<div class="content-area">
<wayne-breadcrumb></wayne-breadcrumb>
Expand All @@ -11,4 +11,4 @@
</div>
</clr-main-container>
<confiramtion-dialog style="display: flex"></confiramtion-dialog>
<wayne-ace-editor></wayne-ace-editor>
<wayne-ace-editor></wayne-ace-editor>
4 changes: 2 additions & 2 deletions src/frontend/src/app/admin/admin.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ describe('AdminComponent', () => {

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ AdminComponent ]
declarations: [AdminComponent]
})
.compileComponents();
.compileComponents();
}));

beforeEach(() => {
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/src/app/admin/admin.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, OnInit} from '@angular/core';
import {BreadcrumbService} from '../shared/client/v1/breadcrumb.service';
import { Component, OnInit } from '@angular/core';
import { BreadcrumbService } from '../shared/client/v1/breadcrumb.service';

@Component({
selector: 'wayne-admin',
Expand Down
72 changes: 36 additions & 36 deletions src/frontend/src/app/admin/admin.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
import {NgModule} from '@angular/core';
import {AdminRoutingModule} from './admin-routing.module';
import {AdminComponent} from './admin.component';
import {AppModule} from './app/app.module';
import {SharedModule} from '../shared/shared.module';
import {DeploymentModule} from './deployment/deployment.module';
import {DeploymentTplModule} from './deploymenttpl/deploymenttpl.module';
import {ClusterModule} from './cluster/cluster.module';
import {NamespaceModule} from './namespace/namespace.module';
import {UserModule} from './user/user.module';
import {GroupModule} from './group/group.module';
import {PermissionModule} from './permission/permission.module';
import {SecretModule} from './secret/secret.module';
import {SecrettplModule} from './secrettpl/secrettpl.module';
import {ConfigMapModule} from './configmap/configmap.module';
import {ConfigMapTplModule} from './configmaptpl/configmaptpl.module';
import {CronjobModule} from './cronjob/cronjob.module';
import {CronjobTplModule} from './cronjobtpl/cronjobtpl.module';
import {AuthService} from '../shared/auth/auth.service';
import {AdminAuthCheckGuard} from '../shared/auth/admin-auth-check-guard.service';
import {PersistentVolumeModule} from './persistentvolume/persistentvolume.module';
import {PersistentVolumeClaimModule} from './persistentvolumeclaim/persistentvolumeclaim.module';
import {PersistentVolumeClaimTplModule} from './persistentvolumeclaimtpl/persistentvolumeclaimtpl.module';
import {AuditLogModule} from './auditlog/auditlog.module';
import {ApiKeyModule} from './apikey/apikey.module';
import {ReportFormModule} from './reportform/reportform.module';
import {DaemonsetModule} from './daemonset/daemonset.module';
import {DaemonsettplModule} from './daemonsettpl/daemonsettpl.module';
import {StatefulsetModule} from './statefulset/statefulset.module';
import {StatefulsettplModule} from './statefulsettpl/statefulsettpl.module';
import {ConfigModule} from './config/config.module';
import {KubernetesDashboardModule} from './kubernetes-dashboard/kubernetes-dashboard.module';
import {NavModule} from './nav/nav.module';
import {NotificationModule} from './notification/notification.module';
import {NodesModule} from './node/nodes.module';
import {LibraryAdminModule} from "../../../lib/admin/library-admin.module";
import { NgModule } from '@angular/core';
import { AdminRoutingModule } from './admin-routing.module';
import { AdminComponent } from './admin.component';
import { AppModule } from './app/app.module';
import { SharedModule } from '../shared/shared.module';
import { DeploymentModule } from './deployment/deployment.module';
import { DeploymentTplModule } from './deploymenttpl/deploymenttpl.module';
import { ClusterModule } from './cluster/cluster.module';
import { NamespaceModule } from './namespace/namespace.module';
import { UserModule } from './user/user.module';
import { GroupModule } from './group/group.module';
import { PermissionModule } from './permission/permission.module';
import { SecretModule } from './secret/secret.module';
import { SecrettplModule } from './secrettpl/secrettpl.module';
import { ConfigMapModule } from './configmap/configmap.module';
import { ConfigMapTplModule } from './configmaptpl/configmaptpl.module';
import { CronjobModule } from './cronjob/cronjob.module';
import { CronjobTplModule } from './cronjobtpl/cronjobtpl.module';
import { AuthService } from '../shared/auth/auth.service';
import { AdminAuthCheckGuard } from '../shared/auth/admin-auth-check-guard.service';
import { PersistentVolumeModule } from './persistentvolume/persistentvolume.module';
import { PersistentVolumeClaimModule } from './persistentvolumeclaim/persistentvolumeclaim.module';
import { PersistentVolumeClaimTplModule } from './persistentvolumeclaimtpl/persistentvolumeclaimtpl.module';
import { AuditLogModule } from './auditlog/auditlog.module';
import { ApiKeyModule } from './apikey/apikey.module';
import { ReportFormModule } from './reportform/reportform.module';
import { DaemonsetModule } from './daemonset/daemonset.module';
import { DaemonsettplModule } from './daemonsettpl/daemonsettpl.module';
import { StatefulsetModule } from './statefulset/statefulset.module';
import { StatefulsettplModule } from './statefulsettpl/statefulsettpl.module';
import { ConfigModule } from './config/config.module';
import { KubernetesDashboardModule } from './kubernetes-dashboard/kubernetes-dashboard.module';
import { NavModule } from './nav/nav.module';
import { NotificationModule } from './notification/notification.module';
import { NodesModule } from './node/nodes.module';
import { LibraryAdminModule } from '../../../lib/admin/library-admin.module';

@NgModule({
imports: [
Expand Down
30 changes: 15 additions & 15 deletions src/frontend/src/app/admin/apikey/apikey.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import {Component, OnInit, ViewChild} from '@angular/core';
import {State} from '@clr/angular';
import {ConfirmationDialogService} from '../../shared/confirmation-dialog/confirmation-dialog.service';
import {ConfirmationMessage} from '../../shared/confirmation-dialog/confirmation-message';
import {ConfirmationButtons, ConfirmationState, ConfirmationTargets} from '../../shared/shared.const';
import {Subscription} from 'rxjs/Subscription';
import {MessageHandlerService} from '../../shared/message-handler/message-handler.service';
import {CacheService} from '../../shared/auth/cache.service';
import {AuthService} from '../../shared/auth/auth.service';
import {PageState} from '../../shared/page/page-state';
import {ListApiKeyComponent} from './list-apikey/list-apikey.component';
import {CreateEditApiKeyComponent} from './create-edit-apikey/create-edit-apikey.component';
import {ApiKey} from '../../shared/model/v1/apikey';
import {ApiKeyService} from '../../shared/client/v1/apikey.service';
import { Component, OnInit, ViewChild } from '@angular/core';
import { State } from '@clr/angular';
import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service';
import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message';
import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const';
import { Subscription } from 'rxjs/Subscription';
import { MessageHandlerService } from '../../shared/message-handler/message-handler.service';
import { CacheService } from '../../shared/auth/cache.service';
import { AuthService } from '../../shared/auth/auth.service';
import { PageState } from '../../shared/page/page-state';
import { ListApiKeyComponent } from './list-apikey/list-apikey.component';
import { CreateEditApiKeyComponent } from './create-edit-apikey/create-edit-apikey.component';
import { ApiKey } from '../../shared/model/v1/apikey';
import { ApiKeyService } from '../../shared/client/v1/apikey.service';

@Component({
selector: 'wayne-apikey',
Expand Down Expand Up @@ -83,7 +83,7 @@ export class ApiKeyComponent implements OnInit {

createApiKey(created: boolean) {
if (created) {
this.retrieve()
this.retrieve();
}
}

Expand Down
14 changes: 7 additions & 7 deletions src/frontend/src/app/admin/apikey/apikey.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {NgModule} from '@angular/core';
import {SharedModule} from '../../shared/shared.module';
import {ApiKeyService} from '../../shared/client/v1/apikey.service';
import {CreateEditApiKeyComponent} from './create-edit-apikey/create-edit-apikey.component';
import {ListApiKeyComponent} from './list-apikey/list-apikey.component';
import {ApiKeyComponent} from './apikey.component';
import {TokenDetailComponent} from './token-detail/token-detail';
import { NgModule } from '@angular/core';
import { SharedModule } from '../../shared/shared.module';
import { ApiKeyService } from '../../shared/client/v1/apikey.service';
import { CreateEditApiKeyComponent } from './create-edit-apikey/create-edit-apikey.component';
import { ListApiKeyComponent } from './list-apikey/list-apikey.component';
import { ApiKeyComponent } from './apikey.component';
import { TokenDetailComponent } from './token-detail/token-detail';

@NgModule({
imports: [
Expand Down
Loading