- 
+ 
- {{ appName }}
+ {{ appConfig?.websiteInfo?.name }}
+
diff --git a/projects/client/src/app/components/app-layout/app-layout.component.ts b/projects/client/src/app/components/app-layout/app-layout.component.ts
index f946ae7..1f5b35a 100644
--- a/projects/client/src/app/components/app-layout/app-layout.component.ts
+++ b/projects/client/src/app/components/app-layout/app-layout.component.ts
@@ -1,60 +1,64 @@
-import { Component, OnInit } from "@angular/core";
-import { NavigationEnd, Router, RouterModule } from "@angular/router";
-import { NzMessageService } from "ng-zorro-antd/message";
+import { Component, OnInit } from '@angular/core'
+import { NavigationEnd, Router, RouterModule } from '@angular/router'
+import { NzMessageService } from 'ng-zorro-antd/message'
-import { NzModalService } from "ng-zorro-antd/modal";
-import { Subject, filter, lastValueFrom, takeUntil } from "rxjs";
-import { ApiService } from "@cdk/services";
-import { appName } from "@cdk/app-settings";
+import { NzModalService } from 'ng-zorro-antd/modal'
+import { Subject, filter, lastValueFrom, takeUntil } from 'rxjs'
+import { ApiService } from '@cdk/services'
+
+import { WebSiteConfig } from '@cdk/types'
+import { ConfigService } from '@client/app/services/config.service'
@Component({
- selector: "app-layout",
- templateUrl: "./app-layout.component.html",
- styleUrls: ["./app-layout.component.less"],
+ selector: 'app-layout',
+ templateUrl: './app-layout.component.html',
+ styleUrls: ['./app-layout.component.less'],
})
export class AppLayoutComponent implements OnInit {
constructor(
private router: Router,
private modal: NzModalService,
private msg: NzMessageService,
- private api: ApiService
+ private api: ApiService,
+ private configService: ConfigService,
) {
this.router.events
.pipe(
takeUntil(this.unSubscribe$),
- filter((e): e is NavigationEnd => e instanceof NavigationEnd)
+ filter((e): e is NavigationEnd => e instanceof NavigationEnd),
)
.subscribe((e) => {
- this.currentUrl = e.url;
- this.fullPage = ["/ingredient/preview", "/data-vis"].some((s) => e.url.startsWith(s));
- });
+ this.currentUrl = e.url
+ this.fullPage = ['/ingredient/preview', '/data-vis'].some((s) => e.url.startsWith(s))
+ })
}
- fullPage = false;
- account = this.api.account;
-
- appName = appName;
+ fullPage = false
+ account = this.api.account
- unSubscribe$ = new Subject();
+ unSubscribe$ = new Subject()
- currentUrl: string = "";
+ currentUrl: string = ''
+ appConfig: WebSiteConfig | null = null
- ngOnInit(): void {}
+ ngOnInit(): void {
+ this.appConfig = this.configService.getConfig()
+ }
openDataVis() {
- window.open("/data-vis");
+ window.open('/data-vis')
}
logout() {
this.modal.confirm({
- nzTitle: "警告",
- nzContent: "是否要退出登录？",
+ nzTitle: '警告',
+ nzContent: '是否要退出登录？',
nzOnOk: async () => {
- const res = await lastValueFrom(this.api.logout());
- this.msg.success(res.desc);
- localStorage.removeItem(this.api.accountKey);
- this.router.navigate(["/login"]);
+ const res = await lastValueFrom(this.api.logout())
+ this.msg.success(res.desc)
+ localStorage.removeItem(this.api.accountKey)
+ this.router.navigate(['/login'])
},
- });
+ })
}
}
diff --git a/projects/client/src/app/pages/login/login.component.html b/projects/client/src/app/pages/login/login.component.html
index 4a3b902..df27bbf 100644
--- a/projects/client/src/app/pages/login/login.component.html
+++ b/projects/client/src/app/pages/login/login.component.html
@@ -8,58 +8,32 @@
-->
- 
+ 
+
-
{{ appName }}
+{{ appConfig?.websiteInfo?.name }}
登录
-
-
-