diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d8a52c9..6fab380 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -38,6 +38,8 @@ import {MatSidenavModule} from '@angular/material/sidenav'; import {MatTabsModule} from '@angular/material/tabs'; import {MatCardModule} from '@angular/material/card'; import {MatButtonToggleModule} from '@angular/material/button-toggle'; +import {MatSelectModule} from '@angular/material/select'; +import {MatCheckboxModule} from '@angular/material/checkbox'; import { FlexLayoutModule } from '@angular/flex-layout'; import { MainNavigationComponent } from './components/main-navigation/main-navigation.component'; @@ -104,7 +106,9 @@ const appRoutes: Routes = [ MatButtonModule, MatListModule, MatCardModule, - MatButtonToggleModule + MatButtonToggleModule, + MatSelectModule, + MatCheckboxModule ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/components/feed/feed.component.html b/src/app/components/feed/feed.component.html index 54e230a..cf41465 100644 --- a/src/app/components/feed/feed.component.html +++ b/src/app/components/feed/feed.component.html @@ -4,17 +4,29 @@ -->
- + - +

+ I protected the environment. +

+ + Did you support the environment? + + the next time ;) + + {{action.name}} + + + +
diff --git a/src/app/components/feed/feed.component.sass b/src/app/components/feed/feed.component.sass index 2ff0394..cbedf1a 100644 --- a/src/app/components/feed/feed.component.sass +++ b/src/app/components/feed/feed.component.sass @@ -15,9 +15,23 @@ width: 100% #input - box-sizing: border-box width: 100% padding-left: 0.5em padding-right: 0.5em +#action-chooser + width: 100% + padding-left: 0.5em + padding-right: 0.5em + +#check + margin: 0 + padding-left: 0.5em + +#post-button + width: 100% + padding-left: 0.5em + padding-right: 0.5em + margin-top: 0.5em + diff --git a/src/app/components/feed/feed.component.ts b/src/app/components/feed/feed.component.ts index 29285ba..9a04690 100644 --- a/src/app/components/feed/feed.component.ts +++ b/src/app/components/feed/feed.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Post } from 'src/app/models/post'; import { FeedService } from 'src/app/services/feed/feed.service'; +import { Actionlist } from 'src/app/models/actionlist'; @Component({ selector: 'home-feed', @@ -17,6 +18,8 @@ export class FeedComponent implements OnInit { parentSelectedPostList: Array + actionlist: Actionlist = new Actionlist(); + constructor(private feedService: FeedService) { } ngOnInit() { diff --git a/src/app/models/actionlist.ts b/src/app/models/actionlist.ts index 21f2643..cfcc223 100644 --- a/src/app/models/actionlist.ts +++ b/src/app/models/actionlist.ts @@ -9,7 +9,7 @@ export class Actionlist{ { id: 6, name: "reduce CO2 emission", points: 5 }, { id: 7, name: "eat a vegetarian meal", points: 2 }, { id: 8, name: "don't use the car", points: 10 }, - { id: 9, name: "buy a fair trade/ local product", points: 1 }, + { id: 9, name: "buy a fair trade / local product", points: 1 }, { id: 10, name: "donate money to an environment organisation ", points: 10 }, ]; } \ No newline at end of file