-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- {{ 'menu.account.center' | i18n }} -
- {{ 'menu.account.settings' | i18n }} -
-
- {{ 'menu.lang' | i18n }}
-
-
-
- -
-
- - {{ item.abbr }} - {{ item.text }} - -
-
-
-
-
-
- {{ 'menu.account.center' | i18n }}
-
-
-
- {{ 'menu.account.settings' | i18n }}
-
-
-
- {{ 'menu.account.trigger' | i18n }}
-
-
-
-
- {{ 'menu.account.logout' | i18n }}
-
-
-
diff --git a/IoTGateway/ClientApp/src/app/layout/passport/passport.component.less b/IoTGateway/ClientApp/src/app/layout/passport/passport.component.less
deleted file mode 100644
index 28633ed3..00000000
--- a/IoTGateway/ClientApp/src/app/layout/passport/passport.component.less
+++ /dev/null
@@ -1,112 +0,0 @@
-@import '@delon/theme/index';
-
-:host ::ng-deep {
- .container {
- display: flex;
- flex-direction: column;
- min-height: 100%;
- background: #f0f2f5;
- }
-
- .langs {
- width: 100%;
- height: 40px;
- line-height: 44px;
- text-align: right;
-
- .anticon {
- margin-top: 24px;
- margin-right: 24px;
- font-size: 14px;
- vertical-align: top;
- cursor: pointer;
- }
- }
-
- .wrap {
- flex: 1;
- padding: 32px 0;
- }
-
- .ant-form-item {
- display: flex;
- justify-content: space-between;
- margin-bottom: 24px;
- }
-
- @media (min-width: @screen-md-min) {
- .container {
- background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg');
- background-repeat: no-repeat;
- background-position: center 110px;
- background-size: 100%;
- }
-
- .wrap {
- padding: 32px 0 24px;
- }
- }
-
- .top {
- text-align: center;
- }
-
- .header {
- height: 44px;
- line-height: 44px;
-
- a {
- text-decoration: none;
- }
- }
-
- .logo {
- height: 44px;
- margin-right: 16px;
- }
-
- .title {
- position: relative;
- color: @heading-color;
- font-weight: 600;
- font-size: 33px;
- font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
- vertical-align: middle;
- }
-
- .desc {
- margin-top: 12px;
- margin-bottom: 40px;
- color: @text-color-secondary;
- font-size: @font-size-base;
- }
-}
-
-[data-theme='dark'] {
- :host ::ng-deep {
- .container {
- background: #141414;
- }
-
- .title {
- color: fade(@white, 85%);
- }
-
- .desc {
- color: fade(@white, 45%);
- }
- @media (min-width: @screen-md-min) {
- .container {
- background-image: none;
- }
- }
- }
-}
-
-[data-theme='compact'] {
- :host ::ng-deep {
- .ant-form-item {
- margin-bottom: 16px;
- }
- }
-}
diff --git a/IoTGateway/ClientApp/src/app/layout/passport/passport.component.ts b/IoTGateway/ClientApp/src/app/layout/passport/passport.component.ts
deleted file mode 100644
index 5c6e216c..00000000
--- a/IoTGateway/ClientApp/src/app/layout/passport/passport.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
-
-@Component({
- selector: 'layout-passport',
- templateUrl: './passport.component.html',
- styleUrls: ['./passport.component.less']
-})
-export class LayoutPassportComponent implements OnInit {
- constructor(@Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService) {}
-
- ngOnInit(): void {
- this.tokenService.clear();
- }
-}
diff --git a/IoTGateway/ClientApp/src/app/routes/dashboard/dashboard.component.html b/IoTGateway/ClientApp/src/app/routes/dashboard/dashboard.component.html
deleted file mode 100644
index 5c90057f..00000000
--- a/IoTGateway/ClientApp/src/app/routes/dashboard/dashboard.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/IoTGateway/ClientApp/src/app/routes/dashboard/dashboard.component.ts b/IoTGateway/ClientApp/src/app/routes/dashboard/dashboard.component.ts
deleted file mode 100644
index 5a6028d6..00000000
--- a/IoTGateway/ClientApp/src/app/routes/dashboard/dashboard.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-
-@Component({
- selector: 'app-dashboard',
- templateUrl: './dashboard.component.html',
- changeDetection: ChangeDetectionStrategy.OnPush
-})
-export class DashboardComponent {}
diff --git a/IoTGateway/ClientApp/src/app/routes/exception/exception-routing.module.ts b/IoTGateway/ClientApp/src/app/routes/exception/exception-routing.module.ts
deleted file mode 100644
index 47e8cc73..00000000
--- a/IoTGateway/ClientApp/src/app/routes/exception/exception-routing.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-
-import { ExceptionComponent } from './exception.component';
-import { ExceptionTriggerComponent } from './trigger.component';
-
-const routes: Routes = [
- { path: '403', component: ExceptionComponent, data: { type: 403 } },
- { path: '404', component: ExceptionComponent, data: { type: 404 } },
- { path: '500', component: ExceptionComponent, data: { type: 500 } },
- { path: 'trigger', component: ExceptionTriggerComponent }
-];
-
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule]
-})
-export class ExceptionRoutingModule {}
diff --git a/IoTGateway/ClientApp/src/app/routes/exception/exception.component.ts b/IoTGateway/ClientApp/src/app/routes/exception/exception.component.ts
deleted file mode 100644
index aa719a59..00000000
--- a/IoTGateway/ClientApp/src/app/routes/exception/exception.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { ExceptionType } from '@delon/abc/exception';
-
-@Component({
- selector: 'app-exception',
- template: ` dashboard content
-
-
-
-
-
-
- `
-})
-export class ExceptionTriggerComponent {
- types = [401, 403, 404, 500];
-
- constructor(private http: _HttpClient, @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService) {}
-
- go(type: number): void {
- this.http.get(`/api/${type}`).subscribe();
- }
-
- refresh(): void {
- this.tokenService.set({ token: 'invalid-token' });
- // 必须提供一个后端地址，无法通过 Mock 来模拟
- this.http.post(`https://localhost:5001/auth`).subscribe(
- res => console.warn('成功', res),
- err => {
- console.log('最后结果失败', err);
- }
- );
- }
-}
diff --git a/IoTGateway/ClientApp/src/app/routes/passport/callback.component.ts b/IoTGateway/ClientApp/src/app/routes/passport/callback.component.ts
deleted file mode 100644
index d82d708f..00000000
--- a/IoTGateway/ClientApp/src/app/routes/passport/callback.component.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { SocialService } from '@delon/auth';
-import { SettingsService } from '@delon/theme';
-
-@Component({
- selector: 'app-callback',
- template: ``,
- providers: [SocialService]
-})
-export class CallbackComponent implements OnInit {
- type = '';
-
- constructor(private socialService: SocialService, private settingsSrv: SettingsService, private route: ActivatedRoute) {}
-
- ngOnInit(): void {
- this.type = this.route.snapshot.params['type'];
- this.mockModel();
- }
-
- private mockModel(): void {
- const info = {
- token: '123456789',
- name: 'iotgateway',
- email: `${this.type}@${this.type}.com`,
- id: 10000,
- time: +new Date()
- };
- this.settingsSrv.setUser({
- ...this.settingsSrv.user,
- ...info
- });
- this.socialService.callback(info);
- }
-}
diff --git a/IoTGateway/ClientApp/src/app/routes/passport/lock/lock.component.html b/IoTGateway/ClientApp/src/app/routes/passport/lock/lock.component.html
deleted file mode 100644
index 6e889794..00000000
--- a/IoTGateway/ClientApp/src/app/routes/passport/lock/lock.component.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
diff --git a/IoTGateway/ClientApp/src/app/routes/passport/lock/lock.component.less b/IoTGateway/ClientApp/src/app/routes/passport/lock/lock.component.less
deleted file mode 100644
index 24787e2b..00000000
--- a/IoTGateway/ClientApp/src/app/routes/passport/lock/lock.component.less
+++ /dev/null
@@ -1,13 +0,0 @@
-:host ::ng-deep {
- .ant-card-body {
- position: relative;
- margin-top: 80px;
- }
-
- .avatar {
- position: absolute;
- top: -20px;
- left: 50%;
- margin-left: -20px;
- }
-}
diff --git a/IoTGateway/ClientApp/src/app/routes/passport/lock/lock.component.ts b/IoTGateway/ClientApp/src/app/routes/passport/lock/lock.component.ts
deleted file mode 100644
index aac5496b..00000000
--- a/IoTGateway/ClientApp/src/app/routes/passport/lock/lock.component.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Component, Inject } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Router } from '@angular/router';
-import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
-import { SettingsService, User } from '@delon/theme';
-
-@Component({
- selector: 'passport-lock',
- templateUrl: './lock.component.html',
- styleUrls: ['./lock.component.less']
-})
-export class UserLockComponent {
- f: FormGroup;
-
- get user(): User {
- return this.settings.user;
- }
-
- constructor(
- fb: FormBuilder,
- @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService,
- private settings: SettingsService,
- private router: Router
- ) {
- this.f = fb.group({
- password: [null, Validators.required]
- });
- }
-
- submit(): void {
- for (const i in this.f.controls) {
- this.f.controls[i].markAsDirty();
- this.f.controls[i].updateValueAndValidity();
- }
- if (this.f.valid) {
- console.log('Valid!');
- console.log(this.f.value);
- this.tokenService.set({
- token: '123'
- });
- this.router.navigate(['dashboard']);
- }
- }
-}
diff --git a/IoTGateway/ClientApp/src/app/routes/passport/login/login.component.html b/IoTGateway/ClientApp/src/app/routes/passport/login/login.component.html
deleted file mode 100644
index c9ae7975..00000000
--- a/IoTGateway/ClientApp/src/app/routes/passport/login/login.component.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
- {{ 'app.login.sign-in-with' | i18n }}
-
-
diff --git a/IoTGateway/ClientApp/src/app/routes/passport/login/login.component.less b/IoTGateway/ClientApp/src/app/routes/passport/login/login.component.less
deleted file mode 100644
index a62f1710..00000000
--- a/IoTGateway/ClientApp/src/app/routes/passport/login/login.component.less
+++ /dev/null
@@ -1,63 +0,0 @@
-@import '@delon/theme/index';
-
-:host {
- display: block;
- width: 368px;
- margin: 0 auto;
-
- ::ng-deep {
- .ant-tabs .ant-tabs-bar {
- margin-bottom: 24px;
- text-align: center;
- border-bottom: 0;
- }
-
- .ant-tabs-tab {
- font-size: 16px;
- line-height: 24px;
- }
-
- .ant-input-affix-wrapper .ant-input:not(:first-child) {
- padding-left: 4px;
- }
-
- .icon {
- margin-left: 16px;
- color: rgb(0 0 0 / 20%);
- font-size: 24px;
- vertical-align: middle;
- cursor: pointer;
- transition: color 0.3s;
-
- &:hover {
- color: @primary-color;
- }
- }
-
- .other {
- margin-top: 24px;
- line-height: 22px;
- text-align: left;
-
- nz-tooltip {
- vertical-align: middle;
- }
-
- .register {
- float: right;
- }
- }
- }
-}
-
-[data-theme='dark'] {
- :host ::ng-deep {
- .icon {
- color: rgb(255 255 255 / 20%);
-
- &:hover {
- color: #fff;
- }
- }
- }
-}
diff --git a/IoTGateway/ClientApp/src/app/routes/passport/login/login.component.ts b/IoTGateway/ClientApp/src/app/routes/passport/login/login.component.ts
deleted file mode 100644
index 9cffb2fa..00000000
--- a/IoTGateway/ClientApp/src/app/routes/passport/login/login.component.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnDestroy, Optional } from '@angular/core';
-import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Router } from '@angular/router';
-import { StartupService } from '@core';
-import { ReuseTabService } from '@delon/abc/reuse-tab';
-import { DA_SERVICE_TOKEN, ITokenService, SocialOpenType, SocialService } from '@delon/auth';
-import { SettingsService, _HttpClient } from '@delon/theme';
-import { environment } from '@env/environment';
-import { NzTabChangeEvent } from 'ng-zorro-antd/tabs';
-import { finalize } from 'rxjs/operators';
-
-@Component({
- selector: 'passport-login',
- templateUrl: './login.component.html',
- styleUrls: ['./login.component.less'],
- providers: [SocialService],
- changeDetection: ChangeDetectionStrategy.OnPush
-})
-export class UserLoginComponent implements OnDestroy {
- constructor(
- fb: FormBuilder,
- private router: Router,
- private settingsService: SettingsService,
- private socialService: SocialService,
- @Optional()
- @Inject(ReuseTabService)
- private reuseTabService: ReuseTabService,
- @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService,
- private startupSrv: StartupService,
- private http: _HttpClient,
- private cdr: ChangeDetectorRef
- ) {
- this.form = fb.group({
- userName: [null, [Validators.required, Validators.pattern(/^(admin)$/)]],
- password: [null, [Validators.required, Validators.pattern(/^(000000)$/)]],
- mobile: [null, [Validators.required, Validators.pattern(/^1\d{10}$/)]],
- captcha: [null, [Validators.required]],
- remember: [true]
- });
- }
-
- // #region fields
-
- get userName(): AbstractControl {
- return this.form.get('userName')!;
- }
- get password(): AbstractControl {
- return this.form.get('password')!;
- }
- get mobile(): AbstractControl {
- return this.form.get('mobile')!;
- }
- get captcha(): AbstractControl {
- return this.form.get('captcha')!;
- }
- form: FormGroup;
- error = '';
- type = 0;
- loading = false;
-
- // #region get captcha
-
- count = 0;
- interval$: any;
-
- // #endregion
-
- switch({ index }: NzTabChangeEvent): void {
- this.type = index!;
- }
-
- getCaptcha(): void {
- if (this.mobile.invalid) {
- this.mobile.markAsDirty({ onlySelf: true });
- this.mobile.updateValueAndValidity({ onlySelf: true });
- return;
- }
- this.count = 59;
- this.interval$ = setInterval(() => {
- this.count -= 1;
- if (this.count <= 0) {
- clearInterval(this.interval$);
- }
- }, 1000);
- }
-
- // #endregion
-
- submit(): void {
- this.error = '';
- if (this.type === 0) {
- this.userName.markAsDirty();
- this.userName.updateValueAndValidity();
- this.password.markAsDirty();
- this.password.updateValueAndValidity();
- if (this.userName.invalid || this.password.invalid) {
- return;
- }
- } else {
- this.mobile.markAsDirty();
- this.mobile.updateValueAndValidity();
- this.captcha.markAsDirty();
- this.captcha.updateValueAndValidity();
- if (this.mobile.invalid || this.captcha.invalid) {
- return;
- }
- }
-
- // 默认配置中对所有HTTP请求都会强制 [校验](https://ng-alain.com/auth/getting-started) 用户 Token
- // 然一般来说登录请求不需要校验，因此可以在请求URL加上：`/login?_allow_anonymous=true` 表示不触发用户 Token 校验
- this.loading = true;
- this.cdr.detectChanges();
- this.http
- .post('/login/account?_allow_anonymous=true', {
- type: this.type,
- userName: this.userName.value,
- password: this.password.value
- })
- .pipe(
- finalize(() => {
- this.loading = true;
- this.cdr.detectChanges();
- })
- )
- .subscribe(res => {
- if (res.msg !== 'ok') {
- this.error = res.msg;
- this.cdr.detectChanges();
- return;
- }
- // 清空路由复用信息
- this.reuseTabService.clear();
- // 设置用户Token信息
- // TODO: Mock expired value
- res.user.expired = +new Date() + 1000 * 60 * 5;
- this.tokenService.set(res.user);
- // 重新获取 StartupService 内容，我们始终认为应用信息一般都会受当前用户授权范围而影响
- this.startupSrv.load().subscribe(() => {
- let url = this.tokenService.referrer!.url || '/';
- if (url.includes('/passport')) {
- url = '/';
- }
- this.router.navigateByUrl(url);
- });
- });
- }
-
- // #region social
-
- open(type: string, openType: SocialOpenType = 'href'): void {
- let url = ``;
- let callback = ``;
- if (environment.production) {
- callback = `https://ng-alain.github.io/ng-alain/#/passport/callback/${type}`;
- } else {
- callback = `http://localhost:4200/#/passport/callback/${type}`;
- }
- switch (type) {
- case 'auth0':
- url = `//cipchk.auth0.com/login?client=8gcNydIDzGBYxzqV0Vm1CX_RXH-wsWo5&redirect_uri=${decodeURIComponent(callback)}`;
- break;
- case 'github':
- url = `//github.com/login/oauth/authorize?client_id=9d6baae4b04a23fcafa2&response_type=code&redirect_uri=${decodeURIComponent(
- callback
- )}`;
- break;
- case 'weibo':
- url = `https://api.weibo.com/oauth2/authorize?client_id=1239507802&response_type=code&redirect_uri=${decodeURIComponent(callback)}`;
- break;
- }
- if (openType === 'window') {
- this.socialService
- .login(url, '/', {
- type: 'window'
- })
- .subscribe(res => {
- if (res) {
- this.settingsService.setUser(res);
- this.router.navigateByUrl('/');
- }
- });
- } else {
- this.socialService.login(url, '/', {
- type: 'href'
- });
- }
- }
-
- // #endregion
-
- ngOnDestroy(): void {
- if (this.interval$) {
- clearInterval(this.interval$);
- }
- }
-}
diff --git a/IoTGateway/ClientApp/src/app/routes/passport/register-result/register-result.component.html b/IoTGateway/ClientApp/src/app/routes/passport/register-result/register-result.component.html
deleted file mode 100644
index 8666655b..00000000
--- a/IoTGateway/ClientApp/src/app/routes/passport/register-result/register-result.component.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
- {{ 'app.register-result.msg' | i18n: params }}
-
- {{ 'app.register.register' | i18n }}
- diff --git a/IoTGateway/ClientApp/src/app/routes/passport/register/register.component.less b/IoTGateway/ClientApp/src/app/routes/passport/register/register.component.less deleted file mode 100644 index d81f54d2..00000000 --- a/IoTGateway/ClientApp/src/app/routes/passport/register/register.component.less +++ /dev/null @@ -1,51 +0,0 @@ -@import '@delon/theme/index'; - -:host { - display: block; - width: 368px; - margin: 0 auto; - - ::ng-deep { - h3 { - margin-bottom: 20px; - font-size: 16px; - } - - .submit { - width: 50%; - } - - .login { - float: right; - line-height: @btn-height-lg; - } - } -} - -::ng-deep { - .register-password-cdk { - .success, - .warning, - .error { - transition: color 0.3s; - } - - .success { - color: @success-color; - } - - .warning { - color: @warning-color; - } - - .error { - color: @error-color; - } - - .progress-pass > .progress { - .ant-progress-bg { - background-color: @warning-color; - } - } - } -} diff --git a/IoTGateway/ClientApp/src/app/routes/passport/register/register.component.ts b/IoTGateway/ClientApp/src/app/routes/passport/register/register.component.ts deleted file mode 100644 index bafffb80..00000000 --- a/IoTGateway/ClientApp/src/app/routes/passport/register/register.component.ts +++ /dev/null @@ -1,139 +0,0 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy } from '@angular/core'; -import { AbstractControl, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; -import { Router } from '@angular/router'; -import { _HttpClient } from '@delon/theme'; -import { MatchControl } from '@delon/util/form'; -import { NzSafeAny } from 'ng-zorro-antd/core/types'; -import { finalize } from 'rxjs/operators'; - -@Component({ - selector: 'passport-register', - templateUrl: './register.component.html', - styleUrls: ['./register.component.less'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class UserRegisterComponent implements OnDestroy { - constructor(fb: FormBuilder, private router: Router, private http: _HttpClient, private cdr: ChangeDetectorRef) { - this.form = fb.group( - { - mail: [null, [Validators.required, Validators.email]], - password: [null, [Validators.required, Validators.minLength(6), UserRegisterComponent.checkPassword.bind(this)]], - confirm: [null, [Validators.required, Validators.minLength(6)]], - mobilePrefix: ['+86'], - mobile: [null, [Validators.required, Validators.pattern(/^1\d{10}$/)]], - captcha: [null, [Validators.required]] - }, - { - validators: MatchControl('password', 'confirm') - } - ); - } - - // #region fields - - get mail(): AbstractControl { - return this.form.get('mail')!; - } - get password(): AbstractControl { - return this.form.get('password')!; - } - get confirm(): AbstractControl { - return this.form.get('confirm')!; - } - get mobile(): AbstractControl { - return this.form.get('mobile')!; - } - get captcha(): AbstractControl { - return this.form.get('captcha')!; - } - form: FormGroup; - error = ''; - type = 0; - loading = false; - visible = false; - status = 'pool'; - progress = 0; - passwordProgressMap: { [key: string]: 'success' | 'normal' | 'exception' } = { - ok: 'success', - pass: 'normal', - pool: 'exception' - }; - - // #endregion - - // #region get captcha - - count = 0; - interval$: any; - - static checkPassword(control: FormControl): NzSafeAny { - if (!control) { - return null; - } - // eslint-disable-next-line @typescript-eslint/no-this-alias - const self: any = this; - self.visible = !!control.value; - if (control.value && control.value.length > 9) { - self.status = 'ok'; - } else if (control.value && control.value.length > 5) { - self.status = 'pass'; - } else { - self.status = 'pool'; - } - - if (self.visible) { - self.progress = control.value.length * 10 > 100 ? 100 : control.value.length * 10; - } - } - - getCaptcha(): void { - if (this.mobile.invalid) { - this.mobile.markAsDirty({ onlySelf: true }); - this.mobile.updateValueAndValidity({ onlySelf: true }); - return; - } - this.count = 59; - this.cdr.detectChanges(); - this.interval$ = setInterval(() => { - this.count -= 1; - this.cdr.detectChanges(); - if (this.count <= 0) { - clearInterval(this.interval$); - } - }, 1000); - } - - // #endregion - - submit(): void { - this.error = ''; - Object.keys(this.form.controls).forEach(key => { - this.form.controls[key].markAsDirty(); - this.form.controls[key].updateValueAndValidity(); - }); - if (this.form.invalid) { - return; - } - - const data = this.form.value; - this.loading = true; - this.cdr.detectChanges(); - this.http - .post('/register?_allow_anonymous=true', data) - .pipe( - finalize(() => { - this.loading = false; - this.cdr.detectChanges(); - }) - ) - .subscribe(() => { - this.router.navigate(['passport', 'register-result'], { queryParams: { email: data.mail } }); - }); - } - - ngOnDestroy(): void { - if (this.interval$) { - clearInterval(this.interval$); - } - } -} diff --git a/IoTGateway/ClientApp/src/app/routes/routes-routing.module.ts b/IoTGateway/ClientApp/src/app/routes/routes-routing.module.ts deleted file mode 100644 index 526711d9..00000000 --- a/IoTGateway/ClientApp/src/app/routes/routes-routing.module.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { SimpleGuard } from '@delon/auth'; -import { environment } from '@env/environment'; - -// layout -import { LayoutBasicComponent } from '../layout/basic/basic.component'; -import { LayoutPassportComponent } from '../layout/passport/passport.component'; -// dashboard pages -import { DashboardComponent } from './dashboard/dashboard.component'; -// single pages -import { CallbackComponent } from './passport/callback.component'; -import { UserLockComponent } from './passport/lock/lock.component'; -// passport pages -import { UserLoginComponent } from './passport/login/login.component'; -import { UserRegisterResultComponent } from './passport/register-result/register-result.component'; -import { UserRegisterComponent } from './passport/register/register.component'; - -const routes: Routes = [ - { - path: '', - component: LayoutBasicComponent, - canActivate: [SimpleGuard], - children: [ - { path: '', redirectTo: 'dashboard', pathMatch: 'full' }, - { path: 'dashboard', component: DashboardComponent, data: { title: '仪表盘' } }, - { path: 'exception', loadChildren: () => import('./exception/exception.module').then(m => m.ExceptionModule) }, - // 业务子模块 - // { path: 'widgets', loadChildren: () => import('./widgets/widgets.module').then(m => m.WidgetsModule) }, - { path: 'sys', loadChildren: () => import('./sys/sys.module').then(m => m.SysModule) } - ] - }, - // 空白布局 - // { - // path: 'blank', - // component: LayoutBlankComponent, - // children: [ - // ] - // }, - // passport - { - path: 'passport', - component: LayoutPassportComponent, - children: [ - { path: 'login', component: UserLoginComponent, data: { title: '登录' } }, - { path: 'register', component: UserRegisterComponent, data: { title: '注册' } }, - { path: 'register-result', component: UserRegisterResultComponent, data: { title: '注册结果' } }, - { path: 'lock', component: UserLockComponent, data: { title: '锁屏' } } - ] - }, - // 单页不包裹Layout - { path: 'passport/callback/:type', component: CallbackComponent }, - { path: '**', redirectTo: 'exception/404' } -]; - -@NgModule({ - imports: [ - RouterModule.forRoot(routes, { - useHash: environment.useHash, - // NOTICE: If you use `reuse-tab` component and turn on keepingScroll you can set to `disabled` - // Pls refer to https://ng-alain.com/components/reuse-tab - scrollPositionRestoration: 'top' - }) - ], - exports: [RouterModule] -}) -export class RouteRoutingModule {} diff --git a/IoTGateway/ClientApp/src/app/routes/routes.module.ts b/IoTGateway/ClientApp/src/app/routes/routes.module.ts deleted file mode 100644 index 96245125..00000000 --- a/IoTGateway/ClientApp/src/app/routes/routes.module.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { NgModule, Type } from '@angular/core'; -import { SharedModule } from '@shared'; - -// dashboard pages -import { DashboardComponent } from './dashboard/dashboard.component'; -// single pages -import { CallbackComponent } from './passport/callback.component'; -import { UserLockComponent } from './passport/lock/lock.component'; -// passport pages -import { UserLoginComponent } from './passport/login/login.component'; -import { UserRegisterResultComponent } from './passport/register-result/register-result.component'; -import { UserRegisterComponent } from './passport/register/register.component'; -import { RouteRoutingModule } from './routes-routing.module'; - -const COMPONENTS: Array
- ![]()
-
- `,
- styleUrls: ['./index.less']
-})
-export class ImageWrapperComponent {
- @Input()
- style!: { [key: string]: string };
- @Input() src: string | undefined;
- @Input() desc: string | undefined;
-}
diff --git a/IoTGateway/ClientApp/src/app/shared/index.ts b/IoTGateway/ClientApp/src/app/shared/index.ts
deleted file mode 100644
index 61f37073..00000000
--- a/IoTGateway/ClientApp/src/app/shared/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Components
-
-// Utils
-export * from './utils/yuan';
-
-// Module
-export * from './shared.module';
-export * from './json-schema/json-schema.module';
diff --git a/IoTGateway/ClientApp/src/app/shared/json-schema/README.md b/IoTGateway/ClientApp/src/app/shared/json-schema/README.md
deleted file mode 100644
index fd66568a..00000000
--- a/IoTGateway/ClientApp/src/app/shared/json-schema/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# 建议统一在 `widgets` 目录下自定义小部件
-
-> 注：@delon/form 本身提供 nz-zorro-antd 数据录入组件的全部实现，以及若干第三方组件的代码，可从[widgets-third](https://github.com/ng-alain/delon/tree/master/packages/form/widgets-third)中获取并放置 `widgets` 目录下注册即可。
diff --git a/IoTGateway/ClientApp/src/app/shared/json-schema/json-schema.module.ts b/IoTGateway/ClientApp/src/app/shared/json-schema/json-schema.module.ts
deleted file mode 100644
index 24b71064..00000000
--- a/IoTGateway/ClientApp/src/app/shared/json-schema/json-schema.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DelonFormModule, WidgetRegistry } from '@delon/form';
-
-import { SharedModule } from '../shared.module';
-import { TestWidget } from './test/test.widget';
-
-export const SCHEMA_THIRDS_COMPONENTS = [TestWidget];
-
-@NgModule({
- declarations: SCHEMA_THIRDS_COMPONENTS,
- imports: [SharedModule, DelonFormModule.forRoot()],
- exports: SCHEMA_THIRDS_COMPONENTS
-})
-export class JsonSchemaModule {
- constructor(widgetRegistry: WidgetRegistry) {
- widgetRegistry.register(TestWidget.KEY, TestWidget);
- }
-}
diff --git a/IoTGateway/ClientApp/src/app/shared/json-schema/test/test.widget.ts b/IoTGateway/ClientApp/src/app/shared/json-schema/test/test.widget.ts
deleted file mode 100644
index ba8178eb..00000000
--- a/IoTGateway/ClientApp/src/app/shared/json-schema/test/test.widget.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { ControlWidget } from '@delon/form';
-
-@Component({
- selector: 'test',
- template: `
- {{ desc }}
-