+
{t('login_no_account')}{' '} @@ -204,7 +204,7 @@ {/* Additional Info */} - + - + {t('login_footer')} Index: src/app/professor/profile/page.tsx =================================================================== --- src/app/professor/profile/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) +++ src/app/professor/profile/page.tsx (revision ba520691331c5f3afac921ef0a143d05e24ce4a5) @@ -98,10 +98,10 @@ const { t } = useTranslation(); return ( - - + + {icon && } {t(label)}: - + {value || t('n_a')} @@ -119,5 +119,5 @@ const { t } = useTranslation(); return ( - + @@ -185,5 +185,5 @@ return ( - {t('loading')} + {t('loading')} ); @@ -208,6 +208,6 @@ - - + + Index: src/app/professor/students/page.tsx =================================================================== --- src/app/professor/students/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) +++ src/app/professor/students/page.tsx (revision ba520691331c5f3afac921ef0a143d05e24ce4a5) @@ -129,10 +129,10 @@ return ( - + - {t('prof_students_title')} - + {t('prof_students_title')} + {t('prof_students_data_note')} /api/prof/students (demo store). @@ -141,7 +141,7 @@ - {t('filter_by_subject')} + {t('filter_by_subject')} setSubjectFilter(e.target.value)} @@ -159,7 +159,7 @@ - {t('find_student_by_id')} + {t('find_student_by_id')} - - + + - {t('student')} - {t('id')} - {t('subject')} - {t('grade')} - {t('actions')} + {t('student')} + {t('id')} + {t('subject')} + {t('grade')} + {t('actions')} @@ -190,5 +190,5 @@ {loading ? ( - + {t('loading')} @@ -196,5 +196,5 @@ ) : filteredRows.length === 0 ? ( - + {t('no_students_found')} @@ -207,12 +207,12 @@ return ( - - {r.studentName} - {r.studentIdStr} - {r.subjectName} + + {r.studentName} + {r.studentIdStr} + {r.subjectName} @@ -229,5 +229,5 @@ ))} - + {t('current')}: {r.grade > 0 ? r.grade : t('none')} Index: src/app/students/applications/page.tsx =================================================================== --- src/app/students/applications/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) +++ src/app/students/applications/page.tsx (revision ba520691331c5f3afac921ef0a143d05e24ce4a5) @@ -23,5 +23,5 @@ const TableCell = ({ children, className = "" }: TableCellProps) => ( - + {children} @@ -78,6 +78,6 @@ - - + + @@ -91,7 +91,7 @@ {/* Session Selection */} - + - + {t('select_exam_session', 'Избери испитна сесија:')} @@ -101,5 +101,5 @@ setIsDropdownOpen(!isDropdownOpen)} - className="bg-white border border-gray-300 rounded-lg px-4 py-2 text-left focus:outline-none focus:ring-2 focus:ring-primary focus:border-primary min-w-80" + className="bg-card border border-border rounded-lg px-4 py-2 text-left focus:outline-none focus:ring-2 focus:ring-primary focus:border-primary min-w-80" > @@ -109,5 +109,5 @@ @@ -115,5 +115,5 @@ {isDropdownOpen && ( - + {applicationsData.examSessions.map((session) => ( - {t(session.id, session.name)} - {session.year} - {t(session.semester, session.semester)} - {t(session.session, session.session)} + {t(session.id, session.name)} + {session.year} - {t(session.semester, session.semester)} - {t(session.session, session.session)} ))} @@ -136,5 +136,5 @@ {/* Applications Section */} - + {t('registered_exams', 'Пријавени испити')} @@ -143,21 +143,21 @@ - + - # - {t('serial_number', 'Сериски број')} - {t('code', 'Код')} - {t('subject', 'Предмет')} - {t('completed', 'Завршена')} - {t('fee', 'Таксени')} - {t('date', 'Датум')} - {t('instructor', 'Наставник')} - {t('decade', 'Декада')} + # + {t('serial_number', 'Сериски број')} + {t('code', 'Код')} + {t('subject', 'Предмет')} + {t('completed', 'Завршена')} + {t('fee', 'Таксени')} + {t('date', 'Датум')} + {t('instructor', 'Наставник')} + {t('decade', 'Декада')} - + {applications.map((application) => ( - - {application.id} + + {application.id} @@ -166,5 +166,5 @@ {application.code} - + @@ -178,9 +178,9 @@ - {application.date} + {application.date} - - {t(application.instructor, application.instructor)} + + {t(application.instructor, application.instructor)} @@ -208,5 +208,5 @@ {/* Statistics Cards */} - + @@ -214,5 +214,5 @@ - {t('registered_exams', 'Пријавени испити')} + {t('registered_exams', 'Пријавени испити')} {applications.length} @@ -222,5 +222,5 @@ - + @@ -228,5 +228,5 @@ - {t('completed', 'Завршени')} + {t('completed', 'Завршени')} {applications.filter(app => app.completed === t('yes', 'Да')).length} @@ -236,5 +236,5 @@ - + @@ -242,5 +242,5 @@ - {t('total_fee', 'Вкупна такса')} + {t('total_fee', 'Вкупна такса')} {applications.reduce((sum, app) => sum + parseFloat(app.fee.replace(',', '.')), 0).toFixed(2)} Index: src/app/students/documents/page.tsx =================================================================== --- src/app/students/documents/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) +++ src/app/students/documents/page.tsx (revision ba520691331c5f3afac921ef0a143d05e24ce4a5) @@ -23,5 +23,5 @@ const TableCell = ({ children, className = "" }: TableCellProps) => ( - + {children} @@ -38,5 +38,5 @@ } return ( - + @@ -73,6 +73,6 @@ - - + + @@ -86,6 +86,6 @@ {/* Document Request Form */} - - + + {t('new_document_request', 'Ново барање за документ')} @@ -95,5 +95,5 @@ {/* Document Type Selection */} - + {t('select_document', 'Избери документ')}: @@ -101,13 +101,13 @@ setIsDropdownOpen(!isDropdownOpen)} - className="w-full bg-white border border-gray-300 rounded-lg px-4 py-3 text-left focus:outline-none focus:ring-2 focus:ring-primary focus:border-primary" + className="w-full bg-card border border-border rounded-lg px-4 py-3 text-left focus:outline-none focus:ring-2 focus:ring-primary focus:border-primary" > - + {selectedDocument ? t(selectedDocument.id) : t('select_document', 'Избери документ')} @@ -115,5 +115,5 @@ {isDropdownOpen && ( - + {documentsData.documentTypes.map((docType) => ( - {t(docType.id)} + {t(docType.id)} {docType.price > 0 && ( {t('price', 'Цена')}: {docType.price} мкд @@ -138,5 +138,5 @@ {/* Comment Section */} - + {t('comment', 'Коментар')}: @@ -145,5 +145,5 @@ onChange={(e) => setComment(e.target.value)} rows={4} - className="w-full border border-gray-300 rounded-lg px-4 py-3 focus:outline-none focus:ring-2 focus:ring-primary focus:border-primary resize-none" + className="w-full border border-border rounded-lg px-4 py-3 focus:outline-none focus:ring-2 focus:ring-primary focus:border-primary resize-none" placeholder={t('add_comment', 'Додај коментар')} /> @@ -163,5 +163,5 @@ {/* Documents Table */} - + {t('my_documents', 'Мои документи')} @@ -170,25 +170,25 @@ - + - # - {t('archive', 'Архива')} - {t('date', 'Датум')} - {t('request', 'Барање')} - {t('price', 'Цена')} - {t('paid', 'Платено')} - {t('document', 'Документ')} - {t('pay_online', 'Плати онлајн')} - {t('status', 'Статус')} - {t('comment', 'Коментар')} + # + {t('archive', 'Архива')} + {t('date', 'Датум')} + {t('request', 'Барање')} + {t('price', 'Цена')} + {t('paid', 'Платено')} + {t('document', 'Документ')} + {t('pay_online', 'Плати онлајн')} + {t('status', 'Статус')} + {t('comment', 'Коментар')} - + {currentDocuments.map((document) => ( - - {document.id} + + {document.id} {document.archive} - {document.date} - + {document.date} + {t(document.request)} @@ -210,5 +210,5 @@ ) : ( - {t('none', '—')} + {t('none', '—')} )} @@ -218,5 +218,5 @@ {document.comment || ( - {t('none', '—')} + {t('none', '—')} )} @@ -228,6 +228,6 @@ {/* Pagination */} - - + + {t('show_rows', 'Прикажи редови')}: @@ -235,5 +235,5 @@ value={recordsPerPage} onChange={(e) => setRecordsPerPage(Number(e.target.value))} - className="border border-gray-300 rounded px-2 py-1 text-sm focus:outline-none focus:ring-1 focus:ring-primary" + className="border border-border rounded px-2 py-1 text-sm focus:outline-none focus:ring-1 focus:ring-primary" > 15 @@ -249,5 +249,5 @@ value={currentPage} onChange={(e) => setCurrentPage(Number(e.target.value))} - className="w-12 border border-gray-300 rounded px-2 py-1 text-sm text-center focus:outline-none focus:ring-1 focus:ring-primary" + className="w-12 border border-border rounded px-2 py-1 text-sm text-center focus:outline-none focus:ring-1 focus:ring-primary" /> {t('of', 'од')} {totalPages} @@ -258,5 +258,5 @@ onClick={() => setCurrentPage(1)} disabled={currentPage === 1} - className="p-2 text-gray-500 hover:text-primary disabled:opacity-50 disabled:cursor-not-allowed" + className="p-2 text-muted-foreground hover:text-primary disabled:opacity-50 disabled:cursor-not-allowed" > @@ -265,5 +265,5 @@ onClick={() => setCurrentPage(Math.max(1, currentPage - 1))} disabled={currentPage === 1} - className="p-2 text-gray-500 hover:text-primary disabled:opacity-50 disabled:cursor-not-allowed" + className="p-2 text-muted-foreground hover:text-primary disabled:opacity-50 disabled:cursor-not-allowed" > @@ -275,5 +275,5 @@ onClick={() => setCurrentPage(Math.min(totalPages, currentPage + 1))} disabled={currentPage === totalPages} - className="p-2 text-gray-500 hover:text-primary disabled:opacity-50 disabled:cursor-not-allowed" + className="p-2 text-muted-foreground hover:text-primary disabled:opacity-50 disabled:cursor-not-allowed" > @@ -282,14 +282,14 @@ onClick={() => setCurrentPage(totalPages)} disabled={currentPage === totalPages} - className="p-2 text-gray-500 hover:text-primary disabled:opacity-50 disabled:cursor-not-allowed" + className="p-2 text-muted-foreground hover:text-primary disabled:opacity-50 disabled:cursor-not-allowed" > - + {t('last', 'Последна')} - + {t('total', 'Вкупно')}: {documents.length} @@ -309,5 +309,5 @@ {/* Statistics Cards */} - + @@ -315,5 +315,5 @@ - {t('total_documents', 'Вкупно документи')} + {t('total_documents', 'Вкупно документи')} {documents.length} @@ -323,5 +323,5 @@ - + @@ -329,5 +329,5 @@ - {t('approved', 'Одобрени')} + {t('approved', 'Одобрени')} {documents.filter(doc => doc.status === "approved").length} @@ -337,5 +337,5 @@ - + @@ -343,5 +343,5 @@ - {t('total_price', 'Вкупна цена')} + {t('total_price', 'Вкупна цена')} {documents.reduce((sum, doc) => sum + doc.price, 0).toFixed(2)} {t('mkd', 'мкд')} Index: src/app/students/layout.tsx =================================================================== --- src/app/students/layout.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) +++ src/app/students/layout.tsx (revision ba520691331c5f3afac921ef0a143d05e24ce4a5) @@ -32,13 +32,9 @@ }>) { return ( - - - - - - {children} - - - + + + + {children} + ); } Index: src/app/students/profile/page.tsx =================================================================== --- src/app/students/profile/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) +++ src/app/students/profile/page.tsx (revision ba520691331c5f3afac921ef0a143d05e24ce4a5) @@ -98,10 +98,10 @@ const { t } = useTranslation(); return ( - - + + {icon && } {t(label)}: - + {value || t('n_a')} @@ -119,5 +119,5 @@ const { t } = useTranslation(); return ( - + @@ -187,5 +187,5 @@ return ( - + {t('loading')} @@ -212,6 +212,6 @@ - - + + Index: src/app/students/semesters/page.tsx =================================================================== --- src/app/students/semesters/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) +++ src/app/students/semesters/page.tsx (revision ba520691331c5f3afac921ef0a143d05e24ce4a5) @@ -49,5 +49,5 @@ const TableCell = ({ children, className = "" }: TableCellProps) => ( - + {children} @@ -66,5 +66,5 @@ } return ( - + {t(status) || status} @@ -87,5 +87,5 @@ ); } - return —; + return —; }; @@ -163,5 +163,5 @@ return ( - + {t('loading')} @@ -185,6 +185,6 @@ - - + + @@ -198,5 +198,5 @@ {/* Table Container */} - + {t('semesters_list')} @@ -205,32 +205,32 @@ - + - # - {t('semester')} - {t('direction')} - {t('quota')} - {t('note')} - {t('student_com')} - {t('sum')} - {t('paid')} - {t('ukim')} - {t('created_on')} - {t('date_changed')} - {t('credits')} - {t('type')} - {t('doc')} - {t('doc1')} - {t('verified')} - {t('taxes')} - {t('signatures')} - {t('status')} - {t('completed')} + # + {t('semester')} + {t('direction')} + {t('quota')} + {t('note')} + {t('student_com')} + {t('sum')} + {t('paid')} + {t('ukim')} + {t('created_on')} + {t('date_changed')} + {t('credits')} + {t('type')} + {t('doc')} + {t('doc1')} + {t('verified')} + {t('taxes')} + {t('signatures')} + {t('status')} + {t('completed')} - + {semesters.map((semester) => ( - - {semester.id} + + {semester.id} {semester.semester} {semester.direction} @@ -246,5 +246,5 @@ ) : ( - — + — )} @@ -255,5 +255,5 @@ ) : ( - — + — )} @@ -265,5 +265,5 @@ ) : ( - — + — )} @@ -275,5 +275,5 @@ ) : ( - — + — )} @@ -282,9 +282,9 @@ {semester.ukim} ) : ( - — - )} - - {semester.createdOn} - {semester.dateChanged} + — + )} + + {semester.createdOn} + {semester.dateChanged} {semester.credits} @@ -331,5 +331,5 @@ {/* Summary Cards */} - + @@ -337,5 +337,5 @@ - {t('completed_semesters')} + {t('completed_semesters')} {semesters.filter(s => s.completed !== "Не").length} @@ -345,5 +345,5 @@ - + @@ -351,5 +351,5 @@ - {t('verified_semesters')} + {t('verified_semesters')} {semesters.filter(s => s.verified === "Да").length} @@ -359,5 +359,5 @@ - + @@ -365,5 +365,5 @@ - {t('total_semesters')} + {t('total_semesters')} {semesters.length} Index: src/app/students/subjects/page.tsx =================================================================== --- src/app/students/subjects/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) +++ src/app/students/subjects/page.tsx (revision ba520691331c5f3afac921ef0a143d05e24ce4a5) @@ -142,5 +142,5 @@ const TableCell = ({ children, className = "" }: TableCellProps) => ( - + {children} @@ -164,5 +164,5 @@ } return ( - + {t(status) || status} @@ -275,5 +275,5 @@ return ( - + {t('loading')} @@ -305,6 +305,6 @@ - - + + @@ -324,9 +324,9 @@ {/* Status Card */} - - + + {t('status')}: {t('enrolled_by_student')} - + {t('ticket_number')}: {currentSemester.ticketNumber} @@ -334,11 +334,11 @@ {/* Semester Selection */} - - + + {t('debt_from_documents')}: {currentSemester.debt} - + {t('select_semester')}: @@ -346,5 +346,5 @@ setIsDropdownOpen(!isDropdownOpen)} - className="w-full bg-white border border-gray-300 rounded-lg px-4 py-3 text-left focus:outline-none focus:ring-2 focus:ring-primary focus:border-primary" + className="w-full bg-card border border-border rounded-lg px-4 py-3 text-left focus:outline-none focus:ring-2 focus:ring-primary focus:border-primary" > @@ -354,5 +354,5 @@ @@ -360,5 +360,5 @@ {isDropdownOpen && ( - + {subjectsData.semesters.map((semester) => ( - {semester.name} - {t('status')}: {semester.status} + {semester.name} + {t('status')}: {semester.status} ))} @@ -387,6 +387,6 @@ {/* Enrolled Subjects */} - - + + {t('enrolled_subjects')} @@ -400,5 +400,5 @@ {/* Right Column - Financial Information */} - + @@ -413,14 +413,14 @@ {/* Left Financial Column */} - - {t('sum')}: + + {t('sum')}: {currentSemester.financialInfo.sum} - - {t('paid')}: + + {t('paid')}: {currentSemester.financialInfo.paid} - - {t('due')}: + + {t('due')}: {currentSemester.financialInfo.due} @@ -433,22 +433,22 @@ {/* Right Financial Column */} - - {t('credits')}: + + {t('credits')}: {currentSemester.financialInfo.credits} - - {t('mksa')}: + + {t('mksa')}: {currentSemester.financialInfo.MKSA} - - {t('electronic_registration')}: + + {t('electronic_registration')}: {currentSemester.financialInfo.electronicRegistration} - - {t('eukim')}: + + {t('eukim')}: {currentSemester.financialInfo.eUKIM} - - {t('bank_provision')}: + + {t('bank_provision')}: {currentSemester.financialInfo.bankProvision} @@ -465,5 +465,5 @@ {/* Subjects Table */} - + {t('subjects_list')} @@ -472,26 +472,26 @@ - + - # - {t('code')} - {t('hours')} - {t('which_time')} - {t('subject')} - {t('semester')} - {t('status')} - {t('signature')} - {t('group')} - {t('professor')} + # + {t('code')} + {t('hours')} + {t('which_time')} + {t('subject')} + {t('semester')} + {t('status')} + {t('signature')} + {t('group')} + {t('professor')} - + {currentSubjects.map((subject: Subject) => ( - - {subject.id} + + {subject.id} {subject.code} {subject.hours} {subject.kojPat} - + @@ -505,15 +505,15 @@ {subject.signature ? t(subject.signature, subject.signature) : ( - — + — )} {subject.group ? t(subject.group, subject.group) : ( - — + — )} {subject.professor ? t(subject.professor, subject.professor) : ( - — + — )}
{t('prof_students_data_note')} /api/prof/students (demo store).
{applications.length} @@ -222,5 +222,5 @@
{applications.filter(app => app.completed === t('yes', 'Да')).length} @@ -236,5 +236,5 @@
{applications.reduce((sum, app) => sum + parseFloat(app.fee.replace(',', '.')), 0).toFixed(2)} Index: src/app/students/documents/page.tsx =================================================================== --- src/app/students/documents/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) +++ src/app/students/documents/page.tsx (revision ba520691331c5f3afac921ef0a143d05e24ce4a5) @@ -23,5 +23,5 @@ const TableCell = ({ children, className = "" }: TableCellProps) => ( -
{documents.length} @@ -323,5 +323,5 @@
{documents.filter(doc => doc.status === "approved").length} @@ -337,5 +337,5 @@
{documents.reduce((sum, doc) => sum + doc.price, 0).toFixed(2)} {t('mkd', 'мкд')} Index: src/app/students/layout.tsx =================================================================== --- src/app/students/layout.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) +++ src/app/students/layout.tsx (revision ba520691331c5f3afac921ef0a143d05e24ce4a5) @@ -32,13 +32,9 @@ }>) { return ( - -
{semesters.filter(s => s.completed !== "Не").length} @@ -345,5 +345,5 @@
{semesters.filter(s => s.verified === "Да").length} @@ -359,5 +359,5 @@
{semesters.length} Index: src/app/students/subjects/page.tsx =================================================================== --- src/app/students/subjects/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) +++ src/app/students/subjects/page.tsx (revision ba520691331c5f3afac921ef0a143d05e24ce4a5) @@ -142,5 +142,5 @@ const TableCell = ({ children, className = "" }: TableCellProps) => ( -