| @@ -7,6 +7,7 @@ import useNavigateCustom from "hooks/useNavigateCustom"; | |||||
| import { createContext, useEffect, useState } from "react"; | import { createContext, useEffect, useState } from "react"; | ||||
| import { useParams } from "react-router-dom"; | import { useParams } from "react-router-dom"; | ||||
| import { getPath } from "routes/path"; | import { getPath } from "routes/path"; | ||||
| import { StoreId, getStore, setStore } from "storage/localstorage"; | |||||
| type App = { | type App = { | ||||
| token: string; | token: string; | ||||
| @@ -47,6 +48,8 @@ export function AppContextProvider({ children }: Props) { | |||||
| setTokenResult("ok"); | setTokenResult("ok"); | ||||
| _setToken(sendData.access_token); | _setToken(sendData.access_token); | ||||
| setReceiptIssuingOrder(res.data.receipt_issuing_order); | setReceiptIssuingOrder(res.data.receipt_issuing_order); | ||||
| setStore(StoreId.ACCESS_TOKEN, sendData.access_token); | |||||
| }, | }, | ||||
| onFailed: () => { | onFailed: () => { | ||||
| setTokenResult("ng"); | setTokenResult("ng"); | ||||
| @@ -74,8 +77,12 @@ export function AppContextProvider({ children }: Props) { | |||||
| }; | }; | ||||
| useEffect(() => { | useEffect(() => { | ||||
| const storeToken = getStore(StoreId.ACCESS_TOKEN); | |||||
| if (paramToken && !token) { | if (paramToken && !token) { | ||||
| setToken(paramToken); | setToken(paramToken); | ||||
| } else if (storeToken && !token) { | |||||
| setToken(storeToken); | |||||
| } else if (!token && !paramToken) { | } else if (!token && !paramToken) { | ||||
| setTokenResult("ng"); | setTokenResult("ng"); | ||||
| navigateWhenChanged(getPath(PageID.PAGE_404)); | navigateWhenChanged(getPath(PageID.PAGE_404)); | ||||
| @@ -16,7 +16,6 @@ import { HasChildren } from "@types"; | |||||
| import { emailRequest } from "api/app/receipt-issuing-order"; | import { emailRequest } from "api/app/receipt-issuing-order"; | ||||
| import useAPICall from "hooks/useAPICall"; | import useAPICall from "hooks/useAPICall"; | ||||
| import useApp from "hooks/useApp"; | import useApp from "hooks/useApp"; | ||||
| import useNavigateCustom from "hooks/useNavigateCustom"; | |||||
| import useSnackbarCustom from "hooks/useSnackbarCustom"; | import useSnackbarCustom from "hooks/useSnackbarCustom"; | ||||
| import { useMemo, useState } from "react"; | import { useMemo, useState } from "react"; | ||||
| import useInputEmailStep from "./hooks/useInputEmailStep"; | import useInputEmailStep from "./hooks/useInputEmailStep"; | ||||
| @@ -64,9 +63,7 @@ export default function EmailOrder() { | |||||
| receiptIssuingOrder: order, | receiptIssuingOrder: order, | ||||
| } = useApp(); | } = useApp(); | ||||
| const { success, error } = useSnackbarCustom(); | |||||
| const { navigate } = useNavigateCustom(); | |||||
| const { error } = useSnackbarCustom(); | |||||
| const [mode, setMode] = useState<"input" | "confirm" | "done">("input"); | const [mode, setMode] = useState<"input" | "confirm" | "done">("input"); | ||||
| @@ -75,7 +72,7 @@ export default function EmailOrder() { | |||||
| setMode("confirm"); | setMode("confirm"); | ||||
| }, | }, | ||||
| onPrev: () => { | onPrev: () => { | ||||
| navigate(-1); | |||||
| navigateToHome(); | |||||
| }, | }, | ||||
| }); | }); | ||||
| @@ -1,7 +1,6 @@ | |||||
| import { | import { | ||||
| Box, | Box, | ||||
| Button, | Button, | ||||
| Divider, | |||||
| Paper, | Paper, | ||||
| Stack, | Stack, | ||||
| Step, | Step, | ||||
| @@ -14,14 +13,13 @@ import { | |||||
| Typography, | Typography, | ||||
| } from "@mui/material"; | } from "@mui/material"; | ||||
| import { HasChildren } from "@types"; | import { HasChildren } from "@types"; | ||||
| import { mailRequest } from "api/app/receipt-issuing-order"; | |||||
| import { getPrefName } from "codes/prefcode"; | import { getPrefName } from "codes/prefcode"; | ||||
| import useAPICall from "hooks/useAPICall"; | |||||
| import useApp from "hooks/useApp"; | import useApp from "hooks/useApp"; | ||||
| import useNavigateCustom from "hooks/useNavigateCustom"; | |||||
| import useSnackbarCustom from "hooks/useSnackbarCustom"; | |||||
| import { useMemo, useState } from "react"; | import { useMemo, useState } from "react"; | ||||
| import useInputMailStep from "./hooks/useInputMailStep"; | import useInputMailStep from "./hooks/useInputMailStep"; | ||||
| import useAPICall from "hooks/useAPICall"; | |||||
| import { mailRequest } from "api/app/receipt-issuing-order"; | |||||
| import useSnackbarCustom from "hooks/useSnackbarCustom"; | |||||
| type TableRowCustomProps = { | type TableRowCustomProps = { | ||||
| title: string; | title: string; | ||||
| @@ -66,9 +64,7 @@ export default function MailOrder() { | |||||
| receiptIssuingOrder: order, | receiptIssuingOrder: order, | ||||
| } = useApp(); | } = useApp(); | ||||
| const { success, error } = useSnackbarCustom(); | |||||
| const { navigate } = useNavigateCustom(); | |||||
| const { error } = useSnackbarCustom(); | |||||
| const [mode, setMode] = useState<"input" | "confirm" | "done">("input"); | const [mode, setMode] = useState<"input" | "confirm" | "done">("input"); | ||||
| @@ -77,7 +73,7 @@ export default function MailOrder() { | |||||
| setMode("confirm"); | setMode("confirm"); | ||||
| }, | }, | ||||
| onPrev: () => { | onPrev: () => { | ||||
| navigate(-1); | |||||
| navigateToHome(); | |||||
| }, | }, | ||||
| }); | }); | ||||
| @@ -1,6 +1,9 @@ | |||||
| let id = 0; | let id = 0; | ||||
| export const StoreId = { | export const StoreId = { | ||||
| LOGIN_ROUTE: "LOGIN_ROUTE", | LOGIN_ROUTE: "LOGIN_ROUTE", | ||||
| // APP向け | |||||
| ACCESS_TOKEN: "ACCESS_TOKEN", | |||||
| } as const; | } as const; | ||||
| export type StoreId = (typeof StoreId)[keyof typeof StoreId]; | export type StoreId = (typeof StoreId)[keyof typeof StoreId]; | ||||