diff --git a/frontend/.storybook/preview.js b/frontend/.storybook/preview.js index 972cdc3e3..b8b34f98f 100644 --- a/frontend/.storybook/preview.js +++ b/frontend/.storybook/preview.js @@ -1,9 +1,9 @@ import { addDecorator } from "@storybook/react"; import axios from "axios"; import { initializeWorker, mswDecorator } from "msw-storybook-addon"; -import { MemoryRouter } from "react-router-dom"; import "../src/api/api"; import "../src/App.css"; +import { ModalProvider } from "../src/hooks/useModalContext"; import { RecruitmentContext } from "../src/hooks/useRecruitmentContext"; import { UserInfoContext } from "../src/hooks/useUserInfoContext"; import { recruitmentDummy, userInfoDummy } from "../src/mock/dummy"; @@ -35,9 +35,9 @@ export const decorators = [ > - + - + diff --git a/frontend/src/App.css b/frontend/src/App.css index 7b9139876..974015253 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -5,10 +5,12 @@ --pc-main-width: 800px; --pc-main-width-narrow: 512px; - --tooltip-z-index: 1000; - --tooltip-dimmed-z-index: 999; - --header-z-index: 998; - --nav-z-index: 997; + --modal-window-z-index: 1000; + --modal-portal-z-index: 990; + --tooltip-z-index: 980; + --tooltip-dimmed-z-index: 970; + --header-z-index: 960; + --nav-z-index: 950; } * { diff --git a/frontend/src/App.js b/frontend/src/App.js index 1a9ed9081..b678f6859 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -22,53 +22,56 @@ import SignUp from "./pages/SignUp/SignUp"; import RecruitmentProvider from "./provider/RecruitmentProvider"; import TokenProvider from "./provider/TokenProvider"; import UserInfoProvider from "./provider/UserInfoProvider"; +import { ModalProvider } from "./hooks/useModalContext"; const App = () => { return ( - -
-
- - - } /> - } /> - } /> - } /> - } /> - } /> - }> - } /> - } /> - } /> - } /> - + + +
+
+ + + } /> + } /> + } /> + } /> + } /> + } /> + }> + } /> + } /> + } /> + } /> + - }> - - - - } - /> - - - - } - /> - - - -
-
- - + }> + + + + } + /> + + + + } + /> + + + +
+