diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index b392881..257c412 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -27,6 +27,7 @@ import { ImprintComponent } from './components/imprint/imprint.component';
import { AboutComponent } from './components/about/about.component';
import { ChatcontactsComponent } from './components/chatmanager/chatcontacts/chatcontacts.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {MatTableModule} from '@angular/material/table';
import { MatSliderModule } from '@angular/material/slider';
import { MatFormFieldModule } from '@angular/material/form-field';
@@ -43,12 +44,14 @@ import {MatCheckboxModule} from '@angular/material/checkbox';
import { OverlayModule} from '@angular/cdk/overlay';
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
import {MatMenuModule} from '@angular/material/menu';
+import {MatRippleModule} from '@angular/material/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { MainNavigationComponent } from './components/main-navigation/main-navigation.component';
import { LayoutModule } from '@angular/cdk/layout';
import { MatButtonModule } from '@angular/material/button';
import { MatListModule } from '@angular/material/list';
+import {MatSortModule} from '@angular/material/sort';
const config: SocketIoConfig = { url: 'http://localhost:4444', options: {} };
@@ -114,7 +117,10 @@ const appRoutes: Routes = [
MatCheckboxModule,
OverlayModule,
MatSlideToggleModule,
- MatMenuModule
+ MatMenuModule,
+ MatRippleModule,
+ MatTableModule,
+ MatSortModule
],
providers: [],
bootstrap: [AppComponent]
diff --git a/src/app/components/about/about.component.html b/src/app/components/about/about.component.html
index 635ed77..9d3f429 100644
--- a/src/app/components/about/about.component.html
+++ b/src/app/components/about/about.component.html
@@ -1,17 +1,18 @@
What's Greenvironment?
-
We, the greenviroment team want to create a netwok for environmentalists who care for our nature and our planet as much as we do.
+
We, the greenviroment team want to create a netwok for environmentalists who care for our nature and our planet as much as we do.
-
We believe, that together we can do amazing things to protect our environment and keep it clean and green.
-
You aren't part of greenvironment yet? - join us now!
+
We believe, that together we can do amazing things to protect our environment and keep it clean and green.
+
You aren't part of greenvironment yet? - join us now!
Register
Login
diff --git a/src/app/components/about/about.component.sass b/src/app/components/about/about.component.sass
index 65e75dc..5011064 100644
--- a/src/app/components/about/about.component.sass
+++ b/src/app/components/about/about.component.sass
@@ -8,21 +8,15 @@
max-width: 100%
min-height: 50%
background-color: mat-color($primary)
- p, h1, h2
- color: white
#text1
padding: 2em
min-height: 50%
max-width: 100%
- p, h1, h2
-.white-icon
- color: white
- transform: scale(3)
-
-p
- font-size: 2em
+.big-icon
+ //color: white
+ transform: scale(2)
.link-button
width: 100%
diff --git a/src/app/components/feed/feed.component.html b/src/app/components/feed/feed.component.html
index 0c89f4d..7363565 100644
--- a/src/app/components/feed/feed.component.html
+++ b/src/app/components/feed/feed.component.html
@@ -19,7 +19,7 @@
What did you do?
nothing ;)
-
+
{{action.name}}
diff --git a/src/app/components/imprint/imprint.component.html b/src/app/components/imprint/imprint.component.html
index 71a25aa..2828c76 100644
--- a/src/app/components/imprint/imprint.component.html
+++ b/src/app/components/imprint/imprint.component.html
@@ -1,8 +1,6 @@
+
Imprint
-
-
Imprint
-
The greenvironment network is being developed by the greenvironment team
-
Contact
-
Email: nick.derkoenig@greenvironment.net
-
+
The greenvironment network is being developed by the greenvironment team
+
Contact
+
Email: nick.derkoenig@greenvironment.net
\ No newline at end of file
diff --git a/src/app/components/imprint/imprint.component.sass b/src/app/components/imprint/imprint.component.sass
index 7f25657..6d771cc 100644
--- a/src/app/components/imprint/imprint.component.sass
+++ b/src/app/components/imprint/imprint.component.sass
@@ -1,19 +1,15 @@
@import '../../../styles/mixins.sass'
@import '../../../styles/vars.sass'
+
#imprint
- background-color: $cSecondaryBackground
- grid-template: 15% 70% 15% / 15% 70% 15%
- display: grid
- height: 90vh
-
-#imprintcontainer
- @include gridPosition(2, 2,2,2)
- background-color: $cPrimaryBackground
- padding: 1em
- overflow: auto
+ padding: 2em
+ max-width: 35em
+ margin: 0 auto
+
+h1.mat-display-1
+ margin: 0
+
-input
- margin: 0.25em
-#header
- @include gridPosition(1, 2, 1, 2)
+
+
diff --git a/src/app/components/main-navigation/main-navigation.component.html b/src/app/components/main-navigation/main-navigation.component.html
index d78ddee..e20ff90 100644
--- a/src/app/components/main-navigation/main-navigation.component.html
+++ b/src/app/components/main-navigation/main-navigation.component.html
@@ -1,4 +1,5 @@
-
+
+
-
+
-
-
Profile
+
name: |
@@ -39,7 +38,26 @@
You can get a different amount of points
for differnet actions you can see in the list below:
-
+
+
+
+
+
+ points |
+ {{action.points}} |
+
+
+
+
+ action |
+ {{action.name}} |
+
+
+
+
+
+
Profile not found :(
diff --git a/src/app/components/profile/profile.component.sass b/src/app/components/profile/profile.component.sass
index 5150b88..b252bbf 100644
--- a/src/app/components/profile/profile.component.sass
+++ b/src/app/components/profile/profile.component.sass
@@ -1,20 +1,14 @@
@import '../../../styles/mixins.sass'
@import '../../../styles/vars.sass'
-#profile
- background-color: $cSecondaryBackground
- grid-template: 3% 94% 3% / 10% 80% 10%
- display: grid
- min-height: 90vh
- max-height: 90vh
-
+#profile
+ padding: 2em
+ max-width: 1200px
+ margin: 0 auto
-#profilecontainer
- @include gridPosition(2, 2,2,2)
- //grid-template: 15% 15% 15% 15% 15% 15% / 100%
- background-color: $cPrimaryBackground
- padding: 1em
- overflow: auto
-
-th
- text-align: left
\ No newline at end of file
+.mat-table
+ width: 100%
+ max-width: 690px
+ margin: 0 auto
+.mat-header-cell
+ padding-right: 0.5em
\ No newline at end of file
diff --git a/src/app/components/profile/profile.component.ts b/src/app/components/profile/profile.component.ts
index 2b252e6..b39669d 100644
--- a/src/app/components/profile/profile.component.ts
+++ b/src/app/components/profile/profile.component.ts
@@ -1,27 +1,34 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild} from '@angular/core';
import {Router} from '@angular/router';
import {Http, URLSearchParams, Headers} from '@angular/http';
import { User } from 'src/app/models/user';
import { Actionlist } from 'src/app/models/actionlist';
import { Levellist } from 'src/app/models/levellist';
import { environment } from 'src/environments/environment';
+import {MatSort} from '@angular/material/sort';
+import {MatTableDataSource} from '@angular/material/table';
@Component({
selector: 'app-profile',
templateUrl: './profile.component.html',
styleUrls: ['./profile.component.sass']
})
+
export class ProfileComponent implements OnInit {
actionlist: Actionlist = new Actionlist();
+
levellist: Levellist = new Levellist();
user: User = new User()
id : string
rankname: string;
profileNotFound : boolean = false;
+ displayedColumns = ['points', 'name'];
+ dataSource = new MatTableDataSource(this.actionlist.Actions);
constructor(private router: Router,private http: Http) { }
-
+ @ViewChild(MatSort, {static: true}) sort: MatSort;
ngOnInit() {
+ this.dataSource.sort = this.sort;
this.id = this.router.url.substr(this.router.url.lastIndexOf("/") + 1);
//let url = './graphql'
let url = environment.graphQLUrl
diff --git a/src/app/components/social/friends/friends.component.html b/src/app/components/social/friends/friends.component.html
index 0362a24..f3943f2 100644
--- a/src/app/components/social/friends/friends.component.html
+++ b/src/app/components/social/friends/friends.component.html
@@ -12,7 +12,8 @@
-->
+ tabindex="0"
+ matRipple>
{{friend.name}}
diff --git a/src/app/models/actionlist.ts b/src/app/models/actionlist.ts
index cfcc223..a7ef6f3 100644
--- a/src/app/models/actionlist.ts
+++ b/src/app/models/actionlist.ts
@@ -1,5 +1,13 @@
+
+export interface Action {
+ id: number
+ name: string;
+ points: number;
+}
+
export class Actionlist{
- actions: { id: number, name: string, points: number}[] = [
+
+ Actions: Action[] = [
{ id: 0, name: "collect a lot of trash",points: 25},
{ id: 1, name: "collect a bit of trash",points: 10 },
{ id: 2, name: "do trash seperation", points: 5 },