Commit 9afce9d7 by Tuukka Kivilahti

still coding

1 parent f442b1cf
......@@ -72,7 +72,7 @@ Jos tulee muita järkeviä kokonaisuuksia, joita voi käyttää muualla, jaa oma
* info `tapahtumanaikana "infolaisen" toimesta tehtävät jutut, sisäänotto, käyttäjänhallinta jne. Oma moduulinsa joka lazyloadataan`
* info.module.ts
* viplist
* viplist.component.ts,html,jne
* info-viplist-page.component.ts,html,jne
* viplist.service.ts
* pizzatilaus
* list.component.ts `listaa kaikki, ja lisää uusi pizzailaus`
......
......@@ -14,19 +14,22 @@ import { TopMenuComponent } from './menu/top-menu/top-menu.component';
import { AppComponent } from './app.component';
import { NgModule } from '@angular/core';
import {MatTableModule} from "@angular/material";
import {ViplistModule} from "./modules/viplist/viplist.module";
import {LoginModule} from "./pages/login/login.module";
@NgModule({
declarations: [
AppComponent,
TopMenuComponent,
MoyaLocaleComponent
MoyaLocaleComponent,
],
imports: [
BrowserModule,
AppRoutingModule,
FormsModule,
HttpClientModule,
MatTableModule,
ViplistModule,
LoginModule,
AlertModule.forRoot(),
TranslateModule.forRoot({
......
<mat-table [dataSource]="vips | async">
<mat-table #table [dataSource]="vips | async">
<ng-container matColumnDef="host">
<mat-header-cell *matHeaderCellDef translate> vip.host </mat-header-cell>
<mat-cell *matCellDef="let v"> {{v.host.firstname v.host.lastname}} </mat-cell>
<mat-cell *matCellDef="let v"> {{v.host.firstname}} {{ v.host.lastname}} </mat-cell>
</ng-container>
<ng-container matColumnDef="host">
......
......@@ -3,21 +3,21 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { DebugElement } from '@angular/core';
import { ViplistComponent } from './viplist.component';
import { InfoViplistPageComponent } from './info-viplist-page.component';
describe('ViplistComponent', () => {
let component: ViplistComponent;
let fixture: ComponentFixture<ViplistComponent>;
describe('InfoViplistPageComponent', () => {
let component: InfoViplistPageComponent;
let fixture: ComponentFixture<InfoViplistPageComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ViplistComponent ]
declarations: [ InfoViplistPageComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ViplistComponent);
fixture = TestBed.createComponent(InfoViplistPageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
......
......@@ -5,11 +5,11 @@ import {ViplistService} from '../viplist.service';
@Component({
selector: 'moya-viplist',
templateUrl: './viplist.component.html',
styleUrls: ['./viplist.component.scss'],
templateUrl: './info-viplist-page.component.html',
styleUrls: ['./info-viplist-page.component.scss'],
providers: [ViplistService]
})
export class ViplistComponent implements OnInit {
export class InfoViplistPageComponent implements OnInit {
vips: Observable<Array<Vip>>;
......
import { ViplistComponent } from '../../modules/viplist/info/viplist.component';
import { InfoViplistPageComponent } from '../../modules/viplist/info/info-viplist-page.component';
import { OldMoyaComponent } from './../old-moya/old-moya.component';
import { InfoMenuComponent } from './../../menu/info-menu/info-menu.component';
import { NgModule } from '@angular/core';
......@@ -9,7 +9,7 @@ const routes: Routes = [
{ path: '', component: InfoMenuComponent, outlet: 'left-menu' },
{ path: '', pathMatch: 'full', component: OldMoyaComponent },
{ path: 'old', component: OldMoyaComponent },
{ path: 'viplist', component: ViplistComponent }
{ path: 'viplist', component: InfoViplistPageComponent }
];
@NgModule({
......
import { ViplistComponent } from '../../modules/viplist/info/viplist.component';
import { OldMoyaModule } from './../old-moya/old-moya.module';
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
......@@ -14,7 +13,7 @@ import { LeftMenuModule } from '../../menu/left-menu/left-menu.module';
LeftMenuModule,
OldMoyaModule
],
declarations: [InfoComponent, InfoMenuComponent, ViplistComponent]
declarations: [InfoComponent, InfoMenuComponent]
})
export class InfoModule { }
......@@ -2,13 +2,12 @@ import { LoginRoutingModule } from './login-routing.module';
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { LoginComponent } from './login.component';
import { TopMenuComponent } from '../../menu/top-menu/top-menu.component';
@NgModule({
imports: [
CommonModule,
LoginRoutingModule
],
declarations: [ LoginComponent, TopMenuComponent ]
declarations: [ LoginComponent]
})
export class LoginModule { }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!