commit 07082d3e4e88e552ba8683e327c8354aacd87432
parent ca815395a37e80d127cab90cfd5d79873a9665e4
Author: MTRNord <mtrnord1@gmail.com>
Date: Sat, 17 Feb 2018 20:44:16 +0100
Temp image Fix
Diffstat:
2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/app/tweet-list/tweet-list.component.html b/src/app/tweet-list/tweet-list.component.html
@@ -7,20 +7,18 @@
</div>
<!--Card image-->
<!-- Todo Fix for more than one image -->
- <!--<div class="overlay hm-white-slight waves-light card-img-top" *ngIf="item.imageURL">
- <img [src]="item.imageURL" class="img-fluid" style="z-index: 0">
+ <div class="overlay hm-white-slight waves-light card-img-top" *ngIf="item.image_urls[0]">
+ <img [src]="item.image_urls[0]" class="img-fluid" style="z-index: 0">
<a>
<div class="mask"></div>
</a>
- </div>-->
+ </div>
<!--Card content-->
<div class="card-body">
<!--Title when Text exists-->
- <!-- Todo Fix for more than one image -->
- <!-- <h4 class="card-title text-left" *ngIf="(item.text && item.imageURL) || (item.text && !item.imageURL)"><a href="{{item.userprofile_link}}">{{item.display_name}}</a></h4>
+ <h4 class="card-title text-left" *ngIf="(item.text && item.image_urls[0]) || (item.text && !item.image_urls[0])"><a href="{{item.userprofile_link}}">{{item.display_name}}</a></h4>
<!--Title when no Text exists-->
- <!-- Todo Fix for more than one image -->
- <h4 class="card-title align-middle" *ngIf="!item.text || !item.imageURL"><a href="{{item.userprofile_link}}">{{item.display_name}}</a></h4>
+ <h4 class="card-title align-middle" *ngIf="!item.text || !item.image_urls[0]"><a href="{{item.userprofile_link}}">{{item.display_name}}</a></h4>
<!--Text-->
<p class="card-text text-justify" *ngIf="item.text" style="white-space: pre-wrap;">{{item.text}}</p>
</div>
diff --git a/src/app/tweet-list/tweet-list.component.ts b/src/app/tweet-list/tweet-list.component.ts
@@ -1,6 +1,23 @@
import {Component, Input, OnInit} from '@angular/core';
import {ApiService} from '../api.service';
+export interface Tweet {
+ tweets?: (TweetsEntity)[] | null;
+}
+export interface TweetsEntity {
+ username: string;
+ user_id: string;
+ display_name: string;
+ userprofile_link: string;
+ text: string;
+ image_urls?: (string)[] | null;
+ created_at: string;
+ favorites: string;
+ retweets: string;
+ retweet: boolean;
+}
+
+
@Component({
selector: 'app-tweet-list',
templateUrl: './tweet-list.component.html',
@@ -8,7 +25,7 @@ import {ApiService} from '../api.service';
})
export class TweetListComponent implements OnInit {
@Input() uuid;
- data;
+ data: (TweetsEntity)[][];
constructor(private apiService: ApiService) {}
@@ -23,7 +40,7 @@ export class TweetListComponent implements OnInit {
);
}
- private chunk(arr, size) {
+ private chunk(arr: (TweetsEntity)[], size: number): (TweetsEntity)[][] {
const newArr = [];
for (let i = 0; i < arr.length; i += size) {
newArr.push(arr.slice(i, i + size));