From c178c13213f22e8e3add2ba2512f8329fc69845a Mon Sep 17 00:00:00 2001 From: Kewonit <108450560+kewonit@users.noreply.github.com.> Date: Thu, 3 Jul 2025 02:23:32 +0530 Subject: [PATCH 1/2] feat: Add scripts for uploading MHT-CET cutoffs and enhance package.json - Added new scripts for importing and uploading MHT-CET cutoffs. - Introduced a new version of the upload script with improved error handling and authentication methods. - Updated package.json to include new script commands and dependencies. - Added README documentation for the scripts. - Included a binary file for PocketBase integration. --- .gitignore | 4 + app/api/mht-cet/state-cutoffs/export/route.ts | 75 + app/api/mht-cet/state-cutoffs/route.ts | 196 +++ .../colleges/bits/cutoffs/[year]/page.tsx | 59 - .../components/cutoff-table-skeleton.tsx | 45 + .../bits/cutoffs/components/cutoff-table.tsx | 88 ++ .../colleges/bits/cutoffs/data/schema.ts | 22 +- app/layout.tsx | 8 +- .../all-state-cutoffs/[year]/[round]/page.tsx | 641 ++++++-- .../components/allocation-filter.tsx | 274 ++++ .../components/breadcrumb.tsx | 36 +- .../components/category-filter.tsx | 276 ++++ .../all-state-cutoffs/components/columns.tsx | 227 ++- .../components/data-table-column-header.tsx | 24 +- .../components/data-table-faceted-filter.tsx | 331 +++-- .../components/data-table-pagination.tsx | 146 +- .../components/data-table-toolbar.tsx | 203 ++- .../components/data-table-view-options.tsx | 2 +- .../components/data-table.tsx | 358 ++++- .../components/percentile-filter-clean.tsx | 284 ++++ .../percentile-filter-new.tsx} | 0 .../components/percentile-filter-old.tsx | 286 ++++ .../components/percentile-filter.tsx | 285 ++++ .../all-state-cutoffs/components/selector.tsx | 9 +- .../components/smart-filter.tsx | 0 .../data/allocation-mappings.ts | 110 ++ .../data/category-mappings.ts | 160 ++ app/mht-cet/all-state-cutoffs/data/schema.ts | 28 +- .../[name]/components/CutoffTrendChart.tsx | 161 -- .../components/data-table-faceted-filter.tsx | 147 -- .../[name]/components/data-table-toolbar.tsx | 105 -- .../[id]/[name]/components/data-table.tsx | 126 -- app/mht-cet/colleges/[id]/[name]/page.tsx | 194 --- app/mht-cet/colleges/city/[city]/page.tsx | 170 --- app/mht-cet/colleges/page.tsx | 181 --- app/mht-cet/page.tsx | 85 +- app/mht-cet/state-cutoffs/page.tsx | 1296 +++++++++++++++++ bits_cutoffs_2023_rows.sql | 1 + components/ui/skeleton.tsx | 15 + lib/pocketbaseClient.ts | 160 ++ migrate-mhtcet-data.js | 143 ++ next.config.mjs | 2 +- package-lock.json | 521 ++++++- package.json | 17 +- pocketbase.exe | Bin 0 -> 32027648 bytes scripts/README.md | 104 ++ scripts/upload-mht-cet-cutoffs-v2.ts | 265 ++++ scripts/upload-mht-cet-cutoffs.ts | 191 +++ 48 files changed, 6263 insertions(+), 1798 deletions(-) create mode 100644 app/api/mht-cet/state-cutoffs/export/route.ts create mode 100644 app/api/mht-cet/state-cutoffs/route.ts delete mode 100644 app/engineering/colleges/bits/cutoffs/[year]/page.tsx create mode 100644 app/engineering/colleges/bits/cutoffs/components/cutoff-table-skeleton.tsx create mode 100644 app/engineering/colleges/bits/cutoffs/components/cutoff-table.tsx create mode 100644 app/mht-cet/all-state-cutoffs/components/allocation-filter.tsx create mode 100644 app/mht-cet/all-state-cutoffs/components/category-filter.tsx create mode 100644 app/mht-cet/all-state-cutoffs/components/percentile-filter-clean.tsx rename app/mht-cet/all-state-cutoffs/{data/seed.ts => components/percentile-filter-new.tsx} (100%) create mode 100644 app/mht-cet/all-state-cutoffs/components/percentile-filter-old.tsx create mode 100644 app/mht-cet/all-state-cutoffs/components/percentile-filter.tsx create mode 100644 app/mht-cet/all-state-cutoffs/components/smart-filter.tsx create mode 100644 app/mht-cet/all-state-cutoffs/data/allocation-mappings.ts create mode 100644 app/mht-cet/all-state-cutoffs/data/category-mappings.ts delete mode 100644 app/mht-cet/colleges/[id]/[name]/components/CutoffTrendChart.tsx delete mode 100644 app/mht-cet/colleges/[id]/[name]/components/data-table-faceted-filter.tsx delete mode 100644 app/mht-cet/colleges/[id]/[name]/components/data-table-toolbar.tsx delete mode 100644 app/mht-cet/colleges/[id]/[name]/components/data-table.tsx delete mode 100644 app/mht-cet/colleges/[id]/[name]/page.tsx delete mode 100644 app/mht-cet/colleges/city/[city]/page.tsx delete mode 100644 app/mht-cet/colleges/page.tsx create mode 100644 app/mht-cet/state-cutoffs/page.tsx create mode 100644 bits_cutoffs_2023_rows.sql create mode 100644 components/ui/skeleton.tsx create mode 100644 lib/pocketbaseClient.ts create mode 100644 migrate-mhtcet-data.js create mode 100644 pocketbase.exe create mode 100644 scripts/README.md create mode 100644 scripts/upload-mht-cet-cutoffs-v2.ts create mode 100644 scripts/upload-mht-cet-cutoffs.ts diff --git a/.gitignore b/.gitignore index a84107a..f6b1f27 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,7 @@ yarn-error.log* # typescript *.tsbuildinfo next-env.d.ts + +# PocketBase +/pb_data/ +/pb_migrations/ diff --git a/app/api/mht-cet/state-cutoffs/export/route.ts b/app/api/mht-cet/state-cutoffs/export/route.ts new file mode 100644 index 0000000..95d32ac --- /dev/null +++ b/app/api/mht-cet/state-cutoffs/export/route.ts @@ -0,0 +1,75 @@ +import { NextRequest, NextResponse } from 'next/server'; +import { getPocketBase, ensureAuthenticatedServer } from '@/lib/pocketbaseClient'; + +export async function GET(request: NextRequest) { + try { + const pb = getPocketBase(); + + let allRecords; + + try { + // Ensure authentication before making the request + await ensureAuthenticatedServer(); + + // Get all records for export + allRecords = await pb.collection('2024_mht_cet_round_one_cutoffs').getFullList({ + sort: '-last_rank', + }); + } catch (error) { + console.error('Database export failed, using mock data:', error); + + // Generate mock data for export + allRecords = Array.from({ length: 500 }, (_, i) => ({ + college_code: `COL${String(i + 1).padStart(3, '0')}`, + college_name: `Mock Engineering College ${i + 1}`, + course_code: `CS${String(i + 1).padStart(2, '0')}`, + course_name: `Computer Science and Engineering ${i + 1}`, + category: ['GOPENS', 'GOBCS', 'GSTS', 'GVJS'][i % 4], + seat_allocation_section: ['STATE_LEVEL', 'HOME_TO_HOME', 'HOME_TO_OTHER'][i % 3], + cutoff_score: String(150 - (i * 0.2)), + last_rank: String(1000 + (i * 10)), + total_admitted: 60 + (i % 20) + })); + } + + // Convert to CSV + const headers = [ + 'College Code', 'College Name', 'Course Code', 'Course Name', + 'Category', 'Seat Allocation', 'Cutoff Score', 'Last Rank', 'Total Admitted' + ]; + + const csvContent = [ + headers.join(','), + ...allRecords.map(record => [ + record.college_code, + `"${record.college_name}"`, + record.course_code, + `"${record.course_name}"`, + record.category, + record.seat_allocation_section, + record.cutoff_score, + record.last_rank, + record.total_admitted + ].join(',')) + ].join('\n'); + + return new NextResponse(csvContent, { + status: 200, + headers: { + 'Content-Type': 'text/csv', + 'Content-Disposition': 'attachment; filename=mht_cet_state_cutoffs_2024.csv', + }, + }); + + } catch (error) { + console.error('Export API Error:', error); + return NextResponse.json( + { + success: false, + error: 'Failed to export cutoff data', + details: error instanceof Error ? error.message : 'Unknown error' + }, + { status: 500 } + ); + } +} diff --git a/app/api/mht-cet/state-cutoffs/route.ts b/app/api/mht-cet/state-cutoffs/route.ts new file mode 100644 index 0000000..95cb9bb --- /dev/null +++ b/app/api/mht-cet/state-cutoffs/route.ts @@ -0,0 +1,196 @@ +import { NextRequest, NextResponse } from 'next/server'; +import { getPocketBase, ensureAuthenticatedServer } from '@/lib/pocketbaseClient'; + +export async function GET(request: NextRequest) { + try { + console.log('API Route called with URL:', request.url); + + const { searchParams } = new URL(request.url); + const page = parseInt(searchParams.get('page') || '1'); + const perPage = parseInt(searchParams.get('perPage') || '50'); + const search = searchParams.get('search') || ''; + const categories = searchParams.get('categories') || ''; + const seatAllocations = searchParams.get('seatAllocations') || ''; + const courses = searchParams.get('courses') || ''; + const percentileInput = searchParams.get('percentileInput') || ''; + const sortBy = searchParams.get('sortBy') || 'last_rank'; + const sortOrder = searchParams.get('sortOrder') || 'desc'; + + console.log('Environment check:', { + hasAdminEmail: !!process.env.POCKETBASE_ADMIN_EMAIL, + hasAdminPassword: !!process.env.POCKETBASE_ADMIN_PASSWORD, + pocketbaseUrl: process.env.NEXT_PUBLIC_POCKETBASE_URL + }); + + const pb = getPocketBase(); + + // Try to ensure authentication with better error handling + try { + await ensureAuthenticatedServer(); + } catch (authError) { + console.error('Authentication failed:', authError); + + // Return mock data if authentication fails + const mockData = Array.from({ length: perPage }, (_, i) => ({ + id: `mock_${i}`, + college_code: `COL${String(i + 1).padStart(3, '0')}`, + college_name: `Mock Engineering College ${i + 1}`, + course_code: `CS${String(i + 1).padStart(2, '0')}`, + course_name: `Computer Science and Engineering ${i + 1}`, + category: ['GOPENS', 'GOBCS', 'GSTS', 'GVJS'][i % 4], + seat_allocation_section: ['STATE_LEVEL', 'HOME_TO_HOME', 'HOME_TO_OTHER'][i % 3], + cutoff_score: String(150 - (i * 2)), + last_rank: String(1000 + (i * 50)), + total_admitted: 60 + (i % 20), + created: new Date().toISOString(), + updated: new Date().toISOString() + })); + + return NextResponse.json({ + success: true, + data: mockData, + totalItems: 1000, + totalPages: Math.ceil(1000 / perPage), + page: page, + perPage: perPage, + note: 'Using mock data - PocketBase server unavailable' + }); + } + + // Build filter query + const filterParts: string[] = []; + + if (search) { + filterParts.push(`(college_name ~ "${search}" || course_name ~ "${search}")`); + } + + if (categories) { + const categoryList = categories.split(',').filter(c => c.trim()); + if (categoryList.length > 0) { + const categoryFilter = categoryList.map(cat => `category = "${cat}"`).join(' || '); + filterParts.push(`(${categoryFilter})`); + } + } + + if (courses) { + const courseList = courses.split(',').filter(c => c.trim()); + if (courseList.length > 0) { + const courseFilter = courseList.map(course => `course_name = "${course}"`).join(' || '); + filterParts.push(`(${courseFilter})`); + } + } + + if (seatAllocations) { + const seatList = seatAllocations.split(',').filter(s => s.trim()); + if (seatList.length > 0) { + const seatFilter = seatList.map(seat => `seat_allocation_section = "${seat}"`).join(' || '); + filterParts.push(`(${seatFilter})`); + } + } + + // Percentile-based filtering (ยฑ1% range) + if (percentileInput && !isNaN(parseFloat(percentileInput))) { + const targetPercentile = parseFloat(percentileInput); + const minPercentile = Math.max(0, targetPercentile - 1); + const maxPercentile = Math.min(100, targetPercentile + 1); + + // Since we don't have direct percentile data, we'll simulate this with cutoff_score + // Higher percentile means higher cutoff score + const estimatedMinScore = Math.floor(minPercentile * 2); // Simple mapping + const estimatedMaxScore = Math.ceil(maxPercentile * 2); + + filterParts.push(`(cutoff_score >= "${estimatedMinScore}" && cutoff_score <= "${estimatedMaxScore}")`); + } + + const filterQuery = filterParts.length > 0 ? filterParts.join(' && ') : ''; + + // Build sort string + const sortPrefix = sortOrder === 'desc' ? '-' : ''; + const sortString = `${sortPrefix}${sortBy}`; + + try { + const result = await pb.collection('2024_mht_cet_round_one_cutoffs').getList( + page, + perPage, + { + filter: filterQuery, + sort: sortString, + } + ); + + return NextResponse.json({ + success: true, + data: result.items, + totalItems: result.totalItems, + totalPages: result.totalPages, + page: result.page, + perPage: result.perPage + }); + } catch (dbError) { + console.error('Database query failed:', dbError); + + // Return filtered mock data as fallback + let mockData = Array.from({ length: Math.min(perPage, 100) }, (_, i) => ({ + id: `mock_${i}`, + college_code: `COL${String(i + 1).padStart(3, '0')}`, + college_name: `Mock Engineering College ${i + 1}`, + course_code: `CS${String(i + 1).padStart(2, '0')}`, + course_name: `Computer Science and Engineering ${i + 1}`, + category: ['GOPENS', 'GOBCS', 'GSTS', 'GVJS'][i % 4], + seat_allocation_section: ['STATE_LEVEL', 'HOME_TO_HOME', 'HOME_TO_OTHER'][i % 3], + cutoff_score: String(150 - (i * 2)), + last_rank: String(1000 + (i * 50)), + total_admitted: 60 + (i % 20), + created: new Date().toISOString(), + updated: new Date().toISOString() + })); + + // Apply search filter to mock data if provided + if (search) { + mockData = mockData.filter(item => + item.college_name.toLowerCase().includes(search.toLowerCase()) || + item.course_name.toLowerCase().includes(search.toLowerCase()) + ); + } + + // Apply percentile filter to mock data if provided + if (percentileInput && !isNaN(parseFloat(percentileInput))) { + const targetPercentile = parseFloat(percentileInput); + const minPercentile = Math.max(0, targetPercentile - 1); + const maxPercentile = Math.min(100, targetPercentile + 1); + + mockData = mockData.filter(item => { + const score = parseInt(item.cutoff_score); + const estimatedMinScore = Math.floor(minPercentile * 2); + const estimatedMaxScore = Math.ceil(maxPercentile * 2); + return score >= estimatedMinScore && score <= estimatedMaxScore; + }); + } + + return NextResponse.json({ + success: true, + data: mockData, + totalItems: mockData.length, + totalPages: Math.ceil(mockData.length / perPage), + page: page, + perPage: perPage, + note: 'Using mock data - Database unavailable' + }); + } + + } catch (error) { + console.error('API Error:', error); + return NextResponse.json( + { + success: false, + error: 'Failed to fetch cutoff data', + details: error instanceof Error ? error.message : 'Unknown error' + }, + { status: 500 } + ); + } +} + +export async function POST() { + return NextResponse.json({ error: 'Method not allowed' }, { status: 405 }); +} diff --git a/app/engineering/colleges/bits/cutoffs/[year]/page.tsx b/app/engineering/colleges/bits/cutoffs/[year]/page.tsx deleted file mode 100644 index 729cc3d..0000000 --- a/app/engineering/colleges/bits/cutoffs/[year]/page.tsx +++ /dev/null @@ -1,59 +0,0 @@ -// app/mht-cet/all-india-cutoffs/[year]/page.tsx -import { Metadata } from "next"; -import { z } from "zod"; -import { columns } from "../components/columns"; -import { DataTable } from "../components/data-table"; -import { taskSchema } from "../data/schema"; -import { Breadcrumbs } from "../components/breadcrumb"; -import { supabase } from "@/lib/supabaseClient"; -import Selector from "../components/selector"; -import { BITSCutoffChart } from "../components/chart"; - -export const metadata: Metadata = { - title: "BITS Cutoffs 2023 - Check All India Cutoffs for BITS Admission", - description: "Get the detailed BITS Cutoffs 2023 for all India candidates. Check the minimum cutoff scores for BITS admission in various engineering branches.", - keywords: "BITS Cutoffs 2023, BITS Admission Cutoffs, All India Cutoffs for BITS, BITS Cutoff Scores, Engineering Cutoffs", -}; - -async function getTasks(year: number) { - const { data, error } = await supabase - .from(`bits_cutoffs_${year}`) - .select(`*`); - if (error) { - console.error('Error fetching tasks:', error); - return []; - } - return z.array(taskSchema).parse(data); -} - -interface TaskPageProps { - params: Promise<{ - year: string; - }>; -} - -export default async function TaskPage(props: TaskPageProps) { - const params = await props.params; - const year = parseInt(params.year) || 2023; - const tasks = await getTasks(year); - - return ( - <> -
-
-
-

- BITS Cutoffs {year} -

- -
-
- -
-
- - {/* */} -
- - ); -} \ No newline at end of file diff --git a/app/engineering/colleges/bits/cutoffs/components/cutoff-table-skeleton.tsx b/app/engineering/colleges/bits/cutoffs/components/cutoff-table-skeleton.tsx new file mode 100644 index 0000000..202a438 --- /dev/null +++ b/app/engineering/colleges/bits/cutoffs/components/cutoff-table-skeleton.tsx @@ -0,0 +1,45 @@ +"use client" + +import { Skeleton } from "@/components/ui/skeleton" +import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table" + +export function CutoffTableSkeleton() { + return ( +
+
+ + +
+
+ + + + + + + + + + + + + {Array(10).fill(0).map((_, i) => ( + + + + + + + + + ))} + +
+
+
+ + +
+
+ ) +} \ No newline at end of file diff --git a/app/engineering/colleges/bits/cutoffs/components/cutoff-table.tsx b/app/engineering/colleges/bits/cutoffs/components/cutoff-table.tsx new file mode 100644 index 0000000..acc0bb8 --- /dev/null +++ b/app/engineering/colleges/bits/cutoffs/components/cutoff-table.tsx @@ -0,0 +1,88 @@ +"use client" + +import { useEffect, useState } from "react" +import { useRouter, usePathname } from "next/navigation" +import { columns } from "./columns" +import { DataTable } from "./data-table" +import { CutoffTableSkeleton } from "./cutoff-table-skeleton" +import { toast } from "@/components/ui/use-toast" +import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert" +import { ExclamationTriangleIcon } from "@radix-ui/react-icons" + +interface CutoffTableProps { + year: number +} + +export function CutoffTable({ year }: CutoffTableProps) { + const [data, setData] = useState([]) + const [loading, setLoading] = useState(true) + const [error, setError] = useState(null) + const router = useRouter() + const pathname = usePathname() + + useEffect(() => { + async function fetchData() { + try { + setLoading(true) + setError(null) + + const response = await fetch(`/api/bits/cutoffs/${year}`) + + if (!response.ok) { + const errorData = await response.json() + throw new Error(errorData.error || `Error ${response.status}: Failed to fetch data`) + } + + const result = await response.json() + + if (!result.items || result.items.length === 0) { + setError("No data found for the selected year") + setData([]) + return + } + + setData(result.items) + } catch (err: any) { + console.error("Failed to fetch BITS cutoffs:", err) + setError(err.message || "Failed to fetch data") + toast({ + title: "Error", + description: err.message || "Failed to fetch data", + variant: "destructive", + }) + } finally { + setLoading(false) + } + } + + fetchData() + }, [year]) + + if (loading) { + return + } + + if (error) { + return ( + + + Error + + {error} + {error === "No data found for the selected year" && ( +
+ +
+ )} + + + ) + } + + return +} \ No newline at end of file diff --git a/app/engineering/colleges/bits/cutoffs/data/schema.ts b/app/engineering/colleges/bits/cutoffs/data/schema.ts index 5d40e0b..926ee42 100644 --- a/app/engineering/colleges/bits/cutoffs/data/schema.ts +++ b/app/engineering/colleges/bits/cutoffs/data/schema.ts @@ -1,12 +1,22 @@ import { z } from 'zod'; export const taskSchema = z.object({ - 'Serial_just_for_database': z.number(), - 'Program': z.string(), - 'Pilani': z.number().optional(), - 'Goa': z.string().optional(), - 'Hyderabad': z.string().optional(), - 'OutOff': z.number(), + id: z.string(), + collectionId: z.string(), + collectionName: z.string(), + created: z.string(), + updated: z.string(), + Program: z.string(), + Pilani: z.union([z.number(), z.string(), z.null()]).optional() + .transform(val => typeof val === 'string' ? val : val?.toString() || ""), + Goa: z.union([z.number(), z.string(), z.null()]).optional() + .transform(val => typeof val === 'string' ? val : val?.toString() || ""), + Hyderabad: z.union([z.number(), z.string(), z.null()]).optional() + .transform(val => typeof val === 'string' ? val : val?.toString() || ""), + OutOff: z.union([z.number(), z.string()]) + .transform(val => typeof val === 'string' ? val : val.toString()), + Year: z.union([z.number(), z.string()]) + .transform(val => typeof val === 'string' ? val : val.toString()), }); export type Task = z.infer diff --git a/app/layout.tsx b/app/layout.tsx index 29a31f8..f2e1dc1 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -8,6 +8,7 @@ import GrainEffect from '@/components/graineffect'; import { Suspense } from "react"; import Loading from "./loading"; import { Toaster } from "@/components/ui/toaster" +import { Toaster as SonnerToaster } from "sonner" import NextTopLoader from 'nextjs-toploader'; import MotionWrapper from '@/components/MotionWrapper'; @@ -47,11 +48,16 @@ export default function RootLayout({ +