diff --git a/config/urls.py b/config/urls.py index fd0f475..0b80af4 100644 --- a/config/urls.py +++ b/config/urls.py @@ -16,7 +16,7 @@ Including another URLconf from django.contrib import admin from django.urls import include from django.urls import path -from .views import home, welcome, help, hard, popular +from .views import home, welcome, help, hard, popular, helpp from django.contrib.staticfiles.urls import staticfiles_urlpatterns urlpatterns = [ @@ -25,6 +25,7 @@ urlpatterns = [ path('popular', popular, name='popular'), path('hard', hard, name='hard'), path('help', help, name='help'), + path('help/', helpp, name="helpp"), path('users/', include("users.urls")), path('questions/', include("questions.urls")), path('answers/', include("answers.urls")), diff --git a/config/views.py b/config/views.py index c01e3d2..ef2c07f 100644 --- a/config/views.py +++ b/config/views.py @@ -19,6 +19,11 @@ def home(request): def help(request): return render(request, 'help-new.html', ) + +def helpp(request, help_id): + return render(request, f'help_{help_id}.html', ) + + @login_required def popular(request): context = {} diff --git a/static/media/SOITA-Home.png b/static/media/SOITA-Home.png deleted file mode 100644 index 30160b3..0000000 Binary files a/static/media/SOITA-Home.png and /dev/null differ diff --git a/static/media/SOITA-Result.png b/static/media/SOITA-Result.png deleted file mode 100644 index 1c2f8f8..0000000 Binary files a/static/media/SOITA-Result.png and /dev/null differ diff --git a/static/media/SOITA-Test.png b/static/media/SOITA-Test.png deleted file mode 100644 index 558b34f..0000000 Binary files a/static/media/SOITA-Test.png and /dev/null differ diff --git a/static/style.css b/static/style.css index b8afe98..16ce00e 100644 --- a/static/style.css +++ b/static/style.css @@ -13,7 +13,7 @@ .sidenav a { padding: 6px 8px 6px 16px; - text-decoration: none; + text-decoration: none;mainTestContainer font-size: 20px; color: #FEEFE5; display: block; @@ -95,6 +95,22 @@ height: 200px; } +.mainTournamentRankingContainer { + border-radius: 25px; + border: 2px solid #FF0B7E; + padding: 20px; + width: 350px; + height: 100px; +} + +.mainTournamentContainer { + border-radius: 25px; + border: 2px solid #FF0B7E; + padding: 20px; + width: 450px; + height: 100px; +} + .mainTestName { font-weight: bold; font-size: 20px; @@ -186,6 +202,19 @@ transform: translate(200%,0%); } +.mainTournamentContainer button { + height: 30px; + width: 85px; + color: #FFF; + font-size: 17px; + background: #00916E; + cursor: pointer; + border-radius: 25px; + border: none; + outline: none; + transform: translate(200%,0%); +} + .solvedTestContainer button { height: 30px; width: 150px; @@ -283,7 +312,12 @@ text-align: center; } -.mainTestContainer a { +.mainTestContaine r a { + color: inherit; + text-decoration: inherit; +} + +.mainTournamentContainer a { color: inherit; text-decoration: inherit; } diff --git a/templates/help-new.html b/templates/help-new.html index e194e47..fb76c13 100644 --- a/templates/help-new.html +++ b/templates/help-new.html @@ -11,7 +11,7 @@ 3. Tworzenie testów

4. Edycja testów

5. Przeglądanie historii testów

- 6. Rozwiązywanie testów + 6. Tryb turniejowy

Mamy nadzieję, że nasza instrukcja jest pomocna i że będziesz mógł na spokojnie wykorzystać cały potencjał aplikacji i zabrać się za rozwiązywanie (lub tworzenie) nowych testów :)

diff --git a/templates/tournament_classification.html b/templates/tournament_classification.html index 0ea5c64..13f2952 100644 --- a/templates/tournament_classification.html +++ b/templates/tournament_classification.html @@ -16,17 +16,16 @@ - {% if final_tournaments%} {% for tournament in final_tournaments%} -{{forloop.counter}} -tuniej: {{tournament.tournament__name}} -wynik: {{tournament.score}} -gracz: {{tournament.user__email}} -data: {{tournament.date|date:"d M Y"}} -
- - +
+ Miejsce: {{forloop.counter}}
+ Nazwa turnieju: {{tournament.tournament__name}}
+ Gracz: {{tournament.user__email}}
+ Wynik gracza: {{tournament.score}}
+ Data wykonania testu: {{tournament.date|date:"d M Y"}} +
+
{% endfor %} {% endif %} diff --git a/templates/tournaments.html b/templates/tournaments.html index 3e92144..26ed2fa 100644 --- a/templates/tournaments.html +++ b/templates/tournaments.html @@ -5,9 +5,9 @@ {% block content %}

Turnieje

-
+

{% for tournament in tournaments %} -
+
{{tournament.name}}