From 6922889fbfb2738baa4564285054c9c88057ec75 Mon Sep 17 00:00:00 2001
From: "Jyotirmoy Bandyopadhyaya [Bravo68]" <jbandyopadhayaya@gmail.com>
Date: Wed, 17 Jan 2024 15:23:05 +0530
Subject: [PATCH] fix: merge conflict

---
 components/TicketSection/TicketCardLPU.tsx    | 78 ++++++++----------
 components/TicketSection/TicketCardProf.tsx   | 81 ++++++++-----------
 .../TicketSection/TicketCardStudent.tsx       | 64 ++++++++-------
 config/communitypartners.json                 | 10 +--
 config/coreteam.json                          | 12 +--
 config/resourcepersons.json                   | 18 ++---
 6 files changed, 121 insertions(+), 142 deletions(-)

diff --git a/components/TicketSection/TicketCardLPU.tsx b/components/TicketSection/TicketCardLPU.tsx
index f282b97..c122d3a 100644
--- a/components/TicketSection/TicketCardLPU.tsx
+++ b/components/TicketSection/TicketCardLPU.tsx
@@ -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
diff --git a/components/TicketSection/TicketCardProf.tsx b/components/TicketSection/TicketCardProf.tsx
index 5cc564d..869dbd5 100644
--- a/components/TicketSection/TicketCardProf.tsx
+++ b/components/TicketSection/TicketCardProf.tsx
@@ -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,
@@ -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>
+        </>
     )
 }
 
diff --git a/components/TicketSection/TicketCardStudent.tsx b/components/TicketSection/TicketCardStudent.tsx
index 55c589f..abb0369 100644
--- a/components/TicketSection/TicketCardStudent.tsx
+++ b/components/TicketSection/TicketCardStudent.tsx
@@ -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>
+        </>
     )
 }
 
diff --git a/config/communitypartners.json b/config/communitypartners.json
index 542ccbf..8836910 100644
--- a/config/communitypartners.json
+++ b/config/communitypartners.json
@@ -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/"
     },
@@ -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"
     }
diff --git a/config/coreteam.json b/config/coreteam.json
index d5d9bfc..6dfbe9c 100644
--- a/config/coreteam.json
+++ b/config/coreteam.json
@@ -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"
     }
diff --git a/config/resourcepersons.json b/config/resourcepersons.json
index 67dfca0..67d4017 100644
--- a/config/resourcepersons.json
+++ b/config/resourcepersons.json
@@ -1,47 +1,47 @@
 [
     {
         "name": "Dr. Lovi Raj Gupta",
-        "img": "/rp-dr-lovi-raj.jpg",
+        "img": "/rp-dr-lovi-raj.webp",
         "linkedin": "https://www.linkedin.com/in/loviraj/"
     },
     {
         "name": "Dr. Rajeev Sobti",
-        "img": "/rp-rajeev-sobti.jpg",
+        "img": "/rp-rajeev-sobti.webp",
         "linkedin": "https://www.linkedin.com/company/scselpu"
     },
     {
         "name": "Dr. Deepak Prashar",
-        "img": "/rp-deeppak-prashar.jpg",
+        "img": "/rp-deeppak-prashar.webp",
         "linkedin": "https://www.linkedin.com/in/dr-deepak-prashar-97196030"
     },
     {
         "name": "Mr. Sami Anand",
-        "img": "/rp-sami.jpg",
+        "img": "/rp-sami.webp",
         "linkedin": "https://www.linkedin.com/in/sami-anand/"
     },
     {
         "name": "Dr. Harwant Singh",
-        "img": "/rp-harvant-singh.jpg",
+        "img": "/rp-harvant-singh.webp",
         "linkedin": "https://www.linkedin.com/in/harwant-singh-arri-510866120/"
     },
     {
         "name": "Dr. Max Bhatia",
-        "img": "/rp-max-bhatia.jpg",
+        "img": "/rp-max-bhatia.webp",
         "linkedin": "https://www.linkedin.com/in/maxbhatia-007/"
     },
     {
         "name": "Dr. Vinay Bharadwaj",
-        "img": "/rp-vinay-bharadwaj.jpeg",
+        "img": "/rp-vinay-bharadwaj.webp",
         "linkedin": "https://www.linkedin.com/in/dr-vinay-bhardwaj-945752224/"
     },
     {
         "name": "Harpreet Kaur",
-        "img": "/rp-harpreet-kaur.jpeg",
+        "img": "/rp-harpreet-kaur.webp",
         "linkedin": "https://www.linkedin.com/in/harpreet-kaur-94687aa0/"
     },
     {
         "name": "Parambir Singh",
-        "img": "/rp-parambir.jpg",
+        "img": "/rp-parambir.webp",
         "linkedin": "https://www.linkedin.com/in/parambir-singh-3b7161177/"
     }
 ]