diff --git a/src/assets/images/ic_google_logo.png b/src/assets/images/ic_google_logo.png new file mode 100644 index 00000000..07ad6420 Binary files /dev/null and b/src/assets/images/ic_google_logo.png differ diff --git a/src/assets/images/img_empty.png b/src/assets/images/img_empty.png new file mode 100644 index 00000000..ade68e28 Binary files /dev/null and b/src/assets/images/img_empty.png differ diff --git a/src/assets/images/img_onboardingHB.png b/src/assets/images/img_onboardingHB.png new file mode 100644 index 00000000..e02701bc Binary files /dev/null and b/src/assets/images/img_onboardingHB.png differ diff --git a/src/assets/images/img_onboardingSB.png b/src/assets/images/img_onboardingSB.png new file mode 100644 index 00000000..9d5d51e2 Binary files /dev/null and b/src/assets/images/img_onboardingSB.png differ diff --git a/src/assets/images/img_senior_refresh.png b/src/assets/images/img_senior_refresh.png new file mode 100644 index 00000000..8f347b46 Binary files /dev/null and b/src/assets/images/img_senior_refresh.png differ diff --git a/src/assets/svgs/TempLogo.svg b/src/assets/svgs/TempLogo.svg deleted file mode 100644 index 4f5fcc71..00000000 --- a/src/assets/svgs/TempLogo.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svgs/googleLogoIc.svg b/src/assets/svgs/googleLogoIc.svg deleted file mode 100644 index 74b4cc28..00000000 --- a/src/assets/svgs/googleLogoIc.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/assets/svgs/img_empty.svg b/src/assets/svgs/img_empty.svg deleted file mode 100644 index f2f23f96..00000000 --- a/src/assets/svgs/img_empty.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/svgs/img_onboarding_hb.svg b/src/assets/svgs/img_onboarding_hb.svg deleted file mode 100644 index b943ab09..00000000 --- a/src/assets/svgs/img_onboarding_hb.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/svgs/img_onboarding_sb.svg b/src/assets/svgs/img_onboarding_sb.svg deleted file mode 100644 index e6499dc0..00000000 --- a/src/assets/svgs/img_onboarding_sb.svg +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/svgs/img_refresh.svg b/src/assets/svgs/img_refresh.svg deleted file mode 100644 index e59dc2e6..00000000 --- a/src/assets/svgs/img_refresh.svg +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/svgs/img_senior_refresh.svg b/src/assets/svgs/img_senior_refresh.svg deleted file mode 100644 index 531b6712..00000000 --- a/src/assets/svgs/img_senior_refresh.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/svgs/index.tsx b/src/assets/svgs/index.tsx index 0addb48c..077e2793 100644 --- a/src/assets/svgs/index.tsx +++ b/src/assets/svgs/index.tsx @@ -33,26 +33,26 @@ export { default as ImgSbdetail2Ic } from './img_sbdetail_2.svg?react'; export { default as ArrowRightIc } from './ic_arrow_right.svg?react'; export { default as DeleteIc } from './ic_delete_btn.svg?react'; export { default as PlusIc } from './ic_plus_btn.svg?react'; -export { default as GoogleLogoIc } from './googleLogoIc.svg?react'; +// export { default as GoogleLogoIc } from './googleLogoIc.svg?react'; export { default as DropdownIc } from './ic_dropdown.svg?react'; // export { default as CareerFlagIc } from './ic_career_flag.svg?react'; // export { default as AwardMedalIc } from './ic_award_medal.svg?react'; export { default as BottomSheetRectangleIc } from './bottom-sheet-Rectangle.svg?react'; export { default as ArrowDownMgIc } from './ic_arrow_down_mg.svg?react'; -export { default as EmptyImg } from './img_empty.svg?react'; +// export { default as EmptyImg } from './img_empty.svg?react'; export { default as SbhbHomeProfile1Img } from './img_sbhbhome_profile1.svg?react'; export { default as SbhbHomeProfile2Img } from './img_sbhbhome_profile2.svg?react'; // export { default as WarningImg } from './img_warning.svg?react'; -export { default as SeniorRefreshImgIc } from './img_senior_refresh.svg?react'; +// export { default as SeniorRefreshImgIc } from './img_senior_refresh.svg?react'; // export { default as ProfileCompleteIc } from './img_profile_complete.svg?react'; export { default as BigMainLogoIc } from './ic_big_main_logo.svg?react'; -export { default as OnboardingBackgroundSBIc } from './img_onboarding_sb.svg?react'; -export { default as OnboardingBackgroundHBIc } from './img_onboarding_hb.svg?react'; +// export { default as OnboardingBackgroundSBIc } from './img_onboarding_sb.svg?react'; +// export { default as OnboardingBackgroundHBIc } from './img_onboarding_hb.svg?react'; // export { default as ImgPromiseCompleteIc } from './img_promise_complete.svg?react'; // export { default as ModalAcceptImg } from './img_modal_accept.svg?react'; // export { default as ModalRejectImg } from './img_modal_reject.svg?react'; export { default as ComingSoonModalImg } from './comingSoonModalImg.svg?react'; -export { default as GhostImg } from './img_ghost.svg?react'; +// export { default as GhostImg } from './img_ghost.svg?react'; // export { default as HbHomeMainSvg } from './img_hbhome_main.svg?react'; // 가입 페이지 배경 diff --git a/src/pages/login/SignupPage.tsx b/src/pages/login/SignupPage.tsx index 75657816..e154b74d 100644 --- a/src/pages/login/SignupPage.tsx +++ b/src/pages/login/SignupPage.tsx @@ -1,4 +1,6 @@ -import { GoogleLogoIc, OnboardingBackgroundHBIc, OnboardingBackgroundSBIc } from '@assets/svgs'; +import ic_google_logo from '@assets/images/ic_google_logo.png'; +import img_onboardingHB from '@assets/images/img_onboardingHB.png'; +import img_onboardingSB from '@assets/images/img_onboardingSB.png'; import styled from '@emotion/styled'; import theme from '@styles/theme'; import { useLocation } from 'react-router-dom'; @@ -33,9 +35,9 @@ const SignupPage = () => { )} - {role === 'SENIOR' ? : } + {role === 'SENIOR' ? : } googleLogin(role)}> - + 구글로 시작하기 @@ -118,7 +120,7 @@ const Text = styled.p` text-align: center; `; -const GoogleLogoIcon = styled(GoogleLogoIc)` +const GoogleLogoImg = styled.img` position: absolute; left: 1rem; @@ -126,3 +128,13 @@ const GoogleLogoIcon = styled(GoogleLogoIc)` height: 33px; margin: 10px; `; + +const OnboardingHBImg = styled.img` + width: 26.2rem; + height: 32.8rem; +`; + +const OnboardingSBImg = styled.img` + width: 27.5rem; + height: 35.3rem; +`; diff --git a/src/pages/promiseList/components/RecentCard.tsx b/src/pages/promiseList/components/RecentCard.tsx index de275f35..9b4943e2 100644 --- a/src/pages/promiseList/components/RecentCard.tsx +++ b/src/pages/promiseList/components/RecentCard.tsx @@ -1,4 +1,4 @@ -import { EmptyImg } from '@assets/svgs'; +import img_empty from '@assets/images/img_empty.png'; import styled from '@emotion/styled'; import useCountdown from '@hooks/useCountDown'; import ProfileChip from './ProfileChip'; @@ -68,7 +68,7 @@ const RecentCard = (props: RecentCardPropType) => { /> ) : ( - + )} ); @@ -109,6 +109,6 @@ const DashedDivider = styled.div` border-bottom: 1px dashed ${({ theme }) => theme.colors.grayScaleLG1}; `; -const EmptyImage = styled(EmptyImg)` +const EmptyImg = styled.img` width: 100%; `; diff --git a/src/pages/seniorProfile/components/Init.tsx b/src/pages/seniorProfile/components/Init.tsx index 0d8371e6..8907dd0e 100644 --- a/src/pages/seniorProfile/components/Init.tsx +++ b/src/pages/seniorProfile/components/Init.tsx @@ -1,4 +1,5 @@ -import { HeaderLogoIc, SeniorRefreshImgIc } from '@assets/svgs'; +import { HeaderLogoIc } from '@assets/svgs'; +import img_senior_refresh from '@assets/images/img_senior_refresh.png'; import { FullBtn } from '@components/commons/FullButton'; import { Header } from '@components/commons/Header'; import styled from '@emotion/styled'; @@ -12,7 +13,7 @@ const Init = ({ setStep }: { setStep: React.Dispatch - + 좋아요! 이제 후배들이 선배님을 알 수 있도록 @@ -38,7 +39,8 @@ const InitWrapper = styled.div` min-height: calc(var(--vh, 1vh) * 100 - 44px); padding: 11vh 6.15rem; `; -const SeniorRefreshImgIcon = styled(SeniorRefreshImgIc)` + +const SeniorRefreshImg = styled.img` position: absolute; top: 30vh; left: 14vh;