diff --git a/questions/static/core/css/style.css b/questions/static/core/css/style.css index 3400af1..236b684 100644 --- a/questions/static/core/css/style.css +++ b/questions/static/core/css/style.css @@ -204,6 +204,10 @@ a:hover { box-shadow: 0.25rem 0.25rem 0 rgba(31, 45, 58, 0.08); } +.not-underlined { + text-decoration: none; +} + .sidebar h2 { margin: 0 0 0.5rem; font-size: 1.25rem; @@ -307,6 +311,21 @@ a:hover { margin-top: 0.4rem; } +.current-tag { + display: inline-block; + border: 0.125rem solid #1f2d3a; + background: #f2f7f7; + padding: 0.25rem 0.6rem; + margin-bottom: 0.6rem; + font-size: 0.85rem; + box-shadow: 0.2rem 0.2rem 0 rgba(31, 45, 58, 0.08); +} + +.current-tag span { + color: #1d57d4; + font-weight: 700; +} + .footer { border-top: 0.125rem solid #1f2d3a; padding: 0.6rem 1.1rem; diff --git a/questions/templates/core/base.html b/questions/templates/core/base.html deleted file mode 100644 index 92f7d13..0000000 --- a/questions/templates/core/base.html +++ /dev/null @@ -1,140 +0,0 @@ - - - - - VkDesk | Fresh Questions - - - - -
- -
- - ASK IT -
-
-
avatar
-
-
Dr. Pepper
-
- settings - log out -
-
-
-
- -
-
-
-

Fresh Questions

- Top Today -
- - - - - - - - -
- - -
- - - - - - - - - - diff --git a/questions/templates/core/hot.html b/questions/templates/core/hot.html new file mode 100644 index 0000000..f53825e --- /dev/null +++ b/questions/templates/core/hot.html @@ -0,0 +1,16 @@ +{% extends 'core/layout/base.html' %} +{% load static %} + +{% block content %} +
+

Hot Questions

+ All questions +
+ +{% for question in hot_questions %} +{% include 'core/partials/question.html' %} +{% endfor %} +{% include 'core/partials/pagination.html' %} + + +{% endblock %} \ No newline at end of file diff --git a/questions/templates/core/index.html b/questions/templates/core/index.html index f02ca7b..1349e12 100644 --- a/questions/templates/core/index.html +++ b/questions/templates/core/index.html @@ -3,10 +3,15 @@ {% block content %}
-

Fresh Questions

- Top Today +

All Questions

+ Hot questions
+{% if tag %} +
+ Текущий тег: #{{ tag }} +
+{% endif %} {% for question in questions %} {% include 'core/partials/question.html' %} {% endfor %} diff --git a/questions/templates/core/layout/base.html b/questions/templates/core/layout/base.html index fe858a2..2b2ad3e 100644 --- a/questions/templates/core/layout/base.html +++ b/questions/templates/core/layout/base.html @@ -9,7 +9,7 @@
- +
ASK IT @@ -34,14 +34,9 @@

Trending Tags

- perl - python - TechnoPark - MySQL - django - Mail.Ru - Voloshin - Firefox + {% for tag in tags %} + {{tag}} + {% endfor %}
diff --git a/questions/templates/core/partials/pagination.html b/questions/templates/core/partials/pagination.html index 58d216c..2cd52b8 100644 --- a/questions/templates/core/partials/pagination.html +++ b/questions/templates/core/partials/pagination.html @@ -1,9 +1,13 @@ \ No newline at end of file diff --git a/questions/templates/core/partials/question.html b/questions/templates/core/partials/question.html index fb7c1b0..5a8678d 100644 --- a/questions/templates/core/partials/question.html +++ b/questions/templates/core/partials/question.html @@ -8,13 +8,14 @@
-

{{ question.title }}

+ {{ question.title }}

{{ question.text }}

answer (3) Tags: - black-jack - bender + {% for tag in question.tags %} + {{ tag }} + {% endfor %}
diff --git a/questions/urls.py b/questions/urls.py index c01bc26..5a394e0 100644 --- a/questions/urls.py +++ b/questions/urls.py @@ -9,4 +9,5 @@ urlpatterns = [ path('profile', views.profile, name='profile'), path('question', views.question, name='question'), path('signup', views.signup, name='signup'), + path('hot', views.hot, name='hot'), ] \ No newline at end of file diff --git a/questions/views.py b/questions/views.py index d114aaf..ff5967f 100644 --- a/questions/views.py +++ b/questions/views.py @@ -7,32 +7,43 @@ QUESTIONS = [ "id": i, "title": f'Question number {i}', "text": f'Some text {i}', + "tags": ["python"], } for i in range(10) ] +HOT_QUESTIONS = QUESTIONS[:4] + +TAGS = {tag for q in QUESTIONS for tag in q["tags"]} + def index(request): + tag = request.GET.get('tag', '') try: page_number = int(request.GET.get('page', 1)) except ValueError: page_number = 1 - page = Paginator(QUESTIONS, 4) + page = Paginator(QUESTIONS if tag == '' + else [ cur_question for cur_question in QUESTIONS if tag in cur_question['tags']], 4) page_obj = page.page(page_number) - return render(request, 'core/index.html', context={'questions': page_obj.object_list, 'page_obj': page_obj}) + return render(request, 'core/index.html', context={'questions': page_obj.object_list, + 'hot_questions': HOT_QUESTIONS, 'page_obj': page_obj, 'tags': TAGS, + 'tag': tag}) def ask(request): - return render(request, 'core/ask.html', context={'questions': QUESTIONS}) - + return render(request, 'core/ask.html', context={'questions': QUESTIONS, 'tags': TAGS}) +def hot(request): + return render(request, 'core/hot.html', context={'questions': QUESTIONS, 'tags': TAGS, + 'hot_questions': HOT_QUESTIONS,}) def login(request): - return render(request, 'core/login.html', context={'questions': QUESTIONS}) + return render(request, 'core/login.html', context={'questions': QUESTIONS, 'tags': TAGS}) def profile(request): - return render(request, 'core/profile.html', context={'questions': QUESTIONS}) + return render(request, 'core/profile.html', context={'questions': QUESTIONS, 'tags': TAGS}) def question(request): - return render(request, 'core/question.html', context={'questions': QUESTIONS}) + return render(request, 'core/question.html', context={'questions': QUESTIONS, 'tags': TAGS}) def signup(request): - return render(request, 'core/signup.html', context={'questions': QUESTIONS}) \ No newline at end of file + return render(request, 'core/signup.html', context={'questions': QUESTIONS, 'tags': TAGS}) \ No newline at end of file