Merge pull request #39 from wisuwo/isabelle-branch

Isabelle branch
wisuwo · Oct 8, 2024 · 68328aa · 68328aa
2 parents efd3d64 + f8a9268
commit 68328aa
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 52 deletions.
diff --git a/wisreactapp/public/img/portfolio/oct1-graduate-sisters.jpg b/wisreactapp/public/img/portfolio/oct1-graduate-sisters.jpg
diff --git a/wisreactapp/public/img/portfolio/oct8-yoga.jpg b/wisreactapp/public/img/portfolio/oct8-yoga.jpg
diff --git a/wisreactapp/public/img/portfolio/sep24-agm.jpg b/wisreactapp/public/img/portfolio/sep24-agm.jpg
diff --git a/wisreactapp/src/components/gallery.jsx b/wisreactapp/src/components/gallery.jsx
@@ -24,15 +24,15 @@ export const Gallery = (props) => {
          <p>Below are some of our current and past events! See our <Link to="/calendar" className="bolder">Calendar</Link> or our <Link to="/imagegallery" className="bolder">Photo Gallery</Link> for more.</p>
        </div>
        {/* Render current events */}
-       <h3>Recent Events</h3>
+       <h3>Upcoming and Recent Events</h3>
         <hr></hr>
        <div className='row'>
          {props.data ? renderEvents(filterEvents('current')) : 'Loading...'}
        </div>
        {/* Render past events */}
        <br></br>
        <br></br>
-       <h3>Past Events</h3>
+       <h3>Past Featured Events</h3>
        <hr></hr>
        <div className='row'>
          {props.data ? renderEvents(filterEvents('past')) : 'Loading...'}

diff --git a/wisreactapp/src/components/navigation.jsx b/wisreactapp/src/components/navigation.jsx
@@ -65,6 +65,13 @@ export const Navigation = (props) => {
               </ScrollLink>
             </li>
 
+            {/* New Calendar Link */}
+            <li className='nav-item'>
+              <Link className='nav-link' to='/calendar'>
+                Calendar
+              </Link>
+            </li>
+
             {/* New Photo Gallery Link */}
             <li className='nav-item'>
               <Link className='nav-link' to='/imagegallery'>

diff --git 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
@@ -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"
+    }