убрал лишние урлы и убрал проверку на наличие заказов
This commit is contained in:
parent
eb16203995
commit
281e3c7139
@ -5,14 +5,17 @@ from dotenv import load_dotenv
|
||||
load_dotenv()
|
||||
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 = DEBUG.lower().strip() in ("true", "yes", "1", "y", "t")
|
||||
DEBUG = os.getenv('DJANGO_DEBUG', default='false')
|
||||
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 = [
|
||||
'films.apps.FilmsConfig',
|
||||
@ -26,9 +29,9 @@ INSTALLED_APPS = [
|
||||
'django.contrib.sessions',
|
||||
'django.contrib.messages',
|
||||
'django.contrib.staticfiles',
|
||||
"sorl.thumbnail",
|
||||
"ckeditor",
|
||||
"django_cleanup.apps.CleanupConfig",
|
||||
'sorl.thumbnail',
|
||||
'ckeditor',
|
||||
'django_cleanup.apps.CleanupConfig',
|
||||
]
|
||||
|
||||
MIDDLEWARE = [
|
||||
@ -43,10 +46,10 @@ MIDDLEWARE = [
|
||||
|
||||
if DEBUG:
|
||||
INSTALLED_APPS += [
|
||||
"debug_toolbar",
|
||||
'debug_toolbar',
|
||||
]
|
||||
MIDDLEWARE += [
|
||||
"debug_toolbar.middleware.DebugToolbarMiddleware",
|
||||
'debug_toolbar.middleware.DebugToolbarMiddleware',
|
||||
]
|
||||
|
||||
ROOT_URLCONF = 'CineSync.urls'
|
||||
@ -55,7 +58,7 @@ TEMPLATES = [
|
||||
{
|
||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||
'DIRS': [
|
||||
BASE_DIR / "templates",
|
||||
BASE_DIR / 'templates',
|
||||
],
|
||||
'APP_DIRS': True,
|
||||
'OPTIONS': {
|
||||
@ -70,9 +73,8 @@ TEMPLATES = [
|
||||
]
|
||||
|
||||
INTERNAL_IPS = [
|
||||
"127.0.0.1",
|
||||
"localhost",
|
||||
"*",
|
||||
'127.0.0.1',
|
||||
'localhost',
|
||||
]
|
||||
|
||||
WSGI_APPLICATION = 'CineSync.wsgi.application'
|
||||
@ -101,13 +103,13 @@ AUTH_PASSWORD_VALIDATORS = [
|
||||
|
||||
LANGUAGE_CODE = 'ru'
|
||||
|
||||
TIME_ZONE = 'UTC'
|
||||
TIME_ZONE = 'Europe/Moscow'
|
||||
|
||||
USE_I18N = True
|
||||
|
||||
USE_TZ = True
|
||||
|
||||
STATIC_URL = 'static/'
|
||||
STATIC_URL = '/static/'
|
||||
|
||||
STATICFILES_DIRS = [
|
||||
BASE_DIR / 'static',
|
||||
@ -115,12 +117,12 @@ STATICFILES_DIRS = [
|
||||
|
||||
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: 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" %}
|
||||
{% load static %}
|
||||
{% load tags %}
|
||||
{% block title %}
|
||||
Заказ оформлен
|
||||
{% endblock %}
|
||||
@ -12,7 +11,7 @@
|
||||
<h1 class="order_success_title">Заказ успешно оформлен</h1>
|
||||
<img class="order_success_image" src="{% static 'img/success.png' %}">
|
||||
<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>
|
||||
{% endblock %}
|
||||
@ -1,11 +1,10 @@
|
||||
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'
|
||||
|
||||
urlpatterns = [
|
||||
path('', ticket_view, name='tickets'),
|
||||
path('order/success', order_success, name='order_success'),
|
||||
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
|
||||
|
||||
|
||||
def ticket_view(request):
|
||||
return render(request, 'tickets/ticket_buy.html')
|
||||
|
||||
|
||||
def order_success(request):
|
||||
return render(request, 'tickets/order_success.html')
|
||||
|
||||
@ -15,17 +11,15 @@ def order_success(request):
|
||||
@login_required
|
||||
def my_orders(request):
|
||||
user = request.user
|
||||
orders = get_list_or_404(
|
||||
Order.objects.filter(
|
||||
profile__id=user.profile.id,
|
||||
).select_related(
|
||||
'session',
|
||||
'session__film',
|
||||
).prefetch_related(
|
||||
'tickets',
|
||||
).order_by(
|
||||
'-datetime_order'
|
||||
)
|
||||
orders = Order.objects.filter(
|
||||
profile__id=user.profile.id,
|
||||
).select_related(
|
||||
'session',
|
||||
'session__film',
|
||||
).prefetch_related(
|
||||
'tickets',
|
||||
).order_by(
|
||||
'-datetime_order'
|
||||
)
|
||||
context = {
|
||||
'my_orders': orders,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user