[se701team3#220] - Combine first_name and last_name into name field

abis555 · Apr 3, 2022 · 21c13d9 · 21c13d9
1 parent 77e3fd7
commit 21c13d9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/forgettable-frontend/src/components/UpcomingBirthdaySummary/UpcomingBirthdaySummary.js b/forgettable-frontend/src/components/UpcomingBirthdaySummary/UpcomingBirthdaySummary.js
@@ -23,11 +23,7 @@ const UpcomingBirthdaySummary = (props) => {
       <div className={classes.ContentContainer}>
         <div className={classes.HeaderContainer}>
           <Avatar
-<<<<<<< HEAD
             alt={props.name}
-=======
-            alt={props.firstName}
->>>>>>> 032f914974408b1a7dd5cb7910b4e231deabc3c5
             src={getImageSrcFromBuffer(props.img)}
             sx={{
               height: '70px',
@@ -41,11 +37,7 @@ const UpcomingBirthdaySummary = (props) => {
             }}
           />
           <div className={classes.IdentityInfoConatiner}>
-<<<<<<< HEAD
             <h3 data-testid="name-element">{props.name}</h3>
-=======
-            <h3 data-testid="name-element">{props.firstName}</h3>
->>>>>>> 032f914974408b1a7dd5cb7910b4e231deabc3c5
           </div>
         </div>
         <div className={classes.DetailsContainer}>
@@ -65,11 +57,7 @@ const UpcomingBirthdaySummary = (props) => {
 
 UpcomingBirthdaySummary.propTypes = {
   id: PropTypes.string,
-<<<<<<< HEAD
   name: PropTypes.string.isRequired,
-=======
-  firstName: PropTypes.string.isRequired,
->>>>>>> 032f914974408b1a7dd5cb7910b4e231deabc3c5
   img: PropTypes.string,
   birthday: PropTypes.instanceOf(Date),
   onClick: PropTypes.func.isRequired,

diff --git a/forgettable-frontend/src/pages/home/Home.js b/forgettable-frontend/src/pages/home/Home.js
@@ -253,11 +253,7 @@ function Home() {
                 <div key={index + 'e'} className={classes.home_cardWrapper} onMouseOver={(event) => handlePersonHover(event, index)} onMouseOut={handleOnMouseOut}>
                   <Link to={`/person/${birthdayPerson._id}`} style={{textDecoration: 'none'}}>
                     <UpcomingBirthdaySummary
-<<<<<<< HEAD
                       firstName={birthdayPerson.name}
-=======
-                      firstName={birthdayPerson.first_name}
->>>>>>> 032f914974408b1a7dd5cb7910b4e231deabc3c5
                       birthday={birthdayPerson.birthday}
                       img={birthdayPerson.image}
                       onClick={() => { }}