♻️ #10 AppBarを表示させないページがあるので修正

kosnu · Nov 26, 2021 · ce0f646 · ce0f646
1 parent 8811976
commit ce0f646
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/frontend/src/pages/_app.tsx b/frontend/src/pages/_app.tsx
@@ -8,7 +8,6 @@ import type { AppProps } from "next/app"
 import React from "react"
 import { RecoilRoot } from "recoil"
 import { client } from "../graphql/apollo"
-import { Header } from "../ui/navigation/components/organisms/Header"
 import { theme } from "../ui/theme"
 import "../ui/theme/styles/globals.css"
 
@@ -24,7 +23,6 @@ function MyApp({ Component, pageProps }: AppProps) {
         <StyledEngineProvider injectFirst>
           <ThemeProvider theme={theme}>
             <LocalizationProvider dateAdapter={DateAdapter}>
-              <Header />
               <Component {...pageProps} />
             </LocalizationProvider>
           </ThemeProvider>

diff --git a/frontend/src/ui/categories/components/templates/CategoryListTemplate.tsx b/frontend/src/ui/categories/components/templates/CategoryListTemplate.tsx
@@ -3,12 +3,14 @@ import { Container, Divider, Grid, Typography } from "@mui/material"
 import React from "react"
 import { SuccessSnackBar } from "../../../common/components/molecules/SuccessSnackBar"
 import { WarningSnackBar } from "../../../common/components/molecules/WarningSnackBar"
+import { HABookAppBar } from "../../../navigation/components/organisms/HABookAppBar"
 import { theme } from "../../../theme"
 import { CategoryList } from "../organisms/CategoryList"
 
 export function CategoryListTemplate() {
   return (
     <>
+      <HABookAppBar />
       <Container css={wrapperStyle} maxWidth={"md"}>
         <Grid container spacing={4} direction={"column"}>
           <Grid item>

diff --git a/frontend/src/ui/categories/components/templates/NewCategoryTemplate.tsx b/frontend/src/ui/categories/components/templates/NewCategoryTemplate.tsx
@@ -4,6 +4,7 @@ import { Button, Container, Divider, Grid, Typography } from "@mui/material"
 import React from "react"
 import { SuccessSnackBar } from "../../../common/components/molecules/SuccessSnackBar"
 import { WarningSnackBar } from "../../../common/components/molecules/WarningSnackBar"
+import { HABookAppBar } from "../../../navigation/components/organisms/HABookAppBar"
 import { theme } from "../../../theme"
 import { useCreateCategoryForm } from "../../hooks/useCreateCategoryForm"
 import { CreateCategoryForm } from "../organisms/CreateCategoryForm"
@@ -19,6 +20,7 @@ export function NewCategoryTemplate() {
 
   return (
     <>
+      <HABookAppBar />
       <Container css={wrapperStyle} maxWidth={"md"}>
         <Grid container spacing={4} direction={"column"}>
           <Grid item>

diff --git a/...avigation/components/organisms/Header.tsx → ...ion/components/organisms/HABookAppBar.tsx b/...avigation/components/organisms/Header.tsx → ...ion/components/organisms/HABookAppBar.tsx
@@ -4,7 +4,7 @@ import { AccountMenuButton } from "../molecules/AccountMenuButton"
 import { AdditionalMenuButton } from "../molecules/AdditionalMenuButton"
 import { HeaderTitle } from "../molecules/HeaderTitle"
 
-export function Header() {
+export function HABookAppBar() {
   return (
     <>
       <AppBar position={"static"} color={"default"}>

diff --git a/frontend/src/ui/payments/components/templates/NewPaymentTemplate.tsx b/frontend/src/ui/payments/components/templates/NewPaymentTemplate.tsx
@@ -3,12 +3,14 @@ import { Container, Divider, Grid, Typography } from "@mui/material"
 import React from "react"
 import { SuccessSnackBar } from "../../../common/components/molecules/SuccessSnackBar"
 import { WarningSnackBar } from "../../../common/components/molecules/WarningSnackBar"
+import { HABookAppBar } from "../../../navigation/components/organisms/HABookAppBar"
 import { theme } from "../../../theme"
 import { CreatePaymentForm } from "../organisms/CreatePaymentForm"
 
 export function NewPaymentTemplate() {
   return (
     <>
+      <HABookAppBar />
       <Container css={wrapperStyle} maxWidth={"md"}>
         <Grid container spacing={4} direction={"column"}>
           <Grid item>

diff --git a/frontend/src/ui/payments/components/templates/PaymentListTemplate.tsx b/frontend/src/ui/payments/components/templates/PaymentListTemplate.tsx
@@ -1,12 +1,14 @@
 import { css } from "@emotion/react"
 import { Box, Container, Divider, Typography } from "@mui/material"
 import React from "react"
+import { HABookAppBar } from "../../../navigation/components/organisms/HABookAppBar"
 import { theme } from "../../../theme"
 import { PaymentList } from "../organisms/PaymentList"
 
 export function PaymentListTemplate() {
   return (
     <>
+      <HABookAppBar />
       <Container css={wrapperStyle} maxWidth={"md"}>
         <Typography variant={"h5"}>支払い一覧</Typography>
         <Divider variant={"fullWidth"} />