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 minor typos #176

Merged
merged 3 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 2 additions & 2 deletions src/assets/CancleFileUpload.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const CancleFileUpload = () => (
const CancelFileUpload = () => (
<svg
xmlns='http://www.w3.org/2000/svg'
width='1.5rem'
Expand All @@ -13,4 +13,4 @@ const CancleFileUpload = () => (
</svg>
);

export default CancleFileUpload;
export default CancelFileUpload;
2 changes: 1 addition & 1 deletion src/assets/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export { default as BlueCheckIcon } from './BlueCheckIcon';
export { default as CancleFileUpload } from './CancleFileUpload';
export { default as CancelFileUpload } from './CancelFileUpload';
export { default as ChatListShiftIcon } from './ChatListShiftIcon';
export { default as CheckBoxIcon } from './CheckBoxIcon';
export { default as CheckedIcon } from './CheckedIcon';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Map/CustomOverlay/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const CustomOverlay: React.FC<CustomOverlayProps> = ({
</div>
</S.Topbox>
<S.Middlebox>
<S.Positon>{position}</S.Positon>
<S.Position>{position}</S.Position>
<S.Company>{company}</S.Company>
</S.Middlebox>
<S.Bottombox>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Map/CustomOverlay/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const Topbox = styled.div`
export const LocationBtn = styled.div``;
export const Name = styled.div``;
export const Company = styled.div``;
export const Positon = styled.div``;
export const Position = styled.div``;
export const Icons = styled.div``;
export const Location = styled.div``;

Expand Down
8 changes: 4 additions & 4 deletions src/components/Modal/FileUpload/FileUploadModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { toast } from 'react-toastify';

import * as S from './style';

import { FileRegisterIcon, CancleFileUpload } from '@/assets';
import { FileRegisterIcon, CancelFileUpload } from '@/assets';
import { FileUploadModalWrapper } from '@/components';

interface Props {
Expand Down Expand Up @@ -38,9 +38,9 @@ const FileUpload: React.FC<Props> = ({ closeModal, setFiles }) => {
<S.FileUploadInfo>
<S.TitleContainer>
<S.Title>파일 추가</S.Title>
<S.CancleUploadContainer onClick={closeModal}>
<CancleFileUpload />
</S.CancleUploadContainer>
<S.CancelUploadContainer onClick={closeModal}>
<CancelFileUpload />
</S.CancelUploadContainer>
</S.TitleContainer>
<S.SmallTitle>20MB 이하의 파일</S.SmallTitle>
</S.FileUploadInfo>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modal/FileUpload/FileUploadModal/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const SmallTitle = styled.p`
color: ${({ theme }) => theme.color.grey[400]};
`;

export const CancleUploadContainer = styled.div`
export const CancelUploadContainer = styled.div`
cursor: pointer;
`;

Expand Down
6 changes: 3 additions & 3 deletions src/components/Modal/MyPage/ProfileImgChange/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ const ProfileImgChange = ({ imgUrl, closeModal }: Props) => {
};

const dataURLtoFile = (dataUrl: string, filename: string) => {
const splitedUrl = dataUrl.split(',');
const mime = splitedUrl?.[0].match(/:(.*?);/)?.[1];
const byteString = atob(splitedUrl[1]);
const splittedUrl = dataUrl.split(',');
const mime = splittedUrl?.[0].match(/:(.*?);/)?.[1];
const byteString = atob(splittedUrl[1]);
let n = byteString.length;
const uint8Array = new Uint8Array(n);
while (n--) {
Expand Down
8 changes: 4 additions & 4 deletions src/components/SelectFile/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { Dispatch, SetStateAction } from 'react';

import * as S from './style';

import { CancleFileUpload, FileUploadIcon } from '@/assets';
import { CancelFileUpload, FileUploadIcon } from '@/assets';

interface Props {
file: File;
Expand All @@ -18,11 +18,11 @@ const SelectFile: React.FC<Props> = ({ file, setFiles, index }) => (
<FileUploadIcon />
<S.Text>{file.name}</S.Text>
</S.FileNameContainer>
<S.CancleUploadContainer
<S.CancelUploadContainer
onClick={() => setFiles((prev) => prev.filter((_, i) => i !== index))}
>
<CancleFileUpload />
</S.CancleUploadContainer>
<CancelFileUpload />
</S.CancelUploadContainer>
</S.Container>
);

Expand Down
2 changes: 1 addition & 1 deletion src/components/SelectFile/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ export const Text = styled.p`
color: ${({ theme }) => theme.color.grey[400]};
`;

export const CancleUploadContainer = styled.div`
export const CancelUploadContainer = styled.div`
cursor: pointer;
`;
4 changes: 2 additions & 2 deletions src/pageContainer/chat/list/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
// return (
// <>
// <Header />
// <S.Conatiner>
// <S.Container>
// <S.Text>채팅 목록</S.Text>
// {chatList?.map((i) => <ChattingListCard key={i.opponentUserId} />)}
// <button onClick={() => sendMessage('test')}>테스트</button>
// </S.Conatiner>
// </S.Container>
// </>
// );
// };
Expand Down
2 changes: 1 addition & 1 deletion src/pageContainer/chat/list/style.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// import styled from '@emotion/styled';

// export const Conatiner = styled.div`
// export const Container = styled.div`
// padding-top: 4.375rem;
// height: 100vh;
// `;
Expand Down