Skip to content

Commit

Permalink
fix: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@BRAVO68WEB
BRAVO68WEB committed Jan 17, 2024
1 parent cd07de6 commit 6922889
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 142 deletions.
78 changes: 35 additions & 43 deletions components/TicketSection/TicketCardLPU.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,53 +12,45 @@ function TicketCard({
}) {
const router = useRouter()
return (
<div className="card w-full max-w-sm bg-white text-black p-5">
<p className="font-bold text-4xl">
LPU <br />
Vertos Pass
</p>
<p className="mt-8 text-lg">
For the students of Lovely Professional University.
</p>
<>
<div className="card w-full max-w-sm bg-white text-black p-5">
<p className="font-bold text-4xl">
LPU <br />
Vertos Pass
</p>
<p className="mt-8 text-lg">
For the students of Lovely Professional University.
</p>

<div className="mt-8 text-lg">
<p className="text-primary">Includes: </p>
<div className="flex flex-col gap-2">
<p>
- Welcome Kit Includes: 1 x Notepad-Pen, 1 x ID-Lanyard,
Stickers
</p>
<p> - Access to CTF</p>
<p> - 2 x Meals Provided</p>
<p> - Complimentry Swags</p>
<p> - Conference Attendee Certificate</p>
<<<<<<< HEAD
<div className="mt-8 text-lg">
<p className="text-primary">Includes: </p>
<div className="flex flex-col gap-2">
<p>
- Welcome Kit Includes: 1 x Notepad-Pen, 1 x ID-Lanyard,
Stickers
</p>
<p> - Access to CTF</p>
<p> - 2 x Meals Provided</p>
<p> - Complimentry Swags</p>
<p> - Conference Attendee Certificate</p>
</div>
</div>
<div className="button mt-8">
<Button
size={'full'}
onClick={() => {
router.push(
`${process.env.NEXT_PUBLIC_PAYMENT_WEBSITE}/student_pass`
)
}}
className="bg-red-950"
>
Rs. 250
</Button>
</div>
</div>
<div className="button mt-8">
<Button
size={'full'}
onClick={() => {
router.push(
`${process.env.NEXT_PUBLIC_PAYMENT_WEBSITE}/student_pass`
)
}}
className="bg-red-950"
>
Rs. 250
</Button>
</div>
</div>
</>
)
=======
</div>
</div>
<div className="button mt-8 bg-primary">
<Button size={'full'} >Coming Soon</Button>
</div>
</div>
)
>>>>>>> f1d45627580b98e6969567d25a9e94c86d56d779
}

export default TicketCard
81 changes: 33 additions & 48 deletions components/TicketSection/TicketCardProf.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import Button from '../ui/Button'
import toast from 'react-hot-toast'
import { useRouter } from 'next/navigation'

<<<<<<< HEAD
function TicketCard({
setTicketType,
setTicketBookingOpen,
Expand All @@ -13,56 +12,42 @@ function TicketCard({
}) {
const router = useRouter()
return (
<div className="card w-full max-w-sm bg-white text-black p-5">
<p className="font-bold text-4xl">Professional Pass</p>
<p className="mt-8 text-lg">
For working professionals and students from other colleges.
</p>
<>
<div className="card w-full max-w-sm bg-white text-black p-5">
<p className="font-bold text-4xl">Professional Pass</p>
<p className="mt-8 text-lg">
For working professionals and students from other colleges.
</p>

<div className="mt-8 text-lg">
<p className="text-primary">Includes: </p>
<div className="flex flex-col gap-2">
<p>
{' '}
- Welcome Kit Includes: 1 x Notepad-Pen, 1 x ID-Lanyard,
Stickers
</p>
=======
function TicketCard() {
return (
<div className="card w-full max-w-sm bg-white text-black p-5 rounded-lg">
<p className="font-bold text-4xl">
Professional Pass
</p>
<p className="mt-8 text-lg">
For working professionals and students from other colleges.
</p>

<div className="mt-8 text-lg">
<p className="text-primary">Includes: </p>
<div className="flex flex-col gap-2">
<p> - 1 x ID-Lanyard</p>
>>>>>>> f1d45627580b98e6969567d25a9e94c86d56d779
<p> - Access to CTF</p>
<p> - 2 x Meals Provided</p>
<p> - Complimentry Swags</p>
<p> - Conference Attendee Certificate</p>
<div className="mt-8 text-lg">
<p className="text-primary">Includes: </p>
<div className="flex flex-col gap-2">
<p>
{' '}
- Welcome Kit Includes: 1 x Notepad-Pen, 1 x ID-Lanyard,
Stickers
</p>
<p> - Access to CTF</p>
<p> - 2 x Meals Provided</p>
<p> - Complimentry Swags</p>
<p> - Conference Attendee Certificate</p>
</div>
</div>
<div className="button mt-8">
<Button
size={'full'}
onClick={() => {
router.push(
`${process.env.NEXT_PUBLIC_PAYMENT_WEBSITE}/professional_pass`
)
}}
className="bg-red-950"
>
Rs. 500
</Button>
</div>
</div>
<div className="button mt-8">
<Button
size={'full'}
onClick={() => {
router.push(
`${process.env.NEXT_PUBLIC_PAYMENT_WEBSITE}/professional_pass`
)
}}
className="bg-red-950"
>
Rs. 500
</Button>
</div>
</div>
</>
)
}

Expand Down
64 changes: 33 additions & 31 deletions components/TicketSection/TicketCardStudent.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,40 +11,42 @@ function TicketCard({
}) {
const router = useRouter()
return (
<div className="card w-full max-w-sm bg-white text-black p-5">
<p className="font-bold text-4xl">Student Pass</p>
<p className="mt-8 text-lg">
For students from other colleges and schools.
</p>
<>
<div className="card w-full max-w-sm bg-white text-black p-5">
<p className="font-bold text-4xl">Student Pass</p>
<p className="mt-8 text-lg">
For students from other colleges and schools.
</p>

<div className="mt-8 text-lg">
<p className="text-primary">Includes: </p>
<div className="flex flex-col gap-2">
<p>
{' '}
- Welcome Kit Includes: 1 x Notepad-Pen, 1 x ID-Lanyard,
Stickers
</p>
<p> - Access to CTF</p>
<p> - 2 x Meals Provided</p>
<p> - Complimentry Swags</p>
<p> - Conference Attendee Certificate</p>
<div className="mt-8 text-lg">
<p className="text-primary">Includes: </p>
<div className="flex flex-col gap-2">
<p>
{' '}
- Welcome Kit Includes: 1 x Notepad-Pen, 1 x ID-Lanyard,
Stickers
</p>
<p> - Access to CTF</p>
<p> - 2 x Meals Provided</p>
<p> - Complimentry Swags</p>
<p> - Conference Attendee Certificate</p>
</div>
</div>
<div className="button mt-8">
<Button
size={'full'}
onClick={() => {
router.push(
`${process.env.NEXT_PUBLIC_PAYMENT_WEBSITE}/standard_pass`
)
}}
className="bg-red-950"
>
Rs. 350
</Button>
</div>
</div>
<div className="button mt-8">
<Button
size={'full'}
onClick={() => {
router.push(
`${process.env.NEXT_PUBLIC_PAYMENT_WEBSITE}/standard_pass`
)
}}
className="bg-red-950"
>
Rs. 350
</Button>
</div>
</div>
</>
)
}

Expand Down
10 changes: 5 additions & 5 deletions config/communitypartners.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"name": "Vulncon",
"img": "/cp-vulncon.jpeg",
"img": "/cp-vulncon.webp",
"linkedin": "https://in.linkedin.com/company/vulncon",
"links": "https://vulncon.in/"
},
Expand All @@ -13,25 +13,25 @@
},
{
"name": "GDSC LPU",
"img": "/cp-gdsc-lpu.png",
"img": "/cp-gdsc-lpu.webp",
"linkedin": "https://in.linkedin.com/company/gdsclpu",
"links": "https://gdsc.community.dev/lovely-professional-university-jalandhar/"
},
{
"name": "TFUG Jalandhar",
"img": "/cp-tfug-jalandhar.png",
"img": "/cp-tfug-jalandhar.webp",
"linkedin": "https://in.linkedin.com/company/tfugjalandhar",
"links": "https://github.com/tfugjalandhar"
},
{
"name": "CNCF Jalandhar",
"img": "/cp-cncf-jalandhar.png",
"img": "/cp-cncf-jalandhar.webp",
"linkedin": "https://in.linkedin.com/company/cncfjalandhar",
"links": "https://community.cncf.io/cloud-native-jalandhar/"
},
{
"name": "GDSC IKGPTU",
"img": "/cp-gdsc-ikgptu.png",
"img": "/cp-gdsc-ikgptu.webp",
"linkedin": "https://in.linkedin.com/company/gdsc-ikgptu",
"github": "https://github.com/GDSC-IKGPTU"
}
Expand Down
12 changes: 6 additions & 6 deletions config/coreteam.json
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
[
{
"name": "s1ck",
"img": "/ct-avinash.jpg",
"img": "/ct-avinash.webp",
"linkedin": "https://www.linkedin.com/in/avinash-sharma-me/",
"github": "https://github.com/hail0hydra"
},
{
"name": "bravo68web",
"img": "/ct-jyotirmoy.jpg",
"img": "/ct-jyotirmoy.webp",
"linkedin": "https://www.linkedin.com/in/bravo68web/",
"github": "https://github.com/bravo68web"
},
{
"name": "l0u51f3r007",
"img": "/ct-abhinandan.jpg",
"img": "/ct-abhinandan.webp",
"linkedin": "https://www.linkedin.com/in/abhinandan-khurana/",
"github": "https://github.com/Abhinandan-Khurana"
},
{
"name": "w1ldqu4k3",
"img": "/ct-kartik.jpg",
"img": "/ct-kartik.webp",
"linkedin": "https://www.linkedin.com/in/kartik-dixit/",
"github": "https://github.com/Kartik-Dixit"
},
{
"name": "ransc0rp1on",
"img": "/ct-chatanya.jpg",
"img": "/ct-chatanya.webp",
"linkedin": "https://www.linkedin.com/in/chaitanya-madane-2802b5223/",
"github": "https://github.com/Chaitu785"
},
{
"name": "D3V_M0nK",
"img": "/ct-suraj.png",
"img": "/ct-suraj.webp",
"linkedin": "https://www.linkedin.com/in/surajmani-me/",
"github": "https://github.com/smanitech"
}
Expand Down
Loading

0 comments on commit 6922889

Please sign in to comment.