From f87b10e4aadc7d4742fa0825958c202a2837e5fd Mon Sep 17 00:00:00 2001
From: jiayi <690405541@qq.com>
Date: Thu, 30 Nov 2017 15:16:25 +0800
Subject: [PATCH] =?UTF-8?q?perf(=E5=B8=90=E6=88=B7=E6=A8=A1=E5=9D=97):=20?=
=?UTF-8?q?=20=E7=A7=BB=E5=8A=A8=E8=B4=A6=E5=8F=B7=E6=A8=A1=E5=9D=97?=
=?UTF-8?q?=EF=BC=8C=E7=99=BB=E5=BD=95=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=B3=A8?=
=?UTF-8?q?=E5=86=8C=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=B3=A8=E5=86=8C=E6=88=90?=
=?UTF-8?q?=E5=8A=9F=E9=A1=B5=E9=9D=A2=E5=88=B0=E7=89=B9=E6=80=A7=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../feature/user/login/login.component.html | 14 ++++++++++++
.../user/login/login.component.scss | 0
.../user/login/login.component.spec.ts | 0
src/app/feature/user/login/login.component.ts | 22 +++++++++++++++++++
.../register-result.component.html | 0
.../register-result.component.scss | 0
.../register-result.component.spec.ts | 0
.../register-result.component.ts | 0
.../user/register/register.component.html | 0
.../user/register/register.component.scss | 0
.../user/register/register.component.spec.ts | 0
.../user/register/register.component.ts | 0
.../user/user-routing.module.ts | 0
.../user/user.component.html | 0
.../user/user.component.scss | 22 +++++++++----------
.../user/user.component.spec.ts | 0
.../{pages => feature}/user/user.component.ts | 0
.../{pages => feature}/user/user.module.ts | 4 ++--
src/app/pages/user/login/login.component.html | 3 ---
src/app/pages/user/login/login.component.ts | 15 -------------
20 files changed, 49 insertions(+), 31 deletions(-)
create mode 100644 src/app/feature/user/login/login.component.html
rename src/app/{pages => feature}/user/login/login.component.scss (100%)
rename src/app/{pages => feature}/user/login/login.component.spec.ts (100%)
create mode 100644 src/app/feature/user/login/login.component.ts
rename src/app/{pages => feature}/user/register-result/register-result.component.html (100%)
rename src/app/{pages => feature}/user/register-result/register-result.component.scss (100%)
rename src/app/{pages => feature}/user/register-result/register-result.component.spec.ts (100%)
rename src/app/{pages => feature}/user/register-result/register-result.component.ts (100%)
rename src/app/{pages => feature}/user/register/register.component.html (100%)
rename src/app/{pages => feature}/user/register/register.component.scss (100%)
rename src/app/{pages => feature}/user/register/register.component.spec.ts (100%)
rename src/app/{pages => feature}/user/register/register.component.ts (100%)
rename src/app/{pages => feature}/user/user-routing.module.ts (100%)
rename src/app/{pages => feature}/user/user.component.html (100%)
rename src/app/{pages => feature}/user/user.component.scss (96%)
rename src/app/{pages => feature}/user/user.component.spec.ts (100%)
rename src/app/{pages => feature}/user/user.component.ts (100%)
rename src/app/{pages => feature}/user/user.module.ts (89%)
delete mode 100644 src/app/pages/user/login/login.component.html
delete mode 100644 src/app/pages/user/login/login.component.ts
diff --git a/src/app/feature/user/login/login.component.html b/src/app/feature/user/login/login.component.html
new file mode 100644
index 0000000..2ef8505
--- /dev/null
+++ b/src/app/feature/user/login/login.component.html
@@ -0,0 +1,14 @@
+
+ login works!
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/user/login/login.component.scss b/src/app/feature/user/login/login.component.scss
similarity index 100%
rename from src/app/pages/user/login/login.component.scss
rename to src/app/feature/user/login/login.component.scss
diff --git a/src/app/pages/user/login/login.component.spec.ts b/src/app/feature/user/login/login.component.spec.ts
similarity index 100%
rename from src/app/pages/user/login/login.component.spec.ts
rename to src/app/feature/user/login/login.component.spec.ts
diff --git a/src/app/feature/user/login/login.component.ts b/src/app/feature/user/login/login.component.ts
new file mode 100644
index 0000000..b2771b2
--- /dev/null
+++ b/src/app/feature/user/login/login.component.ts
@@ -0,0 +1,22 @@
+import { Component, OnInit } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Router } from '@angular/router';
+
+
+@Component({
+ selector: 'app-login',
+ templateUrl: './login.component.html',
+ styleUrls: ['./login.component.scss']
+})
+export class LoginComponent implements OnInit {
+
+ constructor(private _router: Router) { }
+
+ ngOnInit() {
+ }
+
+ login() {
+ localStorage.setItem('currentUser', JSON.stringify({ username: 'admin' }));
+ this._router.navigate(['/dashboard/analysis']);
+ }
+}
diff --git a/src/app/pages/user/register-result/register-result.component.html b/src/app/feature/user/register-result/register-result.component.html
similarity index 100%
rename from src/app/pages/user/register-result/register-result.component.html
rename to src/app/feature/user/register-result/register-result.component.html
diff --git a/src/app/pages/user/register-result/register-result.component.scss b/src/app/feature/user/register-result/register-result.component.scss
similarity index 100%
rename from src/app/pages/user/register-result/register-result.component.scss
rename to src/app/feature/user/register-result/register-result.component.scss
diff --git a/src/app/pages/user/register-result/register-result.component.spec.ts b/src/app/feature/user/register-result/register-result.component.spec.ts
similarity index 100%
rename from src/app/pages/user/register-result/register-result.component.spec.ts
rename to src/app/feature/user/register-result/register-result.component.spec.ts
diff --git a/src/app/pages/user/register-result/register-result.component.ts b/src/app/feature/user/register-result/register-result.component.ts
similarity index 100%
rename from src/app/pages/user/register-result/register-result.component.ts
rename to src/app/feature/user/register-result/register-result.component.ts
diff --git a/src/app/pages/user/register/register.component.html b/src/app/feature/user/register/register.component.html
similarity index 100%
rename from src/app/pages/user/register/register.component.html
rename to src/app/feature/user/register/register.component.html
diff --git a/src/app/pages/user/register/register.component.scss b/src/app/feature/user/register/register.component.scss
similarity index 100%
rename from src/app/pages/user/register/register.component.scss
rename to src/app/feature/user/register/register.component.scss
diff --git a/src/app/pages/user/register/register.component.spec.ts b/src/app/feature/user/register/register.component.spec.ts
similarity index 100%
rename from src/app/pages/user/register/register.component.spec.ts
rename to src/app/feature/user/register/register.component.spec.ts
diff --git a/src/app/pages/user/register/register.component.ts b/src/app/feature/user/register/register.component.ts
similarity index 100%
rename from src/app/pages/user/register/register.component.ts
rename to src/app/feature/user/register/register.component.ts
diff --git a/src/app/pages/user/user-routing.module.ts b/src/app/feature/user/user-routing.module.ts
similarity index 100%
rename from src/app/pages/user/user-routing.module.ts
rename to src/app/feature/user/user-routing.module.ts
diff --git a/src/app/pages/user/user.component.html b/src/app/feature/user/user.component.html
similarity index 100%
rename from src/app/pages/user/user.component.html
rename to src/app/feature/user/user.component.html
diff --git a/src/app/pages/user/user.component.scss b/src/app/feature/user/user.component.scss
similarity index 96%
rename from src/app/pages/user/user.component.scss
rename to src/app/feature/user/user.component.scss
index 84a546e..1b6e375 100644
--- a/src/app/pages/user/user.component.scss
+++ b/src/app/feature/user/user.component.scss
@@ -1,12 +1,12 @@
-:host {
- display: block;
- background: #f0f2f5;
- background-image: url('../../../assets/images/user-bg.svg');
- width: 100%;
- min-height: 100%;
- background-repeat: no-repeat;
- background-position: center;
- background-size: 100%;
- padding: 110px 0 144px 0;
- position: relative;
+:host {
+ display: block;
+ background: #f0f2f5;
+ background-image: url('../../../assets/images/user-bg.svg');
+ width: 100%;
+ min-height: 100%;
+ background-repeat: no-repeat;
+ background-position: center;
+ background-size: 100%;
+ padding: 110px 0 144px 0;
+ position: relative;
}
\ No newline at end of file
diff --git a/src/app/pages/user/user.component.spec.ts b/src/app/feature/user/user.component.spec.ts
similarity index 100%
rename from src/app/pages/user/user.component.spec.ts
rename to src/app/feature/user/user.component.spec.ts
diff --git a/src/app/pages/user/user.component.ts b/src/app/feature/user/user.component.ts
similarity index 100%
rename from src/app/pages/user/user.component.ts
rename to src/app/feature/user/user.component.ts
diff --git a/src/app/pages/user/user.module.ts b/src/app/feature/user/user.module.ts
similarity index 89%
rename from src/app/pages/user/user.module.ts
rename to src/app/feature/user/user.module.ts
index dbdb5c6..0ad0e21 100644
--- a/src/app/pages/user/user.module.ts
+++ b/src/app/feature/user/user.module.ts
@@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { SharedModule } from '@app/shared';
import { UserRoutingModule } from './user-routing.module';
import { UserComponent } from './user.component';
@@ -9,7 +9,7 @@ import { RegisterResultComponent } from './register-result/register-result.compo
@NgModule({
imports: [
- CommonModule,
+ SharedModule,
UserRoutingModule
],
declarations: [UserComponent, LoginComponent, RegisterComponent, RegisterResultComponent]
diff --git a/src/app/pages/user/login/login.component.html b/src/app/pages/user/login/login.component.html
deleted file mode 100644
index cbdfa13..0000000
--- a/src/app/pages/user/login/login.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- login works!
-
diff --git a/src/app/pages/user/login/login.component.ts b/src/app/pages/user/login/login.component.ts
deleted file mode 100644
index 12de138..0000000
--- a/src/app/pages/user/login/login.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-login',
- templateUrl: './login.component.html',
- styleUrls: ['./login.component.scss']
-})
-export class LoginComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit() {
- }
-
-}