Skip to content

Commit aad30fc

Browse files
ShubhAgarwal-devShubhAgarwal-dev
authored
Merge pull request #12 from EnigmaData/main
Latest Deployed Branch
2 parents a3a1278 + f74fc70 commit aad30fc

File tree

16 files changed

+119
-67
lines changed

16 files changed

+119
-67
lines changed

‎app/events/data.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import blocksData from '@/types/Block/blockCard.types'
22

3-
import basic_img from '@/public/Projects/Images/GRAND.png'
4-
53
const data: blocksData = [
64
{
7-
heading: 'AlgoUniversity Code Rush',
8-
time: 'May',
5+
heading: 'Toolset Unbounded',
6+
time: 'June - July',
97
content:
10-
'We will try to replicate GRAND Chip, or try to get near that to make a universal encoding and decoding FPGA',
11-
knowMoreLink: 'https://www.granddecoder.mit.edu/',
12-
image: basic_img.src,
8+
'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.',
9+
knowMoreLink:
10+
'https://drive.google.com/file/d/15gb-OIBMqm8VlWeJ3AOWYgFbwCTwLM4d/view?usp=sharing',
11+
image: '/Events/pics/IMAGE_CODING_CLUB_01.jpg',
1312
},
1413
{
15-
heading: 'Toolset Unbounded',
16-
time: 'June - July',
14+
heading: 'Bitwise Symphony',
15+
time: 'July',
1716
content:
18-
'We will try to replicate GRAND Chip, or try to get near that to make a universal encoding and decoding FPGA',
19-
knowMoreLink: 'https://www.granddecoder.mit.edu/',
20-
image: basic_img.src,
17+
'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!.',
18+
knowMoreLink:
19+
'https://drive.google.com/file/d/1oYef04uoGGo2glUbUzRyPpaeH74GXIer/view?usp=sharing',
20+
image: '/Events/pics/sar.png',
2121
},
2222
]
2323

‎app/members/page.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import { SiBmcsoftware, SiCodeforces } from 'react-icons/si'
1616
import { IoGameController } from 'react-icons/io5'
1717
import { IoIosPeople } from 'react-icons/io'
1818

19+
import Header from '@/components/Members/Header'
20+
1921
const MEMBERS_REVALIDATION_TIME = 60 * 60 * 12
2022
// Keep this very high in the deployed version
2123

@@ -160,6 +162,7 @@ const Page = async () => {
160162
return (
161163
<>
162164
<div className={styles.membersWrapper}>
165+
<Header />
163166
<Tabs.Group
164167
aria-label='Default tabs'
165168
style='default'

‎app/projects/data.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ const data: blocksData = [
1717
image: SCA.src,
1818
time: 'FOSS',
1919
},
20-
{
21-
heading: '2D-Platformer Game',
22-
content:
23-
'Currently we are developing a 2D top down game ,based on the theme of ruin exploration, set on a fictional stage. \
24-
This game boasts a rich world filled with exploration and adventure.',
25-
knowMoreLink:
26-
'https://docs.google.com/document/d/1QNEcDAQeoi_AZt7qXQF7T2RmdZCxovqfjODHy5joCzw/edit?usp=sharing',
27-
image: gd.src,
28-
time: 'Game Dev',
29-
},
20+
// {
21+
// heading: '2D-Platformer Game',
22+
// content:
23+
// 'Currently we are developing a 2D top down game ,based on the theme of ruin exploration, set on a fictional stage. \
24+
// This game boasts a rich world filled with exploration and adventure.',
25+
// knowMoreLink:
26+
// 'https://docs.google.com/document/d/1QNEcDAQeoi_AZt7qXQF7T2RmdZCxovqfjODHy5joCzw/edit?usp=sharing',
27+
// image: gd.src,
28+
// time: 'Game Dev',
29+
// },
3030
]
3131

3232
export default data

‎components/AppBar/AppBar.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ export default function AppBar() {
5454
<div>Home</div>
5555
</Link>
5656
</div>
57-
{/* <div className={styles.option}>
57+
<div className={styles.option}>
5858
<Link href='/events' scroll={false}>
5959
<div>Events</div>
6060
</Link>
61-
</div> */}
61+
</div>
6262
<div className={styles.option}>
6363
<Link href='/projects' scroll={false}>
6464
<div>Projects</div>

‎components/Members/Header.tsx‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import Link from 'next/link'
2+
3+
const Header = () => {
4+
return (
5+
<>
6+
<section className='bg-transparent font-sans'>
7+
<div className='py-4 px-4 mx-auto max-w-screen-xl sm:py-8 md:px-0'>
8+
<div className='max-w-screen-md'>
9+
<h2 className='mb-4 text-3xl md:text-5xl tracking-tight font-extrabold text-white'>
10+
Unlock Your Potential: Join the Coding Club and Shape Your Digital
11+
Future!
12+
</h2>
13+
<p className='mb-1 font-light sm:text-xl text-gray-400'>
14+
Empower yourself at our Coding Club. Join now to shape your
15+
digital destiny and unleash your true potential in a world driven
16+
by code.
17+
</p>
18+
<div className='flex flex-col mt-4 space-y-4 sm:flex-row sm:space-y-0 sm:space-x-4'>
19+
<Link
20+
href='/members/wanna_join'
21+
target='_top'
22+
className='inline-flex items-center justify-center px-4 py-2.5 text-base font-medium text-center border rounded-lg focus:ring-4 text-white border-gray-600 hover:bg-gray-700 focus:ring-gray-600'
23+
>
24+
Enrollement Policy
25+
</Link>
26+
</div>
27+
</div>
28+
</div>
29+
</section>
30+
</>
31+
)
32+
}
33+
34+
export default Header

‎components/Registration/RegBlock/RegBlock.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ const RegBlock = ({ title, inputs, handleChangeInput, type }: Props) => {
5454
},
5555
setAuthState,
5656
)
57-
if (authState.error === null) {
58-
router.push('/leaderboard')
59-
}
57+
// if (authState.error === null) {
58+
// router.push('/leaderboard')
59+
// }
6060
}
6161

6262
return (

‎next.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const nextConfig = {
44
images: {
55
domains: ['drive.google.com', 'https://drive.google.com'],
66
},
7+
pageExtensions: ['page.tsx', 'page.ts', 'page.jsx', 'page.js'],
78
}
89

910
module.exports = nextConfig

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
1515
},
1616
"dependencies": {
17-
"@prisma/client": "4.15.0",
17+
"@prisma/client": "^5.1.1",
1818
"@types/node": "^20.3.1",
1919
"@types/react": "18.2.7",
2020
"@types/react-dom": "18.2.4",
@@ -32,7 +32,7 @@
3232
"next-auth": "^4.23.0",
3333
"postcss": "8.4.24",
3434
"prettier": "2.8.8",
35-
"prisma": "^4.15.0",
35+
"prisma": "^5.1.1",
3636
"react": "18.2.0",
3737
"react-dom": "18.2.0",
3838
"react-icons": "^4.10.1",

‎pages/api/codeforces.ts‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
2424
}),
2525
errorMessage: 'Invalid Length Roll Number Detected',
2626
},
27-
{
28-
valid: validator.isNumeric(rollNumber),
29-
errorMessage: 'Invalid Characters Detected in Roll Number',
30-
},
27+
// {
28+
// valid: validator.isNumeric(rollNumber),
29+
// errorMessage: 'Invalid Characters Detected in Roll Number',
30+
// },
3131
]
3232

3333
validtionSchema.forEach(check => {
@@ -46,7 +46,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
4646

4747
try {
4848
const userWithRollNumber = await prisma.codeforcesLeaderBoard.findUnique({
49-
where: { rollNumber: BigInt(rollNumber) },
49+
where: { rollNumber: String(rollNumber) },
5050
})
5151
if (userWithRollNumber) {
5252
return res.status(400).json({
@@ -96,11 +96,17 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
9696
})
9797
}
9898

99+
if (num_contest === 0) {
100+
return res.status(400).json({
101+
errorMessage: 'Number of contests given are nill',
102+
})
103+
}
104+
99105
try {
100106
const coder = await prisma.codeforcesLeaderBoard.create({
101107
data: {
102108
name: fullName,
103-
rollNumber: BigInt(rollNumber),
109+
rollNumber: String(rollNumber),
104110
rating: Number(rating),
105111
last_contest_id: Number(last_contest),
106112
contests: Number(num_contest),

‎pages/api/leetcode.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
2525
}),
2626
errorMessage: 'Invalid Length Roll Number Detected',
2727
},
28-
{
29-
valid: validator.isNumeric(rollNumber),
30-
errorMessage: 'Invalid Characters Detected in Roll Number',
31-
},
28+
// {
29+
// valid: validator.isNumeric(rollNumber),
30+
// errorMessage: 'Invalid Characters Detected in Roll Number',
31+
// },
3232
]
3333

3434
validtionSchema.forEach(check => {
@@ -47,7 +47,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
4747

4848
try {
4949
const userWithRollNumber = await prisma.leetCodeLeaderBoard.findUnique({
50-
where: { rollNumber: BigInt(rollNumber) },
50+
where: { rollNumber: String(rollNumber) },
5151
})
5252
if (userWithRollNumber) {
5353
return res.status(400).json({
@@ -108,7 +108,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
108108
const coder = await prisma.leetCodeLeaderBoard.create({
109109
data: {
110110
name: fullName,
111-
rollNumber: BigInt(rollNumber),
111+
rollNumber: String(rollNumber),
112112
userHandle: userHandle,
113113
ranking: ranking,
114114
stars: points,

0 commit comments

Comments
 (0)