diff --git a/.github/workflows/badges.yml b/.github/workflows/badges.yml index 0bcb8b4..6fef2a5 100644 --- a/.github/workflows/badges.yml +++ b/.github/workflows/badges.yml @@ -62,7 +62,7 @@ jobs: uses: jpb06/jest-badges-action@latest with: branches: '*' - coverage-summary-path: app/coverage/coverage-summary.json + coverage-summary-path: ui/coverage/coverage-summary.json no-commit: true target-branch: badges diff --git a/ui/src/components/layout/header/header.tsx b/ui/src/components/layout/header/header.tsx index e015705..00c0804 100644 --- a/ui/src/components/layout/header/header.tsx +++ b/ui/src/components/layout/header/header.tsx @@ -17,13 +17,11 @@ const Header = async () => {
- {currentUser && currentUser.roles.includes(Role.UH) && ( + {currentUser.roles.includes(Role.UH) && ( )} -
- -
+
diff --git a/ui/src/components/layout/header/header_menu/header-menu-authz.tsx b/ui/src/components/layout/header/header_menu/header-menu-authz.tsx index 1a53f21..ee9ecd2 100644 --- a/ui/src/components/layout/header/header_menu/header-menu-authz.tsx +++ b/ui/src/components/layout/header/header_menu/header-menu-authz.tsx @@ -17,7 +17,7 @@ const AuthMenuZ = () => { - Contact + Contact diff --git a/ui/src/components/layout/header/header_menu/header-menu.tsx b/ui/src/components/layout/header/header_menu/header-menu.tsx index 0b18628..adb3d25 100644 --- a/ui/src/components/layout/header/header_menu/header-menu.tsx +++ b/ui/src/components/layout/header/header_menu/header-menu.tsx @@ -19,25 +19,18 @@ const Menu = () => { - Home + Home - About + About - - - - Contact - - - ); diff --git a/ui/src/components/layout/header/login_button/login-button.tsx b/ui/src/components/layout/header/login_button/login-button.tsx index 867851d..22c4b15 100644 --- a/ui/src/components/layout/header/login_button/login-button.tsx +++ b/ui/src/components/layout/header/login_button/login-button.tsx @@ -1,7 +1,7 @@ 'use client'; import { Button } from '@/components/ui/button' -import {IconLogin2} from '@tabler/icons-react'; +import { IconLogin2, IconLogout } from '@tabler/icons-react'; import Role from '@/access/role'; import User from '@/access/user'; import { login, logout } from '@/access/authentication'; @@ -13,11 +13,8 @@ const LoginButton = ({ }) => ( <> {!currentUser.roles.includes(Role.UH) - ? - : } + ? + : } ); diff --git a/ui/src/components/ui/accordion.tsx b/ui/src/components/ui/accordion.tsx index 2840bd9..6948083 100644 --- a/ui/src/components/ui/accordion.tsx +++ b/ui/src/components/ui/accordion.tsx @@ -34,7 +34,7 @@ const AccordionTrigger = React.forwardRef< > {children}