From 28cf2e54ba73c91386ef4d2166ba234214a06d92 Mon Sep 17 00:00:00 2001 From: Manurbhav Arya Date: Thu, 20 Jun 2024 11:43:24 +0530 Subject: added comments in every file, integrated MD files in the components, active link for movbile navbar, and some optimisations in code --- src/components/Accordion.astro | 71 ++++++++------ src/components/Carousel.astro | 76 +++++++++------ src/components/Dummy.astro | 153 ------------------------------- src/components/Footer.astro | 33 ++++--- src/components/Header.astro | 10 +- src/components/HomeBody.astro | 112 +++++++++++----------- src/components/IconBar.astro | 11 +++ src/components/LoginBody.astro | 9 +- src/components/Navbar.astro | 59 ++++++++---- src/components/ResourcesBody.astro | 8 +- src/components/ResultsBody.astro | 4 +- src/components/ScheduleBody.astro | 109 ++++++++++++---------- src/components/SignupBody.astro | 11 +++ src/components/TopBar.astro | 106 ++++++++++----------- src/content/homePage/partner/partner1.md | 1 + src/content/homePage/partner/partner2.md | 1 + src/content/homePage/partner/partner3.md | 1 + src/content/homePage/partner/partner4.md | 1 + src/content/scheduleEvent/s1.md | 12 +-- src/content/scheduleEvent/s2.md | 8 +- src/content/scheduleEvent/s3.md | 6 +- src/content/scheduleEvent/s4.md | 8 +- src/content/scheduleEvent/s5.md | 6 +- src/pages/signup.astro | 1 - src/script.py | 3 + src/utils/chunk.ts | 7 ++ 26 files changed, 405 insertions(+), 422 deletions(-) delete mode 100644 src/components/Dummy.astro create mode 100644 src/utils/chunk.ts diff --git a/src/components/Accordion.astro b/src/components/Accordion.astro index 8c9d752..efa4510 100644 --- a/src/components/Accordion.astro +++ b/src/components/Accordion.astro @@ -1,40 +1,38 @@ --- -interface BodyLine { - text: string; - link?: string -} -interface AccordionItem{ - heading : string; - body : BodyLine[]; -} +// interface BodyLine { +// text: string; +// link?: string +// } +// interface AccordionItem{ +// heading : string; +// body : BodyLine[]; +// } -import accordionJson from '../../public/jsonData/accordion.json' +// import accordionJson from '../../public/jsonData/accordion.json' +// const accordionData : AccordionItem[] = accordionJson; -const accordionData : AccordionItem[] = accordionJson; +var accordionContent = await Astro.glob("../content/resourcesPage/*.md"); ---
+ { - accordionData.map((accordion)=>( -
+ accordionContent.map((item)=>{ + const Content = item.Content; + return( +
-

{accordion.heading}

+

{item.frontmatter.heading}

- { - accordion.body.map((bodyLine) => ( -

- {bodyLine.text} -

- )) - } +
- )) -} + )}) + }
@@ -77,7 +75,7 @@ const accordionData : AccordionItem[] = accordionJson; transition: max-height 0.8s ease; } - .answer p{ + .answer ul li{ padding: 1vh 3vh; font-size: 1rem; margin: 0; @@ -87,12 +85,12 @@ const accordionData : AccordionItem[] = accordionJson; background-color: white; } - .answer p a{ + .answer ul li a{ color: #17a2b8; text-decoration: none; } - .answer p a:hover{ + .answer ul li a:hover{ text-decoration: underline; color: #0e8fa3; } @@ -107,7 +105,7 @@ const accordionData : AccordionItem[] = accordionJson; } svg{ - display: none; /* If you want the icon besides the accordion, remove this line */ + display: none; /* If you want an icon besides the accordion, remove this line */ transition: transform 0.5s ease-in; } @@ -138,8 +136,24 @@ const accordionData : AccordionItem[] = accordionJson; + + + diff --git a/src/components/Carousel.astro b/src/components/Carousel.astro index 3eb579e..8df3622 100644 --- a/src/components/Carousel.astro +++ b/src/components/Carousel.astro @@ -1,43 +1,51 @@ --- -import carouselJson from '../../public/jsonData/carousel.json' -interface Carousel{ - img: string; - alt: string; - link?: string; -} +import { chunkArray } from '../utils/chunk'; -const carouselData : Carousel[] = carouselJson; +// import carouselJson from '../../public/jsonData/carousel.json' +// interface Carousel{ +// img: string; +// alt: string; +// link?: string; +// } + +// const carouselData : Carousel[] = carouselJson; + + +var carouselContent = await Astro.glob("../content/partnersCarouselLogo/*.md"); + +//this is the just for chunking the array into 4 parts +const chunkedContent = chunkArray(carouselContent, 4); ---
+ + + + + + +
-
{ - carouselData.slice(0, 4).map((slide) => { - return ( + {chunkedContent.map((chunk, index) => ( +
+ {chunk.map((slide, idx) => ( - - {slide.alt} + + {slide.frontmatter.alt} - ); - }) - }
-
{ - carouselData.slice(4).map((slide) => { - return ( - - - {slide.alt} - - - ); - }) - } -
+ ))} +
+ ))}
+ + + + + @@ -81,6 +89,8 @@ const carouselData : Carousel[] = carouselJson; align-items: center; } + /* styling of the buttons */ + /* #nextBtn{ transform: rotateY(180deg); } @@ -95,6 +105,8 @@ const carouselData : Carousel[] = carouselJson; .gallery div{ grid-gap: 70px; } + + /* styling of the buttons */ /* #backBtn, #nextBtn{ margin: 0; } */ @@ -105,14 +117,20 @@ const carouselData : Carousel[] = carouselJson; - - diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 0bc5abf..63e4c28 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -1,41 +1,46 @@ --- -import footerJson from '../../public/jsonData/footer.json' -interface aboutList { - name: string; - link: string; -} +// import footerJson from '../../public/jsonData/footer.json' +// interface aboutList { +// name: string; +// frontmatter.link: string; +// } -interface footerContent { - about: aboutList[]; - resources: aboutList[]; -} +// interface footerContent { +// about: aboutList[]; +// resources: aboutList[]; +// } -const footerData : footerContent = footerJson; +// const footerContent : footerContent = footerJson; +var aboutContent = await Astro.glob("../content/footer/about/*.md"); +var resourcesContent = await Astro.glob("../content/footer/resources/*.md"); ---
+
+
+
Creative Commons License diff --git a/src/components/Header.astro b/src/components/Header.astro index 0eba94a..41cbc6c 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -3,12 +3,19 @@ import 'bootstrap/dist/css/bootstrap.css' ---
+
+
+

IIT Bombay-FOSSEE-GIS/OSHW, IITTNiF &
ICFOSS presents

-
+ +
+ +
+

Registration opens: April 29, 2023
@@ -19,6 +26,7 @@ import 'bootstrap/dist/css/bootstrap.css' Result Declaration: July 31, 2024

+
Register diff --git a/src/components/HomeBody.astro b/src/components/HomeBody.astro index 302c89e..474ad7c 100644 --- a/src/components/HomeBody.astro +++ b/src/components/HomeBody.astro @@ -1,41 +1,49 @@ --- -import 'bootstrap/dist/css/bootstrap.css' -import Carousel from './Carousel.astro' -import faqJson from '../../public/jsonData/faq.json' -import homeJson from '../../public/jsonData/home.json' const props = Astro.props - -interface Coreteam{ - name : string; - position : string[]; - institute : string; -} - -interface Significance{ - intro : string; - point: string[]; - end: string; -} - -interface PartnerAndOrganisations{ - name: string; - description: string; -} - -interface Faq{ - question: string; - answer: string; -} - -interface Home{ - significance: Significance[]; - purpose: string[]; - partners: PartnerAndOrganisations[]; - coreteam: Coreteam[]; -} - -const homeData : Home = homeJson; -const faqData : Faq[] = faqJson; +import Carousel from './Carousel.astro' +// import 'bootstrap/dist/css/bootstrap.css' +// import faqJson from '../../public/jsonData/faq.json' +// import homeJson from '../../public/jsonData/home.json' + +// interface Coreteam{ +// name : string; +// position : string[]; +// institute : string; +// } + +// interface Significance{ +// intro : string; +// point: string[]; +// end: string; +// } + +// interface PartnerAndOrganisations{ +// name: string; +// description: string; +// } + +// interface Faq{ +// question: string; +// answer: string; +// } + +// interface Home{ +// significance: Significance[]; +// purpose: string[]; +// partners: PartnerAndOrganisations[]; +// coreteam: Coreteam[]; +// } + +// const homeData : Home = homeJson; +// const faqData : Faq[] = faqJson; + +//importing content from markdown files + +const coreTeamContent = await Astro.glob("../content/homePage/coreTeam/*.md"); +const partnerContent = await Astro.glob("../content/homePage/partner/*.md"); +const purposeContent = await Astro.glob("../content/homePage/purpose/*.md"); +const significanceContent = await Astro.glob("../content/homePage/significance/*.md"); +const faqContent = await Astro.glob("../content/faq/*.md"); --- @@ -45,19 +53,19 @@ const faqData : Faq[] = faqJson;

Welcome to the Open Source Hardware IoT GIS Hackathon!

Welcome to the National Level Open Hardware-IoT Geospatial Hackathon, a stage where innovation knows no boundaries. This premier event brings together visionaries, tech enthusiasts, and problem solvers from across the nation to harness the power of open hardware, the Internet of Things (IoT), and geospatial technology. Get ready to explore uncharted possibilities, collaborate on real-world challenges, and make a significant impact on our world.

Significance:

{ - homeData.significance.map((point) => { + significanceContent.map((point) => { return (
    -

    {point.intro}

    +

    {point.frontmatter.intro}

    { - point.point.map((p) => { + point.frontmatter.point.map((p:string) => { return (
  • {p}
    • ) }) }
-

{point.end}

+

{point.frontmatter.end}

) }) } @@ -68,9 +76,9 @@ const faqData : Faq[] = faqJson;

Purpose

{ - homeData.purpose.map((point) => { + purposeContent.map((point) => { return ( -

{point}

+

{point.frontmatter.desc}

) }) } @@ -98,11 +106,11 @@ const faqData : Faq[] = faqJson;
{ - homeData.partners.map((partner) => { + partnerContent.map((partner) => { return (

- {partner.name} - {partner.description} + {partner.frontmatter.name} + {partner.frontmatter.description}

) }) @@ -115,10 +123,10 @@ const faqData : Faq[] = faqJson;

Frequently Asked Questions (FAQ)

{ - faqData.map((faq,index) => { + faqContent.map((faq,index) => { return ( -

{index + 1}. {faq.question}

-

Answer: {faq.answer}

+

{index + 1}. {faq.frontmatter.question}

+

Answer: {faq.frontmatter.answer}

) }) } @@ -134,16 +142,16 @@ const faqData : Faq[] = faqJson;
{ - homeData.coreteam.map((member) => { + coreTeamContent.map((member) => { return (
-

{member.name}

- {member.position.map((pos) => { +

{member.frontmatter.name}

+ {member.frontmatter.position.map((pos:string) => { return (

{pos}

) })} -

{member.institute}

+

{member.frontmatter.institute}

) }) diff --git a/src/components/IconBar.astro b/src/components/IconBar.astro index f1919c3..9440517 100644 --- a/src/components/IconBar.astro +++ b/src/components/IconBar.astro @@ -2,7 +2,12 @@ const props = Astro.props --- + + +
+ + + + @@ -17,6 +24,8 @@ const props = Astro.props + + + + diff --git a/src/components/LoginBody.astro b/src/components/LoginBody.astro index 5dd25a8..d965274 100644 --- a/src/components/LoginBody.astro +++ b/src/components/LoginBody.astro @@ -1,7 +1,8 @@ --- +--- + ----

Admin Login

@@ -17,6 +18,8 @@

+ +
\ No newline at end of file diff --git a/src/components/SignupBody.astro b/src/components/SignupBody.astro index 0601c3d..70b12df 100644 --- a/src/components/SignupBody.astro +++ b/src/components/SignupBody.astro @@ -2,6 +2,8 @@ --- + +

Create an account

@@ -13,9 +15,15 @@
+ + +

+ + +