zenon/web-application-engineering
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed models, frontend start

Browse Source
This commit is contained in:
Manuel Hude 2021-05-04 09:35:01 +02:00
parent b05df288d2
commit e252e07179
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/app_be/models.py
View File

@ -22,6 +22,6 @@ class FeedEntry(models.Model):
class Tweet(models.Model): class Tweet(models.Model):
feed = models.ForeignKey(Feed, null=True, on_delete=models.SET_NULL) 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() date_time = models.DateTimeField()
url = models.CharField(max_length=100) url = models.CharField(max_length=500)

4
backend/app_be/views/twitter_bot.py
View File

@ -46,12 +46,12 @@ class twitter_bot(threading.Thread):
# preparing tweet # preparing tweet
new_tweet = Tweet() new_tweet = Tweet()
new_tweet.icon = None new_tweet.feed = feed
new_tweet.text = current.title new_tweet.text = current.title
if 'published' in current: if 'published' in current:
new_tweet.date_time = parser.parse(current.published) new_tweet.date_time = parser.parse(current.published)
elif 'upddated' in current: elif 'updated' in current:
new_tweet.date_time = parser.parse(current.updated) new_tweet.date_time = parser.parse(current.updated)
else: else:
new_tweet.date_time = datetime.now() new_tweet.date_time = datetime.now()

10
frontend/src/app/component/tweets/tweets.component.html
View File

@ -12,15 +12,15 @@
</div> </div>
<div *ngIf="feeds.length !== 0"> <div *ngIf="feeds.length !== 0">
<div> <div>
<div class="container" *ngFor="let number of [1, 2, 3]"> <div class="container" *ngFor="let tweet of tweets">
<div class="row"> <div class="row">
<div class="col-2 text-center padding-0 margin-auto"> <div class="col-2 text-center padding-0 margin-auto">
<img class="feed-icon" src="assets/logo.svg" alt="Feed-Icon"> <img class="feed-icon" src="{{tweet.icon}}" alt="Feed-Icon">
</div> </div>
<div class="col-10"> <div class="col-10">
<p class="overflow-break">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnop qrstuvwxyz0123456789ABCDE FGHIJKLMNOP <p class="overflow-break">{{tweet.text}}
<span class="white-space-no-wrap"> - 24.03.2021 15:30</span></p> <span class="white-space-no-wrap">{{tweet.date_time}}</span></p>
<a>Zusatz externe URL zum Content der Nachricht</a> <a>{{tweet.url}}</a>
</div> </div>
</div> </div>
</div> </div>

14
frontend/src/app/component/tweets/tweets.component.ts
View File

@ -4,10 +4,8 @@ import {HttpClient, HttpHeaders} from '@angular/common/http';
import {FeedService} from '../../services/feed.service'; import {FeedService} from '../../services/feed.service';
import {IFeed} from '../../interfaces/feed.interface'; import {IFeed} from '../../interfaces/feed.interface';
import {Observable} from 'rxjs'; import {Observable} from 'rxjs';
import {Tweet} from "../../interfaces/interface";
class Tweet {
}
@Component({ @Component({
selector: 'app-tweets', selector: 'app-tweets',
@ -27,9 +25,15 @@ export class TweetsComponent implements OnInit {
this.feeds = data; this.feeds = data;
} }
); );
} }
ngOnInit(): void { ngOnInit(): void {
this.fillTweets()
} }
loadMore() { loadMore() {
@ -50,5 +54,9 @@ export class TweetsComponent implements OnInit {
}); });
} }
fillTweets(){
}
} }