diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 66be7c4..513d435 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,14 +1,10 @@ -import GetMemberContainer from "./get-member/components/index/container.tsx"; -import {getMemberApiCall} from "./get-member/components/index/api.ts"; +import { getMemberApiCall } from "./tool-pages/user-search/index/api.ts"; +import GetMemberContainer from "./tool-pages/user-search/index/container.tsx"; function App() { return ( -
-

- readメイ -

- -
+ // Configure home page here by setting it so some tool page component + ); } diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx index 30819ba..8d22e8d 100644 --- a/frontend/src/main.tsx +++ b/frontend/src/main.tsx @@ -4,6 +4,9 @@ import { createBrowserRouter, RouterProvider } from "react-router-dom"; import App from "./App.tsx"; import "./scss/style.scss"; import ErrorPage from "./error-page.tsx"; +import GetMemberContainer from "./tool-pages/user-search/index/container.tsx"; +import { getMemberApiCall } from "./tool-pages/user-search/index/api.ts"; +import TemplatedTool from "./tool-pages/tool-template/index.tsx"; const router = createBrowserRouter([ { @@ -11,6 +14,16 @@ const router = createBrowserRouter([ element: , errorElement: , }, + { + path: "/member-search", + element: , + errorElement: , + }, + { + path: "/tool-template", + element: , + errorElement: , + }, ]); ReactDOM.createRoot(document.getElementById("root")!).render( diff --git a/frontend/src/scss/style.scss b/frontend/src/scss/style.scss index 55ad127..8b3bfc0 100644 --- a/frontend/src/scss/style.scss +++ b/frontend/src/scss/style.scss @@ -70,4 +70,4 @@ body { .background-blue { background: #32A2D2; -} \ No newline at end of file +} diff --git a/frontend/src/tool-pages/tool-page-components/navBar.tsx b/frontend/src/tool-pages/tool-page-components/navBar.tsx new file mode 100644 index 0000000..2c40429 --- /dev/null +++ b/frontend/src/tool-pages/tool-page-components/navBar.tsx @@ -0,0 +1,26 @@ +import { Navbar, Nav} from 'react-bootstrap'; +import {ReactElement} from "react"; + +const ReadMeiNavBar = (): ReactElement => { + return <> + +
+
+ + ReadMei +
+ + + +
+
+ +} + +export default ReadMeiNavBar; \ No newline at end of file diff --git a/frontend/src/tool-pages/tool-template/index.tsx b/frontend/src/tool-pages/tool-template/index.tsx new file mode 100644 index 0000000..c04b71c --- /dev/null +++ b/frontend/src/tool-pages/tool-template/index.tsx @@ -0,0 +1,14 @@ +import { ReactElement } from "react"; +import ReadMeiNavBar from "../tool-page-components/navBar"; + + + +function TemplatedTool(): ReactElement { + return ( + <> + + + ); + +} +export default TemplatedTool; \ No newline at end of file diff --git a/frontend/src/get-member/components/display/display.tsx b/frontend/src/tool-pages/user-search/display/display.tsx similarity index 100% rename from frontend/src/get-member/components/display/display.tsx rename to frontend/src/tool-pages/user-search/display/display.tsx diff --git a/frontend/src/get-member/components/display/index.ts b/frontend/src/tool-pages/user-search/display/index.ts similarity index 100% rename from frontend/src/get-member/components/display/index.ts rename to frontend/src/tool-pages/user-search/display/index.ts diff --git a/frontend/src/get-member/components/error-panel/error-panel.tsx b/frontend/src/tool-pages/user-search/error-panel/error-panel.tsx similarity index 100% rename from frontend/src/get-member/components/error-panel/error-panel.tsx rename to frontend/src/tool-pages/user-search/error-panel/error-panel.tsx diff --git a/frontend/src/get-member/components/index/api.ts b/frontend/src/tool-pages/user-search/index/api.ts similarity index 100% rename from frontend/src/get-member/components/index/api.ts rename to frontend/src/tool-pages/user-search/index/api.ts diff --git a/frontend/src/get-member/components/index/container.tsx b/frontend/src/tool-pages/user-search/index/container.tsx similarity index 81% rename from frontend/src/get-member/components/index/container.tsx rename to frontend/src/tool-pages/user-search/index/container.tsx index 382b151..c6cf623 100644 --- a/frontend/src/get-member/components/index/container.tsx +++ b/frontend/src/tool-pages/user-search/index/container.tsx @@ -3,6 +3,7 @@ import { InputEvent } from "../../../common/interfaces.ts"; import GetMember from "./get-member.tsx"; import { GetMemberResponse, GetMemberError } from "./interfaces.ts"; import { convertInput } from "../../../common/utils/convertInput.ts"; +import ReadMeiNavBar from "../../tool-page-components/navBar.tsx"; interface GetMemberContainerProps { getMember: (membershipNum: string) => Promise @@ -41,13 +42,16 @@ const GetMemberContainer = (props:GetMemberContainerProps): ReactElement => { setMembershipNum("") } return ( - + <> + + + ) } diff --git a/frontend/src/get-member/components/index/get-member.tsx b/frontend/src/tool-pages/user-search/index/get-member.tsx similarity index 85% rename from frontend/src/get-member/components/index/get-member.tsx rename to frontend/src/tool-pages/user-search/index/get-member.tsx index 2d9d308..9072c7a 100644 --- a/frontend/src/get-member/components/index/get-member.tsx +++ b/frontend/src/tool-pages/user-search/index/get-member.tsx @@ -1,5 +1,5 @@ import {FormEventHandler, ReactElement} from "react"; -import Input from "../../../common/components/input"; +import Input from "../../../common/components/input/index.ts"; import Display from "../display/display.tsx"; import {GetMemberResponse, GetMemberError} from "./interfaces.ts"; import {InputEvent} from "../../../common/interfaces.ts"; @@ -15,6 +15,10 @@ interface GetMemberProps { const GetMember = (props: GetMemberProps): ReactElement => { return ( +
+

+ readメイ +

@@ -35,6 +39,7 @@ const GetMember = (props: GetMemberProps): ReactElement => { response={props.response} error={props.error}/>
+
) } diff --git a/frontend/src/get-member/components/index/index.ts b/frontend/src/tool-pages/user-search/index/index.ts similarity index 100% rename from frontend/src/get-member/components/index/index.ts rename to frontend/src/tool-pages/user-search/index/index.ts diff --git a/frontend/src/get-member/components/index/interfaces.ts b/frontend/src/tool-pages/user-search/index/interfaces.ts similarity index 100% rename from frontend/src/get-member/components/index/interfaces.ts rename to frontend/src/tool-pages/user-search/index/interfaces.ts diff --git a/frontend/src/get-member/components/result-panel/index.ts b/frontend/src/tool-pages/user-search/result-panel/index.ts similarity index 100% rename from frontend/src/get-member/components/result-panel/index.ts rename to frontend/src/tool-pages/user-search/result-panel/index.ts diff --git a/frontend/src/get-member/components/result-panel/result-panel.tsx b/frontend/src/tool-pages/user-search/result-panel/result-panel.tsx similarity index 100% rename from frontend/src/get-member/components/result-panel/result-panel.tsx rename to frontend/src/tool-pages/user-search/result-panel/result-panel.tsx