Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

games button removed; game signals disabled #555

Merged
merged 5 commits into from
Oct 7, 2024
Merged

games button removed; game signals disabled #555

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc4359e
games button removed; game signals disabled
webn1nja Oct 1, 2024
fb6dd59
games signals and button deleted
webn1nja Oct 3, 2024
e8a5a20
returned the signals file so that there would be no conflict during t…
webn1nja Oct 7, 2024
389a128
Merge branch 'dev' into bugfix/remove_games_button_and_signals
webn1nja Oct 7, 2024
82f3619
fix ruff
KonstantinRaikhert Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions adaptive_hockey_federation/games/apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
from django.apps import AppConfig


class GamesConfig(AppConfig):
"""Класс-конфигуратор для приложения games."""

default_auto_field = "django.db.models.BigAutoField"
name = "games"
verbose_name = "Игры"

def ready(self) -> None:
"""Импортирование сигналов для приложения."""
import games.signals # noqa

return super().ready()
from django.apps import AppConfig


class GamesConfig(AppConfig):
"""Класс-конфигуратор для приложения games."""

default_auto_field = "django.db.models.BigAutoField"
name = "games"
verbose_name = "Игры"
59 changes: 0 additions & 59 deletions adaptive_hockey_federation/games/signals.py
View file
Open in desktop

This file was deleted.

117 changes: 56 additions & 61 deletions adaptive_hockey_federation/templates/base/drawer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,56 @@
{% if not request.user.is_moderator %}
<aside id="container__fluid" class="aside-navbar">
<div class="navbar-container">
<ul class="navigate">
<div class="py-5 logo-zone">
<div class="col-auto flex justify-end">
<span class="logo-img">
<img src="https://paraicehockey.ru/wp-content/uploads/2022/02/FAH_q.png" width="100" height="100">
</span>
</div>
<div class="col text-white flex justify-start">
Мир хоккея<br>для особенных<br>детей
</div>
</div>
{% if not request.user.is_agent %}
<li class="nav-item py-2 list-group">
{% url 'main:players' as url_name %}{% include "base/button.html" with name="Игроки" %}
</li>
<li class="nav-item py-2">
{% url 'users:users' as url_name %}{% include "base/button.html" with name="Пользователи" %}
</li>
{% endif %}
<li class="nav-item py-2">
{% url 'main:teams' as url_name %}{% include "base/button.html" with name="Команды" %}
</li>
{% if not request.user.is_agent %}
<li class="nav-item py-2">
{% url 'main:staffs' as url_name %}{% include "base/button.html" with name="Персонал команд" %}
</li>
{% endif %}
<li class="nav-item py-2">
{% url 'competitions:competitions' as url_name %}{% include "base/button.html" with name="Соревнования" %}
</li>
{% if not request.user.is_agent %}
<li class="nav-item py-2">
{% url 'analytics:analytics' as url_name %}{% include "base/button.html" with name="Аналитика" %}
</li>
{% endif %}
{% if request.user.is_admin %}
<li class="nav-item py-2">
{% url 'unloads:unloads' as url_name %}{% include "base/button.html" with name="Выгрузки" %}
</li>
{% endif %}
{% if not request.user.is_agent %}
<li class="nav-item py-2">
{% url 'games:games' as url_name %}{% include "base/button.html" with name="Игры" %}
</li>
{% endif %}
</ul>
<button
onclick="toggle_visibility(false);"
class="nav-button"
type="button"
aria-controls="staticBackdrop"
aria-expanded="true"
>
{% include "base/triangle.html" %}
</button>
</div>
</aside>
{% endif %}
{% if not request.user.is_moderator %}
<aside id="container__fluid" class="aside-navbar">
<div class="navbar-container">
<ul class="navigate">
<div class="py-5 logo-zone">
<div class="col-auto flex justify-end">
<span class="logo-img">
<img src="https://paraicehockey.ru/wp-content/uploads/2022/02/FAH_q.png" width="100" height="100">
</span>
</div>
<div class="col text-white flex justify-start">
Мир хоккея<br>для особенных<br>детей
</div>
</div>
{% if not request.user.is_agent %}
<li class="nav-item py-2 list-group">
{% url 'main:players' as url_name %}{% include "base/button.html" with name="Игроки" %}
</li>
<li class="nav-item py-2">
{% url 'users:users' as url_name %}{% include "base/button.html" with name="Пользователи" %}
</li>
{% endif %}
<li class="nav-item py-2">
{% url 'main:teams' as url_name %}{% include "base/button.html" with name="Команды" %}
</li>
{% if not request.user.is_agent %}
<li class="nav-item py-2">
{% url 'main:staffs' as url_name %}{% include "base/button.html" with name="Персонал команд" %}
</li>
{% endif %}
<li class="nav-item py-2">
{% url 'competitions:competitions' as url_name %}{% include "base/button.html" with name="Соревнования" %}
</li>
{% if not request.user.is_agent %}
<li class="nav-item py-2">
{% url 'analytics:analytics' as url_name %}{% include "base/button.html" with name="Аналитика" %}
</li>
{% endif %}
{% if request.user.is_admin %}
<li class="nav-item py-2">
{% url 'unloads:unloads' as url_name %}{% include "base/button.html" with name="Выгрузки" %}
</li>
{% endif %}
</ul>
<button
onclick="toggle_visibility(false);"
class="nav-button"
type="button"
aria-controls="staticBackdrop"
aria-expanded="true"
>
{% include "base/triangle.html" %}
</button>
</div>
</aside>
{% endif %}
Loading