Skip to content

Commit a8d5444

Browse files
abhitrueprogrammerabhitrueprogrammer
authored
Merge branch 'CodeChefVIT:staging' into staging
2 parents c2df539 + c89e219 commit a8d5444

7 files changed

Lines changed: 13 additions & 33 deletions

File tree

‎src/app/api/request/route.ts‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,32 @@ import PaperRequest from "@/db/paperRequest";
55
export async function POST(req: Request) {
66
try {
77
await connectToDatabase();
8-
const body = await req.json();
8+
const body = (await req.json()) as {
9+
subject: string;
10+
exam: string;
11+
slot: string;
12+
year: string;
13+
};
914

1015
const { subject, exam, slot, year } = body;
1116

1217
if (!subject || !exam || !slot || !year) {
1318
return NextResponse.json(
1419
{ error: "All fields are required." },
15-
{ status: 400 }
20+
{ status: 400 },
1621
);
1722
}
1823

1924
const newRequest = await PaperRequest.create({ subject, exam, slot, year });
2025
return NextResponse.json(
2126
{ message: "Paper request submitted successfully!", request: newRequest },
22-
{ status: 201 }
27+
{ status: 201 },
2328
);
2429
} catch (error) {
2530
console.error("Error creating paper request:", error);
2631
return NextResponse.json(
2732
{ error: "Failed to submit request." },
28-
{ status: 500 }
33+
{ status: 500 },
2934
);
3035
}
3136
}

‎src/app/paper/[id]/page.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ const PaperPage = async ({ params }: { params: { id: string } }) => {
158158
</div>
159159
) : (
160160
<>
161-
<h1 className="my-6 flex justify-center gap-4 text-center font-play text-2xl font-semibold md:mb-10 md:text-3xl">
162161
<h1 className="my-6 flex justify-center gap-4 text-center font-play text-2xl font-semibold md:mb-10 md:text-3xl">
163162
<div>
164163
{paper.subject} {paper.exam} {paper.slot} {paper.year}

‎src/components/Card.tsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ const Card = ({ paper, onSelect, isSelected }: CardProps) => {
6565
return (
6666
<div
6767
className={cn(
68-
"overflow-hidden rounded-sm border-2 border-[#734DFF] bg-[#FFFFFF] font-play transition-all duration-150 hover:bg-[#EFEAFF] dark:border-[#36266D] dark:bg-[#171720] hover:dark:bg-[#262635]",
6968
"overflow-hidden rounded-sm border-2 border-[#734DFF] bg-[#FFFFFF] font-play transition-all duration-150 hover:bg-[#EFEAFF] dark:border-[#36266D] dark:bg-[#171720] hover:dark:bg-[#262635]",
7069
checked && "bg-white",
7170
)}
@@ -81,7 +80,6 @@ const Card = ({ paper, onSelect, isSelected }: CardProps) => {
8180

8281
<div className="justify-center">
8382
<div className="flex flex-row items-center justify-between px-4 pb-2">
84-
<div className="text-md font-play font-medium">
8583
<div className="text-md font-play font-medium">
8684
{extractBracketContent(paper.subject)}
8785
</div>
@@ -117,7 +115,6 @@ const Card = ({ paper, onSelect, isSelected }: CardProps) => {
117115
</div>
118116
</Link>
119117

120-
<div className="hidden items-center justify-between gap-2 px-4 pb-4 font-play md:flex">
121118
<div className="hidden items-center justify-between gap-2 px-4 pb-4 font-play md:flex">
122119
<div className="flex items-center gap-2">
123120
<input

‎src/components/Searchbar/searchbar.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import PinnedSearchBar from "./pinned-searchbar";
77

88
export async function fetchSubjects() {
99
try {
10-
const response = await axios.get<ICourses[]>(`/api/course-list`);
10+
const response = await axios.get<ICourses[]>(
11+
`${process.env.SERVER_URL}/api/course-list`,
12+
);
1113
console.log("Fetched subjects:", response.data);
1214
return response.data.map((course) => course.name);
1315
} catch (err) {

‎src/components/SideBar.tsx‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ function SideBar({
4444
campus: string[],
4545
semester: string[],
4646
anskey: boolean,
47-
anskey: boolean,
4847
) => void;
4948
handleSelectAll: () => void;
5049
handleDeselectAll: () => void;
@@ -80,7 +79,6 @@ function SideBar({
8079
</div>
8180
<div className="flex flex-col">
8281
<div
83-
className="cursor-pointer rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-slate-800 hover:text-white dark:border-[#434dba] dark:hover:border-white dark:hover:bg-slate-900"
8482
className="cursor-pointer rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-slate-800 hover:text-white dark:border-[#434dba] dark:hover:border-white dark:hover:bg-slate-900"
8583
onClick={() => {
8684
handleApplyFilters([], [], [], [], [], false);
@@ -101,10 +99,8 @@ function SideBar({
10199
selectedCampuses,
102100
selectedSemesters,
103101
!selectedAnswerKeyIncluded,
104-
!selectedAnswerKeyIncluded,
105102
);
106103
}}
107-
className={`flex cursor-pointer rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-slate-800 hover:text-white ${
108104
className={`flex cursor-pointer rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-slate-800 hover:text-white ${
109105
selectedAnswerKeyIncluded
110106
? "border-[#B2B8FF] bg-[#B2B8FF] hover:border-black hover:bg-[#B2B8FF] dark:border-[#434dba] dark:bg-[#434dba] dark:hover:border-[white] dark:hover:bg-[#434dba]"
@@ -116,38 +112,28 @@ function SideBar({
116112
</div>
117113

118114
{/* Select/Deselect/Download All Buttons */}
119-
<div className="flex w-full flex-wrap justify-between gap-2 border-b-2 border-[#36266d] px-[10px] py-4">
120115
<div className="flex w-full flex-wrap justify-between gap-2 border-b-2 border-[#36266d] px-[10px] py-4">
121116
<div
122117
onClick={handleSelectAll}
123118
className="cursor-pointer rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-[#B2B8FF] hover:text-black dark:border-white dark:hover:border-[#434dba] dark:hover:bg-[#434dba] dark:hover:text-white"
124-
className="cursor-pointer rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-[#B2B8FF] hover:text-black dark:border-white dark:hover:border-[#434dba] dark:hover:bg-[#434dba] dark:hover:text-white"
125119
>
126120
Select All
127121
</div>
128122
<div
129123
onClick={handleDeselectAll}
130124
className="cursor-pointer rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-[#B2B8FF] hover:text-black dark:border-white dark:hover:border-[#434dba] dark:hover:bg-[#434dba] dark:hover:text-white"
131-
className="cursor-pointer rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-[#B2B8FF] hover:text-black dark:border-white dark:hover:border-[#434dba] dark:hover:bg-[#434dba] dark:hover:text-white"
132125
>
133126
Deselect All
134127
</div>
135128
<div
136129
onClick={handleDownloadAll}
137130
className="cursor-pointer rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-[#B2B8FF] hover:text-black dark:border-white dark:hover:border-[#434dba] dark:hover:bg-[#434dba] dark:hover:text-white"
138-
className="cursor-pointer rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-[#B2B8FF] hover:text-black dark:border-white dark:hover:border-[#434dba] dark:hover:bg-[#434dba] dark:hover:text-white"
139131
>
140132
Download All
141133
</div>
142134
</div>
143135

144136
<div className="flex w-full flex-col items-baseline justify-between border-b-2 border-[#36266d] px-[10px]">
145-
<Accordion
146-
className="w-full"
147-
type="single"
148-
collapsible
149-
defaultValue="item-1"
150-
>
151137
<Accordion
152138
className="w-full"
153139
type="single"
@@ -174,10 +160,8 @@ function SideBar({
174160
selectedCampuses,
175161
selectedSemesters,
176162
selectedAnswerKeyIncluded,
177-
selectedAnswerKeyIncluded,
178163
);
179164
}}
180-
className={`mb-2 mr-2 flex h-fit cursor-pointer items-center rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-slate-800 hover:text-white ${
181165
className={`mb-2 mr-2 flex h-fit cursor-pointer items-center rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-slate-800 hover:text-white ${
182166
selectedExams.includes(exam.value)
183167
? "border-[#B2B8FF] bg-[#B2B8FF] dark:border-[#434dba] dark:bg-[#434dba]"
@@ -215,10 +199,8 @@ function SideBar({
215199
selectedCampuses,
216200
selectedSemesters,
217201
selectedAnswerKeyIncluded,
218-
selectedAnswerKeyIncluded,
219202
);
220203
}}
221-
className={`mb-2 mr-2 flex h-fit cursor-pointer items-center rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-slate-800 hover:text-white ${
222204
className={`mb-2 mr-2 flex h-fit cursor-pointer items-center rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-slate-800 hover:text-white ${
223205
selectedSlots.includes(slot.value)
224206
? "border-[#B2B8FF] bg-[#B2B8FF] dark:border-[#434dba] dark:bg-[#434dba]"
@@ -256,10 +238,8 @@ function SideBar({
256238
selectedCampuses,
257239
selectedSemesters,
258240
selectedAnswerKeyIncluded,
259-
selectedAnswerKeyIncluded,
260241
);
261242
}}
262-
className={`mb-2 mr-2 flex h-fit cursor-pointer items-center rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-slate-800 hover:text-white ${
263243
className={`mb-2 mr-2 flex h-fit cursor-pointer items-center rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-slate-800 hover:text-white ${
264244
selectedYears.includes(year.value)
265245
? "border-[#B2B8FF] bg-[#B2B8FF] dark:border-[#434dba] dark:bg-[#434dba]"
@@ -297,10 +277,8 @@ function SideBar({
297277
selectedCampuses,
298278
newSems,
299279
selectedAnswerKeyIncluded,
300-
selectedAnswerKeyIncluded,
301280
);
302281
}}
303-
className={`mb-2 mr-2 flex h-fit cursor-pointer items-center rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-slate-800 hover:text-white ${
304282
className={`mb-2 mr-2 flex h-fit cursor-pointer items-center rounded-full border-2 border-black px-2 py-1 font-play text-xs font-semibold hover:bg-slate-800 hover:text-white ${
305283
selectedSemesters.includes(semester.value)
306284
? "border-[#B2B8FF] bg-[#B2B8FF] dark:border-[#434dba] dark:bg-[#434dba]"

‎src/components/ui/PWAInstallButton.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const PWAInstallButton = () => {
4141

4242
const handleInstall = async () => {
4343
if (!deferredPrompt) return;
44-
deferredPrompt.prompt();
44+
await deferredPrompt.prompt();
4545
const { outcome } = await deferredPrompt.userChoice;
4646
if (outcome === "accepted") {
4747
setCanInstall(false);

‎src/interface.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ export interface IPaper {
172172
| "Bhopal"
173173
| "Bangalore"
174174
| "Mauritius"
175-
| null;
176175
slot: string;
177176
subject: string;
178177
year: string;

0 commit comments

Comments
 (0)