Merge pull request #77 from APPS-sookmyung/dev

Merge: dev to main

Author: misung-dev

src/assets/icons/index.js

@@ -0,0 +1,8 @@
+export { default as nav_home } from './nav_home.svg';
+export { default as nav_home_active } from './nav_home_active.svg';
+export { default as nav_add_card } from './nav_add_card.svg';
+export { default as nav_add_card_active } from './nav_add_card_active.svg';
+export { default as nav_view_card } from './nav_view_card.svg';
+export { default as nav_view_card_active } from './nav_view_card_active.svg';
+export { default as nav_mypage } from './nav_mypage.svg';
+export { default as nav_mypage_active } from './nav_mypage_active.svg';

src/assets/icons/nav_add_card.svg

@@ -6,6 +6,7 @@ import { Link } from 'react-router-dom';
 
 export default function CardInfo({
   name,
+  team,
   job,
   company,
   imageUrl,
@@ -30,7 +31,7 @@ export default function CardInfo({
         <S.Info>
           <S.Name isSelected={isSelected}>{name}</S.Name>
           <S.Job isSelected={isSelected}>
-            {job}, {company}
+            {job} / {team}, {company}
           </S.Job>
         </S.Info>
       </S.CardWrapper>