diff --git a/wisreactapp/public/img/portfolio/oct1-graduate-sisters.jpg b/wisreactapp/public/img/portfolio/oct1-graduate-sisters.jpg new file mode 100644 index 0000000..8cbd6d5 Binary files /dev/null and b/wisreactapp/public/img/portfolio/oct1-graduate-sisters.jpg differ diff --git a/wisreactapp/public/img/portfolio/oct8-yoga.jpg b/wisreactapp/public/img/portfolio/oct8-yoga.jpg new file mode 100644 index 0000000..c588009 Binary files /dev/null and b/wisreactapp/public/img/portfolio/oct8-yoga.jpg differ diff --git a/wisreactapp/public/img/portfolio/sep24-agm.jpg b/wisreactapp/public/img/portfolio/sep24-agm.jpg new file mode 100644 index 0000000..6a5dda5 Binary files /dev/null and b/wisreactapp/public/img/portfolio/sep24-agm.jpg differ diff --git a/wisreactapp/src/components/gallery.jsx b/wisreactapp/src/components/gallery.jsx index 9aea6fc..a1dfb76 100644 --- a/wisreactapp/src/components/gallery.jsx +++ b/wisreactapp/src/components/gallery.jsx @@ -24,7 +24,7 @@ export const Gallery = (props) => {

Below are some of our current and past events! See our Calendar or our Photo Gallery for more.

{/* Render current events */} -

Recent Events

+

Upcoming and Recent Events


{props.data ? renderEvents(filterEvents('current')) : 'Loading...'} @@ -32,7 +32,7 @@ export const Gallery = (props) => { {/* Render past events */}



-

Past Events

+

Past Featured Events


{props.data ? renderEvents(filterEvents('past')) : 'Loading...'} diff --git a/wisreactapp/src/components/navigation.jsx b/wisreactapp/src/components/navigation.jsx index 3323ace..af97cc9 100644 --- a/wisreactapp/src/components/navigation.jsx +++ b/wisreactapp/src/components/navigation.jsx @@ -65,6 +65,13 @@ export const Navigation = (props) => { + {/* New Calendar Link */} +
  • + + Calendar + +
  • + {/* New Photo Gallery Link */}
  • diff --git a/wisreactapp/src/data/data.json b/wisreactapp/src/data/data.json index def4f2b..df01ef8 100644 --- a/wisreactapp/src/data/data.json +++ b/wisreactapp/src/data/data.json @@ -17,77 +17,42 @@ }, "Gallery": [ { - "title": "Starry Night", - "largeImage": "img/portfolio/17starrynight.png", - "smallImage": "img/portfolio/17starrynight.png", - "eventType": "current" - }, - { - "title": "End of Year Ceremony", - "largeImage": "img/portfolio/16Ceremony.png", - "smallImage": "img/portfolio/16Ceremony.png", + "title": "Yoga Night", + "largeImage": "img/portfolio/oct8-yoga.jpg", + "smallImage": "img/portfolio/oct8-yoga.jpg", "eventType": "current" }, { - "title": "ANOVA Charity Walk / Run", - "largeImage": "img/portfolio/15Anova.png", - "smallImage": "img/portfolio/15Anova.png", + "title": "Graduate Sisters in Science", + "largeImage": "img/portfolio/oct1-graduate-sisters.jpg", + "smallImage": "img/portfolio/oct1-graduate-sisters.jpg", "eventType": "current" }, { - "title": "Intergenerational Speed Mentorship Event", - "largeImage": "img/portfolio/14SpeedMentor.png", - "smallImage": "img/portfolio/14SpeedMentor.png", + "title": "Women in Science Annual General Meeting", + "largeImage": "img/portfolio/sep24-agm.jpg", + "smallImage": "img/portfolio/sep24-agm.jpg", "eventType": "current" }, { - "title": "WIS Trivia Night", - "largeImage": "img/portfolio/13Trivia.png", - "smallImage": "img/portfolio/13Trivia.png", - "eventType": "current" + "title": "ANOVA Charity Walk / Run", + "largeImage": "img/portfolio/15Anova.png", + "smallImage": "img/portfolio/15Anova.png", + "eventType": "past" }, { "title": "Stemposium Conference", "largeImage": "img/portfolio/12Stemposium.png", "smallImage": "img/portfolio/12Stemposium.png", - "eventType": "current" - }, - { - "title": "LinkedIn and Cover Letter Workshop", - "largeImage": "img/portfolio/10LinkedIn.png", - "smallImage": "img/portfolio/10LinkedIn.png", "eventType": "past" - }, + }, { "title": "Endless Exploration", "largeImage": "img/portfolio/1EndlessExploration.png", "smallImage": "img/portfolio/1EndlessExploration.png", "eventType": "past" - }, - { - "title": "Yoga Night", - "largeImage": "img/portfolio/2YogaNight.png", - "smallImage": "img/portfolio/2YogaNight.png", - "eventType": "past" - }, - { - "title": "Free Headshots", - "largeImage": "img/portfolio/3Headshots.png", - "smallImage": "img/portfolio/3Headshots.png", - "eventType": "past" - }, - { - "title": "Research Workshop", - "largeImage": "img/portfolio/4ResearchWorkshop.png", - "smallImage": "img/portfolio/4ResearchWorkshop.png", - "eventType": "past" - }, - { - "title": "University Info Session", - "largeImage": "img/portfolio/5InfoSession.png", - "smallImage": "img/portfolio/5InfoSession.png", - "eventType": "past" } + ], "Services": [ { diff --git a/wisreactapp/src/data/notes.txt b/wisreactapp/src/data/notes.txt new file mode 100644 index 0000000..4dbd448 --- /dev/null +++ b/wisreactapp/src/data/notes.txt @@ -0,0 +1,74 @@ +saving last years events here in case we decide to upload them again: + +{ + "title": "Starry Night", + "largeImage": "img/portfolio/17starrynight.png", + "smallImage": "img/portfolio/17starrynight.png", + "eventType": "current" + }, + { + "title": "End of Year Ceremony", + "largeImage": "img/portfolio/16Ceremony.png", + "smallImage": "img/portfolio/16Ceremony.png", + "eventType": "current" + }, + { + "title": "ANOVA Charity Walk / Run", + "largeImage": "img/portfolio/15Anova.png", + "smallImage": "img/portfolio/15Anova.png", + "eventType": "current" + }, + { + "title": "Intergenerational Speed Mentorship Event", + "largeImage": "img/portfolio/14SpeedMentor.png", + "smallImage": "img/portfolio/14SpeedMentor.png", + "eventType": "current" + }, + { + "title": "WIS Trivia Night", + "largeImage": "img/portfolio/13Trivia.png", + "smallImage": "img/portfolio/13Trivia.png", + "eventType": "current" + }, + { + "title": "Stemposium Conference", + "largeImage": "img/portfolio/12Stemposium.png", + "smallImage": "img/portfolio/12Stemposium.png", + "eventType": "current" + }, + { + "title": "LinkedIn and Cover Letter Workshop", + "largeImage": "img/portfolio/10LinkedIn.png", + "smallImage": "img/portfolio/10LinkedIn.png", + "eventType": "past" + }, + { + "title": "Endless Exploration", + "largeImage": "img/portfolio/1EndlessExploration.png", + "smallImage": "img/portfolio/1EndlessExploration.png", + "eventType": "past" + }, + { + "title": "Yoga Night", + "largeImage": "img/portfolio/2YogaNight.png", + "smallImage": "img/portfolio/2YogaNight.png", + "eventType": "past" + }, + { + "title": "Free Headshots", + "largeImage": "img/portfolio/3Headshots.png", + "smallImage": "img/portfolio/3Headshots.png", + "eventType": "past" + }, + { + "title": "Research Workshop", + "largeImage": "img/portfolio/4ResearchWorkshop.png", + "smallImage": "img/portfolio/4ResearchWorkshop.png", + "eventType": "past" + }, + { + "title": "University Info Session", + "largeImage": "img/portfolio/5InfoSession.png", + "smallImage": "img/portfolio/5InfoSession.png", + "eventType": "past" + } \ No newline at end of file