Merge branch 'feature-frontend-top' into develop-frontend

feature-frontend-expdate-optional
Haru.Kusano 4 months ago
commit bcc4c86b9c
  1. 12
      frontend/src/components/Layout.tsx
  2. 2
      frontend/src/pages/RecipeList.tsx

@ -41,15 +41,19 @@ const Layout: React.FC = () => {
const getTabIndex = (pathname: string) => {
pathname = pathname.split("/")[1];
console.log(pathname);
switch (pathname) {
case '/stock':
case 'stock':
return 0;
case '/tasks':
case 'tasks':
return 1;
case '/recipeList':
case 'recipeList':
return 2;
case 'addRecipe':
return 2;
default:
return 0;
return -1;
}
};

@ -102,7 +102,7 @@ const RecipeList: React.FC = () => {
fontSize: "32px", left: "50%", transform: 'translateX(-50%)'
}}
color="primary"
onClick={() => navigate('/AddRecipe')}
onClick={() => navigate('/addRecipe')}
>
</Button>

Loading…
Cancel
Save