Revert "Revert "Prep for merge""

This reverts commit 635db57.

undo the merge to get the old code back

client/modules/Entries/components/EntriesGroup/EntriesGroup.jsx

@@ -39,55 +39,55 @@ const TEAMS = [
         teamImg: pac,
         projectDesc: 'PAC is a smartphone application that provides audio alerts to drivers when it senses an urgent emergency.',
         link: 'https://okiyuki.github.io/ARCportfolio/public/portfolio.html',
-        link2: '/projects',
+        link2: '/entries/PAC',
       },
       {
         teamName: 'ESSENSE: Driver’s seat vibration pad',
         memberList: 'Erich McMillan, Lindy Wong, Dean Ravida, Siyuan Gao, Joel Yun',
         teamImg: teams,
         projectDesc: 'ESSENCE is the new way to alert driver\'s of pedestrians who are preparing to cross the street at the intersection through vibrations.',
         link: 'https://joelyun.wixsite.com/teams',
-        link2: '/projects',
+        link2: '/entries/ESSENSE',
       },
       {
         teamName: 'M. I. A. -- My Instructional Assistant',
         memberList: 'Maggie Chan, Tony Chan, Jodi Lam, Christine Tran, Christopher Yan',
         teamImg: mia,
         projectDesc: 'An AI instructional assistant that helps reinforce good driving habits by reducing visual cognitive load though the aid of real-time audio feedback from car sensor technology.',
         link: 'https://docs.google.com/presentation/d/18qyh4fYF1w2llDMvokNLTqaY5xZAL_jgfhCgsVPwf18/edit',
-        link2: '/projects',
+        link2: '/entries/MIA',
       },
       {
         teamName: 'Spot: The Smart Parking App',
         memberList: 'Shelly Bae, Daniel Won, Kyle Rico, Tayte Duong, Kellie Higa',
         teamImg: spot,
         projectDesc: 'SPOT is an application that aims to make parking in congested areas easier and more efficient by allowing people to give their parking and its location directly to someone else.',
         link: 'http://spotsd.com/',
-        link2: '/projects',
+        link2: '/entries/Spot2',
       },
       {
         teamName: 'MTS - Track Your Bus: Closing the gap between MTS and its users',
         memberList: 'Arvin Dagoc, Vivian Trinh, Swarnakshi Kapil, Saul Mendez, Chengyang Yu',
         teamImg: mts,
         projectDesc: 'An application which rewards users for reporting MTS related problems.',
         link: 'https://citywalkers.wixsite.com/portfolio',
-        link2: '/projects',
+        link2: '/entries/MTS',
       },
       {
         teamName: 'SafeD',
         memberList: 'Steven Chen, Christopher Wong, Eric Liu, Bradley Day, Grace Chen',
         teamImg: safed,
         projectDesc: 'Our solution combines infrastructural changes and social awareness campaigns supplemented by an attachable device that enhances visibility for drivers. These combine to create better experiences for drivers while improving pedestrian safety.',
         link: 'https://safeducsd.wixsite.com/safed',
-        link2: '/projects',
+        link2: '/entries/SafeD',
       },
       {
         teamName: 'iCbus: Real-time Bus Capacity Forecasting System',
         memberList: 'Yuxuan Zhou, Yuanqi Wang, Yujie Wang',
         teamImg: icbus,
         projectDesc: 'iCBus is a multi-platform bus forecasting system. Based on existing drivers\' control system, it provides drivers a new interface to send out more valuable information, containing bus capacity and wheelchair availability, which will be synchronously transferred to users\' mobile application.',
         link: 'https://yuw281.wixsite.com/icbus',
-        link2: '/projects',
+        link2: '/entries/iCbus',
       },
     ],
   },

client/modules/Entries/components/FinalistsGroup/FinalistsGroup.jsx

@@ -34,12 +34,13 @@ const TEAMS = [
     header: 'Finalists',
     boxContent: [
       {
-        teamName: 'Cycle Detection',
+        teamName: 'CycleDetection',
         position: 1,
         memberList: 'Stephen Cerruti, D.J. Nelson, Savera Soin, James Maron',
         teamImg: cycleDetection,
         projectDesc: 'How can we make bicycles more visible to cars of the future? We think DSRC, the technology behind V2V communication, may be the answer.',
         link: '',
+        link2: '/entries/Cycle_Detection',
       },
       {
         teamName: 'AV onDemand: Remote Service Provider for Autonomous vehicles',
@@ -48,6 +49,7 @@ const TEAMS = [
         teamImg: remoteService,
         projectDesc: 'Hired specialists remotely maneuver AVs through areas of uncertain conditions allowing all riders to travel with no takeover responsibility.',
         link: 'http://joshduhay.herokuapp.com/av.html',
+        link2: '/entries/AV_onDemand',
       },
       {
         teamName: 'Spot: Your Guide to Safe and Walkable Cities',
@@ -56,41 +58,47 @@ const TEAMS = [
         teamImg: spot,
         projectDesc: 'Spot is an app that provides the blind and visually impaired with accessibility-focused walking directions, using data from GE streetlamps.',
         link: 'http://naterenzi.portfoliobox.net/spot',
+        link2: '/entries/Spot1',
       },
       {
         teamName: 'GATE Center: Immersive AV Learning Center',
         memberList: 'Garret Hoover, Selene Hoover, Jessica Yeung',
         teamImg: gate,
         projectDesc: 'An education center where the public directly engages with AVs, accesses learning resources, and provides feedback for stakeholder insights.',
         link: 'https://astrotransits.wixsite.com/gate1/about-1',
+        link2: '/entries/Gate_Center',
       },
       {
         teamName: 'Beach Access For All',
         memberList: 'Andrea Flagiello, Matt Abbondanzio, Tomas Robinson, Daniel Lenzen',
         teamImg: beachAccess,
         projectDesc: 'We wish to redefine the beach experience for those with limited mobility. Our solution is an automated, shared-use, mobility aid service designed for the beach environment.',
         link: '',
+        link2: '/entries/Beach_Access_For_All',
       },
       {
         teamName: 'Road Map',
         memberList: 'Anna Chen, Marie McNamara',
         teamImg: roadMap,
         projectDesc: 'An app focused on the iterative design process, bringing professionals and the public together to share designs, expertise, and feedback.',
         link: '',
+        link2: '/entries/Road_Map',
       },
       {
         teamName: 'San Diego Parking App',
         memberList: 'Tyler Reinecke, Thomas Twomey,  Jangwoo Lee, Adrian Derderian, Dave Dunn',
         teamImg: sdParking,
         projectDesc: 'An app that shows available parking within downtown San Diego.',
         link: '',
+        link2: '/entries/San_Diego_Parking_App',
       },
       {
         teamName: 'Audio Movement',
         memberList: 'Ting Wei Lin, Nathaniel Moreno, James Rich, Danfei  Sun, Diana Nguyen',
         teamImg: audioMovement,
         projectDesc: 'WiFi installation on all MTS vehicles, improving the experience of regular MTS commuters, through education and entertainment resources.',
         link: 'https://www.amwebportfolio.com/',
+        link2: '/entries/Audio_Movement',
       },
     ],
   },
@@ -113,7 +121,7 @@ function FinalistsGroup() {
       {TEAMS.map(({ header, boxContent }) => (
         <div key={header} className={styles.memberBox}>
           <h2 className={styles.theFinalists}>{header}</h2>
-          {boxContent.map(({ teamName, position, memberList, teamImg, projectDesc, link }) => (
+          {boxContent.map(({ teamName, position, memberList, teamImg, projectDesc, link, link2 }) => (
             <div
               key={teamName}
               className={styles.memberInlineWrapper}
@@ -135,6 +143,9 @@ function FinalistsGroup() {
                   </div>
                 </div>
               </div>
+              <div>
+                <a href={link2}><h4>External page for this project</h4></a>
+              </div>
             </div>
           ))}
         </div>