From 198d9a24c669807d4a17af592a4a08108ce9b6fb Mon Sep 17 00:00:00 2001 From: insanity Date: Wed, 31 Jan 2018 15:18:58 +0900 Subject: [PATCH] signup --- src/app/commons/layouts/sidebar/menu-element.ts | 2 +- .../packages/member/component/signin/signin.component.ts | 3 --- src/app/pages/auth/signup/signup-page.module.ts | 6 +++--- src/app/pages/probes/probes-page.component.html | 4 +++- src/app/pages/probes/probes-page.component.ts | 9 ++++----- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/app/commons/layouts/sidebar/menu-element.ts b/src/app/commons/layouts/sidebar/menu-element.ts index 2175881..165ebff 100644 --- a/src/app/commons/layouts/sidebar/menu-element.ts +++ b/src/app/commons/layouts/sidebar/menu-element.ts @@ -27,7 +27,7 @@ export const menus = [ }, { 'name': 'Probes', - 'link': '/probe', + 'link': '/probes', 'icon': 'indeterminate_check_box', 'chip': false, 'open': false, diff --git a/src/app/packages/member/component/signin/signin.component.ts b/src/app/packages/member/component/signin/signin.component.ts index 501b119..67196ea 100644 --- a/src/app/packages/member/component/signin/signin.component.ts +++ b/src/app/packages/member/component/signin/signin.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; -import {MemberService} from '../../services/member.service'; @Component({ selector: 'of-member-signin', @@ -19,7 +18,6 @@ export class SigninComponent implements OnInit { constructor( private router: Router, private formBuilder: FormBuilder, - private memberService: MemberService ) { } ngOnInit() { @@ -45,6 +43,5 @@ export class SigninComponent implements OnInit { login() { console.log('signin component login fnc'); - this.memberService.signin(); } } diff --git a/src/app/pages/auth/signup/signup-page.module.ts b/src/app/pages/auth/signup/signup-page.module.ts index c67f0c2..9f346e7 100644 --- a/src/app/pages/auth/signup/signup-page.module.ts +++ b/src/app/pages/auth/signup/signup-page.module.ts @@ -2,15 +2,15 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SignupPageRoutingModule } from './signup-page-routing.module'; import { SignupPageComponent } from './signup-page.component'; -import { MemberModule } from 'app/packages/member/member.module'; import { FlexLayoutModule } from '@angular/flex-layout'; +import { SignupModule } from 'app/packages/member/component/signup/signup.module'; @NgModule({ imports: [ CommonModule, SignupPageRoutingModule, - MemberModule, - FlexLayoutModule + FlexLayoutModule, + SignupModule ], declarations: [ SignupPageComponent, diff --git a/src/app/pages/probes/probes-page.component.html b/src/app/pages/probes/probes-page.component.html index 93fb5f1..975a544 100644 --- a/src/app/pages/probes/probes-page.component.html +++ b/src/app/pages/probes/probes-page.component.html @@ -1,4 +1,6 @@
- +
+ +
\ No newline at end of file diff --git a/src/app/pages/probes/probes-page.component.ts b/src/app/pages/probes/probes-page.component.ts index 87acd15..ce5c45c 100644 --- a/src/app/pages/probes/probes-page.component.ts +++ b/src/app/pages/probes/probes-page.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { Router, Route } from '@angular/router'; @Component({ selector: 'of-pages-probes', @@ -9,9 +8,9 @@ import { Router, Route } from '@angular/router'; export class ProbesPageComponent { tabs = [ - { label: 'Probe', path: '/probe' }, - { label: 'Unauthorized', path: '/probe/noauth' }, - { label: 'Download', path: '/probe/download' }, + { label: 'Probe', path: '/probes' }, + { label: 'Unauthorized', path: '/probes/noauth' }, + { label: 'Download', path: '/probes/download' }, ]; // tabs2 = [ @@ -20,6 +19,6 @@ export class ProbesPageComponent { // { label: 'History', path: '/probe/history' }, // ]; - constructor(private router: Router) { } + constructor() { } }