Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix/BAR-234] 배포 오류 수정 및 헤더 추가 #62

Merged
merged 5 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/api/http.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ const instance = axios.create({
baseURL: process.env.NEXT_PUBLIC_SERVER_URL,
headers: {
'content-type': 'application/json',
'Access-Control-Allow-Origin': '*',
'Access-Control-Allow-Credentials': true,
},
});

Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
12 changes: 6 additions & 6 deletions src/constants/icon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ import Complete from '@assets/icons/complete.svg';
import Copy from '@assets/icons/copy.svg';
import Error from '@assets/icons/error.svg';
import Google from '@assets/icons/google.svg';
import Google2 from '@assets/icons/google2.svg';
import GoogleProfile from '@assets/icons/googleProfile.svg';
import Instagram from '@assets/icons/instagram.svg';
import Kakao from '@assets/icons/kakao.svg';
import Kakao2 from '@assets/icons/kakao2.svg';
import KakaoProfile from '@assets/icons/kakaoProfile.svg';
import Logo32 from '@assets/icons/logo32.svg';
import Logout from '@assets/icons/logout.svg';
import Menu from '@assets/icons/menu.svg';
import Naver from '@assets/icons/naver.svg';
import Naver2 from '@assets/icons/naver2.svg';
import NaverProfile from '@assets/icons/naverProfile.svg';
import PencilActive from '@assets/icons/pencil-active.svg';
import PencilDefault from '@assets/icons/pencil-default.svg';
import Picture from '@assets/icons/picture.svg';
Expand Down Expand Up @@ -63,15 +63,15 @@ export const iconFactory = {
checkBoxActive: CheckBoxActive,
error: Error,
google: Google,
google2: Google2,
googleProfile: GoogleProfile,
instagram: Instagram,
kakao: Kakao,
kakao2: Kakao2,
kakaoProfile: KakaoProfile,
logo32: Logo32,
logout: Logout,
menu: Menu,
naver: Naver,
naver2: Naver2,
naverProfile: NaverProfile,
pencilActive: PencilActive,
pencilDefault: PencilDefault,
profile: Profle,
Expand Down
6 changes: 3 additions & 3 deletions src/domain/계정설정/components/Form/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ const ProfileForm = ({ name, nickname, authType, email }: ProfileFormProps) => {
const authTypeIcon = useMemo(() => {
switch (authType) {
case 'kakao':
return <Icon icon="kakao2" width={32} height={32} />;
return <Icon icon="kakaoProfile" width={32} height={32} />;
case 'naver':
return <Icon icon="naver2" width={32} height={32} />;
return <Icon icon="naverProfile" width={32} height={32} />;
case 'google':
return <Icon icon="google2" width={32} height={32} />;
return <Icon icon="googleProfile" width={32} height={32} />;
default:
return null;
}
Expand Down
1 change: 0 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"~types/*": ["./types/*"],
"@api/*": ["./src/api/*"],
"@assets/*": ["./src/assets/*"],
"@api/*": ["./src/api/*"],
"@components/*": ["./src/components/*"],
"@constants/*": ["./src/constants/*"],
"@domain/*": ["./src/domain/*"],
Expand Down
Loading