diff --git a/django_views_routing_homework/settings.py b/django_views_routing_homework/settings.py index dee3f58..9300f65 100644 --- a/django_views_routing_homework/settings.py +++ b/django_views_routing_homework/settings.py @@ -15,8 +15,10 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + ] + MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', diff --git a/django_views_routing_homework/urls.py b/django_views_routing_homework/urls.py index 269591b..ecb1ff1 100644 --- a/django_views_routing_homework/urls.py +++ b/django_views_routing_homework/urls.py @@ -2,7 +2,10 @@ from django.urls import path from django_views_routing_homework.views.level_1.a_welcome_user import welcome_user_view +from django_views_routing_homework.views.level_1.b_bye_user import bye_user_view from django_views_routing_homework.views.level_1.c_baned_username import is_username_banned_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 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 @@ -15,6 +18,7 @@ urlpatterns = [ path('admin/', admin.site.urls), path('welcome/', welcome_user_view), + path('bye/', bye_user_view), path('banned//', is_username_banned_view), path('user-info-by-username//', get_user_info_by_username_view), path('products/', get_products_view), @@ -24,5 +28,8 @@ path('user/validate/', validate_user_data_view), path('user/github//full-name/', fetch_name_from_github_view), path('text/generate/', generate_file_with_text_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..4e74cfa 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..e150913 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 @@ -10,9 +10,11 @@ 2. Результат проверяйте по ссылке http://127.0.0.1:8000/banned/тут интересующий юзернэйм/, например http://127.0.0.1:8000/banned/any_username/ """ -BANNED_USERNAMES = ['red_dev', 'green_bear', 'monster'] +BANNED_USERNAMES = ["red_dev", "green_bear", "monster"] 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/d_user_info.py b/django_views_routing_homework/views/level_1/d_user_info.py index 99db774..794c1bd 100644 --- a/django_views_routing_homework/views/level_1/d_user_info.py +++ b/django_views_routing_homework/views/level_1/d_user_info.py @@ -11,9 +11,9 @@ 3. Проверьте созданный вами путь с несуществуюшим айдишником. """ USER_ID_TO_USER_INFO_MAPPER = { - 1: {'username': 'red_dev', 'age': 34}, - 2: {'username': 'green_bear', 'age': 43}, - 3: {'username': 'monster', 'age': 17}, + 1: {"username": "red_dev", "age": 34}, + 2: {"username": "green_bear", "age": 43}, + 3: {"username": "monster", "age": 17}, } @@ -21,4 +21,4 @@ def get_user_info_view(request, user_id: int): if user_id in USER_ID_TO_USER_INFO_MAPPER: return JsonResponse(data=USER_ID_TO_USER_INFO_MAPPER[user_id]) else: - return JsonResponse(data={'error': 'There is no user info'}, status=404) + return JsonResponse(data={"error": "There is no user info"}, status=404) 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..8ee4c2d 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 @@ -14,9 +14,26 @@ def get_month_title_by_number(month_number: int): - pass # код писать тут + months = { + 1: "January", + 2: "February", + 3: "March", + 4: "April", + 5: "May", + 6: "June", + 7: "July", + 8: "August", + 9: "September", + 10: "October", + 11: "November", + 12: "December", + } + if month_number in months: + return months.get(month_number) def get_month_title_view(request, month_number: int): - # код писать тут - return HttpResponseNotFound('Месяца с таким номером не существует') + if get_month_title_by_number(month_number): + return HttpResponse(get_month_title_by_number(month_number)) + else: + return HttpResponseNotFound("Месяца с таким номером не существует")