This commit is contained in:
insanity 2018-01-31 15:18:58 +09:00
parent 971f3406ab
commit 198d9a24c6
5 changed files with 11 additions and 13 deletions

View File

@ -27,7 +27,7 @@ export const menus = [
}, },
{ {
'name': 'Probes', 'name': 'Probes',
'link': '/probe', 'link': '/probes',
'icon': 'indeterminate_check_box', 'icon': 'indeterminate_check_box',
'chip': false, 'chip': false,
'open': false, 'open': false,

View File

@ -1,7 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import {MemberService} from '../../services/member.service';
@Component({ @Component({
selector: 'of-member-signin', selector: 'of-member-signin',
@ -19,7 +18,6 @@ export class SigninComponent implements OnInit {
constructor( constructor(
private router: Router, private router: Router,
private formBuilder: FormBuilder, private formBuilder: FormBuilder,
private memberService: MemberService
) { } ) { }
ngOnInit() { ngOnInit() {
@ -45,6 +43,5 @@ export class SigninComponent implements OnInit {
login() { login() {
console.log('signin component login fnc'); console.log('signin component login fnc');
this.memberService.signin();
} }
} }

View File

@ -2,15 +2,15 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SignupPageRoutingModule } from './signup-page-routing.module'; import { SignupPageRoutingModule } from './signup-page-routing.module';
import { SignupPageComponent } from './signup-page.component'; import { SignupPageComponent } from './signup-page.component';
import { MemberModule } from 'app/packages/member/member.module';
import { FlexLayoutModule } from '@angular/flex-layout'; import { FlexLayoutModule } from '@angular/flex-layout';
import { SignupModule } from 'app/packages/member/component/signup/signup.module';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SignupPageRoutingModule, SignupPageRoutingModule,
MemberModule, FlexLayoutModule,
FlexLayoutModule SignupModule
], ],
declarations: [ declarations: [
SignupPageComponent, SignupPageComponent,

View File

@ -1,4 +1,6 @@
<div> <div>
<of-sub-menubar [tabs]="tabs"></of-sub-menubar> <of-sub-menubar [tabs]="tabs"></of-sub-menubar>
<div style="padding: 15px">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div>
</div> </div>

View File

@ -1,5 +1,4 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router, Route } from '@angular/router';
@Component({ @Component({
selector: 'of-pages-probes', selector: 'of-pages-probes',
@ -9,9 +8,9 @@ import { Router, Route } from '@angular/router';
export class ProbesPageComponent { export class ProbesPageComponent {
tabs = [ tabs = [
{ label: 'Probe', path: '/probe' }, { label: 'Probe', path: '/probes' },
{ label: 'Unauthorized', path: '/probe/noauth' }, { label: 'Unauthorized', path: '/probes/noauth' },
{ label: 'Download', path: '/probe/download' }, { label: 'Download', path: '/probes/download' },
]; ];
// tabs2 = [ // tabs2 = [
@ -20,6 +19,6 @@ export class ProbesPageComponent {
// { label: 'History', path: '/probe/history' }, // { label: 'History', path: '/probe/history' },
// ]; // ];
constructor(private router: Router) { } constructor() { }
} }