From 5833282888de8c5f7300fd5e6ec571e29b78143c Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 3 Jan 2020 16:27:05 +0100 Subject: [PATCH 1/3] fixed friendrequest bug --- src/app/services/datasharing.service.ts | 6 ++++++ src/app/services/request/request.service.ts | 1 + 2 files changed, 7 insertions(+) diff --git a/src/app/services/datasharing.service.ts b/src/app/services/datasharing.service.ts index bc0d047..7116724 100644 --- a/src/app/services/datasharing.service.ts +++ b/src/app/services/datasharing.service.ts @@ -19,6 +19,12 @@ export class DatasharingService { this.userInfoSource.next(pUserInfo); } + addSentRequestUserID(id: number) { + const user: User = this.userInfoSource.getValue(); + user.sentRequestUserIDs.push(id); + this.changeUserInfo(user); + } + changeChatIDs(pChatIDs: number[]) { this.chatIDsSource.next(pChatIDs); } diff --git a/src/app/services/request/request.service.ts b/src/app/services/request/request.service.ts index 8cf340e..273a823 100644 --- a/src/app/services/request/request.service.ts +++ b/src/app/services/request/request.service.ts @@ -37,6 +37,7 @@ export class RequestService { } public sendFriendRequest(user: User) { + this.data.addSentRequestUserID(user.userID); const headers = new Headers(); headers.set('Content-Type', 'application/json'); this.http.post(environment.graphQLUrl, this.buildJsonRequest(user.userID, 'FRIENDREQUEST')) From 23bd554073d8f009e32ac23540d60c7c5653c540 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 4 Jan 2020 12:08:16 +0100 Subject: [PATCH 2/3] fixed displaying bug in safari --- src/app/components/about/about.component.html | 2 ++ src/app/components/about/about.component.sass | 6 ++++++ src/app/components/feed/feed.component.html | 2 +- .../main-navigation/main-navigation.component.sass | 6 ++++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/app/components/about/about.component.html b/src/app/components/about/about.component.html index 6edf33c..f0d7f9d 100644 --- a/src/app/components/about/about.component.html +++ b/src/app/components/about/about.component.html @@ -1,3 +1,4 @@ +

Greenvironment






@@ -17,3 +18,4 @@
Login
+
\ No newline at end of file diff --git a/src/app/components/about/about.component.sass b/src/app/components/about/about.component.sass index 5011064..90e88b1 100644 --- a/src/app/components/about/about.component.sass +++ b/src/app/components/about/about.component.sass @@ -3,6 +3,12 @@ @import '~@angular/material/theming' @import '../../../styles/greenvironment-material-theme.scss' +#about + position: fixed + width: 100% + height: calc(100% - 56px) + overflow: scroll + #text0, #text2 padding: 2em max-width: 100% diff --git a/src/app/components/feed/feed.component.html b/src/app/components/feed/feed.component.html index 4acdf59..6c021fb 100644 --- a/src/app/components/feed/feed.component.html +++ b/src/app/components/feed/feed.component.html @@ -30,7 +30,7 @@ - You are not logged in. Do you want to post something? + You need no log in to post something. diff --git a/src/app/components/main-navigation/main-navigation.component.sass b/src/app/components/main-navigation/main-navigation.component.sass index 4daa65d..6fdc7c0 100644 --- a/src/app/components/main-navigation/main-navigation.component.sass +++ b/src/app/components/main-navigation/main-navigation.component.sass @@ -1,6 +1,5 @@ .mat-sidenav-container - margin-top: 56px - height: calc(100vh - 56px) + height: 100vh .sidenav width: 200px @@ -22,6 +21,9 @@ .mat-tab-link height: 56px +.mat-sidenav-content + padding-top: 56px + #link-box padding: 0.5em From 0e553fd53fa274542d6910bc8d72875b02a82e73 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 5 Jan 2020 21:03:22 +0100 Subject: [PATCH 3/3] added a new line cause tslint said so lol --- src/typings.d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/typings.d.ts b/src/typings.d.ts index 4a77fa7..44692e6 100644 --- a/src/typings.d.ts +++ b/src/typings.d.ts @@ -1,4 +1,5 @@ declare module '*.svg' { const svg: string; export default svg; - } \ No newline at end of file + } + \ No newline at end of file