diff --git a/src/config/celery.py b/src/config/celery.py index 9205098..fa0fedd 100644 --- a/src/config/celery.py +++ b/src/config/celery.py @@ -11,6 +11,6 @@ app.autodiscover_tasks() app.conf.beat_schedule = { 'send-emails': { 'task': 'send_emails', - 'schedule': crontab(hour=7, minute=55), + 'schedule': crontab(hour=5, minute=55), }, } \ No newline at end of file diff --git a/src/series/tasks.py b/src/series/tasks.py index 6309bb8..39afa6c 100644 --- a/src/series/tasks.py +++ b/src/series/tasks.py @@ -1,10 +1,8 @@ from celery import shared_task from account.models import User -from requests import get -from datetime import datetime from django.template.loader import render_to_string from django.core.mail import EmailMessage -from celery.utils.log import get_task_logger +# from celery.utils.log import get_task_logger from imdb_api_access import SeriesCounter from imdb_api_access import MaximumUsageError diff --git a/src/series/templates/homepage.html b/src/series/templates/homepage.html index 806eaef..a03f454 100644 --- a/src/series/templates/homepage.html +++ b/src/series/templates/homepage.html @@ -8,6 +8,11 @@ {% include 'components/message.html' %} +
+ + +
+ diff --git a/src/series/views/homepage.py b/src/series/views/homepage.py index 1d171e7..e239bd0 100644 --- a/src/series/views/homepage.py +++ b/src/series/views/homepage.py @@ -8,14 +8,18 @@ from django.db.models import Q @login_required(login_url='/account/login') def homepage_view(request): user = User.objects.get(id=request.user.id) + if request.GET.get('new') == 'true': - series_true = user.series.filter(~Q(new_episodes_count=0), show=True).order_by('-id') - series_false = user.series.filter(~Q(new_episodes_count=0), show=False).order_by('-id') - else: - series_true = user.series.filter(show=True).order_by('-id') - series_false = user.series.filter(show=False).order_by('-id') + series = user.series.filter(~Q(new_episodes_count=0)).order_by('-id') + + else: series = user.series.filter().order_by('-id') + + if search := request.GET.get('search'): + series = series.filter( + Q(title__icontains=search) + ) page = request.GET.get('page') - paginator = Paginator(list(series_true) + list(series_false), 5) + paginator = Paginator(series, 5) return render(request, 'homepage.html', context={'series': paginator.get_page(page)}) \ No newline at end of file diff --git a/src/static/css/homepage.css b/src/static/css/homepage.css index 04fa9fb..83a0e1a 100644 --- a/src/static/css/homepage.css +++ b/src/static/css/homepage.css @@ -10,6 +10,15 @@ float: right; } +.search-form { + width: 370px; + display: flex; +} + +.search-form input { + margin-right: 1rem; +} + @media only screen and (max-width: 510px) { table { font-size: 87%; @@ -24,4 +33,15 @@ width: 19px; height: 19px; } + + .search-form { + width: 330px; + display: flex; + } + + .search-form input { + margin-top: 4px; + height: 45px; + margin-right: 1rem; + } } \ No newline at end of file