diff --git a/backend/.gitignore b/backend/.gitignore index cbeb2f6..c7091f0 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -1,7 +1,7 @@ venv *.pyc staticfiles -media +media/feed-icons .env *.sqlite3 *.sqlite diff --git a/backend/app_be/media/default-icon.svg b/backend/app_be/media/default-icon.svg new file mode 100644 index 0000000..b1c7bbe Binary files /dev/null and b/backend/app_be/media/default-icon.svg differ diff --git a/backend/app_be/models.py b/backend/app_be/models.py index 1fa41f0..e407166 100644 --- a/backend/app_be/models.py +++ b/backend/app_be/models.py @@ -9,7 +9,7 @@ class User(models.Model): class Feed(models.Model): url = models.TextField(blank=False, null=False, validators=[URLValidator(['http', 'https'])]) active = models.BooleanField() - icon = models.FileField(upload_to='feed-icons', blank=True, null=True, + icon = models.FileField(upload_to='feed-icons', blank=True, null=False, default='default-icon.svg', validators=[FileExtensionValidator(['png', 'svg'])]) keywords = models.TextField(blank=False, null=False) match_all_keywords = models.BooleanField(blank=True, default=False) diff --git a/frontend/src/app/component/einstellungen/einstellungen.component.ts b/frontend/src/app/component/einstellungen/einstellungen.component.ts index 57ffbfc..4ce40bb 100644 --- a/frontend/src/app/component/einstellungen/einstellungen.component.ts +++ b/frontend/src/app/component/einstellungen/einstellungen.component.ts @@ -1,11 +1,11 @@ import {Component, OnInit} from '@angular/core'; import {HttpClient} from '@angular/common/http'; -import {Observable, throwError} from 'rxjs'; +import {throwError} from 'rxjs'; import {MatSnackBar} from '@angular/material/snack-bar'; import {NGXLogger} from 'ngx-logger'; import {IFeed} from '../../interfaces/feed.interface'; import {FeedService} from '../../services/feed.service'; -import {ActivatedRoute, NavigationEnd, Router} from '@angular/router'; +import {ActivatedRoute} from '@angular/router'; @Component({ selector: 'app-einstellungen', @@ -22,10 +22,8 @@ export class EinstellungenComponent implements OnInit { private _snackbar: MatSnackBar, private _logger: NGXLogger, private _feedService: FeedService, - private _route: ActivatedRoute, - private _router: Router) { + private _route: ActivatedRoute) { this.icon = 'assets/logo.svg'; - this._router.routeReuseStrategy.shouldReuseRoute = () => false; this._feedService.getFeeds().toPromise().then(data => this.feeds = data).catch(err => this._logger.error(err)); }