From e252e0717954f5541f2c13ac8d9b85da6853f8ed Mon Sep 17 00:00:00 2001 From: Manuel Hude Date: Tue, 4 May 2021 09:35:01 +0200 Subject: [PATCH] Fixed models, frontend start --- backend/app_be/models.py | 4 ++-- backend/app_be/views/twitter_bot.py | 4 ++-- .../src/app/component/tweets/tweets.component.html | 10 +++++----- .../src/app/component/tweets/tweets.component.ts | 14 +++++++++++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/backend/app_be/models.py b/backend/app_be/models.py index e407166..1724443 100644 --- a/backend/app_be/models.py +++ b/backend/app_be/models.py @@ -22,6 +22,6 @@ class FeedEntry(models.Model): class Tweet(models.Model): feed = models.ForeignKey(Feed, null=True, on_delete=models.SET_NULL) - text = models.CharField(max_length=137) + text = models.CharField(max_length=500) date_time = models.DateTimeField() - url = models.CharField(max_length=100) + url = models.CharField(max_length=500) diff --git a/backend/app_be/views/twitter_bot.py b/backend/app_be/views/twitter_bot.py index 88d2824..7d4852b 100644 --- a/backend/app_be/views/twitter_bot.py +++ b/backend/app_be/views/twitter_bot.py @@ -46,12 +46,12 @@ class twitter_bot(threading.Thread): # preparing tweet new_tweet = Tweet() - new_tweet.icon = None + new_tweet.feed = feed new_tweet.text = current.title if 'published' in current: new_tweet.date_time = parser.parse(current.published) - elif 'upddated' in current: + elif 'updated' in current: new_tweet.date_time = parser.parse(current.updated) else: new_tweet.date_time = datetime.now() diff --git a/frontend/src/app/component/tweets/tweets.component.html b/frontend/src/app/component/tweets/tweets.component.html index e9460ef..03ff5a9 100644 --- a/frontend/src/app/component/tweets/tweets.component.html +++ b/frontend/src/app/component/tweets/tweets.component.html @@ -12,15 +12,15 @@
-
+
- Feed-Icon + Feed-Icon
-

ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnop qrstuvwxyz0123456789ABCDE FGHIJKLMNOP - - 24.03.2021 15:30

- Zusatz externe URL zum Content der Nachricht +

{{tweet.text}} + {{tweet.date_time}}

+ {{tweet.url}}
diff --git a/frontend/src/app/component/tweets/tweets.component.ts b/frontend/src/app/component/tweets/tweets.component.ts index 3ee55e2..31699d6 100644 --- a/frontend/src/app/component/tweets/tweets.component.ts +++ b/frontend/src/app/component/tweets/tweets.component.ts @@ -4,10 +4,8 @@ import {HttpClient, HttpHeaders} from '@angular/common/http'; import {FeedService} from '../../services/feed.service'; import {IFeed} from '../../interfaces/feed.interface'; import {Observable} from 'rxjs'; +import {Tweet} from "../../interfaces/interface"; -class Tweet { - -} @Component({ selector: 'app-tweets', @@ -27,9 +25,15 @@ export class TweetsComponent implements OnInit { this.feeds = data; } ); + + + } ngOnInit(): void { + + this.fillTweets() + } loadMore() { @@ -50,5 +54,9 @@ export class TweetsComponent implements OnInit { }); } + fillTweets(){ + + + } }