diff --git a/app/events/data.ts b/app/events/data.ts index 55b330c..2c06197 100644 --- a/app/events/data.ts +++ b/app/events/data.ts @@ -1,23 +1,23 @@ import blocksData from '@/types/Block/blockCard.types' -import basic_img from '@/public/Projects/Images/GRAND.png' - const data: blocksData = [ { - heading: 'AlgoUniversity Code Rush', - time: 'May', + heading: 'Toolset Unbounded', + time: 'June - July', content: - 'We will try to replicate GRAND Chip, or try to get near that to make a universal encoding and decoding FPGA', - knowMoreLink: 'https://www.granddecoder.mit.edu/', - image: basic_img.src, + 'The problem Statement involves developing a GUI frontend with a user-friendly UI/UX. It includes a secure signup/login page with password/OTP protection. Implement a lossless image and text compression/decompression algorithms. Compressed images are stored in a secure database, and a file management system allows users to add/delete their images. You are free to choose various components, and exploration is encouraged.', + knowMoreLink: + 'https://drive.google.com/file/d/15gb-OIBMqm8VlWeJ3AOWYgFbwCTwLM4d/view?usp=sharing', + image: '/Events/pics/IMAGE_CODING_CLUB_01.jpg', }, { - heading: 'Toolset Unbounded', - time: 'June - July', + heading: 'Bitwise Symphony', + time: 'July', content: - 'We will try to replicate GRAND Chip, or try to get near that to make a universal encoding and decoding FPGA', - knowMoreLink: 'https://www.granddecoder.mit.edu/', - image: basic_img.src, + 'Unleash your algorithmic prowess, crafting a symphony from integers. Witness the mesmerizing rise of numbers, powered by bitwise sorcery. Seek the harmonies that transcend ordinariness, forging an ascending masterpiece. Dare you compose the ultimate melody, or chase the enigmatic crescendo? Enter the realm of Bitwise Symphony!.', + knowMoreLink: + 'https://drive.google.com/file/d/1oYef04uoGGo2glUbUzRyPpaeH74GXIer/view?usp=sharing', + image: '/Events/pics/sar.png', }, ] diff --git a/app/members/page.tsx b/app/members/page.tsx index c777684..b22f1fd 100644 --- a/app/members/page.tsx +++ b/app/members/page.tsx @@ -16,6 +16,8 @@ import { SiBmcsoftware, SiCodeforces } from 'react-icons/si' import { IoGameController } from 'react-icons/io5' import { IoIosPeople } from 'react-icons/io' +import Header from '@/components/Members/Header' + const MEMBERS_REVALIDATION_TIME = 60 * 60 * 12 // Keep this very high in the deployed version @@ -160,6 +162,7 @@ const Page = async () => { return ( <>
+
Home
- {/*
+
Events
-
*/} +
Projects
diff --git a/components/Members/Header.tsx b/components/Members/Header.tsx new file mode 100644 index 0000000..55a1ee9 --- /dev/null +++ b/components/Members/Header.tsx @@ -0,0 +1,34 @@ +import Link from 'next/link' + +const Header = () => { + return ( + <> +
+
+
+

+ Unlock Your Potential: Join the Coding Club and Shape Your Digital + Future! +

+

+ Empower yourself at our Coding Club. Join now to shape your + digital destiny and unleash your true potential in a world driven + by code. +

+
+ + Enrollement Policy + +
+
+
+
+ + ) +} + +export default Header diff --git a/components/Registration/RegBlock/RegBlock.tsx b/components/Registration/RegBlock/RegBlock.tsx index 54edcf5..8c3a276 100644 --- a/components/Registration/RegBlock/RegBlock.tsx +++ b/components/Registration/RegBlock/RegBlock.tsx @@ -54,9 +54,9 @@ const RegBlock = ({ title, inputs, handleChangeInput, type }: Props) => { }, setAuthState, ) - if (authState.error === null) { - router.push('/leaderboard') - } + // if (authState.error === null) { + // router.push('/leaderboard') + // } } return ( diff --git a/next.config.js b/next.config.js index 273cb88..e576658 100644 --- a/next.config.js +++ b/next.config.js @@ -4,6 +4,7 @@ const nextConfig = { images: { domains: ['drive.google.com', 'https://drive.google.com'], }, + pageExtensions: ['page.tsx', 'page.ts', 'page.jsx', 'page.js'], } module.exports = nextConfig diff --git a/package.json b/package.json index aa7181d..395becf 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts" }, "dependencies": { - "@prisma/client": "4.15.0", + "@prisma/client": "^5.1.1", "@types/node": "^20.3.1", "@types/react": "18.2.7", "@types/react-dom": "18.2.4", @@ -32,7 +32,7 @@ "next-auth": "^4.23.0", "postcss": "8.4.24", "prettier": "2.8.8", - "prisma": "^4.15.0", + "prisma": "^5.1.1", "react": "18.2.0", "react-dom": "18.2.0", "react-icons": "^4.10.1", diff --git a/pages/api/codeforces.ts b/pages/api/codeforces.ts index a0e8ac1..1f63df9 100644 --- a/pages/api/codeforces.ts +++ b/pages/api/codeforces.ts @@ -24,10 +24,10 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => { }), errorMessage: 'Invalid Length Roll Number Detected', }, - { - valid: validator.isNumeric(rollNumber), - errorMessage: 'Invalid Characters Detected in Roll Number', - }, + // { + // valid: validator.isNumeric(rollNumber), + // errorMessage: 'Invalid Characters Detected in Roll Number', + // }, ] validtionSchema.forEach(check => { @@ -46,7 +46,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => { try { const userWithRollNumber = await prisma.codeforcesLeaderBoard.findUnique({ - where: { rollNumber: BigInt(rollNumber) }, + where: { rollNumber: String(rollNumber) }, }) if (userWithRollNumber) { return res.status(400).json({ @@ -96,11 +96,17 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => { }) } + if (num_contest === 0) { + return res.status(400).json({ + errorMessage: 'Number of contests given are nill', + }) + } + try { const coder = await prisma.codeforcesLeaderBoard.create({ data: { name: fullName, - rollNumber: BigInt(rollNumber), + rollNumber: String(rollNumber), rating: Number(rating), last_contest_id: Number(last_contest), contests: Number(num_contest), diff --git a/pages/api/leetcode.ts b/pages/api/leetcode.ts index 79bc81e..cae2083 100644 --- a/pages/api/leetcode.ts +++ b/pages/api/leetcode.ts @@ -25,10 +25,10 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => { }), errorMessage: 'Invalid Length Roll Number Detected', }, - { - valid: validator.isNumeric(rollNumber), - errorMessage: 'Invalid Characters Detected in Roll Number', - }, + // { + // valid: validator.isNumeric(rollNumber), + // errorMessage: 'Invalid Characters Detected in Roll Number', + // }, ] validtionSchema.forEach(check => { @@ -47,7 +47,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => { try { const userWithRollNumber = await prisma.leetCodeLeaderBoard.findUnique({ - where: { rollNumber: BigInt(rollNumber) }, + where: { rollNumber: String(rollNumber) }, }) if (userWithRollNumber) { return res.status(400).json({ @@ -108,7 +108,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => { const coder = await prisma.leetCodeLeaderBoard.create({ data: { name: fullName, - rollNumber: BigInt(rollNumber), + rollNumber: String(rollNumber), userHandle: userHandle, ranking: ranking, stars: points, diff --git a/prisma/migrations/20230813211225_roll_num_data_changed/migration.sql b/prisma/migrations/20230813211225_roll_num_data_changed/migration.sql new file mode 100644 index 0000000..f96dda0 --- /dev/null +++ b/prisma/migrations/20230813211225_roll_num_data_changed/migration.sql @@ -0,0 +1,8 @@ +-- AlterTable +ALTER TABLE "CodeforcesLeaderBoard" ALTER COLUMN "rollNumber" SET DATA TYPE TEXT; + +-- AlterTable +ALTER TABLE "LeetCodeLeaderBoard" ALTER COLUMN "rollNumber" SET DATA TYPE TEXT; + +-- AlterTable +ALTER TABLE "Members" ALTER COLUMN "roll_number" SET DATA TYPE TEXT; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index c8a85e3..b8b73ea 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -14,7 +14,7 @@ datasource db { model Members { id String @id @default(uuid()) name String - roll_number Int @unique + roll_number String @unique wing Wing created_at DateTime @default(now()) updated_at DateTime @updatedAt diff --git a/prisma/seed.ts b/prisma/seed.ts index 3e7f3f4..cb224ac 100644 --- a/prisma/seed.ts +++ b/prisma/seed.ts @@ -4,10 +4,10 @@ const prisma = new PrismaClient() async function main() { const shubh = await prisma.members.upsert({ - where: { roll_number: 210020047 }, + where: { roll_number: '210020047' }, update: {}, create: { - roll_number: 210020047, + roll_number: '210020047', name: 'Shubh Agarwal', wing: 'FOSS', leetcode: { @@ -26,11 +26,11 @@ async function main() { }) const saksham = await prisma.members.upsert({ - where: { roll_number: 210010046 }, + where: { roll_number: '210010046' }, update: {}, create: { name: 'Saksham Chhimwal', - roll_number: 210010046, + roll_number: '210010046', wing: 'FOSS', codeforces: { create: { @@ -43,11 +43,11 @@ async function main() { }) const ayush = await prisma.members.upsert({ - where: { roll_number: 210020048 }, + where: { roll_number: '210020048' }, update: {}, create: { name: 'Ayush Singhi', - roll_number: 210020048, + roll_number: '210020048', wing: 'GAME_DEV', game_dev: { create: { diff --git a/public/Events/pics/IMAGE_CODING_CLUB_01.jpg b/public/Events/pics/IMAGE_CODING_CLUB_01.jpg new file mode 100644 index 0000000..5b8c3f2 Binary files /dev/null and b/public/Events/pics/IMAGE_CODING_CLUB_01.jpg differ diff --git a/public/Events/pics/sar.png b/public/Events/pics/sar.png new file mode 100644 index 0000000..52eb59e Binary files /dev/null and b/public/Events/pics/sar.png differ diff --git a/yarn.lock b/yarn.lock index 9694c3f..66f2516 100644 --- a/yarn.lock +++ b/yarn.lock @@ -258,22 +258,22 @@ resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz" integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== -"@prisma/client@4.15.0": - version "4.15.0" - resolved "https://registry.npmjs.org/@prisma/client/-/client-4.15.0.tgz" - integrity sha512-xnROvyABcGiwqRNdrObHVZkD9EjkJYHOmVdlKy1yGgI+XOzvMzJ4tRg3dz1pUlsyhKxXGCnjIQjWW+2ur+YXuw== +"@prisma/client@^5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.1.1.tgz#ea2b0c8599bdb3f86d92e8df46fba795a744db01" + integrity sha512-fxcCeK5pMQGcgCqCrWsi+I2rpIbk0rAhdrN+ke7f34tIrgPwA68ensrpin+9+fZvuV2OtzHmuipwduSY6HswdA== dependencies: - "@prisma/engines-version" "4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944" + "@prisma/engines-version" "5.1.1-1.6a3747c37ff169c90047725a05a6ef02e32ac97e" -"@prisma/engines-version@4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944": - version "4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944" - resolved "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944.tgz" - integrity sha512-sVOig4tjGxxlYaFcXgE71f/rtFhzyYrfyfNFUsxCIEJyVKU9rdOWIlIwQ2NQ7PntvGnn+x0XuFo4OC1jvPJKzg== +"@prisma/engines-version@5.1.1-1.6a3747c37ff169c90047725a05a6ef02e32ac97e": + version "5.1.1-1.6a3747c37ff169c90047725a05a6ef02e32ac97e" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.1.1-1.6a3747c37ff169c90047725a05a6ef02e32ac97e.tgz#2e8a1f098ec09452dbe00923b24f582f95d1747c" + integrity sha512-owZqbY/wucbr65bXJ/ljrHPgQU5xXTSkmcE/JcbqE1kusuAXV/TLN3/exmz21SZ5rJ7WDkyk70J2G/n68iogbQ== -"@prisma/engines@4.15.0": - version "4.15.0" - resolved "https://registry.npmjs.org/@prisma/engines/-/engines-4.15.0.tgz" - integrity sha512-FTaOCGs0LL0OW68juZlGxFtYviZa4xdQj/rQEdat2txw0s3Vu/saAPKjNVXfIgUsGXmQ72HPgNr6935/P8FNAA== +"@prisma/engines@5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.1.1.tgz#9c26d209f93a563e048eab63b1976f222f1707d0" + integrity sha512-NV/4nVNWFZSJCCIA3HIFJbbDKO/NARc9ej0tX5S9k2EVbkrFJC4Xt9b0u4rNZWL4V+F5LAjvta8vzEUw0rw+HA== "@rushstack/eslint-patch@^1.1.3": version "1.3.2" @@ -2518,15 +2518,15 @@ prettier@2.8.8: pretty-format@^3.8.0: version "3.8.0" - resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-3.8.0.tgz" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-3.8.0.tgz#bfbed56d5e9a776645f4b1ff7aa1a3ac4fa3c385" integrity sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew== -prisma@^4.15.0: - version "4.15.0" - resolved "https://registry.npmjs.org/prisma/-/prisma-4.15.0.tgz" - integrity sha512-iKZZpobPl48gTcSZVawLMQ3lEy6BnXwtoMj7hluoGFYu2kQ6F9LBuBrUyF95zRVnNo8/3KzLXJXJ5TEnLSJFiA== +prisma@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.1.1.tgz#8f5c0f9467a828746cb94f846d694dc7b7481a9e" + integrity sha512-WJFG/U7sMmcc6TjJTTifTfpI6Wjoh55xl4AzopVwAdyK68L9/ogNo8QQ2cxuUjJf/Wa82z/uhyh3wMzvRIBphg== dependencies: - "@prisma/engines" "4.15.0" + "@prisma/engines" "5.1.1" prop-types@^15.8.1: version "15.8.1"