diff --git a/public/static/css/rosmorport.css b/public/static/css/rosmorport.css new file mode 100644 index 0000000..78c185f --- /dev/null +++ b/public/static/css/rosmorport.css @@ -0,0 +1,27 @@ +/* шрифт для лого */ +@import url('https://fonts.googleapis.com/css2?family=Lobster&display=swap'); +/*@import url('https://fonts.googleapis.com/css2?family=Amatic+SC:wght@700&display=swap');*/ +/*@import url('https://fonts.googleapis.com/css2?family=Kurale&display=swap');*/ + +/* НАВИГАЦИЯ */ +.navbar { + background: rgb(111,66,193); + background: linear-gradient(11deg, rgba(111,66,193,1) 15%, rgba(152,66,193,0.7) 70%); + height: 75px; +} +.navbar > div.container-fluid > a.navbar-brand { + font-family: "Lobster", sans-serif; + font-weight: 400; + font-style: normal; + font-size: 11pt; + color: #fff; +} + +.modal { + background: rgb(33, 20, 56); + background: linear-gradient(11deg, rgb(33, 20, 56, 1) 15%, rgba(49, 22, 64, 0.6) 70%); +} +.modal > .modal-dialog > .modal-content .modal-header, +.modal > .modal-dialog > .modal-content .modal-footer { + background: whitesmoke; +} \ No newline at end of file diff --git a/rosmorport_tsts/rosmorport_tsts/urls.py b/rosmorport_tsts/rosmorport_tsts/urls.py index ef8af82..3944a82 100644 --- a/rosmorport_tsts/rosmorport_tsts/urls.py +++ b/rosmorport_tsts/rosmorport_tsts/urls.py @@ -27,6 +27,7 @@ urlpatterns = [ re_path(r'^$', views.index), re_path(r'^logout$', views.my_logout), re_path(r'^login$', views.my_login), + re_path(r'^not-auth$', views.not_auth), ] # Обработчики ошибок diff --git a/rosmorport_tsts/rosmorport_tsts/views.py b/rosmorport_tsts/rosmorport_tsts/views.py index c33522b..144cce9 100644 --- a/rosmorport_tsts/rosmorport_tsts/views.py +++ b/rosmorport_tsts/rosmorport_tsts/views.py @@ -16,7 +16,7 @@ def index(request: HttpRequest) -> HttpResponse: # except (TemplateDoesNotExist, TemplateSyntaxError) as e: # # Обработка ошибки отсутствия шаблона # return HttpResponse(f"Не нашли шаблон или в нем ошибка \"{e}\".", status=424) - return render(request, "index.jinja", {}) + return render(request, template_name="index.jinja", context={}) def my_logout(request: HttpRequest) -> HttpResponseRedirect: @@ -26,7 +26,7 @@ def my_logout(request: HttpRequest) -> HttpResponseRedirect: :return response: исходящий http-ответ """ logout(request) - return HttpResponseRedirect('/') + return HttpResponseRedirect(redirect_to='/') def my_login(request: HttpRequest) -> HttpResponseRedirect: @@ -35,18 +35,27 @@ def my_login(request: HttpRequest) -> HttpResponseRedirect: :param :return response: исходящий http-ответ """ - print(request.POST) - if request.method == 'POST': - username = request.POST.get('username') - password = request.POST.get('password') - print(username, password) - user = authenticate(request, username=username, password=password) - if user is not None: - login(request, user) - # A backend authenticated the credentials - print(f"{user} is authenticated") - else: - # No backend authenticated the credentials - pass - # request.session['user'] = request.POST.get('login') - return HttpResponseRedirect('/') + try: + print(request.POST) + if request.method == 'POST': + user = authenticate(request, + username=request.POST['username'], + password=request.POST['password']) + if user is None: + # return HttpResponse('Пользователь не найден', status=304) + return HttpResponseRedirect(redirect_to='/not-auth') + else: + login(request, user) + return HttpResponseRedirect('/') + except KeyError: + return HttpResponseRedirect('/') + + +def not_auth(request: HttpRequest) -> HttpResponse: + """ Страница для неавторизованных пользователей + + :param + :return response: исходящий http-ответ + """ + to_template = {"META_REFRESH": "15; url=/"} + return render(request, template_name="not_auth.jinja", context=to_template, status=401) diff --git a/rosmorport_tsts/templates-django/base.jinja b/rosmorport_tsts/templates-django/base.jinja index e723d72..4f31dd0 100644 --- a/rosmorport_tsts/templates-django/base.jinja +++ b/rosmorport_tsts/templates-django/base.jinja @@ -19,7 +19,7 @@ - + @@ -38,7 +38,7 @@ {% block BODY %} {% block Top_CSS1 %}{% endblock %}{% block Top_CSS2 %}{% endblock %}{% block Top_CSS3 %}{% endblock %}{% include "blocks/header_nav.jinja" %} -{# {% block CONTENT %}{% endblock CONTENT %}#} + {% block CONTENT %}{% endblock CONTENT %} {# {% include "blocks/footer.jinja" %} #}{# {% if COOKIES %}#} {# {% include "blocks/accept-cookies.jinja2" %}{% endif %} #} diff --git a/rosmorport_tsts/templates-django/blocks/header_nav.jinja b/rosmorport_tsts/templates-django/blocks/header_nav.jinja index 9d4583e..b3bd8e6 100644 --- a/rosmorport_tsts/templates-django/blocks/header_nav.jinja +++ b/rosmorport_tsts/templates-django/blocks/header_nav.jinja @@ -1,6 +1,6 @@ {# ВЕРХНЯЯ НАВИГАЦИЯ #}{% include "popup/logon-logout.jinja" %} - + {% include "popup/logon-logout.jinja" %} \ No newline at end of file diff --git a/rosmorport_tsts/templates-django/not_auth.jinja b/rosmorport_tsts/templates-django/not_auth.jinja new file mode 100644 index 0000000..a6ff3f6 --- /dev/null +++ b/rosmorport_tsts/templates-django/not_auth.jinja @@ -0,0 +1,28 @@ +{% extends 'base.jinja' %} + +{% block CONTENT %} + + {% endblock CONTENT %} +{% block Top_JS1 %} + {% endblock Top_JS1 %} \ No newline at end of file diff --git a/rosmorport_tsts/templates-django/popup/logon-logout.jinja b/rosmorport_tsts/templates-django/popup/logon-logout.jinja index b973007..9050899 100644 --- a/rosmorport_tsts/templates-django/popup/logon-logout.jinja +++ b/rosmorport_tsts/templates-django/popup/logon-logout.jinja @@ -1,12 +1,12 @@ -