Skip to content

Commit 09b9326

Browse files
authored
Merge pull request #44 from development-ping/feat/ide
fix: 이미지 경로 변경
2 parents fb94292 + 51ee869 commit 09b9326

File tree

6 files changed

+17
-19
lines changed

6 files changed

+17
-19
lines changed

src/pages/IDEPage/Header/Header.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { IFile } from '../../../recoil/File/type';
77
import { confirmAlert } from 'react-confirm-alert';
88
import { useRecoilState } from 'recoil';
99
import FileState from '../../../recoil/File/atoms';
10+
import logo from '../../../../public/images/logo2.png';
1011

1112
const Header = () => {
1213
const navigate = useNavigate();
@@ -72,7 +73,7 @@ const Header = () => {
7273
return (
7374
<IdeTop>
7475
<IdeTop_Logo>
75-
<img src="/public/images/logo2.png" />
76+
<img src={logo} />
7677
<span>D P I D E</span>
7778
</IdeTop_Logo>
7879
<IdeTop_Close onClick={onCloseClickHandler}>

src/pages/Invite/Header/Header.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { IdeTop, IdeTop_Close, IdeTop_Logo } from './Header.style';
33
import { useNavigate } from 'react-router-dom';
44
import { useSetRecoilState } from 'recoil';
55
import ReceiveContent from '../../../recoil/ReceiveContent/atom';
6+
import logo from '../../../../public/images/logo2.png';
67

78
const Header = () => {
89
const navigate = useNavigate();
@@ -15,7 +16,7 @@ const Header = () => {
1516
return (
1617
<IdeTop>
1718
<IdeTop_Logo>
18-
<img src="/public/images/logo2.png" />
19+
<img src={logo} />
1920
<span>D P I D E</span>
2021
</IdeTop_Logo>
2122
<IdeTop_Close onClick={onCloseClickHandler}>

src/pages/LoginPage/InputBox/Input.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { useState } from 'react';
22
import { ErrorMessage, Inputbox, InputContent, InputWrapper } from './Input.style';
33
import { FieldError, UseFormRegister } from 'react-hook-form';
4+
import eyeOn from '../../../../public/images/eye-light-on.png';
5+
import eyeOff from '../../../../public/images/eye-light-off.png';
46

57
interface FormInput {
68
email: string;
@@ -53,12 +55,7 @@ const Input = ({ placeholder, name, register, errors }: Props) => {
5355
type={placeholder === '이메일' ? 'text' : passwordState ? 'text' : 'password'}
5456
{...register(name, { required: required, pattern: pattern })}
5557
/>
56-
{placeholder === '비밀번호' && (
57-
<img
58-
src={passwordState ? '/public/images/eye-light-on.png' : '/public/images/eye-light-off.png'}
59-
onClick={onEyeClickHandler}
60-
/>
61-
)}
58+
{placeholder === '비밀번호' && <img src={passwordState ? eyeOn : eyeOff} onClick={onEyeClickHandler} />}
6259
</Inputbox>
6360
{errors && <ErrorMessage>{renderErrorMessage()}</ErrorMessage>}
6461
</InputWrapper>

src/pages/LoginPage/Login.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import LoginRequest from '../../apis/Auth/Login/LoginRequest';
1818
import { useCookies } from 'react-cookie';
1919
import { AxiosResponse } from 'axios';
2020
import { useEffect, useState } from 'react';
21+
import logo from '../../../public/images/logo2.png';
2122

2223
interface FormInput {
2324
email: string;
@@ -78,7 +79,7 @@ const Login = () => {
7879
<LoginContainer>
7980
<LoginWrapper>
8081
<LoginLogo>
81-
<img src="/public/images/logo2.png" />
82+
<img src={logo} />
8283
<span>D P I D E</span>
8384
</LoginLogo>
8485
<LoginForm onSubmit={handleSubmit(onSubmit)}>

src/pages/SignUpPage/SignUp.tsx

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ import { useCookies } from 'react-cookie';
2020
import { toast } from 'react-toastify';
2121
import 'react-toastify/dist/ReactToastify.css';
2222
import { AxiosResponse } from 'axios';
23+
import eyeOn from '../../../public/images/eye-light-on.png';
24+
import eyeOff from '../../../public/images/eye-light-off.png';
25+
import logo from '../../../public/images/logo2.png';
2326

2427
interface FormIF {
2528
email: string;
@@ -84,7 +87,7 @@ const SignUp = () => {
8487
<SignUpContainer>
8588
<SignUpWrapper>
8689
<SignUp_logo>
87-
<img src="/public/images/logo2.png" />
90+
<img src={logo} />
8891
<span>D P I D E</span>
8992
</SignUp_logo>
9093

@@ -108,10 +111,7 @@ const SignUp = () => {
108111
type={pwState ? 'text' : 'password'}
109112
{...register('password', { required: true, pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/ })}
110113
/>
111-
<img
112-
src={pwState ? '/public/images/eye-light-on.png' : '/public/images/eye-light-off.png'}
113-
onClick={onPasswordHandler}
114-
/>
114+
<img src={pwState ? eyeOn : eyeOff} onClick={onPasswordHandler} />
115115
</SignUp_InputBox>
116116
{errors.password && errors.password?.type === 'required' && (
117117
<ErrorMessage>비밀번호를 입력해주세요.</ErrorMessage>
@@ -129,10 +129,7 @@ const SignUp = () => {
129129
required: true,
130130
})}
131131
/>
132-
<img
133-
src={pwConfirmState ? '/public/images/eye-light-on.png' : '/public/images/eye-light-off.png'}
134-
onClick={onPasswordConfirmHandler}
135-
/>
132+
<img src={pwConfirmState ? eyeOn : eyeOff} onClick={onPasswordConfirmHandler} />
136133
</SignUp_InputBox>
137134
{errors.passwordConfirm && errors.passwordConfirm?.type === 'required' && (
138135
<ErrorMessage>비밀번호 확인을 입력해주세요.</ErrorMessage>

src/pages/StartPage/StartPage.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
import StartHeader from '../../components/Header/StartHeader';
1515
import { useEffect } from 'react';
1616
import { useCookies } from 'react-cookie';
17+
import startPage from '../../../public/images/startPage.png';
1718

1819
const StartPage = () => {
1920
const navigate = useNavigate();
@@ -40,7 +41,7 @@ const StartPage = () => {
4041
</StartWrapper_Bottom_Buttons>
4142
</Start>
4243
<StartWraper_Bottom_Image>
43-
<img src="/public/images/startPage.png" />
44+
<img src={startPage} />
4445
</StartWraper_Bottom_Image>
4546
</StartWrapper_Bottom>
4647
</StartContainer>

0 commit comments

Comments
 (0)