Commit 0350ad5f by Max Mecklin

merge

1 parent 1393c4a8
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
"@angular/common": "^5.2.0", "@angular/common": "^5.2.0",
"@angular/compiler": "^5.2.0", "@angular/compiler": "^5.2.0",
"@angular/core": "^5.2.0", "@angular/core": "^5.2.0",
"@angular/forms": "^5.2.0", "@angular/forms": "^5.2.9",
"@angular/http": "^5.2.0", "@angular/http": "^5.2.0",
"@angular/material": "^5.2.4", "@angular/material": "^5.2.4",
"@angular/platform-browser": "^5.2.0", "@angular/platform-browser": "^5.2.0",
......
...@@ -6,3 +6,4 @@ ...@@ -6,3 +6,4 @@
<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-event-list></moya-event-list> <moya-event-list></moya-event-list>
<moya-new-organization></moya-new-organization>
<p> <form [formGroup]="organizationForm" (ngSubmit)="onSubmit()">
new-organization works! <mat-form-field>
</p> <input matInput placeholder="Organization name:" formControlName="name">
</mat-form-field>
<button mat-button type="submit">Submit</button>
</form>
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormControl, FormGroup} from '@angular/forms';
@Component({ @Component({
selector: 'moya-new-organization', selector: 'moya-new-organization',
...@@ -7,9 +9,14 @@ import { Component, OnInit } from '@angular/core'; ...@@ -7,9 +9,14 @@ import { Component, OnInit } from '@angular/core';
}) })
export class NewOrganizationComponent implements OnInit { export class NewOrganizationComponent implements OnInit {
public organizationForm = new FormGroup({
name: new FormControl()
});
constructor() { } constructor() { }
ngOnInit() { ngOnInit() {
} }
onSubmit() { }
} }
...@@ -6,13 +6,17 @@ import { EventListComponent } from './event-list/event-list.component'; ...@@ -6,13 +6,17 @@ import { EventListComponent } from './event-list/event-list.component';
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 {MatCardModule} from '@angular/material/card';
import {MatButtonModule} from '@angular/material'; import { ReactiveFormsModule } from '@angular/forms';
import { MatInputModule } from '@angular/material/input';
import { MatButtonModule } from '@angular/material';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
MatSelectModule, MatSelectModule,
MatCardModule, MatCardModule,
ReactiveFormsModule,
MatInputModule,
MatButtonModule MatButtonModule
], ],
providers: [OrganizationListService], providers: [OrganizationListService],
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!