update: common struct

weplanx · Mar 17, 2023 · 218a4ae · 218a4ae
1 parent 7982109
commit 218a4ae
Show file tree

Hide file tree

Showing 34 changed files with 30 additions and 30 deletions.
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -7,13 +7,13 @@ import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule, Routes } from '@angular/router';
 
-import { LayoutComponent } from '@common/layout/layout.component';
-import { LayoutModule } from '@common/layout/layout.module';
-import { AuthorizedComponent } from '@common/result/authorized/authorized.component';
-import { ResultModule } from '@common/result/result.module';
-import { UnauthorizeComponent } from '@common/result/unauthorize/unauthorize.component';
+import { LayoutComponent } from '@common/components/layout/layout.component';
+import { LayoutModule } from '@common/components/layout/layout.module';
+import { AuthorizedComponent } from '@common/components/result/authorized/authorized.component';
+import { ResultModule } from '@common/components/result/result.module';
+import { UnauthorizeComponent } from '@common/components/result/unauthorize/unauthorize.component';
+import { TranslationModule } from '@common/components/translation/translation.module';
 import { ShareModule } from '@common/share.module';
-import { TranslationModule } from '@common/translation/translation.module';
 import { environment } from '@env';
 import { WpxRichtextModule } from '@weplanx/ng/richtext';
 import { WpxStoreModule } from '@weplanx/ng/store';

diff --git a/.../blank-layout/blank-layout.component.html → .../blank-layout/blank-layout.component.html b/.../blank-layout/blank-layout.component.html → .../blank-layout/blank-layout.component.html
diff --git a/.../blank-layout/blank-layout.component.scss → .../blank-layout/blank-layout.component.scss b/.../blank-layout/blank-layout.component.scss → .../blank-layout/blank-layout.component.scss
diff --git a/...on/blank-layout/blank-layout.component.ts → ...ts/blank-layout/blank-layout.component.ts b/...on/blank-layout/blank-layout.component.ts → ...ts/blank-layout/blank-layout.component.ts
diff --git a/...ommon/blank-layout/blank-layout.module.ts → ...nents/blank-layout/blank-layout.module.ts b/...ommon/blank-layout/blank-layout.module.ts → ...nents/blank-layout/blank-layout.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 
-import { BlankLayoutComponent } from '@common/blank-layout/blank-layout.component';
+import { BlankLayoutComponent } from '@common/components/blank-layout/blank-layout.component';
 import { ShareModule } from '@common/share.module';
 
 @NgModule({

diff --git a/src/app/common/layout/layout.component.html → ...n/components/layout/layout.component.html b/src/app/common/layout/layout.component.html → ...n/components/layout/layout.component.html
diff --git a/src/app/common/layout/layout.component.scss → ...n/components/layout/layout.component.scss b/src/app/common/layout/layout.component.scss → ...n/components/layout/layout.component.scss
diff --git a/src/app/common/layout/layout.component.ts → ...mon/components/layout/layout.component.ts b/src/app/common/layout/layout.component.ts → ...mon/components/layout/layout.component.ts
@@ -2,8 +2,8 @@ import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { AppService } from '@app';
-import { ProfileComponent } from '@common/layout/profile/profile.component';
-import { QuickComponent } from '@common/layout/quick/quick.component';
+import { ProfileComponent } from '@common/components/layout/profile/profile.component';
+import { QuickComponent } from '@common/components/layout/quick/quick.component';
 import { WpxService } from '@weplanx/ng';
 import { NzDrawerRef, NzDrawerService } from 'ng-zorro-antd/drawer';
 

diff --git a/src/app/common/components/layout/layout.module.ts b/src/app/common/components/layout/layout.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+
+import { LayoutComponent } from '@common/components/layout/layout.component';
+import { ProfileModule } from '@common/components/layout/profile/profile.module';
+import { QuickModule } from '@common/components/layout/quick/quick.module';
+import { TranslationModule } from '@common/components/translation/translation.module';
+import { ShareModule } from '@common/share.module';
+
+@NgModule({
+  imports: [ShareModule, ProfileModule, QuickModule, TranslationModule],
+  declarations: [LayoutComponent],
+  exports: [LayoutComponent]
+})
+export class LayoutModule {}
diff --git a/...yout/profile/avatar/avatar.component.html → ...yout/profile/avatar/avatar.component.html b/...yout/profile/avatar/avatar.component.html → ...yout/profile/avatar/avatar.component.html
diff --git a/...layout/profile/avatar/avatar.component.ts → ...layout/profile/avatar/avatar.component.ts b/...layout/profile/avatar/avatar.component.ts → ...layout/profile/avatar/avatar.component.ts
diff --git a/.../backup-email/backup-email.component.html → .../backup-email/backup-email.component.html b/.../backup-email/backup-email.component.html → .../backup-email/backup-email.component.html
diff --git a/...le/backup-email/backup-email.component.ts → ...le/backup-email/backup-email.component.ts b/...le/backup-email/backup-email.component.ts → ...le/backup-email/backup-email.component.ts
diff --git a/...layout/profile/email/email.component.html → ...layout/profile/email/email.component.html b/...layout/profile/email/email.component.html → ...layout/profile/email/email.component.html
diff --git a/...n/layout/profile/email/email.component.ts → ...s/layout/profile/email/email.component.ts b/...n/layout/profile/email/email.component.ts → ...s/layout/profile/email/email.component.ts
diff --git a/...n/layout/profile/name/name.component.html → ...s/layout/profile/name/name.component.html b/...n/layout/profile/name/name.component.html → ...s/layout/profile/name/name.component.html
diff --git a/...mon/layout/profile/name/name.component.ts → ...nts/layout/profile/name/name.component.ts b/...mon/layout/profile/name/name.component.ts → ...nts/layout/profile/name/name.component.ts
diff --git a/.../profile/password/password.component.html → .../profile/password/password.component.html b/.../profile/password/password.component.html → .../profile/password/password.component.html
diff --git a/...ut/profile/password/password.component.ts → ...ut/profile/password/password.component.ts b/...ut/profile/password/password.component.ts → ...ut/profile/password/password.component.ts
diff --git a/...mon/layout/profile/profile.component.html → ...nts/layout/profile/profile.component.html b/...mon/layout/profile/profile.component.html → ...nts/layout/profile/profile.component.html
diff --git a/...ommon/layout/profile/profile.component.ts → ...nents/layout/profile/profile.component.ts b/...ommon/layout/profile/profile.component.ts → ...nents/layout/profile/profile.component.ts
diff --git a/...p/common/layout/profile/profile.module.ts → ...mponents/layout/profile/profile.module.ts b/...p/common/layout/profile/profile.module.ts → ...mponents/layout/profile/profile.module.ts
diff --git a/.../common/layout/quick/quick.component.html → ...ponents/layout/quick/quick.component.html b/.../common/layout/quick/quick.component.html → ...ponents/layout/quick/quick.component.html
diff --git a/...pp/common/layout/quick/quick.component.ts → ...omponents/layout/quick/quick.component.ts b/...pp/common/layout/quick/quick.component.ts → ...omponents/layout/quick/quick.component.ts
diff --git a/src/app/common/layout/quick/quick.module.ts → ...n/components/layout/quick/quick.module.ts b/src/app/common/layout/quick/quick.module.ts → ...n/components/layout/quick/quick.module.ts
diff --git a/...result/authorized/authorized.component.ts → ...result/authorized/authorized.component.ts b/...result/authorized/authorized.component.ts → ...result/authorized/authorized.component.ts
diff --git a/src/app/common/result/result.module.ts → ...common/components/result/result.module.ts b/src/app/common/result/result.module.ts → ...common/components/result/result.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 
-import { AuthorizedComponent } from '@common/result/authorized/authorized.component';
-import { UnauthorizeComponent } from '@common/result/unauthorize/unauthorize.component';
+import { AuthorizedComponent } from '@common/components/result/authorized/authorized.component';
+import { UnauthorizeComponent } from '@common/components/result/unauthorize/unauthorize.component';
 import { ShareModule } from '@common/share.module';
 
 @NgModule({

diff --git a/...sult/unauthorize/unauthorize.component.ts → ...sult/unauthorize/unauthorize.component.ts b/...sult/unauthorize/unauthorize.component.ts → ...sult/unauthorize/unauthorize.component.ts
diff --git a/...on/translation/translation.component.html → ...ts/translation/translation.component.html b/...on/translation/translation.component.html → ...ts/translation/translation.component.html
diff --git a/...mmon/translation/translation.component.ts → ...ents/translation/translation.component.ts b/...mmon/translation/translation.component.ts → ...ents/translation/translation.component.ts
diff --git a/.../common/translation/translation.module.ts → ...ponents/translation/translation.module.ts b/.../common/translation/translation.module.ts → ...ponents/translation/translation.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 
+import { TranslationComponent } from '@common/components/translation/translation.component';
 import { ShareModule } from '@common/share.module';
-import { TranslationComponent } from '@common/translation/translation.component';
 
 @NgModule({
   imports: [ShareModule],

diff --git a/src/app/common/layout/layout.module.ts b/src/app/common/layout/layout.module.ts
diff --git a/src/app/forget/forget.module.ts b/src/app/forget/forget.module.ts
@@ -1,9 +1,9 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
-import { BlankLayoutModule } from '@common/blank-layout/blank-layout.module';
+import { BlankLayoutModule } from '@common/components/blank-layout/blank-layout.module';
+import { TranslationModule } from '@common/components/translation/translation.module';
 import { ShareModule } from '@common/share.module';
-import { TranslationModule } from '@common/translation/translation.module';
 import { NzStepsModule } from 'ng-zorro-antd/steps';
 
 import { ForgetComponent } from './forget.component';

diff --git a/src/app/login/login.module.ts b/src/app/login/login.module.ts
@@ -1,9 +1,9 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
-import { BlankLayoutModule } from '@common/blank-layout/blank-layout.module';
+import { BlankLayoutModule } from '@common/components/blank-layout/blank-layout.module';
+import { TranslationModule } from '@common/components/translation/translation.module';
 import { ShareModule } from '@common/share.module';
-import { TranslationModule } from '@common/translation/translation.module';
 
 import { LoginComponent } from './login.component';