Merge branch 'max_dev' of Software_Engineering_I/greenvironment-frontend into master

master
Trivernis 5 years ago committed by Gitea
commit 40798b0869

@ -60,6 +60,7 @@ export class ProfileComponent implements OnInit {
this.userProfile = response; this.userProfile = response;
// tslint:disable-next-line:max-line-length // tslint:disable-next-line:max-line-length
this.userProfile.allowedToSendRequest = this.requestService.isAllowedToSendRequest(this.userProfile.userID, this.self); this.userProfile.allowedToSendRequest = this.requestService.isAllowedToSendRequest(this.userProfile.userID, this.self);
console.log(this.userProfile.allowedToSendRequest);
this.ownProfile = this.userProfile.userID === this.self.userID; this.ownProfile = this.userProfile.userID === this.self.userID;
this.rankname = this.levellist.getLevelName(this.userProfile.level); this.rankname = this.levellist.getLevelName(this.userProfile.level);
} else { } else {

@ -19,6 +19,9 @@ export class RequestService {
if (!self.loggedIn) { if (!self.loggedIn) {
return false; return false;
} else { } else {
if (userID === self.userID) {
return false;
}
for (const receiverID of self.sentRequestUserIDs) { for (const receiverID of self.sentRequestUserIDs) {
if (userID === receiverID || if (userID === receiverID ||
userID === self.userID) { userID === self.userID) {

@ -1,5 +1,8 @@
@mixin gridPosition($rowStart, $rowEnd, $columnStart, $columnEnd) ::-webkit-scrollbar
grid-row-start: $rowStart width: 4px
grid-row-end: $rowEnd
grid-column-start: $columnStart ::-webkit-scrollbar-track
grid-column-end: $columnEnd background: #ddd
::-webkit-scrollbar-thumb
background: #666

Loading…
Cancel
Save