diff --git a/src/app/components/profile/profile.component.ts b/src/app/components/profile/profile.component.ts index 41b8e57..147c1b7 100644 --- a/src/app/components/profile/profile.component.ts +++ b/src/app/components/profile/profile.component.ts @@ -60,6 +60,7 @@ export class ProfileComponent implements OnInit { this.userProfile = response; // tslint:disable-next-line:max-line-length 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.rankname = this.levellist.getLevelName(this.userProfile.level); } else { diff --git a/src/app/services/request/request.service.ts b/src/app/services/request/request.service.ts index 9fe0d81..d3904c9 100644 --- a/src/app/services/request/request.service.ts +++ b/src/app/services/request/request.service.ts @@ -19,6 +19,9 @@ export class RequestService { if (!self.loggedIn) { return false; } else { + if (userID === self.userID) { + return false; + } for (const receiverID of self.sentRequestUserIDs) { if (userID === receiverID || userID === self.userID) { diff --git a/src/styles/mixins.sass b/src/styles/mixins.sass index 14bca84..5c1bc5c 100644 --- a/src/styles/mixins.sass +++ b/src/styles/mixins.sass @@ -1,5 +1,8 @@ -@mixin gridPosition($rowStart, $rowEnd, $columnStart, $columnEnd) - grid-row-start: $rowStart - grid-row-end: $rowEnd - grid-column-start: $columnStart - grid-column-end: $columnEnd +::-webkit-scrollbar + width: 4px + +::-webkit-scrollbar-track + background: #ddd + +::-webkit-scrollbar-thumb + background: #666