Index: backend/backend/settings.py =================================================================== --- backend/backend/settings.py (revision 48ee75d108679bbc15057385d7cc1cb0c1eecf42) +++ backend/backend/settings.py (revision 522e6290294133bb73f7150fe715fc9848aeafc3) @@ -48,6 +48,7 @@ 'DEFAULT_AUTHENTICATION_CLASSES': [ 'rest_framework_simplejwt.authentication.JWTAuthentication' - ] - + ], + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', + 'PAGE_SIZE': 10 } Index: backend/subjects/models.py =================================================================== --- backend/subjects/models.py (revision 48ee75d108679bbc15057385d7cc1cb0c1eecf42) +++ backend/subjects/models.py (revision 522e6290294133bb73f7150fe715fc9848aeafc3) @@ -88,5 +88,5 @@ class EvaluationReview(models.Model): - review = models.OneToOneField(Review, on_delete=models.CASCADE) + review = models.OneToOneField(Review, on_delete=models.CASCADE, related_name='evaluation_review') signature_condition = models.CharField(max_length=64, blank=True) @@ -130,5 +130,5 @@ ("other", "Other"), ] - review = models.OneToOneField(Review, on_delete=models.CASCADE) + review = models.OneToOneField(Review, on_delete=models.CASCADE, related_name='other_review') content = models.TextField() category = models.CharField(max_length=16, choices=CATEGORY_TYPE_CHOICES) Index: backend/subjects/permissions.py =================================================================== --- backend/subjects/permissions.py (revision 522e6290294133bb73f7150fe715fc9848aeafc3) +++ backend/subjects/permissions.py (revision 522e6290294133bb73f7150fe715fc9848aeafc3) @@ -0,0 +1,14 @@ +from rest_framework.permissions import BasePermission + +class IsUserType(BasePermission): + allowed_user_types = [] + + def has_permission(self, request, view): + user = request.user + return user.is_authenticated and user.user_type in self.allowed_user_types + +class IsAdminUserType(IsUserType): + allowed_user_types = ['admin'] + +class IsStudentUserType(IsUserType): + allowed_user_types = ['student'] Index: backend/subjects/serializers.py =================================================================== --- backend/subjects/serializers.py (revision 48ee75d108679bbc15057385d7cc1cb0c1eecf42) +++ backend/subjects/serializers.py (revision 522e6290294133bb73f7150fe715fc9848aeafc3) @@ -34,9 +34,10 @@ class ReviewMetaSerializer(serializers.ModelSerializer): student = serializers.SerializerMethodField() + subject = serializers.SerializerMethodField() user_has_voted = serializers.SerializerMethodField() class Meta: model = Review - fields = ['id', 'student', 'is_confirmed', 'votes_score', 'user_has_voted'] + fields = ['id', 'student', 'subject', 'is_confirmed', 'votes_score', 'user_has_voted'] @@ -56,4 +57,7 @@ def get_student(self, obj): return obj.student.index + + def get_subject(self, obj): + return {"name": obj.subject.name, "code": obj.subject.code} class EvaluationComponentSerializer(serializers.ModelSerializer): Index: backend/subjects/urls.py =================================================================== --- backend/subjects/urls.py (revision 48ee75d108679bbc15057385d7cc1cb0c1eecf42) +++ backend/subjects/urls.py (revision 522e6290294133bb73f7150fe715fc9848aeafc3) @@ -1,5 +1,5 @@ from django.urls import path from .views import (ToggleSubjectPreferences, PreferencesView, all_subjects, - get_recommendations, SubjectReview, ReviewsForSubject, ToggleVote) + get_recommendations, SubjectReview, ReviewsForSubject, ToggleVote, ReviewListView) urlpatterns = [ path('all/', all_subjects, name='all_subjects'), @@ -8,4 +8,5 @@ path('toggle-subject-pref/', ToggleSubjectPreferences.as_view(), name='student-toggle-preferences'), path('subject-review/', SubjectReview.as_view(), name='subject-review'), + path('subjects-reviews-list/', ReviewListView.as_view(), name='review-list'), path('subject-review/toggle-vote/', ToggleVote.as_view(), name='toggle-vote'), path('subject-review//', ReviewsForSubject.as_view(), name='subject-review'), Index: backend/subjects/views.py =================================================================== --- backend/subjects/views.py (revision 48ee75d108679bbc15057385d7cc1cb0c1eecf42) +++ backend/subjects/views.py (revision 522e6290294133bb73f7150fe715fc9848aeafc3) @@ -11,5 +11,6 @@ from .serializers import SubjectSerializer, EvaluationReviewSerializer, OtherReviewSerializer from .models import Subject, Review, EvaluationReview, OtherReview, ReviewVote - +from rest_framework.pagination import LimitOffsetPagination +from .permissions import IsAdminUserType, IsStudentUserType def index(request): return HttpResponse("ok") @@ -60,5 +61,5 @@ class PreferencesView(APIView): - permission_classes = [IsAuthenticated] + permission_classes = [IsAuthenticated, IsStudentUserType] def get(self, request, *args, **kwargs): @@ -77,5 +78,5 @@ Expects a POST request with {'subject_id': }. """ - permission_classes = [IsAuthenticated] + permission_classes = [IsAuthenticated, IsStudentUserType] def post(self, request, *args, **kwargs): subject_id = request.data.get('subject_id') @@ -128,5 +129,4 @@ class SubjectReview(APIView): permission_classes = [IsAuthenticated] - def post(self, request): student = request.user.student @@ -237,2 +237,36 @@ return Response({"message": "Vote recorded.", "vote_score": review.votes_score}, status=status.HTTP_201_CREATED) +class ReviewListView(APIView): + # permission_classes = [IsAuthenticated, IsAdminUserType] + + def get(self, request): + review_query_set = Review.objects.all() + + review_type = request.query_params.get('type') + if review_type: + if review_type not in ["evaluation", "other"]: + return Response({"message": "Invalid type."}, status=status.HTTP_400_BAD_REQUEST) + review_query_set = review_query_set.filter(review_type=review_type) + + is_confirmed = request.query_params.get('is_confirmed') + if is_confirmed: + if is_confirmed not in ["true", "false"]: + return Response({"message": "Invalid is_confirmed param."}, status=status.HTTP_400_BAD_REQUEST) + is_confirmed = True if is_confirmed == "true" else False + review_query_set = review_query_set.filter(is_confirmed=is_confirmed) + + review_query_set = review_query_set.select_related("evaluation_review", "other_review") + + paginator = LimitOffsetPagination() + paginated_query_set = paginator.paginate_queryset(review_query_set, request) + + data = [] + for review in paginated_query_set: + if review.review_type == 'evaluation' and hasattr(review, "evaluation_review"): + serializer = EvaluationReviewSerializer(review.evaluation_review) + data.append(serializer.data) + elif review.review_type == 'other' and hasattr(review, "other_review"): + serializer = OtherReviewSerializer(review.other_review) + data.append(serializer.data) + + return paginator.get_paginated_response(data) Index: frontend/src/App.tsx =================================================================== --- frontend/src/App.tsx (revision 48ee75d108679bbc15057385d7cc1cb0c1eecf42) +++ frontend/src/App.tsx (revision 522e6290294133bb73f7150fe715fc9848aeafc3) @@ -10,4 +10,5 @@ import "./index.css"; import Account from "./pages/Account"; +import AdminDashboard from "./pages/AdminDashboard"; import Home from "./pages/Home"; import Login from "./pages/Login"; @@ -82,6 +83,14 @@ path: "review-form/:code", element: ( - + + + ), + }, + { + path: "admin", + element: ( + + ), Index: frontend/src/components/Navbar.tsx =================================================================== --- frontend/src/components/Navbar.tsx (revision 48ee75d108679bbc15057385d7cc1cb0c1eecf42) +++ frontend/src/components/Navbar.tsx (revision 522e6290294133bb73f7150fe715fc9848aeafc3) @@ -118,7 +118,11 @@ {user?.user_type === "admin" ? ( <> -
- Admin Panel (Placeholder) -
+ setProfileMenuOpen(false)} + > + Админ панел + + + + + + + {/* Reviews List */} +
+ {reviews.length === 0 && !loading ? ( +

+ Нема рецензии според избраните филтри. +

+ ) : ( + reviews.map((review) => ( +
+
+
+
+ + {review.review.subject.name} ({review.review.subject.code} + ) + + + {/* className={`px-2 py-1 rounded text-xs font-medium ${ + "methods" in review + ? "bg-blue-100 text-blue-800" + : "bg-purple-100 text-purple-800" + }`} + > + */} + {/* make api specify types to prevent this */} + {"methods" in review ? "Полагање" : "Други"} + + {"category" in review && review.category && ( + + { + MAP_REVIEW_CATEGORY_TO_MK[ + review.category as keyof typeof MAP_REVIEW_CATEGORY_TO_MK + ] + } + + )} +
+
+ Студент: {review.review.student} + + Гласови:{" "} + {`${ + review.review.votes_score ?? 0 > 0 + ? "+" + : review.review.votes_score ?? 0 < 0 + ? "-" + : "" + }${review.review.votes_score}`} + +
+
+
+ + + +
+
+ +
+ + {review.review.is_confirmed ? "✓ Одобрено" : "✗ Неодобрено"} + +
+ + {/* Expanded Details */} + {expandedReview === review.review.id && ( +
+ {"methods" in review ? ( +
+

Начини на оценување:

+ {review.methods?.map((method, index) => ( +
+

Метод {index + 1}:

+ {method.note && ( +

+ Забелешка: {method.note} +

+ )} +
+ + + + + + + + + {method.components.map((component, idx) => ( + + + + + ))} + +
+ Активност + + Процент +
+ { + EVALUATION_MAP_TO_MK[ + (component.category + .charAt(0) + .toUpperCase() + + component.category.slice( + 1 + )) as keyof typeof EVALUATION_MAP_TO_MK + ] + } + + {component.percentage}% +
+
+
+ ))} +
+ Услов за потпис:{" "} + {review.signature_condition || "Нема"} +
+
+ ) : ( +
+

Содржина:

+

+ {"content" in review ? review.content : "Нема содржина"} +

+
+ )} +
+ )} +
+ )) + )} + + {/* Load More Button */} + {nextUrl && ( +
+ +
+ )} +
+ + {loading && reviews.length === 0 && ( +
+
Се вчитува...
+
+ )} + + ); +}; + +export default AdminDashboard; Index: frontend/src/pages/ReviewForm.tsx =================================================================== --- frontend/src/pages/ReviewForm.tsx (revision 48ee75d108679bbc15057385d7cc1cb0c1eecf42) +++ frontend/src/pages/ReviewForm.tsx (revision 522e6290294133bb73f7150fe715fc9848aeafc3) @@ -141,4 +141,6 @@ return; } + + // TODO: handle admin requests (should be approved from start) // post specific for evaluation reviews