Skip to content

Commit 6bc50d1

Browse files
zhyalezhyale
committed
change style
1 parent b6a7da5 commit 6bc50d1

File tree

12 files changed

+95
-48
lines changed

12 files changed

+95
-48
lines changed

‎angular.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@
111111
},
112112
"i18n": {
113113
"sourceLocale": "en-US",
114-
"locales": {
115-
"zh": "src/locale/messages.zh.xlf"
116-
}
114+
"locales": { }
117115
}
118116
},
119117
"janusec-admin-e2e": {

‎src/app/app.component.css‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,17 @@
66
display: flex;
77
align-items: top;
88
justify-content: center;
9-
width: 60px;
10-
background: rgba(233, 226, 226, 0.1);
9+
width: 190px;
1110
}
1211

1312
mat-icon {
14-
font-size: 24px;
13+
font-size: 12px;
14+
}
15+
16+
.mat-sidenav {
17+
background-color: #E5E5E5;
18+
}
19+
.mat-list-item {
20+
font-size: 12px;
21+
font-family: 'Arial Narrow', Arial, sans-serif;
1522
}

‎src/app/app.component.html‎

Lines changed: 47 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,68 @@
44
<mat-sidenav-container class="sidenav-container">
55
<mat-sidenav *ngIf="applicationService.auth_user.logged"
66
#sidenav mode="side" opened="true" class="sidenav" role="navigation">
7-
<mat-nav-list>
7+
<mat-nav-list>
8+
<mat-list-item>
9+
<a routerLink="/dashboard">
10+
<mat-icon>dashboard</mat-icon>
11+
<span i18n="@@dashboard">Dashboard</span>
12+
</a>
13+
</mat-list-item>
814

9-
<mat-list-item i18n-matTooltip="@@cert_mgmt" matTooltip="Certificate Management" [matTooltipPosition]="position">
10-
<a routerLink="/certificates"><mat-icon>lock_outline</mat-icon></a>
15+
<mat-list-item>
16+
<a routerLink="/certificates">
17+
<mat-icon>lock_outline</mat-icon>
18+
<span i18n="@@cert_mgmt">Certificate Management</span>
19+
</a>
1120
</mat-list-item>
1221

13-
<mat-list-item i18n-matTooltip="@@app_mgmt" matTooltip="Application Management" [matTooltipPosition]="position">
14-
<a routerLink="/applications"><mat-icon>format_color_text</mat-icon></a>
22+
<mat-list-item>
23+
<a routerLink="/applications">
24+
<mat-icon>format_color_text</mat-icon>
25+
<span i18n="@@app_mgmt">Application Management</span>
26+
</a>
1527
</mat-list-item>
1628

17-
<mat-list-item i18n-matTooltip="@@node_mgmt" matTooltip="Node Management" [matTooltipPosition]="position">
18-
<a routerLink="/nodes"><mat-icon>games</mat-icon></a>
19-
</mat-list-item>
20-
21-
<mat-list-item i18n-matTooltip="@@user_mgmt" matTooltip="User Management" [matTooltipPosition]="position">
22-
<a routerLink="/usermgmt"><mat-icon>supervisor_account</mat-icon></a>
29+
<mat-list-item>
30+
<a routerLink="/nodes">
31+
<mat-icon>games</mat-icon>
32+
<span i18n="@@node_mgmt">Node Management</span>
33+
</a>
2334
</mat-list-item>
2435

25-
<mat-divider></mat-divider>
26-
27-
<mat-list-item i18n-matTooltip="@@dashboard" matTooltip="Dashboard" [matTooltipPosition]="position">
28-
<a routerLink="/dashboard"><mat-icon>dashboard</mat-icon></a>
36+
<mat-list-item>
37+
<a routerLink="/usermgmt">
38+
<mat-icon>supervisor_account</mat-icon>
39+
<span i18n="@@user_mgmt">User Management</span>
40+
</a>
2941
</mat-list-item>
3042

31-
<mat-list-item i18n-matTooltip="@@waf_mgmt" matTooltip="WAF Management" [matTooltipPosition]="position">
32-
<a routerLink="/waf"><mat-icon>security</mat-icon></a>
43+
<mat-list-item>
44+
<a routerLink="/waf">
45+
<mat-icon>security</mat-icon>
46+
<span i18n="@@waf_mgmt">WAF Management</span>
47+
</a>
3348
</mat-list-item>
3449

35-
<mat-list-item i18n-matTooltip="@@waf_logs" matTooltip="WAF Logs" [matTooltipPosition]="position">
36-
<a routerLink="/logs"><mat-icon>assignment</mat-icon></a>
50+
<mat-list-item>
51+
<a routerLink="/logs">
52+
<mat-icon>assignment</mat-icon>
53+
<span i18n="@@waf_logs">WAF Logs</span>
54+
</a>
3755
</mat-list-item>
3856

39-
<mat-list-item i18n-matTooltip="@@cc_logs" matTooltip="CC Logs" [matTooltipPosition]="position">
40-
<a routerLink="/cclogs"><mat-icon>assignment</mat-icon></a>
57+
<mat-list-item>
58+
<a routerLink="/cclogs">
59+
<mat-icon>assignment</mat-icon>
60+
<span i18n="@@cc_logs">CC Logs</span>
61+
</a>
4162
</mat-list-item>
4263

43-
<mat-list-item matTooltip="SSH" [matTooltipPosition]="position">
44-
<a routerLink="/ssh"><mat-icon>computer</mat-icon></a>
64+
<mat-list-item>
65+
<a routerLink="/ssh">
66+
<mat-icon>computer</mat-icon>
67+
<span>Web SSH</span>
68+
</a>
4569
</mat-list-item>
4670

4771
</mat-nav-list>

‎src/app/app.module.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { BrowserModule } from '@angular/platform-browser';
22
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
33
import { NgModule } from '@angular/core';
44
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
5-
//import { HttpModule } from '@angular/http';
65
import { HttpClientModule } from '@angular/common/http';
76
import { AppRoutingModule } from './/app-routing/app-routing.module';
87
import { AppComponent } from './app.component';
@@ -63,9 +62,7 @@ import { MatStepperModule } from '@angular/material/stepper';
6362
import { MatNativeDateModule, MatRippleModule } from '@angular/material/core';
6463
import { WebsshComponent } from './webssh/webssh.component';
6564
import { HashLocationStrategy, LocationStrategy} from '@angular/common';
66-
//import { registerLocaleData } from '@angular/common';
67-
//import localeZh from '@angular/common/locales/zh';
68-
//registerLocaleData(localeZh, 'zh-Hans');
65+
import { FlexLayoutModule } from '@angular/flex-layout';
6966

7067
@NgModule({
7168
exports:[
@@ -137,7 +134,7 @@ export class MaterialModule{}
137134
MaterialModule,
138135
BrowserModule,
139136
BrowserAnimationsModule,
140-
//HttpModule,
137+
FlexLayoutModule,
141138
FormsModule,
142139
HttpClientModule,
143140
AppRoutingModule

‎src/app/footer/footer.component.css‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.footer {
2+
font-size: 14px;
3+
font-family: 'Arial Narrow', Arial, sans-serif;
4+
text-align: center;
5+
}
6+
7+
.mat-toolbar-row {
8+
background-color: #D5D5D5;
9+
height: 40px;
10+
}

‎src/app/footer/footer.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<mat-toolbar color="secondary">
1+
<mat-toolbar>
22
<mat-toolbar-row>
3-
<div>
4-
&copy;Janusec all rights reserved
3+
<div class="footer">
4+
All Rights Reserved by &copy;JANUSEC
55
</div>
66
</mat-toolbar-row>
77
</mat-toolbar>

‎src/app/frontpage/frontpage.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <h2 i18n="@@product_name">Janusec Application Gateway 0.9.7</h2>
4242
</mat-card>
4343
<mat-card>
4444
<mat-card-header>
45-
<mat-card-title>
45+
<mat-card-title i18n="@@support">
4646
Support
4747
</mat-card-title>
4848
</mat-card-header>

‎src/app/login-form/login-form.component.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.submit {
2+
background-color: #F5F5F5;
3+
}

‎src/app/login-form/login-form.component.html‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
<div>
2-
<div *ngIf="applicationService.auth_user.logged==false" class="container">
3-
<h1 i18n="@@login_title">Login</h1>
1+
<div fxLayout="row wrap">
2+
<div fxFlex="30%"></div>
3+
<div fxFlex="40%" *ngIf="applicationService.auth_user.logged==false" class="container">
4+
<h1 i18n="@@login_title">Admin Login</h1>
45
<mat-form-field>
56
<input matInput i18n-placeholder="@@username" placeholder="Username" [(ngModel)]="username" required>
67
</mat-form-field>
@@ -9,9 +10,10 @@ <h1 i18n="@@login_title">Login</h1>
910
<input matInput i18n-placeholder="@@password" type="password" placeholder="Password" [(ngModel)]="password" required>
1011
</mat-form-field>
1112

12-
<button i18n="@@submit" mat-button (click)="onSubmit($event)">Submit</button>
13+
<button i18n="@@submit" mat-button (click)="onSubmit($event)" class="submit">Submit</button>
1314
</div>
1415
<div *ngIf="oauth.use_oauth==true" class="container">
1516
<a href="{{ oauth.entrance_url }}">{{ oauth.display_name }}</a>
1617
</div>
18+
<div fxFlex="30%"></div>
1719
</div>

‎src/app/navbar/navbar.component.css‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
flex: 1 1 auto;
77
}
88

9-
.navbar {
10-
height: 50px;
9+
.mat-toolbar {
10+
height: 40px;
11+
padding-left: 1px;
12+
}
13+
14+
.logo {
15+
height: 36px;
1116
}

0 commit comments

Comments
 (0)