CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/profile' into 'develop'

Browse Source 
Add media to staticfiles, update `profile.html`

See merge request 2020-2021/online/s101/group-02/access_controller!6
This commit is contained in:
Кравченко Артем 2021-02-11 18:31:09 +00:00
commit 4555627bd3
3 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
access_controller/settings.py
View File

@ -119,6 +119,7 @@ STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'staticroot')
STATICFILES_DIRS = [
os.path.join(BASE_DIR, 'static'),
os.path.join(BASE_DIR, 'media'),
]
MEDIA_ROOT = BASE_DIR / 'media'
@ -126,4 +127,3 @@ MEDIA_URL = '/media/'
LOGIN_REDIRECT_URL = '/'
LOGOUT_REDIRECT_URL = '/'

3
access_controller/urls.py
View File

@ -31,6 +31,3 @@ urlpatterns = [
path('accounts/', include('django.contrib.auth.urls')),
path('accounts/', include('django_registration.backends.one_step.urls')),
]
if DEBUG:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

51
main/templates/pages/profile.html
View File

@ -10,37 +10,42 @@
{% block extra_css %}
<style>
<style>
.img{
width:auto;
height:auto;
max-width:150px!important;
max-width:300px!important;
max-height:500px!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_name %}
<img src="{% static image_name %}" 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 %}