feat: update

i18n/cn.json

 {
   "reset": "重置",
   "submit": "提交",
-  "email subject prefix": "邮件",
+  "email subject prefix": "邮件主题前缀",
+  "basic setting": "基本设置",
+  "email setting": "邮件设置",
+  "ldap setting": "LDAP设置",
+  "terminal setting": "终端设置",
+  "current site url": "当前站点URL",
+  "user guide url": "用户向导URL",
+  "user first login update profile done redirect to it": "用户第一次登录，修改profile后重定向到地址",
   "server": "服务器",
   "view": "视图",
   "help": "帮助",
@@ -10,5 +17,27 @@
   "disconnect all": "断开所有链接",
   "disconnect": "断开链接",
   "website": "我们的网站",
-  "search": "搜索"
+  "search": "搜索",
+  "settings": "系统设置",
+  "job center": "作业中心",
+  "sessions": "会话管理",
+  "perms": "权限管理",
+  "assets": "资产管理",
+  "users": "用户管理",
+  "dashboard": "仪表盘",
+  "task": "任务",
+  "session online": "在线会话",
+  "session offline": "离线会话",
+  "commands": "命令记录",
+  "terminal": "终端管理",
+  "asset perminssion": "资产授权",
+  "asset": "资产",
+  "asset group": "资产组",
+  "cluster": "集群",
+  "admin user": "管理用户",
+  "system user": "系统用户",
+  "labels": "标签管理",
+  "user": "用户",
+  "user group": "用户组",
+  "login logs": "登陆日志"
 }

src/app/app.module.ts

@@ -58,7 +58,6 @@ import {ElementTableComponent} from './elements/table/table.component';
 import {SettingPageComponent} from './setting-page/setting-page.component';
 import {ElementLeftbarComponent} from './elements/leftbar/leftbar.component';
 import {ElementOfooterComponent} from './elements/ofooter/ofooter.component';
-import {SettingPageNavComponent} from './setting-page/nav/nav.component';
 import {SettingPageBasicComponent} from './setting-page/basic/basic.component';
 import {SettingPageEmailComponent} from './setting-page/email/email.component';
 import {SettingPageLdapComponent} from './setting-page/ldap/ldap.component';
@@ -115,7 +114,6 @@ import {TransPipe} from './trans.pipe';
     TestPageComponent,
     BlankPageComponent,
     SettingPageComponent,
-    SettingPageNavComponent,
     SettingPageBasicComponent,
     SettingPageEmailComponent,
     SettingPageLdapComponent,

src/app/elements/leftbar/leftbar.component.html

@@ -7,10 +7,6 @@
         <a href="http://www.jumpserver.org" target="_blank">
           <img alt="image" height="55" src="/static/imgs/logo-text.png" style="margin-left: 10px">
         </a>
-        <div class="clearfix"></div>
-        <div class="logo-element">
-          <img alt="image" height="40" src="/static/imgs/logo.png">
-        </div>
       </div>
       <div class="body">
         <ul class="nav metismenu nav-frist-level">

src/app/setting-page/basic/basic.component.html

-<mat-form-field hintLabel="http://jumpserver.abc.com:8080">
-  <input matInput #input maxlength="10" placeholder="Current SITE URL">
-</mat-form-field>
-<mat-form-field hintLabel="User first login update profile done redirect to it">
-  <input matInput #input maxlength="10" placeholder="User Guide URL">
-</mat-form-field>
-<mat-form-field hintLabel="">
-  <input matInput #input maxlength="10" placeholder="Email Subject Prefix">
-</mat-form-field>
-<button mat-button>{{ 'Reset' | trans }}</button>
-<button mat-button>{{ 'Submit' | trans }}</button>
-
+<div class="basic-form">
+  <br/>
+  <mat-form-field hintLabel="http://jumpserver.abc.com:8080">
+    <input matInput #input maxlength="10" placeholder="{{'Current SITE URL'|trans}}">
+  </mat-form-field>
+  <br/>
+  <mat-form-field hintLabel="{{'User first login update profile done redirect to it'|trans}}">
+    <input matInput #input maxlength="10" placeholder="{{'User Guide URL'|trans}}">
+  </mat-form-field>
+  <br/>
+  <mat-form-field hintLabel="">
+    <input matInput #input maxlength="10" placeholder="{{'Email Subject Prefix'|trans}}">
+  </mat-form-field>
+  <br/>
+  <div class="button-row">
+    <button mat-raised-button>{{ 'Reset' | trans }}</button>
+    <button mat-raised-button color="primary">{{ 'Submit' | trans }}</button>
+  </div>
+  <br/>
+</div>

src/app/setting-page/basic/basic.component.scss

+.basic-form {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  max-width: 400px;
+  margin: auto;
+  font-size: 14pt;
+}
+
+.basic-form > * {
+  width: 100%;
+}

src/app/setting-page/nav/nav.component.html

-<div class="panel-options">
-  <ul class="nav nav-tabs">
-    <li>
-      <a href=" " class="text-center"><i
-        class="fa fa-cubes"></i> trans 'Basic setting'</a>
-    </li>
-    <li>
-      <a href=" " class="text-center"><i
-        class="fa fa-envelope"></i> trans 'Email setting' </a>
-    </li>
-    <li>
-      <a href=" " class="text-center"><i
-        class="fa fa-archive"></i> trans 'LDAP setting' </a>
-    </li>
-    <li class="active">
-      <a href=" " class="text-center"><i
-        class="fa fa-hdd-o"></i> trans 'Terminal setting' </a>
-    </li>
-  </ul>
-</div>

src/app/setting-page/nav/nav.component.spec.ts

-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SettingPageNavComponent } from './nav.component';
-
-describe('SettingPageNavComponent', () => {
-  let component: SettingPageNavComponent;
-  let fixture: ComponentFixture<SettingPageNavComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ SettingPageNavComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SettingPageNavComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/setting-page/nav/nav.component.ts

-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-sp-nav',
-  templateUrl: './nav.component.html',
-  styleUrls: ['./nav.component.scss']
-})
-export class SettingPageNavComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}

src/app/setting-page/setting-page.component.html

 <div class="pace-done">
   <app-element-leftbar></app-element-leftbar>
-
-  <!--<app-sp-basic></app-sp-basic>-->
+  <mat-card class="content">
+    <mat-tab-group>
+      <mat-tab label="{{'Basic setting'|trans}}">
+        <app-sp-basic></app-sp-basic>
+      </mat-tab>
+      <mat-tab label="{{'Email setting'|trans}}">
+        <app-sp-email></app-sp-email>
+      </mat-tab>
+      <mat-tab label="{{'LDAP setting'|trans}}">
+        <app-sp-ldap></app-sp-ldap>
+      </mat-tab>
+      <mat-tab label="{{'Terminal setting'|trans}}">
+        <app-sp-terminal></app-sp-terminal>
+      </mat-tab>
+    </mat-tab-group>
+  </mat-card>
   <app-element-ofooter></app-element-ofooter>
 </div>

src/app/setting-page/setting-page.component.scss

@@ -3,3 +3,8 @@
   height: 100%;
   padding: 0;
 }
+
+.content {
+  margin-left: 220px;
+  height: 100%;
+}