+
What does the level mean?
There are different levels you can reach through green behaviour.
diff --git a/src/app/components/profile/profile.component.sass b/src/app/components/profile/profile.component.sass
index 94f9cde..b67ae33 100644
--- a/src/app/components/profile/profile.component.sass
+++ b/src/app/components/profile/profile.component.sass
@@ -19,9 +19,20 @@
.icon-box
text-align: right
width: 100%
- .request-button
- margin-top: 0.5em
- margin-bottom: 0.5em
+.request-button
+ margin-top: 0.5em
+ margin-bottom: 0.5em
+ margin-left: auto
+#toolbar
+ margin-top: 25px
+
+#username
+ margin: 0.5em
+#handle
+ font-size: 14px
+#info
+ font-size: 14px
+ margin-left: calc(100px + 0.5em)
.mat-table
width: 100%
@@ -30,9 +41,18 @@
.mat-header-cell
padding-right: 0.5em
+$mat-card-header-size: 100px !default
.profile-picture
background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg)
+ height: $mat-card-header-size
+ width: $mat-card-header-size
+ border-radius: 50%
+ flex-shrink: 0
background-size: cover
+ // Makes `` tags behave like `background-size: cover`. Not supported
+ // in IE, but we're using it as a progressive enhancement.
+ object-fit: cover
+
#profile-table
diff --git a/src/app/components/profile/profile.component.ts b/src/app/components/profile/profile.component.ts
index 4f8f4f2..2327ed5 100644
--- a/src/app/components/profile/profile.component.ts
+++ b/src/app/components/profile/profile.component.ts
@@ -9,6 +9,7 @@ import {MatSort} from '@angular/material/sort';
import {MatTableDataSource} from '@angular/material/table';
import { RequestService } from 'src/app/services/request/request.service';
import { DatasharingService } from '../../services/datasharing.service';
+import { FeedService } from 'src/app/services/feed/feed.service';
@Component({
selector: 'app-profile',
@@ -74,6 +75,7 @@ export class ProfileComponent implements OnInit {
this.userProfile.handle = response.data.getUser.handle;
this.userProfile.points = response.data.getUser.points;
this.userProfile.level = response.data.getUser.level;
+ this.userProfile.posts = response.data.getUser.posts;
this.rankname = this.levellist.getLevelName(this.userProfile.level);
// tslint:disable-next-line:max-line-length
this.userProfile.allowedToSendRequest = this.requestService.isAllowedToSendRequest(response.data.getUser.id, this.self);
diff --git a/src/app/components/search/search.component.sass b/src/app/components/search/search.component.sass
index 8e797cf..5a06e35 100644
--- a/src/app/components/search/search.component.sass
+++ b/src/app/components/search/search.component.sass
@@ -20,6 +20,8 @@
box-sizing: border-box
width: 100%
margin-top: 0.5em
+ outline: none
+ user-select: none
/deep/ .mat-card-header-text
width: 1000%
margin: 0
diff --git a/src/app/components/social/groups/groups.component.html b/src/app/components/social/groups/groups.component.html
index 6076fd9..85a4121 100644
--- a/src/app/components/social/groups/groups.component.html
+++ b/src/app/components/social/groups/groups.component.html
@@ -1,7 +1,7 @@
Groups
-
+
diff --git a/src/app/components/social/groups/groups.component.ts b/src/app/components/social/groups/groups.component.ts
index 2b2d31f..84a28f0 100644
--- a/src/app/components/social/groups/groups.component.ts
+++ b/src/app/components/social/groups/groups.component.ts
@@ -25,7 +25,7 @@ export class DialogCreateGroupComponent {
if (name) {
this.social.createGroup(name);
this.dialogRef.close();
- }
+ }
}
}
diff --git a/src/app/models/user.ts b/src/app/models/user.ts
index b42a8b5..b3e5fca 100644
--- a/src/app/models/user.ts
+++ b/src/app/models/user.ts
@@ -1,6 +1,7 @@
import { FriendRequest } from 'src/app/models/friendRequest';
import { FriendInfo } from 'src/app/models/friendinfo';
import { GroupInfo } from 'src/app/models/groupinfo';
+import { Post } from 'src/app/models/post';
export class User {
loggedIn = false;
@@ -16,6 +17,7 @@ export class User {
friends: FriendInfo[] = new Array();
groups: GroupInfo[] = new Array();
+ posts: Post[] = new Array();
chatIDs: number[];
receivedRequests: FriendRequest[] = new Array();
sentRequestUserIDs: number[] = new Array(); // IDs of users that already received requests of the logged in user
diff --git a/src/styles/greenvironment-material-theme.scss b/src/styles/greenvironment-material-theme.scss
index 724989c..3d073a1 100644
--- a/src/styles/greenvironment-material-theme.scss
+++ b/src/styles/greenvironment-material-theme.scss
@@ -6,6 +6,39 @@
// Be sure that you only ever include this mixin once!
@include mat-core();
+$md-gvgreen: (
+ 50 : #e0f7e7,
+ 100 : #b3ebc3,
+ 200 : #80de9c,
+ 300 : #4dd174,
+ 400 : #26c756,
+ 500 : #00bd38,
+ 600 : #00b732,
+ 700 : #00ae2b,
+ 800 : #00a624,
+ 900 : #009817,
+ A100 : #c3ffc9,
+ A200 : #90ff9a,
+ A400 : #5dff6b,
+ A700 : #44ff54,
+ contrast: (
+ 50 : #000000,
+ 100 : #000000,
+ 200 : #000000,
+ 300 : #000000,
+ 400 : #000000,
+ 500 : #ffffff,
+ 600 : #ffffff,
+ 700 : #ffffff,
+ 800 : #ffffff,
+ 900 : #ffffff,
+ A100 : #000000,
+ A200 : #000000,
+ A400 : #000000,
+ A700 : #000000,
+ )
+);
+
// Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue. Available color palettes: https://material.io/design/color/