Skip to content

Commit

Permalink
Merge pull request #89 from TEAM-BEAT/refactor/#88/RefactorBookPageName
Browse files Browse the repository at this point in the history
[Refactor/#88] 기존의 book 페이지 gig으로 수정
  • Loading branch information
pepperdad authored Jul 10, 2024
2 parents 45800ee + 7257712 commit 0ff7eeb
Show file tree
Hide file tree
Showing 54 changed files with 8,217 additions and 13,945 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"@storybook/addon-links": "^8.1.11",
"@storybook/addon-onboarding": "^8.1.11",
"@storybook/blocks": "^8.1.11",
"@storybook/preview-api": "^8.2.1",
"@storybook/react": "^8.1.11",
"@storybook/react-vite": "^8.1.11",
"@storybook/test": "^8.1.11",
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IcHamburgar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIcHamburgar = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 32 32" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IcomCopy.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIcomCopy = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 25 24" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconArrowLeft.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconArrowLeft = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconArrowRight.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconArrowRight = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconArrowUp.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconArrowUp = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconBnk.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconBnk = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
Expand Down
2 changes: 1 addition & 1 deletion src/assets/svgs/IconCalendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { SVGProps } from "react";
const SvgIconCalendar = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
<path
fill={props.fill}
fill="#626262"
d="M9.9 5v1.4h4.2V5h1.4v1.4h2.8a.7.7 0 0 1 .7.7v11.2a.7.7 0 0 1-.7.7H5.7a.7.7 0 0 1-.7-.7V7.1a.7.7 0 0 1 .7-.7h2.8V5zm7.7 7H6.4v5.6h11.2zM8.5 7.8H6.4v2.8h11.2V7.8h-2.1v1.4h-1.4V7.8H9.9v1.4H8.5z"
/>
</svg>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconCheck.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconCheck = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconEyeOff.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconEyeOff = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconHanna.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconHanna = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconIbk.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconIbk = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconIm.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconIm = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconKabank.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconKabank = (props: SVGProps<SVGSVGElement>) => (
<svg
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconKb.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconKb = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconLogo.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconLogo = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 73 30" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconMinus.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconMinus = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconNonghyup.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconNonghyup = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconPlus.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconPlus = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconSaemauel.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconSaemauel = (props: SVGProps<SVGSVGElement>) => (
<svg
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconSc.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconSc = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconShinhan.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconShinhan = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconShinhyup.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconShinhyup = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconSoohyup.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconSoohyup = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconTextfiedlDelete.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconTextfiedlDelete = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconToss.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconToss = (props: SVGProps<SVGSVGElement>) => (
<svg
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconWoochaegook.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconWoochaegook = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconWoori.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconWoori = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
Expand Down
1 change: 0 additions & 1 deletion src/assets/svgs/IconXButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import type { SVGProps } from "react";
const SvgIconXButton = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
Expand Down
14 changes: 0 additions & 14 deletions src/assets/svgs/index.ts

This file was deleted.

11 changes: 7 additions & 4 deletions src/assets/svgs/index.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
export { default as IcHamburgar } from "./IcHamburgar";
export { default as IcomCopy } from "./IcomCopy";
export { default as IconArrowDown } from "./IconArrowDown";
export { default as IconArrowLeft } from "./IconArrowLeft";
export { default as IconArrowRight } from "./IconArrowRight";
export { default as IconArrowDown } from "./IconArrowDown";
export { default as IconArrowUp } from "./IconArrowUp";
export { default as IconBnk } from "./IconBnk";
export { default as IconCalendar } from "./IconCalendar";
export { default as IconCheck } from "./IconCheck";
export { default as IconEyeOff } from "./IconEyeOff";
export { default as IconHanna } from "./IconHanna";
export { default as IconIbk } from "./IconIbk";
export { default as IconIm } from "./IconIm";
export { default as IconKabank } from "./IconKabank";
export { default as IconKb } from "./IconKb";
export { default as IconEyeOff } from "./IconEyeOff";
export { default as IconLogo } from "./IconLogo";
export { default as IconMinus } from "./IconMinus";
export { default as IconNonghyup } from "./IconNonghyup";
Expand All @@ -20,9 +23,9 @@ export { default as IconShinhan } from "./IconShinhan";
export { default as IconShinhyup } from "./IconShinhyup";
export { default as IconSoohyup } from "./IconSoohyup";
export { default as IconTextfiedlDelete } from "./IconTextfiedlDelete";
export { default as IconTime } from "./IconTime";
export { default as IconToss } from "./IconToss";
export { default as IconWoochaegook } from "./IconWoochaegook";
export { default as IconWoori } from "./IconWoori";
export { default as IconXButton } from "./IconXButton";
export { default as IcHamburgar } from "./IcHamburgar";
export { default as IconCalendar } from "./IconCalendar";
export { default as IcOutlinePlace } from "./IcOutlinePlace";
4 changes: 2 additions & 2 deletions src/pages/book/Book.tsx → src/pages/gig/Gig.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Content from "./components/content/Content";
import ShowInfo from "./components/showInfo/ShowInfo";
import { SHOW_DETAIL_INFO } from "./constants";

const Book = () => {
const Gig = () => {
// TODO: performanceId로 상세 정보 조회(GET)
const { performanceId } = useParams<{ performanceId: string }>();
const [detail, setDetail] = useState(SHOW_DETAIL_INFO);
Expand Down Expand Up @@ -38,7 +38,7 @@ const Book = () => {
);
};

export default Book;
export default Gig;

const FooterContainer = styled.div`
position: sticky;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TAB_TYPE, TabType } from "@pages/book/constants";
import { TAB_TYPE, TabType } from "@pages/gig/constants";
import { useState } from "react";
import MakerIntroduce from "../makerIntroduce/MakerIntroduce";
import PerformanceIntroduce from "../performanceIntroduce/PerformanceIntroduce";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SHOW_TYPE, ShowTypes } from "@pages/book/constants";
import { SHOW_TYPE, ShowTypes } from "@pages/gig/constants";
import * as S from "./ShowType.styled";

interface ShowTypeProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TAB_TYPE, TabType } from "@pages/book/constants";
import { TAB_TYPE, TabType } from "@pages/gig/constants";
import * as S from "./TabBar.styled";

interface TabBarProps {
Expand Down
File renamed without changes.
File renamed without changes
4 changes: 2 additions & 2 deletions src/routes/Router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Layout from "@components/layout/Layout";
import ActionBottomSheetTest from "@pages/ActionBottomSheetTest";
import Apage from "@pages/APage/Apage";
import BankTest from "@pages/BankTest";
import Book from "@pages/book/Book";
import Gig from "@pages/gig/Gig";
import Lookup from "@pages/lookup/Lookup";
import Manage from "@pages/manage/Manage";
import ModalTest from "@pages/ModalTest";
Expand All @@ -21,7 +21,7 @@ const router = createBrowserRouter([
{ path: "lookup", element: <Lookup /> },
{ path: "testpage", element: <TestPage /> },
{ path: "register", element: <Register /> },
{ path: "book/:performanceId", element: <Book /> },
{ path: "gig/:performanceId", element: <Gig /> },
{ path: "manage", element: <Manage /> },
{ path: "myregisteredshow", element: <MyRegisterdShow /> },
// ... other pages
Expand Down
Loading

0 comments on commit 0ff7eeb

Please sign in to comment.