diff --git a/gradle.properties b/gradle.properties index 80e4ae90..e107bb5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ version=0.0.1-SNAPSHOT org.gradle.parallel=true org.gradle.caching=true org.gradle.daemon=true -org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx2048M +org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M dusername=alexbob dpassword=dckr_pat_wvKMRljAECuiaY7riNJ5RVOMM-M demail=5199840@qq.com diff --git a/ui/web/proxy.conf.json b/ui/web/proxy.conf.json index ca40c9a2..d4df3d01 100644 --- a/ui/web/proxy.conf.json +++ b/ui/web/proxy.conf.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://192.168.1.2:18080", + "target": "http://127.0.0.1:8080", "secure": false, "pathRewrite": { "^/api": "" diff --git a/ui/web/src/app/app-routing.module.ts b/ui/web/src/app/app-routing.module.ts index 1b92a29e..5a71a90f 100644 --- a/ui/web/src/app/app-routing.module.ts +++ b/ui/web/src/app/app-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes, TitleStrategy} from '@angular/router'; -import {PageNotFoundComponent} from "./shared/page-not-found/page-not-found.component"; +import {PageNotFoundComponent} from "./pages/page-not-found/page-not-found.component"; import {PageTitleStrategy} from "./shared/page-title-strategy.service"; const routes: Routes = [ diff --git a/ui/web/src/app/app.component.ts b/ui/web/src/app/app.component.ts index e3cb1d42..bb07038f 100644 --- a/ui/web/src/app/app.component.ts +++ b/ui/web/src/app/app.component.ts @@ -9,10 +9,8 @@ import {Component, OnInit} from '@angular/core'; styleUrls: ['./app.component.scss'] }) export class AppComponent implements OnInit { - page: number = 0; ngOnInit(): void { - this.page = 1; } } diff --git a/ui/web/src/app/app.module.ts b/ui/web/src/app/app.module.ts index 95a7970d..2861cc35 100644 --- a/ui/web/src/app/app.module.ts +++ b/ui/web/src/app/app.module.ts @@ -8,10 +8,12 @@ import {RouterModule} from '@angular/router'; import {httpInterceptorProviders} from "./http-interceptors"; import {HttpClientXsrfModule} from "@angular/common/http"; import {SharedModule} from "./shared/shared.module"; +import {PageNotFoundComponent} from "./pages/page-not-found/page-not-found.component"; @NgModule({ declarations: [ - AppComponent + AppComponent, + PageNotFoundComponent ], imports: [ ServiceWorkerModule.register('ngsw-worker.js', { diff --git a/ui/web/src/app/shared/page-not-found/page-not-found.component.html b/ui/web/src/app/pages/page-not-found/page-not-found.component.html similarity index 100% rename from ui/web/src/app/shared/page-not-found/page-not-found.component.html rename to ui/web/src/app/pages/page-not-found/page-not-found.component.html diff --git a/ui/web/src/app/shared/page-not-found/page-not-found.component.scss b/ui/web/src/app/pages/page-not-found/page-not-found.component.scss similarity index 100% rename from ui/web/src/app/shared/page-not-found/page-not-found.component.scss rename to ui/web/src/app/pages/page-not-found/page-not-found.component.scss diff --git a/ui/web/src/app/shared/page-not-found/page-not-found.component.ts b/ui/web/src/app/pages/page-not-found/page-not-found.component.ts similarity index 63% rename from ui/web/src/app/shared/page-not-found/page-not-found.component.ts rename to ui/web/src/app/pages/page-not-found/page-not-found.component.ts index d70fae10..7cf7e6e8 100644 --- a/ui/web/src/app/shared/page-not-found/page-not-found.component.ts +++ b/ui/web/src/app/pages/page-not-found/page-not-found.component.ts @@ -1,5 +1,4 @@ import {Component} from '@angular/core'; -import {LayoutService} from "../layout.service"; @Component({ selector: 'app-page-not-found', @@ -7,7 +6,6 @@ import {LayoutService} from "../layout.service"; styleUrls: ['./page-not-found.component.scss'] }) export class PageNotFoundComponent { - constructor(private layoutService: LayoutService) { - layoutService.isHide(true); + constructor() { } } diff --git a/ui/web/src/app/security/login/login.component.html b/ui/web/src/app/security/login/login.component.html index d8ca1243..0c0f7893 100644 --- a/ui/web/src/app/security/login/login.component.html +++ b/ui/web/src/app/security/login/login.component.html @@ -15,10 +15,9 @@
Login to your account
+ (loginForm.controls.username.dirty || loginForm.controls.username.touched)" + [class.is-valid]="loginForm.controls.username.valid" autocomplete="off" class="layui-input" + name="username" placeholder="用户名" required type="text">
@@ -27,10 +26,9 @@
Login to your account
+ (loginForm.controls.password.dirty || loginForm.controls.password.touched)" + [class.is-valid]="loginForm.controls.password.valid" autocomplete="off" class="layui-input" + name="password" placeholder="密 码" required type="password">
@@ -65,7 +63,7 @@
Login to your account
忘记密码?
- +
diff --git a/ui/web/src/app/security/login/login.component.ts b/ui/web/src/app/security/login/login.component.ts index afc3acb3..a43411a4 100644 --- a/ui/web/src/app/security/login/login.component.ts +++ b/ui/web/src/app/security/login/login.component.ts @@ -2,7 +2,6 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {FormBuilder, FormControl, Validators} from "@angular/forms"; import {Credentials, LoginService} from "./login.service"; import {ActivatedRoute, Router} from "@angular/router"; -import {LayoutService} from "../../shared/layout.service"; @Component({ selector: 'app-login', @@ -25,11 +24,10 @@ export class LoginComponent implements OnInit, OnDestroy { rememberMe: new FormControl(false) }); - constructor(private formBuilder: FormBuilder, - private loginService: LoginService, - private layoutService: LayoutService, - private router: Router, - private route: ActivatedRoute) { + constructor(private router: Router, + private route: ActivatedRoute, + private formBuilder: FormBuilder, + private loginService: LoginService) { } onSubmit(): void { @@ -54,14 +52,12 @@ export class LoginComponent implements OnInit, OnDestroy { this.loginForm.patchValue({ username: credentials.username, password: credentials.password, - rememberMe: true + rememberMe: false }); } - this.layoutService.isHide(true); } ngOnDestroy(): void { - this.layoutService.isHide(false); } } diff --git a/ui/web/src/app/shared/page-title-strategy.service.ts b/ui/web/src/app/shared/page-title-strategy.service.ts index 4bc23915..b9988147 100644 --- a/ui/web/src/app/shared/page-title-strategy.service.ts +++ b/ui/web/src/app/shared/page-title-strategy.service.ts @@ -13,7 +13,7 @@ export class PageTitleStrategy extends TitleStrategy { override updateTitle(routerState: RouterStateSnapshot) { const title = this.buildTitle(routerState); if (title !== undefined) { - this.title.setTitle($localize`:@@siteTitlePrefix:Plate Platform- | ${title}`); + this.title.setTitle($localize`:@@siteTitlePrefix:Plate Platform | ${title}`); } } } diff --git a/ui/web/src/app/shared/shared.module.ts b/ui/web/src/app/shared/shared.module.ts index d542783b..9c3c8c24 100644 --- a/ui/web/src/app/shared/shared.module.ts +++ b/ui/web/src/app/shared/shared.module.ts @@ -2,7 +2,6 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {FormsModule, ReactiveFormsModule} from "@angular/forms"; import {HttpClientModule} from "@angular/common/http"; -import {PageNotFoundComponent} from "./page-not-found/page-not-found.component"; import {MatSnackBarModule} from "@angular/material/snack-bar"; import {MatProgressBarModule} from "@angular/material/progress-bar"; import {RouterModule} from "@angular/router"; @@ -13,10 +12,8 @@ import {RouterModule} from "@angular/router"; RouterModule ], declarations: [ - PageNotFoundComponent ], exports: [ - PageNotFoundComponent, CommonModule, FormsModule, HttpClientModule, diff --git a/ui/web/src/locale/messages.zh.xlf b/ui/web/src/locale/messages.zh.xlf index 23084948..dc27b654 100644 --- a/ui/web/src/locale/messages.zh.xlf +++ b/ui/web/src/locale/messages.zh.xlf @@ -47,8 +47,8 @@ src/app/security/login/login.component.html:12 - Plateva Platform Manager - 平台管理后台 + Plate Platform Manager + 盘子管理平台 @@ -156,7 +156,7 @@ src/app/shared/page-title-strategy.service.ts:16 - 盘子管理平台- | + 盘子管理平台 |