Skip to content

Commit

Permalink
[fix/#53] svgConvention 맞추기
Browse files Browse the repository at this point in the history
[fix/#53] svgConvention 맞추기
  • Loading branch information
moondda authored Jan 11, 2024
2 parents 499e1c3 + caeaf8d commit 5e3f378
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 21 deletions.
11 changes: 5 additions & 6 deletions src/assets/svgs/index.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
export { default as GroupListProfileOpenIcn } from './groupListProfileIcnOpen.svg?react';
export { default as GroupTabBtnBaseBeforeIcn } from './groupTabBtnBaseBefore.svg?react';
export { default as GroupTabBtnBaseNextIcn } from './groupTabBtnBaseNext.svg?react';

export { default as GroupTabBtnBaseBeforeIc } from './groupTabBtnBaseBefore.svg?react';
export { default as GroupTabBtnBaseNextIc } from './groupTabBtnBaseNext.svg?react';

export { default as FooterInstaIc } from './footerInstaSvg.svg?react';
export { default as FooterKakaoIc } from './footerKakaoSvg.svg?react';
export { default as FooterMailIc } from './footerMailSvg.svg?react';
export { default as FooterLogoIc } from './footerLogoSvg.svg?react';

export { default as GroupDateIc } from './groupDateIcn.svg?react';
export { default as GroupLeaderIc } from './groupLeaderIcn.svg?react';
export { default as GroupMemberIc } from './groupMemberIcn.svg?react';
export { default as GroupCuriousProfileOpenIc } from './groupBestProfileIcnOpen.svg?react';
export { default as GroupListProfileOpenIc } from './groupListProfileIcnOpen.svg?react';

export { default as HeaderLogoSvg } from './headerLogoSvg.svg?react';
export { default as HeaderLogoIc } from './headerLogoSvg.svg?react';

export { default as MakeGroupPlusBtn } from './mainMakeGroupBtnEnable.svg?react';
export { default as MakeGroupPlusHoverBtn } from './mainMakeGroupBtnHover.svg?react';
2 changes: 0 additions & 2 deletions src/components/commons/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import styled from '@emotion/styled';

import Spacing from './Spacing';

import { FooterInstaIc, FooterKakaoIc, FooterLogoIc, FooterMailIc } from '../../assets/svgs';

import theme from '../../styles/theme';

const Footer = () => {
Expand Down
10 changes: 5 additions & 5 deletions src/components/commons/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import styled from '@emotion/styled';

import Button from './Button';
import LogInOutBtn from './LogInOutBtn';
import { HeaderLogoSvg } from '../../assets/svgs';
import { HeaderLogoIc } from '../../assets/svgs';
import MakeGroupBtn from '../../pages/groupFeed/MakeGroupBtn';
import MyGroupBtn from '../../pages/groupFeed/MyGroupBtn';
import theme from '../../styles/theme';
Expand All @@ -20,7 +20,7 @@ interface OnClickTwoProps {
export const GroupFeedHeader = ({ onClick }: OnClickProps) => {
return (
<HeaderWrapper>
<HeaderLogoSvg />
<HeaderLogoIc />
<HeaderBtnLayout>
<MyGroupBtn />
<CommonBtnLayout>
Expand All @@ -36,7 +36,7 @@ export const GroupFeedHeader = ({ onClick }: OnClickProps) => {
export const LogOutHeader = ({ onClick }: OnClickProps) => {
return (
<HeaderWrapper>
<HeaderLogoSvg />
<HeaderLogoIc />
<LogInOutBtn onClick={onClick}>로그인</LogInOutBtn>
</HeaderWrapper>
);
Expand All @@ -46,7 +46,7 @@ export const LogOutHeader = ({ onClick }: OnClickProps) => {
export const EditorHeader = ({ onClick }: OnClickProps) => {
return (
<HeaderWrapper>
<HeaderLogoSvg />
<HeaderLogoIc />
<Button typeName="submitEditType" onClick={onClick}>
수정 완료하기
</Button>
Expand All @@ -58,7 +58,7 @@ export const EditorHeader = ({ onClick }: OnClickProps) => {
export const EditorHeaderTemp = ({ onClickTempSave, onClickSubmit }: OnClickTwoProps) => {
return (
<HeaderWrapper>
<HeaderLogoSvg />
<HeaderLogoIc />
<CommonBtnLayout>
<Button typeName="deleteTempType" onClick={onClickTempSave}>
임시저장
Expand Down
2 changes: 1 addition & 1 deletion src/pages/groupFeed/GroupTodayWriteStyle.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from '@emotion/styled';

import Button from '../../components/common/Button';
import Button from '../../components/commons/Button';

const GroupTodayWriteStyle = () => {
const onHandleSubmit = () => {
Expand Down
10 changes: 5 additions & 5 deletions src/pages/groupFeed/carousel/Carousel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Slider from 'react-slick';
import './slick-theme.css';
import './slick.css';
import CarouselContainer from './CarouselContainer';
import { GroupTabBtnBaseBeforeIcn, GroupTabBtnBaseNextIcn } from '../../../assets/svgs';
import { GroupTabBtnBaseBeforeIc, GroupTabBtnBaseNextIc } from '../../../assets/svgs';
import BeforeBtn from '../../../assets/svgs/groupTabBeforeBtnEnable.svg';
import BeforeBtnHover from '../../../assets/svgs/groupTabBeforeBtnHover.svg';
import NextBtn from '../../../assets/svgs/groupTabNextBtnEnable.svg';
Expand Down Expand Up @@ -41,7 +41,7 @@ const Carousel = (props: CategoryIdPropTypes) => {

return (
<CarouselWrapper>
<GroupTabBtnBaseBeforeIc />
<GroupTabBtnBaseBeforeIcon />
<Slider {...settings}>
{CAROUSEL_CATEGORY.categoryList.map((category) => (
<CarouselContainer
Expand All @@ -53,7 +53,7 @@ const Carousel = (props: CategoryIdPropTypes) => {
</CarouselContainer>
))}
</Slider>
<GroupTabBtnBaseNextIc />
<GroupTabBtnBaseNextIcon />
</CarouselWrapper>
);
};
Expand Down Expand Up @@ -94,15 +94,15 @@ const Prev = styled.div`
}
`;

const GroupTabBtnBaseBeforeIc = styled(GroupTabBtnBaseBeforeIcn)`
const GroupTabBtnBaseBeforeIcon = styled(GroupTabBtnBaseBeforeIc)`
position: absolute;
top: 0;
z-index: 1;
pointer-events: none;
`;

const GroupTabBtnBaseNextIc = styled(GroupTabBtnBaseNextIcn)`
const GroupTabBtnBaseNextIcon = styled(GroupTabBtnBaseNextIc)`
position: absolute;
top: 0;
right: 0;
Expand Down
4 changes: 2 additions & 2 deletions src/pages/groupFeed/carousel/EachArticle.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from '@emotion/styled';

import { GroupListProfileOpenIcn } from '../../../assets/svgs';
import { GroupListProfileOpenIc } from '../../../assets/svgs';
import Spacing from '../../../components/commons/Spacing';

const EachArticle = () => {
Expand All @@ -16,7 +16,7 @@ const EachArticle = () => {
</ArticleContent>
<Spacing marginBottom="1.2" />
<ArticleInfo>
<GroupListProfileOpenIcn />
<GroupListProfileOpenIc />
<ProfileName>프로필명</ProfileName>
<ArticleDetail>23.12.29 11:11</ArticleDetail>
<ArticleDetail>·</ArticleDetail>
Expand Down

0 comments on commit 5e3f378

Please sign in to comment.