diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..eba74f4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +venv/ \ No newline at end of file diff --git a/django_views_routing_homework/urls.py b/django_views_routing_homework/urls.py index 79fc417..f05c687 100644 --- a/django_views_routing_homework/urls.py +++ b/django_views_routing_homework/urls.py @@ -6,6 +6,10 @@ from django_views_routing_homework.views.level_2.a_user_info_by_username import get_user_info_by_username_view from django_views_routing_homework.views.level_2.c_product_type import get_products_view from django_views_routing_homework.views.level_2.d_authorization import authorization_view, process_authorization_view +from django_views_routing_homework.views.level_1.b_bye_user import bye_user_view +from django_views_routing_homework.views.level_1.d_user_info import get_user_info_view +from django_views_routing_homework.views.level_1.e_month_title import get_month_title_view + urlpatterns = [ path('admin/', admin.site.urls), @@ -15,5 +19,8 @@ path('products/', get_products_view), path('authorization/', authorization_view), path('process-authorization/', process_authorization_view), - # добавлять пути тут + path('bye/', bye_user_view), + path('user-info//', get_user_info_view), + path('month-title//', get_month_title_view), ] + diff --git a/django_views_routing_homework/views/level_1/a_welcome_user.py b/django_views_routing_homework/views/level_1/a_welcome_user.py index c45ef16..f61e00b 100644 --- a/django_views_routing_homework/views/level_1/a_welcome_user.py +++ b/django_views_routing_homework/views/level_1/a_welcome_user.py @@ -10,5 +10,5 @@ def welcome_user_view(request): - welcome_message = 'Bye, user' + welcome_message = 'Hello, user' return HttpResponse(welcome_message) diff --git a/django_views_routing_homework/views/level_1/c_baned_username.py b/django_views_routing_homework/views/level_1/c_baned_username.py index 54bb122..4170d4b 100644 --- a/django_views_routing_homework/views/level_1/c_baned_username.py +++ b/django_views_routing_homework/views/level_1/c_baned_username.py @@ -14,5 +14,7 @@ def is_username_banned_view(request, username: str): - # код писать тут - return HttpResponse('User not banned') + if username in BANNED_USERNAMES: + return HttpResponse('User banned') + else: + return HttpResponse('User not banned') diff --git a/django_views_routing_homework/views/level_1/e_month_title.py b/django_views_routing_homework/views/level_1/e_month_title.py index 77b266c..8e51e78 100644 --- a/django_views_routing_homework/views/level_1/e_month_title.py +++ b/django_views_routing_homework/views/level_1/e_month_title.py @@ -12,11 +12,33 @@ вызывалась вьюха get_month_title_view. Например http://127.0.0.1:8000/month-title/3/ """ +MONTHS = { + 1: 'Январь', + 2: 'Февраль', + 3: 'Март', + 4: 'Апрель', + 5: 'Май', + 6: 'Июнь', + 7: 'Июль', + 8: 'Август', + 9: 'Сентябрь', + 10: 'Октябрь', + 11: 'Ноябрь', + 12: 'Декабрь', +} + def get_month_title_by_number(month_number: int): - pass # код писать тут + if month_number in MONTHS: + return MONTHS[month_number] + else: + return None def get_month_title_view(request, month_number: int): - # код писать тут - return HttpResponseNotFound('Месяца с таким номером не существует') + month_title = get_month_title_by_number(month_number) + + if month_title: + return HttpResponse(month_title) + else: + return HttpResponseNotFound('Месяца с таким номером не существует') \ No newline at end of file