npm install create package-lock.json

vnobo · Oct 26, 2023 · 5ba3a01 · 5ba3a01
1 parent 9b419fb
commit 5ba3a01
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 34 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...e-not-found/page-not-found.component.html → ...e-not-found/page-not-found.component.html b/...e-not-found/page-not-found.component.html → ...e-not-found/page-not-found.component.html
diff --git a/...e-not-found/page-not-found.component.scss → ...e-not-found/page-not-found.component.scss b/...e-not-found/page-not-found.component.scss → ...e-not-found/page-not-found.component.scss
diff --git a/...age-not-found/page-not-found.component.ts → ...age-not-found/page-not-found.component.ts b/...age-not-found/page-not-found.component.ts → ...age-not-found/page-not-found.component.ts
@@ -1,13 +1,11 @@
 import {Component} from '@angular/core';
-import {LayoutService} from "../layout.service";
 
 @Component({
   selector: 'app-page-not-found',
   templateUrl: './page-not-found.component.html',
   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
@@ -15,10 +15,9 @@ <h5 class="text-center mb-4" i18n>Login to your account</h5>
                   <i class="layui-icon layui-icon-username"></i>
                 </div>
                 <input [class.is-invalid]="loginForm.controls.username.invalid &&
-                           (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">
+                           (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">
               </div>
             </div>
             <div class="layui-form-item">
@@ -27,10 +26,9 @@ <h5 class="text-center mb-4" i18n>Login to your account</h5>
                   <i class="layui-icon layui-icon-password"></i>
                 </div>
                 <input [class.is-invalid]="loginForm.controls.password.invalid &&
-                           (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">
+                           (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">
               </div>
               <div *ngIf="loginForm.controls.password.errors?.['minlength']
                     || loginForm.controls.password.errors?.['maxlength']" class="invalid-feedback" i18n>
@@ -65,7 +63,7 @@ <h5 class="text-center mb-4" i18n>Login to your account</h5>
               <a href="#forget" style="float: right; margin-top: 7px;">忘记密码？</a>
             </div>
             <div class="layui-form-item">
-              <button class="layui-btn layui-btn-fluid" lay-filter="demo-login" lay-submit>登录</button>
+              <button class="layui-btn layui-btn-fluid" type="submit">登录</button>
             </div>
           </div>
         </form>

diff --git 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
@@ -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
@@ -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
@@ -47,8 +47,8 @@
         <note category="location">src/app/security/login/login.component.html:12</note>
       </notes>
       <segment>
-        <source>Plateva Platform Manager</source>
-        <target>平台管理后台</target>
+        <source>Plate Platform Manager</source>
+        <target>盘子管理平台</target>
       </segment>
     </unit>
     <unit id="1274686598843595771">
@@ -156,7 +156,7 @@
             <note category="location">src/app/shared/page-title-strategy.service.ts:16</note>
           </notes>
           <segment>
-            <source>盘子管理平台- | <ph id="0" equiv="PH" disp="title"/></source>
+            <source>盘子管理平台 | <ph id="0" equiv="PH" disp="title"/></source>
           </segment>
         </unit>
   </file>