Merge branch 'develop' into feature/work/html

This commit is contained in:
Ivan Pesnya
2021-02-17 15:50:10 +03:00
16 changed files with 235 additions and 146 deletions

View File

@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="ru" class="h-100">
{% load static %}
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

View File

@@ -1,26 +1,23 @@
{% load static %}
<header>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<nav class="navbar navbar-light" style="background-color: #a3f2fd;">
<a class="navbar-brand" href="#">
<img src="media/images/access.png" width="30" height="30" class="d-inline-block align-top" alt="" loading="lazy">
<nav class="navbar navbar-light" style="background-color: #00FF00;">
<a class="navbar-brand" href="{% url 'index' %}">
<img src="{% static 'main/img/logo.png' %}" width="30" height="30" class="d-inline-block align-top" alt="" loading="lazy">
Access Controller
</a>
{% if request.user.is_authenticated %}
<div class="btn-group" role="group" aria-label="Basic example">
<a class="btn btn-secondary" href="/accounts/logout">Выйти</a>
<a class="btn btn-secondary" href="">Профиль</a>
</div>
<div class="btn-group" role="group" aria-label="Basic example">
<a class="btn btn-secondary" href="{% url 'profile' %}">Профиль</a>
<a class="btn btn-secondary" href="{% url 'logout' %}">Выйти</a>
</div>
{% else %}
<div class="btn-group" role="group" aria-label="Basic example">
<a class="btn btn-secondary" href="/accounts/login">Войти</a>
<a class="btn btn-secondary" href="/accounts/register">Зарегистрироваться</a>
</div>
<div class="btn-group" role="group" aria-label="Basic example">
<a class="btn btn-secondary" href="/accounts/login">Войти</a>
<a class="btn btn-secondary" href="/accounts/register">Зарегистрироваться</a>
</div>
{% endif %}
</nav>
</header>

View File

@@ -10,37 +10,42 @@
{% block extra_css %}
<style>
<style>
.img{
width:auto;
height:auto;
max-width:150px!important;
max-height:500px!important;
max-width:100px!important;
max-height:100px!important;
}
</style>
</style>
{% endblock %}
{% block content %}
<br>
<div class="row">
<div class="col-auto">
<div class="container">
{% if image_name %}
<img src="/media/{{image_name}}" class="img img-thumbnail" alt="Аватар">
{% else %}
<img src="{% static 'no_avatar.png' %}" class="img img-thumbnail" alt="Нет изображения">
{% endif %}
</div>
</div>
<div class="row g-5">
<div class="col g-5">
<h4><span class="badge bg-secondary">Имя пользователя</span> {{name}}</h4>
<h4><span class="badge bg-secondary">Электронная почта</span> {{email}}</h4>
<h4><span class="badge bg-secondary">Текущая роль</span> {{role}}</h4>
<form action="">
<button class="btn btn-primary">Запросить права доступа</button>
</form>
</div>
<br>
<div class="row">
<div class="col-auto">
<div class="container">
{% if image_url %}
<img src={{image_url}} class="img img-thumbnail" alt="Аватар">
{% else %}
<img src="{% static 'no_avatar.png' %}" class="img img-thumbnail" alt="Нет изображения">
{% endif %}
</div>
</div>
<div class="col">
<h5><span class="badge bg-secondary text-light">Имя пользователя</span> {{name}}</h5>
<br>
<h5><span class="badge bg-secondary text-light">Электронная почта</span> {{email}}</h5>
<br>
<h5><span class="badge bg-secondary text-light">Текущая роль</span> {{role}}</h5>
</div>
</div>
<div align="center">
<form action="">
<button class="btn btn-primary"><big>Запросить права доступа</big></button>
</form>
</div>
{% endblock %}