Skip to content

Commit d20e7c8

Browse files
feat: faculty fullstack implementation
1 parent 0b56c71 commit d20e7c8

File tree

10 files changed

+391
-368
lines changed

10 files changed

+391
-368
lines changed

app/[locale]/faculty-and-staff/utils.tsx

Lines changed: 267 additions & 265 deletions
Large diffs are not rendered by default.

app/[locale]/profile/client-utils.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ export const Tabs = ({
9191
qualifications: MdSchool,
9292
experience: MdWork,
9393
projects: FaFlask,
94-
educationCurrent: FaBook,
94+
continuingEducation: FaBook,
9595
publications: MdApproval,
96-
scholars: MdGroups,
97-
awards: MdEmojiEvents,
96+
researchScholars: MdGroups,
97+
awardsAndHonors: MdEmojiEvents,
9898
};
9999

100100
return select ? (

i18n/en.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,18 @@ const text: Translations = {
108108
scopusId: 'Scopus',
109109
},
110110
intellectualContributions: {
111-
patents: 'PATENTS',
112111
publications: 'PUBLICATIONS',
113-
books: 'BOOKS',
112+
continuingEducation: 'CONTINUING EDUCATION',
113+
doctoralStudents: 'DOCTORAL STUDENTS',
114114
},
115115
tabs: {
116116
qualifications: 'Education Qualifications',
117117
experience: 'Experience',
118118
projects: 'Projects',
119-
educationCurrent: 'Continuing Education',
119+
continuingEducation: 'Continuing Education',
120120
publications: 'Publications',
121-
scholars: 'Research Scholars',
122-
awards: 'Awards and Honors',
121+
researchScholars: 'Research Scholars',
122+
awardsAndHonors: 'Awards and Honors',
123123
},
124124
},
125125
FAQ: { title: 'Frequently Asked Questions' },

i18n/hi.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,18 +114,18 @@ const text: Translations = {
114114
scopusId: 'स्कोपस',
115115
},
116116
intellectualContributions: {
117-
patents: 'पेटेंट',
118117
publications: 'प्रकाशन',
119-
books: 'पुस्तकें',
118+
continuingEducation: 'निरंतर शिक्षा',
119+
doctoralStudents: 'डॉक्टरेट छात्र',
120120
},
121121
tabs: {
122122
qualifications: 'शैक्षिक योग्यता',
123123
experience: 'अनुभव',
124124
projects: 'प्रोजेक्ट्स',
125-
educationCurrent: 'निरंतर शिक्षा',
125+
continuingEducation: 'निरंतर शिक्षा',
126126
publications: 'प्रकाशन',
127-
scholars: 'अनुसंधान विद्वान',
128-
awards: 'पुरस्कार और सम्मान',
127+
researchScholars: 'अनुसंधान विद्वान',
128+
awardsAndHonors: 'पुरस्कार और सम्मान',
129129
},
130130
},
131131
FAQ: { title: 'अक्सर पूछे जाने वाले प्रश्न' },

i18n/translations.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,18 @@ export interface Translations {
7878
scopusId: string;
7979
};
8080
intellectualContributions: {
81-
patents: string;
8281
publications: string;
83-
books: string;
82+
continuingEducation: string;
83+
doctoralStudents: string;
8484
};
8585
tabs: {
8686
qualifications: string;
8787
experience: string;
8888
projects: string;
89-
educationCurrent: string;
89+
continuingEducation: string;
9090
publications: string;
91-
scholars: string;
92-
awards: string;
91+
researchScholars: string;
92+
awardsAndHonors: string;
9393
};
9494
};
9595
FAQ: { title: string };

package-lock.json

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"class-variance-authority": "^0.7.0",
3737
"clsx": "^2.1.0",
3838
"cmdk": "^1.0.0",
39-
"drizzle-orm": "^0.33.0",
39+
"drizzle-orm": "^0.34.1",
4040
"embla-carousel-autoplay": "^8.2.1",
4141
"embla-carousel-fade": "^8.2.1",
4242
"embla-carousel-react": "^8.2.1",
@@ -61,7 +61,7 @@
6161
"@types/react-slick": "^0.23.13",
6262
"@typescript-eslint/eslint-plugin": "^6.19.1",
6363
"autoprefixer": "^10.0.1",
64-
"drizzle-kit": "^0.24.0",
64+
"drizzle-kit": "^0.25.0",
6565
"eslint": "^8",
6666
"eslint-config-next": "14.2.4",
6767
"eslint-config-prettier": "^9.1.0",

server/db/schema/doctorates.schema.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ export const doctorates = pgTable('doctorates', {
2121
studentId: integer('student_id')
2222
.references(() => students.id)
2323
.notNull(),
24-
supervisorId: integer('supervisor_id')
25-
.references(() => faculty.id)
24+
facultyId: varchar('faculty_id', { length: 8 })
25+
.references(() => faculty.employeeId)
2626
.notNull(),
2727
type: varchar('type', { enum: ['part-time', 'full-time'] }).notNull(),
2828
title: varchar('title', { length: 256 }).notNull(),
@@ -40,7 +40,7 @@ export const doctoratesRelations = relations(doctorates, ({ one }) => ({
4040
references: [students.id],
4141
}),
4242
supervisor: one(faculty, {
43-
fields: [doctorates.supervisorId],
44-
references: [faculty.id],
43+
fields: [doctorates.facultyId],
44+
references: [faculty.employeeId],
4545
}),
4646
}));

0 commit comments

Comments
 (0)