From 127110555d67e87ad5d5dac97171bad6f633660c Mon Sep 17 00:00:00 2001 From: Jayesh Nayak Date: Sun, 15 Oct 2023 17:42:37 +0530 Subject: [PATCH] fix: styling issues and updated content in footer and about section (#98) * fix: styling issues and updated content in footer and about section * fix: update content of sponsor section and add policies * chore: add links to payment * fix: updated compressed images --------- Co-authored-by: Ashish Padhy <100484401+Shurtu-gal@users.noreply.github.com> --- .env.sample | 3 +- config/content/EventPage.js | 28 +++++++--- config/content/FAQ.js | 52 ++++++++++-------- config/content/Footer.js | 30 ++++++---- config/content/payment.js | 8 +-- config/content/sponsors.js | 55 ++++++++++++------- src/components/Payment/PaymentCard.jsx | 2 +- .../SponsorSection/SponsorSection.jsx | 2 +- src/components/SponsorSection/styles.js | 7 +-- src/components/Ticker/styles.jsx | 4 +- src/components/marginals/Footer/Footer.jsx | 4 +- src/components/marginals/Footer/styles.js | 3 +- src/components/shared/About.jsx | 7 ++- src/pages/events.js | 4 +- 14 files changed, 130 insertions(+), 79 deletions(-) diff --git a/.env.sample b/.env.sample index 4fd828c..cb24227 100644 --- a/.env.sample +++ b/.env.sample @@ -5,4 +5,5 @@ GATSBY_FIREBASE_STORAGE_BUCKET=SOME_STORAGE_BUCKET GATSBY_FIREBASE_MESSAGING_SENDER_ID=SOME_MESSAGING_SENDER_ID GATSBY_FIREBASE_APP_ID=SOME_APP_ID GATSBY_FIREBASE_MEASUREMENT_ID=SOME_MEASUREMENT_ID -GATSBY_API_URL=https://avenue-api.nitrkl.in/ \ No newline at end of file +GATSBY_API_URL=https://avenue-api.nitrkl.in/ +GATSBY_AVENUE_API_URL=https://avenue-api.nitrkl.in diff --git a/config/content/EventPage.js b/config/content/EventPage.js index 6f4270a..0ea4a32 100644 --- a/config/content/EventPage.js +++ b/config/content/EventPage.js @@ -2,36 +2,50 @@ export default [ { title: 'Technical', type: 'Technical', - image: 'https://placehold.co/80', + image: + 'https://res.cloudinary.com/dme9vltjf/image/upload/' + + 'v1697370432/Inno%202k23/david-leveque-GpNOhig3LSU-unsplash_11zon_y5ajhn.jpg', }, { title: 'Pro Shows', type: 'Pro', - image: 'https://placehold.co/80', + image: + 'https://res.cloudinary.com/dme9vltjf/image/upload/' + + 'v1697370431/Inno%202k23/Pro_Sho_11zon_bowwb3.jpg', }, { title: 'Workshops', type: 'Workshop', - image: 'https://placehold.co/80', + image: + 'https://res.cloudinary.com/dme9vltjf/image/upload/v1697370432/' + + 'Inno%202k23/lexscope-0k2mMcdTOYU-unsplash_11zon_zemsvp.jpg', }, { title: 'Guest Lectures', type: 'Guest-Lectures', - image: 'https://placehold.co/80', + image: + 'https://res.cloudinary.com/dme9vltjf/image/upload/v1697370431/' + + 'Inno%202k23/miguel-henriques-RfiBK6Y_upQ-unsplash_11zon_a1nvuc.jpg', }, { title: 'Exhibitions', type: 'Exhibitions', - image: 'https://placehold.co/80', + image: + 'https://res.cloudinary.com/dme9vltjf/image/upload/' + + 'v1697370431/Inno%202k23/sergio-rota-lq-3u9EqNb4-unsplash_11zon_mpy2wj.jpg', }, { title: 'Fun Events', type: 'Fun', - image: 'https://placehold.co/80', + image: + 'https://res.cloudinary.com/dme9vltjf/image/upload/v1697370432/' + + 'Inno%202k23/jonny-gios-8wKTIZ1KEzY-unsplash_11zon_frv6up.jpg', }, { title: 'Others', type: 'Other', - image: 'https://placehold.co/80', + image: + 'https://res.cloudinary.com/dme9vltjf/image/upload/v1697370957/' + + 'Inno%202k23/samantha-gades-fIHozNWfcvs-unsplash_bi17wn_3_evkqzx.jpg', }, ]; diff --git a/config/content/FAQ.js b/config/content/FAQ.js index 0d38beb..e3e03e0 100644 --- a/config/content/FAQ.js +++ b/config/content/FAQ.js @@ -3,50 +3,56 @@ export const FAQS = [ id: 1, question: 'What is INNOVISION? ', answer: - 'Innovision is one of the biggest ' + - 'techno management fest organised by students of NITR,' + - ' with participation from all over India ', + 'Innovision is one of the biggest techno ' + + 'management fest organised by students of NITR, ' + + 'with participation from all over India. ', }, { id: 2, - question: 'Who are we?', + question: 'Who can participate? ', answer: - 'Organised by students of NIT Rourkela, INNOVISION is the annual techno management.' + - 'With our unrivalled ability to host such technical fests ' + - "we were recognised as Odisha's top student chapter", + 'All science and technology enthusiasts currently ' + + 'studying in college are invited to participate. ', }, { id: 3, - question: 'Who can participate?', - answer: - 'All science and technology enthusiasts currently ' + - 'studying in college are invited to participate.', + question: 'How to participate?', + answer: 'You can acquire all the information you need by registering on the website for this.', }, { id: 4, - question: 'Will it be conducted online?', - answer: 'No the event will be conducted in offline mode.', + question: 'Cost of registration? ', + answer: 'The cost of registration, including accommodation is Rs. 1000. ', }, { id: 5, - question: 'What is the goal of the fest? ', + question: 'Will there be any proshows?', answer: - 'The major purpose of the fest is to bring together people ' + - 'who share a passion for technology in order ' + - 'to showcase their skills and give attendees' + - ' a fantastic chance to broaden their technical understandings.', + 'All the attendees will ' + + 'have the opportunity to enjoy a lifetime of experiences, including DJ Night, stand-up ' + + 'comedy shows, and more, creating lasting memories.', }, { id: 6, - question: 'How could I know if I got selected for any event? ', - answer: "If you're chosen, we'll send you an email.", + question: 'Will I have to pay anything extra for the events?', + answer: 'Most of the events are free of cost apart from few fun events and workshops.', }, { id: 7, - question: 'Cost of registration? ', + question: 'Starting from which date will accommodation be provided?', + answer: + 'Accommodation will strictly be provided ' + + 'from 3rd November 2023 to 5th November 2023. Please note that accommodation will ' + + 'not be provided on 2nd November 2023 or 6th November 2023.', + }, + { + id: 8, + question: 'Will I have to pay anything extra for accommodation?', answer: - 'The cost of registration, including accommodation is Rs. 950,' + - ' and without accommodation, it is Rs. 750.', + "No, you don't have to pay anything " + + 'extra for accommodation. The registration fees ' + + 'includes 3-day accommodation. Please note that meals will not be provided by us. ' + + 'However, you can buy your meals at eateries and restaurants.', }, ]; diff --git a/config/content/Footer.js b/config/content/Footer.js index 6104a6d..09dd973 100644 --- a/config/content/Footer.js +++ b/config/content/Footer.js @@ -12,12 +12,22 @@ export default { { id: 1, name: 'Privacy Policy', - link: '/privacy', + link: 'https://drive.google.com/file/d/1mQqqUzHdR-56cmrKLMCANlrrT22FVkgk/view', }, { id: 2, - name: 'Team', - link: '/', + name: 'Code of Conduct', + link: 'https://drive.google.com/file/d/1Nr38t6s37FQQ5edU8biloQdl3EsdGns-/view', + }, + { + id: 3, + name: 'Terms and Conditions', + link: 'https://drive.google.com/file/d/1bg9NMoJV80vdaoNRTpQIKVt-QGQtkpy5/view', + }, + { + id: 4, + name: 'Refund Policy', + link: 'https://drive.google.com/file/d/1cLnuEBtt7yFfC1dQeFVOP0Oxf_hsCTzb/view', }, ], }, @@ -29,28 +39,28 @@ export default { { idx: 1, infoName: 'Weekdays', - info: 'Timings', + info: '9:00AM - 10:00PM', }, { idx: 2, infoName: 'Saturday, Sunday', - info: 'Timings', + info: '9:00AM - 10:00PM', }, ], }, { id: 2, - infoTitle: 'Opening Hours', + infoTitle: 'Contact Us', list: [ { idx: 1, - infoName: 'Weekdays', - info: 'Timings', + infoName: 'Snehasish', + info: '+91 98277 02030', }, { idx: 2, - infoName: 'Saturday, Sunday', - info: 'Timings', + infoName: 'Medha', + info: '+91 97051 66433', }, ], }, diff --git a/config/content/payment.js b/config/content/payment.js index c3a99ef..3b630d5 100644 --- a/config/content/payment.js +++ b/config/content/payment.js @@ -25,25 +25,25 @@ export const PaymentContent = { id: 'privacy', term: 'I have read and agree to the ', linkText: 'Privacy Policy', - link: 'https://www.google.com', + link: 'https://drive.google.com/file/d/1mQqqUzHdR-56cmrKLMCANlrrT22FVkgk/view', }, { id: 'code', term: 'I have read and agree to the ', linkText: 'Code of Conduct', - link: 'https://www.google.com', + link: 'https://drive.google.com/file/d/1Nr38t6s37FQQ5edU8biloQdl3EsdGns-/view', }, { id: 'refund', term: 'I have read and agree to the ', linkText: 'Refund Policy', - link: 'https://www.google.com', + link: 'https://drive.google.com/file/d/1bg9NMoJV80vdaoNRTpQIKVt-QGQtkpy5/view', }, { id: 'terms', term: 'I have read and agree to the ', linkText: 'Terms and Conditions', - link: 'https://www.google.com', + link: 'https://drive.google.com/file/d/1cLnuEBtt7yFfC1dQeFVOP0Oxf_hsCTzb/view', }, ], }; diff --git a/config/content/sponsors.js b/config/content/sponsors.js index 82e145c..b359e25 100644 --- a/config/content/sponsors.js +++ b/config/content/sponsors.js @@ -1,5 +1,6 @@ export default { title: 'Past Sponsors', + footer: 'Want to sponsor us? ', link: 'https://docs.google.com/forms/d/e/1FAIpQLSfV6ZclXiO7K5vVWFjR6_' + @@ -9,8 +10,10 @@ export default { titleSponsor: [ { id: 1, - logo: 'https://res.cloudinary.com/dme9vltjf/image/upload/v1695818710/inno_logo_gjqvic.svg', - alt: 'INNO TTILE', + logo: + 'https://res.cloudinary.com/dsg5j3qx6/image/' + + 'upload/v1697350325/Innovision%202023/Sponsors/Adobe.png', + alt: 'INNO TITLE', link: 'inno.nitrkl.in', color: '#FFB8FF', }, @@ -19,49 +22,61 @@ export default { sponsors: [ { id: 1, - logo: 'https://res.cloudinary.com/dme9vltjf/image/upload/v1695818710/inno_logo_gjqvic.svg', - alt: 'TBA', - type: 'Associate Sponsor', + logo: + 'https://res.cloudinary.com/dsg5j3qx6/image/upload' + + '/v1697350330/Innovision%202023/Sponsors/Huddang.jpg', + alt: 'Huddang', + type: 'Fooding Partner', link: 'inno.nitrkl.in', color: '#5CFFA7', }, { id: 2, - logo: 'https://res.cloudinary.com/dme9vltjf/image/upload/v1695818710/inno_logo_gjqvic.svg', - alt: 'TBA', - type: 'Media Sponsor', + logo: + 'https://res.cloudinary.com/dsg5j3qx6/image/upload/' + + 'v1697350340/Innovision%202023/Sponsors/Sambad.jpg', + alt: 'Sambad', + type: 'Media Partner', link: 'inno.nitrkl.in', color: '#E85CFF', }, { id: 3, - logo: 'https://res.cloudinary.com/dme9vltjf/image/upload/v1695818710/inno_logo_gjqvic.svg', - alt: 'TBA', - type: 'Refreshments Sponsor', + logo: + 'https://res.cloudinary.com/dsg5j3qx6/image/' + + 'upload/v1697350334/Innovision%202023/Sponsors/RKL%20SHINES.jpg', + alt: 'Rourkela Shines', + type: 'Media Partner', link: 'inno.nitrkl.in', color: '#5C9DFF', }, { id: 4, - logo: 'https://res.cloudinary.com/dme9vltjf/image/upload/v1695818710/inno_logo_gjqvic.svg', - alt: 'TBA', - type: 'Associate Sponsor', + logo: + 'https://res.cloudinary.com/dsg5j3qx6/image/' + + 'upload/v1697350322/Innovision%202023/Sponsors/Flavour%20Box.png', + alt: 'Flavour Box', + type: 'Sponsor', link: 'inno.nitrkl.in', color: '#5CFFA7', }, { id: 5, - logo: 'https://res.cloudinary.com/dme9vltjf/image/upload/v1695818710/inno_logo_gjqvic.svg', - alt: 'TBA', - type: 'Media Sponsor', + logo: + 'https://res.cloudinary.com/dsg5j3qx6/image/upload/' + + 'v1697350329/Innovision%202023/Sponsors/Clavimate.jpg', + alt: 'Clavimate', + type: 'Sponsor', link: 'inno.nitrkl.in', color: '#E85CFF', }, { id: 6, - logo: 'https://res.cloudinary.com/dme9vltjf/image/upload/v1695818710/inno_logo_gjqvic.svg', - alt: 'TBA', - type: 'Refreshments Sponsor', + logo: + 'https://res.cloudinary.com/dsg5j3qx6/image/' + + 'upload/v1697350328/Innovision%202023/Sponsors/Unacademy.jpg', + alt: 'Unacademy', + type: 'Sponsor', link: 'inno.nitrkl.in', color: '#5C9DFF', }, diff --git a/src/components/Payment/PaymentCard.jsx b/src/components/Payment/PaymentCard.jsx index 414392c..90a0eb5 100644 --- a/src/components/Payment/PaymentCard.jsx +++ b/src/components/Payment/PaymentCard.jsx @@ -93,7 +93,7 @@ const PaymentCard = () => { WebkitTextFillColor: 'transparent', }} > - ₹750 + ₹899 diff --git a/src/components/SponsorSection/SponsorSection.jsx b/src/components/SponsorSection/SponsorSection.jsx index 9b52b70..2840dc8 100644 --- a/src/components/SponsorSection/SponsorSection.jsx +++ b/src/components/SponsorSection/SponsorSection.jsx @@ -29,7 +29,7 @@ const SponsorSection = () => ( {sponsors.map(({ id, logo, alt, link, type, color }) => ( - + {type} diff --git a/src/components/SponsorSection/styles.js b/src/components/SponsorSection/styles.js index 73b170b..5e06e09 100644 --- a/src/components/SponsorSection/styles.js +++ b/src/components/SponsorSection/styles.js @@ -21,13 +21,11 @@ export const TitleSponsorContainer = styled.div` ${tw` flex flex-col - gap-[32px] text-center w-[320px] `} @media (max-width: 1100px) { width: 240px; - gap: 16px; } `; @@ -77,7 +75,7 @@ export const SponsorContainer = styled.div` ${tw` flex flex-col - gap-[32px] + gap-[20px] text-center w-[320px] col-span-1 @@ -99,7 +97,6 @@ export const SponsorContainer = styled.div` export const SponsorLogo = styled.img` ${tw` - w-full - my-auto + h-full `} `; diff --git a/src/components/Ticker/styles.jsx b/src/components/Ticker/styles.jsx index 0015685..a7abe3d 100644 --- a/src/components/Ticker/styles.jsx +++ b/src/components/Ticker/styles.jsx @@ -52,9 +52,9 @@ export const TickerMover = styled.div` inline-block whitespace-nowrap `} - animation: ${({ reverse }) => (reverse ? reverseTicker : ticker)} 160s linear infinite; + animation: ${({ reverse }) => (reverse ? reverseTicker : ticker)} 260s linear infinite; @media (max-width: 720px) { - animation: ${({ reverse }) => (reverse ? reverseTicker : ticker)} 110s linear infinite; + animation: ${({ reverse }) => (reverse ? reverseTicker : ticker)} 200s linear infinite; } `; diff --git a/src/components/marginals/Footer/Footer.jsx b/src/components/marginals/Footer/Footer.jsx index 15b0445..95dd3a8 100644 --- a/src/components/marginals/Footer/Footer.jsx +++ b/src/components/marginals/Footer/Footer.jsx @@ -39,7 +39,9 @@ const Footer = () => ( {quicklinks.list.map(({ id, name, link }) => ( - {name} + + {name} + ))} diff --git a/src/components/marginals/Footer/styles.js b/src/components/marginals/Footer/styles.js index eaa5fb0..2636c58 100644 --- a/src/components/marginals/Footer/styles.js +++ b/src/components/marginals/Footer/styles.js @@ -6,13 +6,14 @@ export const InformationContainer = styled.div` flex flex-col gap-[15px] - w-[208px] + max-w-[308px] overflow-hidden `} @media (max-width: 890px) { gap: 16px; width: 264px; + max-width: 290px; margin: 0 auto; } `; diff --git a/src/components/shared/About.jsx b/src/components/shared/About.jsx index 959f0cf..2f83bc0 100644 --- a/src/components/shared/About.jsx +++ b/src/components/shared/About.jsx @@ -67,7 +67,12 @@ const MobileHeading = styled(Heading2)` `; const About = ({ title, desc, image, link, alt }) => ( - + diff --git a/src/pages/events.js b/src/pages/events.js index 02a61ba..4327029 100644 --- a/src/pages/events.js +++ b/src/pages/events.js @@ -9,7 +9,7 @@ import { _eventPage } from '../../config/content'; import { Heading4 } from '../components/shared'; const TypeSelectWrapper = styled.div` - ${tw` flex space-x-4 pb-14 overflow-x-clip w-11/12 mx-auto`} + ${tw` flex space-x-4 pt-6 pb-8 overflow-x-clip w-11/12 mx-auto`} overflow-x: auto; /* Scrollbar Styling */ @@ -79,7 +79,7 @@ const EventPage = () => { {_eventPage.map(({ type: _type, image, title }) => ( handleTypeChange(_type)} key={_type} active={_type === type}> - {_type} + {_type} {title}