убрал лишние урлы и убрал проверку на наличие заказов
This commit is contained in:
parent
eb16203995
commit
281e3c7139
@ -5,14 +5,17 @@ from dotenv import load_dotenv
|
|||||||
load_dotenv()
|
load_dotenv()
|
||||||
BASE_DIR = Path(__file__).resolve().parent.parent
|
BASE_DIR = Path(__file__).resolve().parent.parent
|
||||||
|
|
||||||
SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY", default="google")
|
SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', default='google')
|
||||||
|
|
||||||
DEBUG = os.getenv("DJANGO_DEBUG", default="false")
|
DEBUG = os.getenv('DJANGO_DEBUG', default='false')
|
||||||
DEBUG = DEBUG.lower().strip() in ("true", "yes", "1", "y", "t")
|
DEBUG = DEBUG.lower().strip() in ('true', 'yes', '1', 'y', 't')
|
||||||
|
|
||||||
AUTH_USER_MODEL = "auth.User"
|
AUTH_USER_MODEL = 'auth.User'
|
||||||
|
|
||||||
ALLOWED_HOSTS = []
|
ALLOWED_HOSTS = [
|
||||||
|
'localhost',
|
||||||
|
'127.0.0.1',
|
||||||
|
]
|
||||||
|
|
||||||
INSTALLED_APPS = [
|
INSTALLED_APPS = [
|
||||||
'films.apps.FilmsConfig',
|
'films.apps.FilmsConfig',
|
||||||
@ -26,9 +29,9 @@ INSTALLED_APPS = [
|
|||||||
'django.contrib.sessions',
|
'django.contrib.sessions',
|
||||||
'django.contrib.messages',
|
'django.contrib.messages',
|
||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
"sorl.thumbnail",
|
'sorl.thumbnail',
|
||||||
"ckeditor",
|
'ckeditor',
|
||||||
"django_cleanup.apps.CleanupConfig",
|
'django_cleanup.apps.CleanupConfig',
|
||||||
]
|
]
|
||||||
|
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
@ -43,10 +46,10 @@ MIDDLEWARE = [
|
|||||||
|
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
INSTALLED_APPS += [
|
INSTALLED_APPS += [
|
||||||
"debug_toolbar",
|
'debug_toolbar',
|
||||||
]
|
]
|
||||||
MIDDLEWARE += [
|
MIDDLEWARE += [
|
||||||
"debug_toolbar.middleware.DebugToolbarMiddleware",
|
'debug_toolbar.middleware.DebugToolbarMiddleware',
|
||||||
]
|
]
|
||||||
|
|
||||||
ROOT_URLCONF = 'CineSync.urls'
|
ROOT_URLCONF = 'CineSync.urls'
|
||||||
@ -55,7 +58,7 @@ TEMPLATES = [
|
|||||||
{
|
{
|
||||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||||
'DIRS': [
|
'DIRS': [
|
||||||
BASE_DIR / "templates",
|
BASE_DIR / 'templates',
|
||||||
],
|
],
|
||||||
'APP_DIRS': True,
|
'APP_DIRS': True,
|
||||||
'OPTIONS': {
|
'OPTIONS': {
|
||||||
@ -70,9 +73,8 @@ TEMPLATES = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
INTERNAL_IPS = [
|
INTERNAL_IPS = [
|
||||||
"127.0.0.1",
|
'127.0.0.1',
|
||||||
"localhost",
|
'localhost',
|
||||||
"*",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
WSGI_APPLICATION = 'CineSync.wsgi.application'
|
WSGI_APPLICATION = 'CineSync.wsgi.application'
|
||||||
@ -101,13 +103,13 @@ AUTH_PASSWORD_VALIDATORS = [
|
|||||||
|
|
||||||
LANGUAGE_CODE = 'ru'
|
LANGUAGE_CODE = 'ru'
|
||||||
|
|
||||||
TIME_ZONE = 'UTC'
|
TIME_ZONE = 'Europe/Moscow'
|
||||||
|
|
||||||
USE_I18N = True
|
USE_I18N = True
|
||||||
|
|
||||||
USE_TZ = True
|
USE_TZ = True
|
||||||
|
|
||||||
STATIC_URL = 'static/'
|
STATIC_URL = '/static/'
|
||||||
|
|
||||||
STATICFILES_DIRS = [
|
STATICFILES_DIRS = [
|
||||||
BASE_DIR / 'static',
|
BASE_DIR / 'static',
|
||||||
@ -115,12 +117,12 @@ STATICFILES_DIRS = [
|
|||||||
|
|
||||||
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
||||||
|
|
||||||
MEDIA_URL = "/media/"
|
MEDIA_URL = '/media/'
|
||||||
|
|
||||||
MEDIA_ROOT = BASE_DIR / "media"
|
MEDIA_ROOT = BASE_DIR / 'media'
|
||||||
|
|
||||||
LOGIN_URL = "/auth/login/"
|
LOGIN_URL = '/auth/login/'
|
||||||
|
|
||||||
LOGIN_REDIRECT_URL = "/"
|
LOGIN_REDIRECT_URL = '/'
|
||||||
|
|
||||||
LOGOUT_REDIRECT_URL = "/auth/login/"
|
LOGOUT_REDIRECT_URL = '/auth/login/'
|
||||||
|
|||||||
@ -72,3 +72,27 @@ body::-webkit-scrollbar-thumb {
|
|||||||
border-radius: 5vw;
|
border-radius: 5vw;
|
||||||
border: 2px solid #0d1d3a;
|
border: 2px solid #0d1d3a;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.error_code {
|
||||||
|
font-size: 5vw;
|
||||||
|
color: #eaeaea;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error_title, .error_text {
|
||||||
|
color: #eaeaea;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error_info_block {
|
||||||
|
height: 40vw;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.text_block {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
17
CineSync/templates/404.html
Normal file
17
CineSync/templates/404.html
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
{% load static %}
|
||||||
|
{% block title %}
|
||||||
|
Заказ оформлен
|
||||||
|
{% endblock %}
|
||||||
|
{% block content %}
|
||||||
|
<link href="{% static 'css/style.css' %}" rel="stylesheet">
|
||||||
|
<link href="{% static 'css/tickets/order_success.css' %}" rel="stylesheet">
|
||||||
|
<div class="error_info_block">
|
||||||
|
<div class="text_block">
|
||||||
|
<h1 class="error_title">Страница не найдена :(</h1>
|
||||||
|
<h1 class="error_code">404</h1>
|
||||||
|
<p class="error_text">Проверьте правильность данных</p>
|
||||||
|
<a class="btn btn-primary" href="{% url 'home:homepage' %}">На главную</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
@ -1,6 +1,5 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% load static %}
|
{% load static %}
|
||||||
{% load tags %}
|
|
||||||
{% block title %}
|
{% block title %}
|
||||||
Заказ оформлен
|
Заказ оформлен
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@ -12,7 +11,7 @@
|
|||||||
<h1 class="order_success_title">Заказ успешно оформлен</h1>
|
<h1 class="order_success_title">Заказ успешно оформлен</h1>
|
||||||
<img class="order_success_image" src="{% static 'img/success.png' %}">
|
<img class="order_success_image" src="{% static 'img/success.png' %}">
|
||||||
<p class="order_success_text">Скоро он станет доступен в списке ваших заказов</p>
|
<p class="order_success_text">Скоро он станет доступен в списке ваших заказов</p>
|
||||||
<a class="btn btn-primary" href="{% url 'home:homepage' %}">Отлично</a>
|
<a class="btn btn-primary" href="{% url 'tickets:my_orders' %}">Отлично</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@ -1,11 +1,10 @@
|
|||||||
from django.urls import path
|
from django.urls import path
|
||||||
|
|
||||||
from tickets.views import ticket_view, order_success, my_orders
|
from tickets.views import order_success, my_orders
|
||||||
|
|
||||||
app_name = 'tickets'
|
app_name = 'tickets'
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('', ticket_view, name='tickets'),
|
|
||||||
path('order/success', order_success, name='order_success'),
|
path('order/success', order_success, name='order_success'),
|
||||||
path('my/', my_orders, name='my_orders')
|
path('my/', my_orders, name='my_orders')
|
||||||
]
|
]
|
||||||
|
|||||||
@ -4,10 +4,6 @@ from django.shortcuts import render, get_list_or_404
|
|||||||
from tickets.models import Order, Ticket
|
from tickets.models import Order, Ticket
|
||||||
|
|
||||||
|
|
||||||
def ticket_view(request):
|
|
||||||
return render(request, 'tickets/ticket_buy.html')
|
|
||||||
|
|
||||||
|
|
||||||
def order_success(request):
|
def order_success(request):
|
||||||
return render(request, 'tickets/order_success.html')
|
return render(request, 'tickets/order_success.html')
|
||||||
|
|
||||||
@ -15,17 +11,15 @@ def order_success(request):
|
|||||||
@login_required
|
@login_required
|
||||||
def my_orders(request):
|
def my_orders(request):
|
||||||
user = request.user
|
user = request.user
|
||||||
orders = get_list_or_404(
|
orders = Order.objects.filter(
|
||||||
Order.objects.filter(
|
profile__id=user.profile.id,
|
||||||
profile__id=user.profile.id,
|
).select_related(
|
||||||
).select_related(
|
'session',
|
||||||
'session',
|
'session__film',
|
||||||
'session__film',
|
).prefetch_related(
|
||||||
).prefetch_related(
|
'tickets',
|
||||||
'tickets',
|
).order_by(
|
||||||
).order_by(
|
'-datetime_order'
|
||||||
'-datetime_order'
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
context = {
|
context = {
|
||||||
'my_orders': orders,
|
'my_orders': orders,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user