From 00c019196fc0ffdaab084b0e7946f7c74904ed62 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 10 Jan 2020 13:15:58 +0100 Subject: [PATCH 1/9] pictures in posts are displayed correctly now --- src/app/app.module.ts | 2 ++ src/app/components/feed/feed.component.ts | 4 +-- .../feed/postlist/postlist.component.html | 4 +-- .../feed/postlist/postlist.component.sass | 9 +++-- .../main-navigation.component.html | 4 +-- .../main-navigation.component.sass | 6 ++++ .../main-navigation.component.ts | 2 +- .../components/profile/profile.component.html | 31 ++++++++++------- .../components/profile/profile.component.sass | 26 +++++++++++++-- .../components/profile/profile.component.ts | 2 ++ .../components/search/search.component.sass | 2 ++ .../social/groups/groups.component.html | 2 +- .../social/groups/groups.component.ts | 2 +- src/app/models/user.ts | 2 ++ src/styles/greenvironment-material-theme.scss | 33 +++++++++++++++++++ 15 files changed, 106 insertions(+), 25 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8dcff6a..3a5a112 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -58,6 +58,7 @@ import { SearchComponent } from './components/search/search.component'; import {DomSanitizer} from '@angular/platform-browser'; import {MatIconRegistry} from '@angular/material/icon'; import {MatDialogModule} from '@angular/material/dialog'; +import {MatTooltipModule} from '@angular/material/tooltip'; // import logo from 'src/assets/gv-new-logo.svg'; import logo from '!!raw-loader!./gv-new-logo-white.svg'; @@ -134,6 +135,7 @@ const appRoutes: Routes = [ MatBadgeModule, MatProgressSpinnerModule, MatDialogModule, + MatTooltipModule ], entryComponents: [ DialogCreateGroupComponent ], providers: [], diff --git a/src/app/components/feed/feed.component.ts b/src/app/components/feed/feed.component.ts index bd35acb..4395115 100644 --- a/src/app/components/feed/feed.component.ts +++ b/src/app/components/feed/feed.component.ts @@ -34,6 +34,7 @@ export class FeedComponent implements OnInit { ngOnInit() { this.data.currentUserInfo.subscribe(user => { + console.log('feed got new user'); this.user = user; this.loggedIn = user.loggedIn; if (this.loggedIn) { @@ -53,8 +54,7 @@ export class FeedComponent implements OnInit { this.feedMostLiked = this.feedNew; console.log(this.feedNew); }); - } - + } }); } diff --git a/src/app/components/feed/postlist/postlist.component.html b/src/app/components/feed/postlist/postlist.component.html index 919f013..da2da14 100644 --- a/src/app/components/feed/postlist/postlist.component.html +++ b/src/app/components/feed/postlist/postlist.component.html @@ -46,12 +46,12 @@

- {{post.upvotes}} - diff --git a/src/app/components/feed/postlist/postlist.component.sass b/src/app/components/feed/postlist/postlist.component.sass index e9b0e0b..12f3e95 100644 --- a/src/app/components/feed/postlist/postlist.component.sass +++ b/src/app/components/feed/postlist/postlist.component.sass @@ -5,10 +5,10 @@ box-sizing: border-box width: 100% margin-top: 0.5em + outline: none + user-select: none ::ng-deep .mat-card-header-text margin: 0px - .mat-card-header - .mat-card-subtitle display: contents a:hover @@ -16,4 +16,9 @@ #button-box text-align: right margin-left: auto + ::ng-deep img + max-width: 100% + height: auto + border-radius: 4px + diff --git a/src/app/components/main-navigation/main-navigation.component.html b/src/app/components/main-navigation/main-navigation.component.html index b325689..1936530 100644 --- a/src/app/components/main-navigation/main-navigation.component.html +++ b/src/app/components/main-navigation/main-navigation.component.html @@ -38,8 +38,8 @@ fxShow="true" fxHide.gt-sm="true"> menu - - Greenvironment + + Greenvironment