From 57999e7470218621d30ee6a03ac90a0924b3ac07 Mon Sep 17 00:00:00 2001 From: shivamk-21 <2103shivamk@gmail.com> Date: Mon, 26 Feb 2024 21:59:56 +0530 Subject: [PATCH 1/3] Moved Data Pages together for faster modifications --- components/EventCalendar/Calendar.tsx | 2 +- .../EventCalendarData.ts | 10 +- data/GalleryData.ts | 214 ++++++++++++++++++ {features/home => data}/NewsData.ts | 26 +-- .../events => data}/RecentMajorEventsData.ts | 8 +- features/events/MajorEvents.tsx | 2 +- features/events/MonthlyCalendar.tsx | 2 +- features/gallery/Carousel.tsx | 2 +- features/gallery/Gallery.tsx | 2 +- features/gallery/GalleryData.ts | 214 ------------------ features/gallery/RecentClubEvents.tsx | 2 +- features/home/News.tsx | 2 +- 12 files changed, 243 insertions(+), 243 deletions(-) rename {components/EventCalendar => data}/EventCalendarData.ts (95%) create mode 100644 data/GalleryData.ts rename {features/home => data}/NewsData.ts (64%) rename {features/events => data}/RecentMajorEventsData.ts (89%) delete mode 100644 features/gallery/GalleryData.ts diff --git a/components/EventCalendar/Calendar.tsx b/components/EventCalendar/Calendar.tsx index f21b55f..aff5a1c 100644 --- a/components/EventCalendar/Calendar.tsx +++ b/components/EventCalendar/Calendar.tsx @@ -3,7 +3,7 @@ import Typography from "@mui/material/Typography"; import Grid2 from "@mui/material/Unstable_Grid2/Grid2"; import PaperItem from "./PaperItem"; import SingleDate from "./SingleDate"; -import { calendarData } from "./EventCalendarData"; +import { calendarData } from "../../data/EventCalendarData"; const Calendar = () => { const currDate = new Date(); diff --git a/components/EventCalendar/EventCalendarData.ts b/data/EventCalendarData.ts similarity index 95% rename from components/EventCalendar/EventCalendarData.ts rename to data/EventCalendarData.ts index 9de71b3..8a56951 100644 --- a/components/EventCalendar/EventCalendarData.ts +++ b/data/EventCalendarData.ts @@ -1,9 +1,9 @@ import { StaticImageData } from "next/image"; -import starIcon from "../../assets/calendar_icons/star.svg"; //Festival and Special Events -import circleIcon from "../../assets/calendar_icons/circle.svg"; // National Events -import crossIcon from "../../assets/calendar_icons/cross.svg"; // sports -import rectangleIcon from "../../assets/calendar_icons/rectangle.svg"; // technical -import triangleIcon from "../../assets/calendar_icons/triangle.svg"; // cultural +import starIcon from "../assets/calendar_icons/star.svg"; //Festival and Special Events +import circleIcon from "../assets/calendar_icons/circle.svg"; // National Events +import crossIcon from "../assets/calendar_icons/cross.svg"; // sports +import rectangleIcon from "../assets/calendar_icons/rectangle.svg"; // technical +import triangleIcon from "../assets/calendar_icons/triangle.svg"; // cultural interface CalendarDataProps { date: string; diff --git a/data/GalleryData.ts b/data/GalleryData.ts new file mode 100644 index 0000000..c4be0b9 --- /dev/null +++ b/data/GalleryData.ts @@ -0,0 +1,214 @@ +import { StaticImageData } from "next/image"; + +// Major Events +import hackmanthan from "../assets/major_events_pics/hackmanthan.jpeg"; +import scientfic from "../assets/major_events_pics/scientfic.jpeg"; +import ganesh_chaturthi from "../assets/major_events_pics/ganesh_chaturthi.jpeg"; +import technovate from "../assets/major_events_pics/technovate.jpeg"; + +// Recent Major Events +import chaipecharcha from "../assets/recent_club_events/chaipecharcha.jpeg"; +import canvakar from "../assets/recent_club_events/canvakar.jpeg"; +import quizadry from "../assets/recent_club_events/quizadry.jpeg"; +import run from "../assets/recent_club_events/run.jpeg"; +import yet from "../assets/recent_club_events/yet.jpeg"; +import blood from "../assets/recent_club_events/blood.png"; +import constitution from "../assets/recent_club_events/constitution.jpeg"; + +// Technical +import robo1 from "../assets/club_event_pics/technical/robo1.jpeg"; +import robo2 from "../assets/club_event_pics/technical/robo2.jpeg"; +import robo3 from "../assets/club_event_pics/technical/robo3.jpeg"; +import robo4 from "../assets/club_event_pics/technical/robo4.jpeg"; +import robo5 from "../assets/club_event_pics/technical/robo5.jpeg"; +import robo6 from "../assets/club_event_pics/technical/robo6.jpeg"; +import hack1 from "../assets/club_event_pics/technical/hack1.jpeg"; +import hack2 from "../assets/club_event_pics/technical/hack2.jpeg"; +import hack3 from "../assets/club_event_pics/technical/hack3.jpeg"; +import hack4 from "../assets/club_event_pics/technical/hack4.jpeg"; +import hack5 from "../assets/club_event_pics/technical/hack5.jpeg"; +import hack6 from "../assets/club_event_pics/technical/hack6.jpeg"; +import quiz1 from "../assets/club_event_pics/technical/quiz1.jpeg"; +import quiz2 from "../assets/club_event_pics/technical/quiz2.jpeg"; +import quiz3 from "../assets/club_event_pics/technical/quiz3.jpeg"; +import quiz4 from "../assets/club_event_pics/technical/quiz4.jpeg"; +import quiz5 from "../assets/club_event_pics/technical/quiz5.jpeg"; +import quiz6 from "../assets/club_event_pics/technical/quiz6.jpeg"; + +// Cultural +import chai1 from "../assets/club_event_pics/cultural/chai1.jpeg"; +import chai2 from "../assets/club_event_pics/cultural/chai2.jpeg"; +import chai3 from "../assets/club_event_pics/cultural/chai3.jpeg"; +import chai4 from "../assets/club_event_pics/cultural/chai4.jpeg"; +import chai5 from "../assets/club_event_pics/cultural/chai5.jpeg"; +import chai6 from "../assets/club_event_pics/cultural/chai6.jpeg"; +import ramp1 from "../assets/club_event_pics/cultural/ramp1.jpeg"; +import ramp2 from "../assets/club_event_pics/cultural/ramp2.jpeg"; +import ramp3 from "../assets/club_event_pics/cultural/ramp3.jpeg"; +import ramp4 from "../assets/club_event_pics/cultural/ramp4.jpeg"; +import ramp5 from "../assets/club_event_pics/cultural/ramp5.jpeg"; +import ramp6 from "../assets/club_event_pics/cultural/ramp6.jpeg"; +import canva1 from "../assets/club_event_pics/cultural/canva1.jpeg"; +import canva2 from "../assets/club_event_pics/cultural/canva2.jpeg"; +import canva3 from "../assets/club_event_pics/cultural/canva3.jpeg"; +import canva4 from "../assets/club_event_pics/cultural/canva4.jpeg"; +import canva5 from "../assets/club_event_pics/cultural/canva5.jpeg"; +import canva6 from "../assets/club_event_pics/cultural/canva6.jpeg"; +import yet1 from "../assets/club_event_pics/cultural/yet1.jpeg"; +import yet2 from "../assets/club_event_pics/cultural/yet2.jpeg"; +import yet3 from "../assets/club_event_pics/cultural/yet3.jpeg"; +import yet4 from "../assets/club_event_pics/cultural/yet4.jpeg"; +import yet5 from "../assets/club_event_pics/cultural/yet5.jpeg"; +import yet6 from "../assets/club_event_pics/cultural/yet6.jpeg"; + +// Sports +import lakshya1 from "../assets/club_event_pics/sports/lakshya1.jpeg"; +import lakshya2 from "../assets/club_event_pics/sports/lakshya2.jpeg"; +import lakshya3 from "../assets/club_event_pics/sports/lakshya3.jpeg"; +import lakshya4 from "../assets/club_event_pics/sports/lakshya4.jpeg"; +import lakshya5 from "../assets/club_event_pics/sports/lakshya5.jpeg"; +import lakshya6 from "../assets/club_event_pics/sports/lakshya6.jpeg"; + +interface MajorEventsProps { + label: string; + img: StaticImageData; + date: string; +} + +interface RecentClubEventsProps { + img: StaticImageData; + name: string; + clubName: string; + date: string; +} + +interface ClubEventsProps { + cultural: { name: string; date?: string; img: StaticImageData[] }[]; + technical: { name: string; date?: string; img: StaticImageData[] }[]; + sports: { name: string; date?: string; img: StaticImageData[] }[]; +} + +/* + You need to delete the last entry and add the new entry first for every new entry. + Alternatively, you have to delete the newsData[last] and add the new entry on newsData[0]. + Also you have to make sure that on every new entry you have to delete the images from the assets > major_events_pics + folder and add the new images for major events. +*/ + +export const majorEvents: MajorEventsProps[] = [ + { + label: "SCIη′TFIC", + img: scientfic, + date: "14 January 2023", + }, + { + label: "Technovate", + img: technovate, + date: "5-7 Nov 2022", + }, + { + label: "Ganesh Chaturthi", + img: ganesh_chaturthi, + date: "Aug 31 - Sep 4", + }, + { + label: "HackManthan", + img: hackmanthan, + date: "15 June 2022", + }, +]; + +export const recentClubEvents: RecentClubEventsProps[] = [ + { + img: chaipecharcha, + name: "Chai Pe Charcha", + clubName: "by MUN club", + date: "19 Jan 2023", + }, + { + img: yet, + name: "Yet to be Decided", + clubName: "by Take-Da-Bait club", + date: "20 Jan 2023", + }, + { + img: constitution, + name: "Constitution Day", + clubName: "by NSS", + date: "26 Nov 2022", + }, + { + img: blood, + name: "Blood Donation Camp", + clubName: "by NSS", + date: "8 Nov 2022", + }, + { + img: canvakar, + name: "CanvaKar", + clubName: "by IndraDhanush club", + date: "14 Oct to 16 Nov 2022", + }, + { + img: quizadry, + name: "Quizadry", + clubName: "by Inquizitive club", + date: "15 Oct,2022", + }, + { + img: run, + name: "RUN FOR UNITY", + clubName: "by NSS", + date: "31 Oct, 2022", + }, +]; + +export const ClubEvents: ClubEventsProps = { + cultural: [ + { + name: "Yet to be Decided", + date: "20 Jan 2023", + img: [yet1, yet2, yet3, yet4, yet5, yet6], + }, + { + name: "Chai Pe Charcha", + date: "20 Jan 2023", + img: [chai1, chai2, chai3, chai4, chai5, chai6], + }, + { + name: "CanvaKar", + date: "", + img: [canva1, canva2, canva3, canva4, canva5, canva6], + }, + + { + name: "Ramphage", + date: "", + img: [ramp1, ramp2, ramp3, ramp4, ramp5, ramp6], + }, + ], + technical: [ + { + name: "Quizadry", + date: "", + img: [quiz1, quiz2, quiz3, quiz4, quiz5, quiz6], + }, + { + name: "Robolution", + date: "", + img: [robo1, robo2, robo3, robo4, robo5, robo6], + }, + { + name: "Hacknovate", + date: "", + img: [hack1, hack2, hack3, hack4, hack5, hack6], + }, + ], + sports: [ + { + name: "Lakshya", + date: "", + img: [lakshya1, lakshya2, lakshya3, lakshya4, lakshya5, lakshya6], + }, + ], +}; diff --git a/features/home/NewsData.ts b/data/NewsData.ts similarity index 64% rename from features/home/NewsData.ts rename to data/NewsData.ts index 0f8d80d..09b7cab 100644 --- a/features/home/NewsData.ts +++ b/data/NewsData.ts @@ -1,19 +1,19 @@ import { StaticImageData } from "next/image"; // import from news_pics for images of news -import chai from "../../assets/club_event_pics/cultural/chai6.jpeg"; -import scientfic from "../../assets/major_events_pics/scientfic.jpeg"; -import blood from "../../assets/news_pics/news_blood.jpeg"; -import technovate from "../../assets/news_pics/news_technovate.jpeg"; -import yet from "../../assets/club_event_pics/cultural/yet2.jpeg"; -import consti from "../../assets/news_pics/news_const.jpeg"; -import hackmanthan from "../../assets/news_pics/news_hack.jpeg"; -import chess from "../../assets/club_event_pics/sports/lakshya1.jpeg"; -import navneet from "../../assets/team_22-23/navneet_chaubey.jpeg"; -import trisul from "../../assets/team_23-24/Trisul.jpeg" -import nano_img from "../../assets/major_events_pics/nano_tech.jpg"; -import jay from "../../assets/team_22-23/Jay_Deep_Singh.jpeg"; -import sudhanshu from "../../assets/team_22-23/Sudhanshu_Tripathi.jpeg"; +import chai from "../assets/club_event_pics/cultural/chai6.jpeg"; +import scientfic from "../assets/major_events_pics/scientfic.jpeg"; +import blood from "../assets/news_pics/news_blood.jpeg"; +import technovate from "../assets/news_pics/news_technovate.jpeg"; +import yet from "../assets/club_event_pics/cultural/yet2.jpeg"; +import consti from "../assets/news_pics/news_const.jpeg"; +import hackmanthan from "../assets/news_pics/news_hack.jpeg"; +import chess from "../assets/club_event_pics/sports/lakshya1.jpeg"; +import navneet from "../assets/team_22-23/navneet_chaubey.jpeg"; +import trisul from "../assets/team_23-24/Trisul.jpeg" +import nano_img from "../assets/major_events_pics/nano_tech.jpg"; +import jay from "../assets/team_22-23/Jay_Deep_Singh.jpeg"; +import sudhanshu from "../assets/team_22-23/Sudhanshu_Tripathi.jpeg"; interface NewsDataProps { img?: StaticImageData; diff --git a/features/events/RecentMajorEventsData.ts b/data/RecentMajorEventsData.ts similarity index 89% rename from features/events/RecentMajorEventsData.ts rename to data/RecentMajorEventsData.ts index 02e5d1a..604e148 100644 --- a/features/events/RecentMajorEventsData.ts +++ b/data/RecentMajorEventsData.ts @@ -1,8 +1,8 @@ import { StaticImageData } from "next/image"; -import scientfic from "../../assets/major_events_poster/scientifc.png"; -import hackmanthan from "../../assets/major_events_poster/hackmanthan.jpeg"; -import technovate from "../../assets/major_events_poster/technovate.jpeg"; -import ganesh from "../../assets/major_events_poster/ganesh.jpeg"; +import scientfic from "../assets/major_events_poster/scientifc.png"; +import hackmanthan from "../assets/major_events_poster/hackmanthan.jpeg"; +import technovate from "../assets/major_events_poster/technovate.jpeg"; +import ganesh from "../assets/major_events_poster/ganesh.jpeg"; interface RecentMajorEventsDataProps { poster: StaticImageData; diff --git a/features/events/MajorEvents.tsx b/features/events/MajorEvents.tsx index a23b6d8..a2410ee 100644 --- a/features/events/MajorEvents.tsx +++ b/features/events/MajorEvents.tsx @@ -6,7 +6,7 @@ import { useState } from "react"; import Image from "next/image"; import { Button, Stack, useTheme } from "@mui/material"; import { KeyboardArrowLeft, KeyboardArrowRight } from "@mui/icons-material"; -import { recentMajorEventsData } from "./RecentMajorEventsData"; +import { recentMajorEventsData } from "../../data/RecentMajorEventsData"; const AutoPlaySwipeableViews = autoPlay(SwipeableViews); diff --git a/features/events/MonthlyCalendar.tsx b/features/events/MonthlyCalendar.tsx index 2a4eb1a..4b34dde 100644 --- a/features/events/MonthlyCalendar.tsx +++ b/features/events/MonthlyCalendar.tsx @@ -10,7 +10,7 @@ import iconCircle from "../../assets/calendar_icons/circle.svg"; import Divider from "@mui/material/Divider"; import Grid2 from "@mui/material/Unstable_Grid2"; import SingleDate from "../../components/EventCalendar/SingleDate"; -import { calendarData } from "../../components/EventCalendar/EventCalendarData"; +import { calendarData } from "../../data/EventCalendarData"; import { NextPage } from "next"; interface MonthlyCalendarProps { diff --git a/features/gallery/Carousel.tsx b/features/gallery/Carousel.tsx index 34d55f8..eb844c5 100644 --- a/features/gallery/Carousel.tsx +++ b/features/gallery/Carousel.tsx @@ -6,7 +6,7 @@ import SwipeableViews from "react-swipeable-views"; import { autoPlay } from "react-swipeable-views-utils"; import { useState } from "react"; import Image from "next/image"; -import { majorEvents } from "./GalleryData"; +import { majorEvents } from "../../data/GalleryData"; const AutoPlaySwipeableViews = autoPlay(SwipeableViews); diff --git a/features/gallery/Gallery.tsx b/features/gallery/Gallery.tsx index 9f248f5..caf5e1d 100644 --- a/features/gallery/Gallery.tsx +++ b/features/gallery/Gallery.tsx @@ -13,7 +13,7 @@ import Divider from "@mui/material/Divider"; import layerIcon from "../../assets/icon/icon_layer.svg"; import Button from "@mui/material/Button"; import Select, { SelectChangeEvent } from "@mui/material/Select"; -import { ClubEvents } from "./GalleryData"; +import { ClubEvents } from "../../data/GalleryData"; const StyledButton = styled(Button)({ fontFamily: "Rubik", diff --git a/features/gallery/GalleryData.ts b/features/gallery/GalleryData.ts deleted file mode 100644 index 16605b6..0000000 --- a/features/gallery/GalleryData.ts +++ /dev/null @@ -1,214 +0,0 @@ -import { StaticImageData } from "next/image"; - -// Major Events -import hackmanthan from "../../assets/major_events_pics/hackmanthan.jpeg"; -import scientfic from "../../assets/major_events_pics/scientfic.jpeg"; -import ganesh_chaturthi from "../../assets/major_events_pics/ganesh_chaturthi.jpeg"; -import technovate from "../../assets/major_events_pics/technovate.jpeg"; - -// Recent Major Events -import chaipecharcha from "../../assets/recent_club_events/chaipecharcha.jpeg"; -import canvakar from "../../assets/recent_club_events/canvakar.jpeg"; -import quizadry from "../../assets/recent_club_events/quizadry.jpeg"; -import run from "../../assets/recent_club_events/run.jpeg"; -import yet from "../../assets/recent_club_events/yet.jpeg"; -import blood from "../../assets/recent_club_events/blood.png"; -import constitution from "../../assets/recent_club_events/constitution.jpeg"; - -// Technical -import robo1 from "../../assets/club_event_pics/technical/robo1.jpeg"; -import robo2 from "../../assets/club_event_pics/technical/robo2.jpeg"; -import robo3 from "../../assets/club_event_pics/technical/robo3.jpeg"; -import robo4 from "../../assets/club_event_pics/technical/robo4.jpeg"; -import robo5 from "../../assets/club_event_pics/technical/robo5.jpeg"; -import robo6 from "../../assets/club_event_pics/technical/robo6.jpeg"; -import hack1 from "../../assets/club_event_pics/technical/hack1.jpeg"; -import hack2 from "../../assets/club_event_pics/technical/hack2.jpeg"; -import hack3 from "../../assets/club_event_pics/technical/hack3.jpeg"; -import hack4 from "../../assets/club_event_pics/technical/hack4.jpeg"; -import hack5 from "../../assets/club_event_pics/technical/hack5.jpeg"; -import hack6 from "../../assets/club_event_pics/technical/hack6.jpeg"; -import quiz1 from "../../assets/club_event_pics/technical/quiz1.jpeg"; -import quiz2 from "../../assets/club_event_pics/technical/quiz2.jpeg"; -import quiz3 from "../../assets/club_event_pics/technical/quiz3.jpeg"; -import quiz4 from "../../assets/club_event_pics/technical/quiz4.jpeg"; -import quiz5 from "../../assets/club_event_pics/technical/quiz5.jpeg"; -import quiz6 from "../../assets/club_event_pics/technical/quiz6.jpeg"; - -// Cultural -import chai1 from "../../assets/club_event_pics/cultural/chai1.jpeg"; -import chai2 from "../../assets/club_event_pics/cultural/chai2.jpeg"; -import chai3 from "../../assets/club_event_pics/cultural/chai3.jpeg"; -import chai4 from "../../assets/club_event_pics/cultural/chai4.jpeg"; -import chai5 from "../../assets/club_event_pics/cultural/chai5.jpeg"; -import chai6 from "../../assets/club_event_pics/cultural/chai6.jpeg"; -import ramp1 from "../../assets/club_event_pics/cultural/ramp1.jpeg"; -import ramp2 from "../../assets/club_event_pics/cultural/ramp2.jpeg"; -import ramp3 from "../../assets/club_event_pics/cultural/ramp3.jpeg"; -import ramp4 from "../../assets/club_event_pics/cultural/ramp4.jpeg"; -import ramp5 from "../../assets/club_event_pics/cultural/ramp5.jpeg"; -import ramp6 from "../../assets/club_event_pics/cultural/ramp6.jpeg"; -import canva1 from "../../assets/club_event_pics/cultural/canva1.jpeg"; -import canva2 from "../../assets/club_event_pics/cultural/canva2.jpeg"; -import canva3 from "../../assets/club_event_pics/cultural/canva3.jpeg"; -import canva4 from "../../assets/club_event_pics/cultural/canva4.jpeg"; -import canva5 from "../../assets/club_event_pics/cultural/canva5.jpeg"; -import canva6 from "../../assets/club_event_pics/cultural/canva6.jpeg"; -import yet1 from "../../assets/club_event_pics/cultural/yet1.jpeg"; -import yet2 from "../../assets/club_event_pics/cultural/yet2.jpeg"; -import yet3 from "../../assets/club_event_pics/cultural/yet3.jpeg"; -import yet4 from "../../assets/club_event_pics/cultural/yet4.jpeg"; -import yet5 from "../../assets/club_event_pics/cultural/yet5.jpeg"; -import yet6 from "../../assets/club_event_pics/cultural/yet6.jpeg"; - -// Sports -import lakshya1 from "../../assets/club_event_pics/sports/lakshya1.jpeg"; -import lakshya2 from "../../assets/club_event_pics/sports/lakshya2.jpeg"; -import lakshya3 from "../../assets/club_event_pics/sports/lakshya3.jpeg"; -import lakshya4 from "../../assets/club_event_pics/sports/lakshya4.jpeg"; -import lakshya5 from "../../assets/club_event_pics/sports/lakshya5.jpeg"; -import lakshya6 from "../../assets/club_event_pics/sports/lakshya6.jpeg"; - -interface MajorEventsProps { - label: string; - img: StaticImageData; - date: string; -} - -interface RecentClubEventsProps { - img: StaticImageData; - name: string; - clubName: string; - date: string; -} - -interface ClubEventsProps { - cultural: { name: string; date?: string; img: StaticImageData[] }[]; - technical: { name: string; date?: string; img: StaticImageData[] }[]; - sports: { name: string; date?: string; img: StaticImageData[] }[]; -} - -/* - You need to delete the last entry and add the new entry first for every new entry. - Alternatively, you have to delete the newsData[last] and add the new entry on newsData[0]. - Also you have to make sure that on every new entry you have to delete the images from the assets > major_events_pics - folder and add the new images for major events. -*/ - -export const majorEvents: MajorEventsProps[] = [ - { - label: "SCIη′TFIC", - img: scientfic, - date: "14 January 2023", - }, - { - label: "Technovate", - img: technovate, - date: "5-7 Nov 2022", - }, - { - label: "Ganesh Chaturthi", - img: ganesh_chaturthi, - date: "Aug 31 - Sep 4", - }, - { - label: "HackManthan", - img: hackmanthan, - date: "15 June 2022", - }, -]; - -export const recentClubEvents: RecentClubEventsProps[] = [ - { - img: chaipecharcha, - name: "Chai Pe Charcha", - clubName: "by MUN club", - date: "19 Jan 2023", - }, - { - img: yet, - name: "Yet to be Decided", - clubName: "by Take-Da-Bait club", - date: "20 Jan 2023", - }, - { - img: constitution, - name: "Constitution Day", - clubName: "by NSS", - date: "26 Nov 2022", - }, - { - img: blood, - name: "Blood Donation Camp", - clubName: "by NSS", - date: "8 Nov 2022", - }, - { - img: canvakar, - name: "CanvaKar", - clubName: "by IndraDhanush club", - date: "14 Oct to 16 Nov 2022", - }, - { - img: quizadry, - name: "Quizadry", - clubName: "by Inquizitive club", - date: "15 Oct,2022", - }, - { - img: run, - name: "RUN FOR UNITY", - clubName: "by NSS", - date: "31 Oct, 2022", - }, -]; - -export const ClubEvents: ClubEventsProps = { - cultural: [ - { - name: "Yet to be Decided", - date: "20 Jan 2023", - img: [yet1, yet2, yet3, yet4, yet5, yet6], - }, - { - name: "Chai Pe Charcha", - date: "20 Jan 2023", - img: [chai1, chai2, chai3, chai4, chai5, chai6], - }, - { - name: "CanvaKar", - date: "", - img: [canva1, canva2, canva3, canva4, canva5, canva6], - }, - - { - name: "Ramphage", - date: "", - img: [ramp1, ramp2, ramp3, ramp4, ramp5, ramp6], - }, - ], - technical: [ - { - name: "Quizadry", - date: "", - img: [quiz1, quiz2, quiz3, quiz4, quiz5, quiz6], - }, - { - name: "Robolution", - date: "", - img: [robo1, robo2, robo3, robo4, robo5, robo6], - }, - { - name: "Hacknovate", - date: "", - img: [hack1, hack2, hack3, hack4, hack5, hack6], - }, - ], - sports: [ - { - name: "Lakshya", - date: "", - img: [lakshya1, lakshya2, lakshya3, lakshya4, lakshya5, lakshya6], - }, - ], -}; diff --git a/features/gallery/RecentClubEvents.tsx b/features/gallery/RecentClubEvents.tsx index 8d74f0b..d6eb36a 100644 --- a/features/gallery/RecentClubEvents.tsx +++ b/features/gallery/RecentClubEvents.tsx @@ -6,7 +6,7 @@ import SwipeableViews from "react-swipeable-views"; import { autoPlay } from "react-swipeable-views-utils"; import { useState } from "react"; import Image from "next/image"; -import { recentClubEvents } from "./GalleryData"; +import { recentClubEvents } from "../../data/GalleryData"; const AutoPlaySwipeableViews = autoPlay(SwipeableViews); diff --git a/features/home/News.tsx b/features/home/News.tsx index 1c52021..f955632 100644 --- a/features/home/News.tsx +++ b/features/home/News.tsx @@ -7,7 +7,7 @@ import Grid2 from "@mui/material/Unstable_Grid2/Grid2"; import Image, { StaticImageData } from "next/image"; import { ReactNode } from "react"; import { NextPage } from "next"; -import newsData from "./NewsData"; +import newsData from "../../data/NewsData"; interface NewsProps { img?: StaticImageData; From 359c16b133a17c97de9ecba2d57f949f7e9f91cc Mon Sep 17 00:00:00 2001 From: shivamk-21 <2103shivamk@gmail.com> Date: Mon, 26 Feb 2024 22:23:05 +0530 Subject: [PATCH 2/3] Updated Calendar Page --- data/EventCalendarData.ts | 516 ++++++++++++++++---------------------- 1 file changed, 212 insertions(+), 304 deletions(-) diff --git a/data/EventCalendarData.ts b/data/EventCalendarData.ts index 8a56951..6eac283 100644 --- a/data/EventCalendarData.ts +++ b/data/EventCalendarData.ts @@ -9,470 +9,378 @@ interface CalendarDataProps { date: string; eventName: string; icon: StaticImageData; + club: string; } export const calendarData: CalendarDataProps[] = [ - //Aug + //Jan { - date: "10-08-2023", - eventName: "Intro to Competitive ML", - icon: rectangleIcon, - }, - { - date: "12-08-2023", - eventName: "Aagaaz", + date: "04-01-2024", + eventName: "Esports", icon: crossIcon, + club: "Atharv" }, { - date: "13-08-2023", - eventName: "Aagaaz", - icon: crossIcon, + date: "07-01-2024", + eventName: "Cover the song", + icon: triangleIcon, + club: "Capriccio" }, { - date: "14-08-2023", - eventName: "Aagaaz", + date: "08-01-2024", + eventName: "Gym Inauguration", icon: crossIcon, + club: "Atharv" }, { - date: "15-08-2023", - eventName: "Independence Day", - icon: circleIcon, - }, - { - date: "17-08-2023", - eventName: "Workshop", - icon: rectangleIcon, - }, - { - date: "18-08-2023", - eventName: "CodeConquer", - icon: rectangleIcon, - }, - { - date: "19-08-2023", - eventName: "Photography day", + date: "08-01-2024", + eventName: "Debate Aaj kal", icon: triangleIcon, + club: "TDB" }, { - date: "19-08-2023", - eventName: "Workshop", - icon: rectangleIcon, - }, - { - date: "21-08-2023", - eventName: "Workshop", + date: "09-01-2024", + eventName: "PictoMania", icon: triangleIcon, + club: "Indradhanush" }, { - date: "22-08-2023", - eventName: "Workshop", - icon: triangleIcon, + date: "12-01-2024", + eventName: "National Youth Day", + icon: rectangleIcon, + club: "IIC" }, { - date: "23-08-2023", - eventName: "Chai Pe Charcha", - icon: triangleIcon, + date: "13-01-2024", + eventName: "Scintfic 2k24", + icon: "", + club: "SAC" }, { - date: "24-08-2023", - eventName: "E-sports", + date: "15-01-2024", + eventName: "Volleyball", icon: crossIcon, + club: "Atharv" }, { - date: "25-08-2023", - eventName: "E-sports", - icon: crossIcon, + date: "18-01-2024", + eventName: "Political Drama", + icon: triangleIcon, + club: "MUN & CDT" }, { - date: "26-08-2023", - eventName: "Data Crusade", + date: "20-01-2024", + eventName: "Treasure Hunt", icon: rectangleIcon, + club: "Inquizitive&ComEt" }, { - date: "27-08-2023", - eventName: "Data Crusade", + date: "21-01-2024", + eventName: "IDOR workshop", icon: rectangleIcon, + club: "Ciphercell" }, { - date: "28-08-2023", - eventName: "Debate Aaj Kal", + date: "21-01-2024", + eventName: "Painting and Sketch", icon: triangleIcon, + club: "Indradhanush" }, { - date: "28-08-2023", - eventName: "National Sports Day", - icon: crossIcon, - }, - { - date: "29-08-2023", - eventName: "Workshop", - icon: triangleIcon, + date: "26-01-2024", + eventName: "Republic Day", + icon: circleIcon, + club: "SAC" }, { - date: "30-08-2023", - eventName: "Fresher Cooker", + date: "27-01-2024", + eventName: "Cognitio", icon: rectangleIcon, + club: "AIML" }, { - date: "31-08-2023", - eventName: "Screening Night", - icon: triangleIcon, - }, - - //Sep - - { - date: "01-09-2023", - eventName: "Jamming Session", - icon: triangleIcon, + date: "29-01-2024", + eventName: "Drink&Code", + icon: rectangleIcon, + club: "TSoC" }, + //Feb { - date: "02-09-2023", - eventName: "Dance Workshop", - icon: triangleIcon, + date: "04-02-2024", + eventName: "Design Thinking Workshop", + icon: rectangleIcon, + club: "IIC" }, { - date: "03-09-2023", - eventName: "Intercollege And School", - icon: triangleIcon, + date: "07-02-2024", + eventName: "National Science day", + icon: rectangleIcon, + club: "IIC" }, { - date: "04-09-2023", - eventName: "JAM", + date: "10-02-2024", + eventName: "Field/Exposure Visit", icon: rectangleIcon, + club: "IIC" }, { - date: "05-09-2023", - eventName: "Teacher's Day", + date: "14-02-2024", + eventName: "Saraswati Puja", icon: starIcon, + club: "SAC" }, { - date: "05-09-2023", - eventName: "Gaming Night", - icon: triangleIcon, - }, - { - date: "06-09-2023", - eventName: "Gaming Night", - icon: triangleIcon, - }, - { - date: "07-09-2023", - eventName: "Football", - icon: crossIcon, + date: "14-02-2024", + eventName: "National Startup day", + icon: rectangleIcon, + club: "IIC" }, { - date: "08-09-2023", - eventName: "Football", - icon: crossIcon, + date: "16-02-2024", + eventName: "Technovate", + icon: starIcon, + club: "SAC" }, { - date: "09-09-2023", - eventName: "Football", + date: "20-02-2024", + eventName: "Online chess", icon: crossIcon, + club: "Atharv" }, { - date: "10-09-2023", - eventName: "Hacking Into Website", + date: "22-02-2024", + eventName: "XSS-Cross Site Scripting", icon: rectangleIcon, + club: "Ciphercell" }, { - date: "11-09-2023", - eventName: "Workshop", - icon: triangleIcon, - }, - { - date: "12-09-2023", - eventName: "Aap Ki Adalat", - icon: triangleIcon, - }, - { - date: "13-09-2023", - eventName: "Bi-Monthly Quiz-1", + date: "23-02-2024", + eventName: "PixelQuest", icon: rectangleIcon, + club: "AIML" }, { - date: "14-09-2023", - eventName: "Hindi Diwas", + date: "24-02-2024", + eventName: "Quiz 1", icon: rectangleIcon, + club: "Inquizitive" }, + //March { - date: "14-09-2023", + date: "09-03-2024", eventName: "Workshop", icon: rectangleIcon, + club: "Ciphercell" }, { - date: "15-09-2023", - eventName: "Engineer'S Day", - icon: rectangleIcon, - }, - { - date: "15-09-2023", - eventName: "Media Cell Event", - icon: triangleIcon, - }, - { - date: "16-09-2023", - eventName: "Media Cell Event", - icon: triangleIcon, - }, - { - date: "17-09-2023", - eventName: "CTF", - icon: rectangleIcon, - }, - { - date: "18-09-2023", - eventName: "Table Top Triumph", + date: "09-03-2024", + eventName: "Cricket", icon: crossIcon, + club: "Atharv" }, { - date: "19-09-2023", - eventName: "Ganesh Chaturthi", - icon: starIcon, - }, - { - date: "20-09-2023", - eventName: "Ganesh Chaturthi", - icon: starIcon, - }, - { - date: "21-09-2023", - eventName: "Ganesh Chaturthi", - icon: starIcon, - }, - { - date: "22-09-2023", - eventName: "Ganesh Chaturthi", - icon: starIcon, - }, - { - date: "23-09-2023", - eventName: "Screening Event", - icon: triangleIcon, - }, - - //oct - { - date: "2-10-2023", - eventName: "Gandhi Jayanti and Shashtr", - icon: circleIcon, - }, - { - date: "5-10-2023", - eventName: "Bi-Monthly Quiz-2", + date: "11-03-2024", + eventName: "Quiz 2", icon: rectangleIcon, + club: "Inquizitive" }, { - date: "6-10-2023", - eventName: "Cover The Song", - icon: triangleIcon, - }, - { - date: "7-10-2023", - eventName: "Workshop 2", + date: "12-03-2024", + eventName: "Workshop", icon: rectangleIcon, + club: "ComEt" }, { - date: "8-10-2023", - eventName: "Workshop 1", + date: "13-03-2024", + eventName: "B2B Auction", icon: rectangleIcon, + club: "TSoC" }, { - date: "9-10-2023", - eventName: "Chess", - icon: crossIcon, - }, - { - date: "10-10-2023", - eventName: "Chess", - icon: crossIcon, - }, - { - date: "14-10-2023", - eventName: "Dance Workshop 2", + date: "14-03-2024", + eventName: "FilmVenture Safari", icon: triangleIcon, + club: "Indradhanush" }, { - date: "15-10-2023", - eventName: "Cognitio (AIML)", + date: "15-03-2024", + eventName: "Bit2Byte", icon: rectangleIcon, + club: "TSoC" }, { - date: "15-10-2023", - eventName: "Garba Night", - icon: starIcon, - }, - { - date: "16-10-2023", - eventName: "Gram Panchayat", + date: "18-03-2024", + eventName: "Election Campaign starts", icon: triangleIcon, + club: "MUN" }, { - date: "17-10-2023", - eventName: "Tricky Circuits", - icon: rectangleIcon, + date: "19-03-2024", + eventName: "Campaigning", + icon: triangleIcon, + club: "MUN" }, { - date: "18-10-2023", - eventName: "PG Workshop", + date: "20-03-2024", + eventName: "Election voting & Results", icon: triangleIcon, + club: "MUN" }, { - date: "19-10-2023", - eventName: "Aarambh", + date: "21-03-2024", + eventName: "B League", icon: crossIcon, + club: "Atharv" }, { - date: "20-10-2023", - eventName: "Aarambh", - icon: crossIcon, + date: "24-03-2024", + eventName: "Holika Dahan", + icon: starIcon, + club: "SAC" }, + //April { - date: "21-10-2023", - eventName: "Aarambh", + date: "01-04-2024", + eventName: "Shuttle Showdown", icon: crossIcon, + club: "Atharv" }, { - date: "28-10-2023", - eventName: "CFT", - icon: rectangleIcon, - }, - { - date: "29-10-2023", - eventName: "Pixel Quest", - icon: rectangleIcon, + date: "02-04-2024", + eventName: "ad quest", + icon: triangleIcon, + club: "CDT" }, { - date: "30-10-2023", - eventName: "Bi-Monthly Quiz-3", + date: "03-04-2024", + eventName: "Quiz 3", icon: rectangleIcon, + club: "Inquizitive" }, { - date: "31-10-2023", - eventName: "Unity Day", - icon: circleIcon, - }, - - //Nov - { - date: "1-11-2023", - eventName: "The Ad-venture Quest: Unleashing Creativity", + date: "05-04-2024", + eventName: "Jamming night", icon: triangleIcon, + club: "Capriccio" }, { - date: "2-11-2023", - eventName: "Blindfold Imagination Canvas", - icon: triangleIcon, + date: "06-04-2024", + eventName: "Hack-a-Sol 3.0", + icon: starIcon, + club: "SAC" }, { - date: "3-11-2023", - eventName: "CodeNubs", - icon: rectangleIcon, + date: "08-04-2024", + eventName: "Quiz", + icon: starIcon, + club: "shutterbug" }, { - date: "4-11-2023", - eventName: "Hack-A-Sol 3.0", + date: "09-04-2024", + eventName: "JAM", icon: rectangleIcon, + club: "ComEt" }, { - date: "5-11-2023", - eventName: "Hack-A-Sol 3.0", + date: "10-04-2024", + eventName: "Workshop", icon: rectangleIcon, + club: "TSoC" }, { - date: "6-11-2023", - eventName: "Badminton", - icon: crossIcon, + date: "11-04-2024", + eventName: "News Report Anchoring", + icon: triangleIcon, + club: "TDB" }, { - date: "7-11-2023", - eventName: "Badminton", - icon: crossIcon, + date: "12-04-2024", + eventName: "Origami Workshop", + icon: triangleIcon, + club: "Indradhanush" }, { - date: "8-11-2023", - eventName: "Badminton", + date: "12-04-2024", + eventName: "Aaghaaz", icon: crossIcon, + club: "Atharv" }, { - date: "9-11-2023", - eventName: "Power Play: The Journalist- Politician Press Conference", + date: "13-04-2024", + eventName: "Dance Workshop 2", icon: triangleIcon, + club: "Igniters" }, { - date: "10-11-2023", - eventName: "Linguistic Showdown", + date: "14-04-2024", + eventName: "Local File Inclusion", icon: rectangleIcon, + club: "Ciphercell" }, { - date: "11-11-2023", - eventName: "??", - icon: triangleIcon, - }, - { - date: "13-11-2023", - eventName: "PG Workshop", - icon: triangleIcon, + date: "14-04-2024", + eventName: "Blood Donation Camp", + icon: starIcon, + club: "NSS" }, { - date: "15-11-2023", - eventName: "Picturesque", - icon: triangleIcon, + date: "15-04-2024", + eventName: "Quiz 4", + icon: rectangleIcon, + club: "Inquizitive" }, { - date: "16-11-2023", - eventName: "Workshop", + date: "17-04-2024", + eventName: "Linguistic Showdown", icon: rectangleIcon, + club: "AIML" }, { - date: "17-11-2023", - eventName: "Karaoke Night", - icon: triangleIcon, + date: "18-04-2024", + eventName: "Competition", + icon: starIcon, + club: "shutterbug" }, { - date: "18-11-2023", - eventName: "Inter College Dance", + date: "19-04-2024", + eventName: "Funtakshari", icon: triangleIcon, + club: "Capriccio" }, { - date: "19-11-2023", - eventName: "Test Your Web Skills", - icon: rectangleIcon, + date: "20-04-2024", + eventName: "Inter-MUN", + icon: triangleIcon, + club: "MUN" }, { - date: "21-11-2023", - eventName: "Inquizitiive Main Event", + date: "23-04-2024", + eventName: "Descode", icon: rectangleIcon, + club: "TSoC" }, { - date: "24-11-2023", - eventName: "Cricket Tournament", - icon: crossIcon, + date: "24-04-2024", + eventName: "Anime Quiz", + icon: triangleIcon, + club: "C2C" }, { - date: "25-11-2023", - eventName: "Cricket Tournament", - icon: crossIcon, + date: "25-04-2024", + eventName: "Cultural night", + icon: starIcon, + club: "SAC" }, { - date: "26-11-2023", - eventName: "Constitution Day", + date: "26-04-2024", + eventName: "Bug-Hunting", icon: rectangleIcon, + club: "Ciphercell" }, { - date: "27-11-2023", - eventName: "Blood Donation Camp", - icon: triangleIcon, - }, - { - date: "28-11-2023", - eventName: "Farzi Mushaera", - icon: triangleIcon, - }, - { - date: "29-11-2023", - eventName: "Guess The Picture", - icon: triangleIcon, - }, + date: "15-08-2024", + eventName: "Independence Day", + icon: circleIcon, + club: "Ciphercell" + } ]; From a31a562c71ba709bdc1a141c5f49ef0738b4c498 Mon Sep 17 00:00:00 2001 From: shivamk-21 <2103shivamk@gmail.com> Date: Mon, 26 Feb 2024 22:43:45 +0530 Subject: [PATCH 3/3] Modified Monthly Calendar --- data/EventCalendarData.ts | 2 +- features/events/MonthlyCalendar.tsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/EventCalendarData.ts b/data/EventCalendarData.ts index 6eac283..a92a7d1 100644 --- a/data/EventCalendarData.ts +++ b/data/EventCalendarData.ts @@ -381,6 +381,6 @@ export const calendarData: CalendarDataProps[] = [ date: "15-08-2024", eventName: "Independence Day", icon: circleIcon, - club: "Ciphercell" + club: "SAC" } ]; diff --git a/features/events/MonthlyCalendar.tsx b/features/events/MonthlyCalendar.tsx index 4b34dde..05511df 100644 --- a/features/events/MonthlyCalendar.tsx +++ b/features/events/MonthlyCalendar.tsx @@ -17,6 +17,7 @@ interface MonthlyCalendarProps { date: string; eventName: string; icon: StaticImageData; + club:string } interface ItemProps { @@ -139,7 +140,7 @@ const MonthlyCalendar: NextPage = () => {