a

srcs/backend/myapp/views.py

@@ -14,7 +14,6 @@
 import uuid
 import os
 import json
-from .forms import UserRegistrationForm
 from .models import Tournament, User, Player, WaitingPlayer, Message, UserProfile, Feedback, Achievement, MyAppUserGroups, MyAppUserPermissions, Channel, GameStats
 from django.utils import timezone
 from django.db import IntegrityError
@@ -212,6 +211,23 @@ def get_friends(request):
         return JsonResponse({'error': 'User not found'}, status=404)
     except Exception as e:
         return JsonResponse({'error': str(e)}, status=400)
+
+def get_blocked_users(request):
+    try:
+        token = request.headers.get('Authorization', '').split('Bearer ')[-1]
+        payload = jwt.decode(token, settings.SIGNING_KEY, algorithms=['HS256'])
+        user_id = payload['user_id']
+
+        user_requester = User.objects.get(pk=user_id)
+
+        blocked_users = user_requester.blocked_users.all()
+
+        blocked_usernames = [user.username for user in blocked_users]
+
+        return JsonResponse({'blocked_users': blocked_usernames})
+
+    except Exception as e:
+        return JsonResponse({'message': str(e)}, status=400)
 
 def unblock_user(request):
     try:

srcs/backend/myproject/urls.py

@@ -13,57 +13,57 @@
 
 
 urlpatterns = [
-    #path('', views.home, name='home'),
-    path('ws/chatpage/', consumers.ChatConsumer.as_asgi()),
-    path('chatpage/', consumers.ChatConsumer.as_asgi()),
-    path('ws/pingpong/', consumers.PingPongConsumer.as_asgi()),
-    path('pingpong/', consumers.PingPongConsumer.as_asgi()),
-    path('admin/', admin.site.urls),
-    path('login/', views.login_view, name='login'),
-    path('ping/', views.login_view, name='ping'),
-    path('register/', views.register, name='register'),
-    path('leaderboard/', views.leaderboard, name='leaderboard'),
-    path('tournaments/', views.tournaments, name='tournaments'),
-    path('get-csrf-token/', views.get_csrf_token, name='get_csrf_token'),
-    path('fetch-messages/', views.fetch_messages, name='fetch_messages'),
-    path('send-message/', views.send_message, name='send_message'),
-    path('token/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
-    path('token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
-    path('proxyb/', views.proxy_viewb, name='proxy_viewb'),
-    path('proxyc/', views.proxy_viewc, name='proxy_viewc'),
-    path('signin42/', views.signin42, name='signin42'),
-    path('signin42b/', views.signin42b, name='signin42b'),
-    path('messages', views.messages, name='messages'),
-    path('get_all_users', views.get_all_users, name='get_all_users'),
-    path('profiles/', views.get_profile_info, name='get_profile_info'),
-    path('upload-avatar/', views.upload_avatar, name='upload_avatar'),
-    path('get-email/', views.upload_avatar, name='get_email'),
-    path('get-nickname/', views.get_nickname, name='get_nickname'),
-    path('update-nickname/', views.update_nickname, name='update_nickname'),
-    path('get-games/', views.update_nickname, name='get_games'),
-    path('userinfo/', views.proxy_userinfo, name='proxy_userinfo'),
-    path('update-player/', views.update_player_position, name='update_player_position'),
-    path('game-state/', views.get_game_state, name='get_game_state'),
-    path('check-player-waiting/<str:user_login>/', views.check_player_waiting, name='check_player_waiting'),
-    path('feedback/', views.submit_feedback, name='submit_feedback'),
-    path('show-feedbacks/', views.show_feedbacks, name='show_feedbacks'),
-    path('manage-profile/', views.manage_profile, name='manage_profile'),
-    path('2fa-status', views.get_2fa_status, name='get_2fa_status'),
-    path('2fa-activate', views.activate_2fa, name='activate_2fa'),
-    path('2fa-deactivate', views.deactivate_2fa, name='deactivate_2fa'),
+    # path('ws/chatpage/', consumers.ChatConsumer.as_asgi()),
+    # path('chatpage/', consumers.ChatConsumer.as_asgi()),
+    # path('ws/pingpong/', consumers.PingPongConsumer.as_asgi()),
+    # path('pingpong/', consumers.PingPongConsumer.as_asgi()),
+    # path('admin/', admin.site.urls),
+    # path('login/', views.login_view, name='login'),
+    # path('ping/', views.login_view, name='ping'),
+    # path('register/', views.register, name='register'),
+    # path('leaderboard/', views.leaderboard, name='leaderboard'),
+    # path('tournaments/', views.tournaments, name='tournaments'),
+    # path('get-csrf-token/', views.get_csrf_token, name='get_csrf_token'),
+    # path('fetch-messages/', views.fetch_messages, name='fetch_messages'),
+    # path('send-message/', views.send_message, name='send_message'),
+    # path('token/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
+    # path('token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
+    # path('proxyb/', views.proxy_viewb, name='proxy_viewb'),
+    # path('proxyc/', views.proxy_viewc, name='proxy_viewc'),
+    # path('signin42/', views.signin42, name='signin42'),
+    # path('signin42b/', views.signin42b, name='signin42b'),
+    # path('messages', views.messages, name='messages'),
+    # path('get_all_users', views.get_all_users, name='get_all_users'),
+    # path('profiles/', views.get_profile_info, name='get_profile_info'),
+    # path('upload-avatar/', views.upload_avatar, name='upload_avatar'),
+    # path('get-email/', views.upload_avatar, name='get_email'),
+    # path('get-nickname/', views.get_nickname, name='get_nickname'),
+    # path('update-nickname/', views.update_nickname, name='update_nickname'),
+    # path('get-games/', views.update_nickname, name='get_games'),
+    # path('userinfo/', views.proxy_userinfo, name='proxy_userinfo'),
+    # path('update-player/', views.update_player_position, name='update_player_position'),
+    # path('game-state/', views.get_game_state, name='get_game_state'),
+    # path('check-player-waiting/<str:user_login>/', views.check_player_waiting, name='check_player_waiting'),
+    # path('feedback/', views.submit_feedback, name='submit_feedback'),
+    # path('show-feedbacks/', views.show_feedbacks, name='show_feedbacks'),
+    # path('manage-profile/', views.manage_profile, name='manage_profile'),
+    # path('2fa-status', views.get_2fa_status, name='get_2fa_status'),
+    # path('2fa-activate', views.activate_2fa, name='activate_2fa'),
+    # path('2fa-deactivate', views.deactivate_2fa, name='deactivate_2fa'),
 
-    path('2fa-qr-code', views.generate_qr_code, name='generate_qr_code'),
-    path('update-score', views.update_score, name='update_score'),
-    path('get-online-users', views.get_online_users, name='get_online_users'),
-    path('logout', views.logout_view, name='logout_view'),
-    path('signin42c/', views.signin42c, name='signin42c'),
-    path('check-2fa-code', views.check_2fa_code, name='check_2fa_code'),
-    path('add-friend', views.add_friend, name='add_friend'),
-    path('remove-friend', views.remove_friend, name='remove_friend'),
-    path('block-user', views.block_user, name='block_user'),
-    path('unblock-user', views.unblock_user, name='unblock_user'),
-    path('friends', views.get_friends, name='get_friends'),
-    path('user-achievements', views.fetch_achievements, name='fetch_achievements'),
+    # path('2fa-qr-code', views.generate_qr_code, name='generate_qr_code'),
+    # path('update-score', views.update_score, name='update_score'),
+    # path('get-online-users', views.get_online_users, name='get_online_users'),
+    # path('logout', views.logout_view, name='logout_view'),
+    # path('signin42c/', views.signin42c, name='signin42c'),
+    # path('check-2fa-code', views.check_2fa_code, name='check_2fa_code'),
+    # path('add-friend', views.add_friend, name='add_friend'),
+    # path('remove-friend', views.remove_friend, name='remove_friend'),
+    # path('block-user', views.block_user, name='block_user'),
+    # path('unblock-user', views.unblock_user, name='unblock_user'),
+    # path('friends', views.get_friends, name='get_friends'),
+    # path('user-achievements', views.fetch_achievements, name='fetch_achievements'),
+    # path('get-blocked-users/', views.get_blocked_users, name='get_blocked_users'),
 
     path('api/login/', views.login_view, name='api_login'),
     path('api/ping/', views.login_view, name='api_ping'),
@@ -111,6 +111,7 @@
 
     path('api/friends', views.get_friends, name='get_friends'),
     path('api/user-achievements', views.fetch_achievements, name='fetch_achievements'),
+    path('api/get-blocked-users/', views.get_blocked_users, name='get_blocked_users'),
 
 
 ]  + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

srcs/frontend/vercel.json

@@ -2,11 +2,11 @@
   "rewrites": [
     {
       "source": "/api/:path*",
-      "destination": "https://pong42.azurewebsites.net/:path*"
+      "destination": "https://pong42.azurewebsites.net/api/:path*"
     },
     {
       "source": "/api/:path*/",
-      "destination": "https://pong42.azurewebsites.net/:path*/"
+      "destination": "https://pong42.azurewebsites.net/api/:path*/"
     },
     {
       "source": "/media/:path*",

vercel.json

@@ -2,11 +2,11 @@
   "rewrites": [
     {
       "source": "/api/:path*",
-      "destination": "https://pong42.azurewebsites.net/:path*"
+      "destination": "https://pong42.azurewebsites.net/api/:path*"
     },
     {
       "source": "/api/:path*/",
-      "destination": "https://pong42.azurewebsites.net/:path*/"
+      "destination": "https://pong42.azurewebsites.net/api/:path*/"
     },
     {
       "source": "/media/:path*",