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

asset의 폴더 구조를 정리하고 파일 이름을 수정한다. #142

Merged
merged 4 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
4 changes: 2 additions & 2 deletions frontend/src/Router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { createBrowserRouter } from 'react-router-dom';
import { ROUTE_PATH } from '@/constants/routePath';
import CategoryChoosePage from '@/pages/CategoryChoosePage';
import ChecklistListPage from '@/pages/ChecklistListPage';
import ChecklistPreviewPage from '@/pages/ChecklistSummaryPage';
import ChecklistSummaryPage from '@/pages/ChecklistSummaryPage';
import NewChecklistPage from '@/pages/NewChecklistPage/NewChecklistPage';
import NotFound from '@/pages/NotFound';
import RoomComparePage from '@/pages/RoomComparePage';
Expand All @@ -18,7 +18,7 @@ const router = createBrowserRouter([
path: ROUTE_PATH.checklistList,
},
{
element: <ChecklistPreviewPage />,
element: <ChecklistSummaryPage />,
path: '/checklists/:id',
},
{
Expand Down
45 changes: 23 additions & 22 deletions frontend/src/assets/assets.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
/* Arrow */
import ArrowBack from '@/assets/arrow-back.svg';
import InputRequiredDot from '@/assets/input-required-dot.svg';
import ArrowBack from '@/assets/icons/arrow/arrow-back.svg';
import ArrowDownSmall from '@/assets/icons/arrow/arrow-down-small.svg';
import ArrowRightGreen from '@/assets/icons/arrow/arrow-right-green.svg';
import ArrowRightYellow from '@/assets/icons/arrow/arrow-right-yellow.svg';
import ArrowUpSmall from '@/assets/icons/arrow/arrow-up-small.svg';

/* face icon */
import ArrowDownSmall from '@/assets/arrow-down-small.svg';
import ArrowRightGreen from '@/assets/arrow-right-green.svg';
import ArrowUpSmall from '@/assets/arrow-up-small.svg';
import XIcon from '@/assets/delete.svg';
import ArrowRightYellow from '@/assets/icons/arrow-right-yellow.svg';
/*common-icons */
import CheckIcon from '@/assets/icons/check.svg';
import CloseIcon from '@/assets/icons/close.svg';
import XIcon from '@/assets/icons/delete.svg';
import LocationLineIcon from '@/assets/icons/location-lined.svg';
import Plus from '@/assets/icons/plus.svg';

/* face icon */
import FaceIconBadGray from '@/assets/face-icon/face-icon-bad-gray.svg';
Expand All @@ -16,25 +19,23 @@ import FaceIconGoodGray from '@/assets/face-icon/face-icon-good-gray.svg';
import FaceIconGood from '@/assets/face-icon/face-icon-good.svg';
import FaceIconSosoGray from '@/assets/face-icon/face-icon-soso-gray.svg';
import FaceIconSoso from '@/assets/face-icon/face-icon-soso.svg';
import Plus from '@/assets/plus.svg';

/* logos */
import ChecklistLogoActive from '@/assets/logos/checklist-logo-active.svg';
import ChecklistLogo from '@/assets/logos/checklist-logo.svg';
import HomeLogoActive from '@/assets/logos/home-logo-active.svg';
import HomeLogo from '@/assets/logos/home-logo.svg';
import LocationLogoActive from '@/assets/logos/location-logo-active.svg';
import LocationLogo from '@/assets/logos/location-logo.svg';
import MyPageLogoActive from '@/assets/logos/my-page-logo-active.svg';
import MyPageLogo from '@/assets/logos/my-page-logo.svg';
/*common-icons */
import CheckIcon from '@/assets/check.svg';
import ChecklistLogoActive from '@/assets/icons/footer-icon/checklist-logo-active.svg';
import ChecklistLogo from '@/assets/icons/footer-icon/checklist-logo.svg';
import HomeLogoActive from '@/assets/icons/footer-icon/home-logo-active.svg';
import HomeLogo from '@/assets/icons/footer-icon/home-logo.svg';
import LocationLogoActive from '@/assets/icons/footer-icon/location-logo-active.svg';
import LocationLogo from '@/assets/icons/footer-icon/location-logo.svg';
import MyPageLogoActive from '@/assets/icons/footer-icon/my-page-logo-active.svg';
import MyPageLogo from '@/assets/icons/footer-icon/my-page-logo.svg';

/* etc */
import BangBangIcon from '@/assets/icons/bang-bang-icon.svg';
import CloseIcon from '@/assets/icons/close.svg';
import InputRequiredDot from '@/assets/icons/input-required-dot.svg';
import LampIcon from '@/assets/icons/lamp-icon.svg';
import LocationLineIcon from '@/assets/icons/location-lined.svg';
import QuestionDot from '@/assets/question-dot.svg';
import QuestionDot from '@/assets/icons/question-dot.svg';

export {
ArrowBack,
ArrowDownSmall,
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
3 changes: 1 addition & 2 deletions frontend/src/components/common/Accordion/AccordionBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ const Container = styled.div<{ isOpen: boolean }>`
overflow: hidden;

height: ${({ isOpen }) => (isOpen ? 'auto' : '0')};

/* margin-top: ${({ isOpen }) => (isOpen ? '10px' : '0')}; */
margin-top: ${({ isOpen }) => (isOpen ? '10px' : '0')};

background-color: ${({ theme }) => theme.palette.white};
transition: max-height 0.3s cubic-bezier(0.15, 0.1, 0.25, 1);
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/pages/ChecklistSummaryPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export interface addAnswerProps {
newAnswer: number;
}

const ChecklistPreviewPage = () => {
const ChecklistSummaryPage = () => {
// TODO: Param 으로 변경해보기
const location = useLocation();
const checklistId = location.state?.id;
Expand All @@ -38,12 +38,12 @@ const ChecklistPreviewPage = () => {
<S.Wrapper>
<Accordion>
{checklist?.categories?.map(category => (
<>
<div key={category.categoryId}>
<Accordion.header text={category.categoryName} id={category.categoryId} />
<Accordion.body id={category.categoryId}>
<ChecklistCategory type="preview" key={category.categoryId} category={category} />
</Accordion.body>
</>
</div>
))}
</Accordion>
</S.Wrapper>
Expand All @@ -52,7 +52,7 @@ const ChecklistPreviewPage = () => {
);
};

export default ChecklistPreviewPage;
export default ChecklistSummaryPage;

const S = {
Wrapper: styled.div`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ const S = {
font-size: ${({ theme }) => theme.text.size.large};
`,
SubmitButton: styled(Button)`
width: 96%;
width: 100%;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

버튼 width 수정 확인했습니다.

border-radius: 4px;

background-color: ${({ theme }) => theme.palette.yellow500};
Expand Down
Loading