merge

code/moya-management-portal/src/app/app.component.html

@@ -5,4 +5,4 @@
   </h1>
   </h1>
   <img width="300" alt="Angular Logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
   <img width="300" alt="Angular Logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
 </div>
 </div>
-<moya-organization-list></moya-organization-list>
+<moya-event-list></moya-event-list>
\ No newline at end of file

code/moya-management-portal/src/app/organization/event-list/event-list.component.html

-<p>
-  event-list works!
-</p>
+<mat-card *ngFor="let event of events" style="width:40%;margin:1em;">
+  <mat-card-title>{{event.title}}</mat-card-title>
+  <mat-card-subtitle>{{event.date}}</mat-card-subtitle>
+  <mat-card-actions>
+    <button mat-raised-button color="primary" (click)="onClick()" style="float:right;margin-top:-5em;margin-right:1em;">Edit</button>
+  </mat-card-actions>
+</mat-card>
\ No newline at end of file

code/moya-management-portal/src/app/organization/event-list/event-list.component.scss

+@import "~@angular/material/prebuilt-themes/indigo-pink.css";
\ No newline at end of file

code/moya-management-portal/src/app/organization/event-list/event-list.component.ts

@@ -7,8 +7,19 @@ import { Component, OnInit } from '@angular/core';
 })
 })
 export class EventListComponent implements OnInit {
 export class EventListComponent implements OnInit {
 
 
+  public events = [
+    {title: 'Assembly Winter 18', date: '1.2.2018 - 3.2.2018'},
+    {title: 'Assembly Summer 18', date: '1.2.2018 - 3.2.2018'},
+    {title: 'Assembly Winter 19', date: '1.2.2018 - 3.2.2018'},
+    {title: 'Assembly Summer 19', date: '1.2.2018 - 3.2.2018'}
+  ];
+
   constructor() { }
   constructor() { }
 
 
+  onClick() {
+    console.log('Nappitoimii');
+  }
+
   ngOnInit() {
   ngOnInit() {
   }
   }
 
 

code/moya-management-portal/src/app/organization/organization.module.ts

@@ -3,14 +3,17 @@ import { CommonModule } from '@angular/common';
 import { NewOrganizationComponent } from './new-organization/new-organization.component';
 import { NewOrganizationComponent } from './new-organization/new-organization.component';
 import { OrganizationListComponent } from './organization-list/organization-list.component';
 import { OrganizationListComponent } from './organization-list/organization-list.component';
 import { EventListComponent } from './event-list/event-list.component';
 import { EventListComponent } from './event-list/event-list.component';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {MatSelectModule} from '@angular/material/select';
 import {MatSelectModule} from '@angular/material/select';
 import {OrganizationListService} from './organization-list/organization-list.service';
 import {OrganizationListService} from './organization-list/organization-list.service';
+import {MatCardModule} from '@angular/material/card';
+import {MatButtonModule} from '@angular/material';
 
 
 @NgModule({
 @NgModule({
   imports: [
   imports: [
     CommonModule,
     CommonModule,
-    MatSelectModule
+    MatSelectModule,
+    MatCardModule,
+    MatButtonModule
   ],
   ],
   providers: [OrganizationListService],
   providers: [OrganizationListService],
   declarations: [NewOrganizationComponent, OrganizationListComponent, EventListComponent],
   declarations: [NewOrganizationComponent, OrganizationListComponent, EventListComponent],