Fix spacing in accordion and Jest badge generation (#39)

uhawaii-system-its-ti-iam · Jul 6, 2024 · e2d7997 · e2d7997
1 parent 6719e4c
commit e2d7997
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 22 deletions.
diff --git 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
@@ -17,13 +17,11 @@ const Header = async () => {
 
                     <div className="hidden sm:flex space-x-1" data-testid="header-links">
                         <Menu/>
-                        {currentUser && currentUser.roles.includes(Role.UH) && (
+                        {currentUser.roles.includes(Role.UH) && (
                             <AuthMenuZ/>
                         )}
                         <LoginButton currentUser={currentUser}/>
-                        <div className="px-4">
-                            <ColorSchemeToggle/>
-                        </div>
+                        <ColorSchemeToggle />
                     </div>
                 </div>
             </div>

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
@@ -17,7 +17,7 @@ const AuthMenuZ = () => {
                 <NavigationMenuItem>
                     <Link href="/contact" legacyBehavior passHref>
                         <NavigationMenuLink className={navigationMenuTriggerStyle()}>
-                    Contact
+                            Contact
                         </NavigationMenuLink>
                     </Link>
                 </NavigationMenuItem>

diff --git 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 = () => {
                 <NavigationMenuItem>
                     <Link href="/" legacyBehavior passHref>
                         <NavigationMenuLink className={navigationMenuTriggerStyle()}>
-                          Home
+                            Home
                         </NavigationMenuLink>
                     </Link>
                 </NavigationMenuItem>
                 <NavigationMenuItem>
                     <Link href="/about" legacyBehavior passHref>
                         <NavigationMenuLink className={navigationMenuTriggerStyle()}>
-                          About
+                            About
                         </NavigationMenuLink>
                     </Link>
                 </NavigationMenuItem>
                 <CampusDropdown/>
-                <NavigationMenuItem>
-                    <Link href="/contact" legacyBehavior passHref>
-                        <NavigationMenuLink className={navigationMenuTriggerStyle()}>
-                    Contact
-                        </NavigationMenuLink>
-                    </Link>
-                </NavigationMenuItem>
             </NavigationMenuList>
         </NavigationMenu>
     );

diff --git 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)
-            ? <Button className={"bg-cyan-600 ring-1 ring-cyan-800 text-white hover:bg-cyan-800"} onClick={() =>
-                login()}>
-              Login <IconLogin2 />
-            </Button>
-            : <Button variant="default" onClick={() => logout()}>Logout ({currentUser.uid})</Button>}
+            ? <Button variant="outline" onClick={() => login()}>Login <IconLogin2 /></Button>
+            : <Button onClick={() => logout()}>Logout ({currentUser.uid})&nbsp;<IconLogout /></Button>}
     </> 
 );
 

diff --git a/ui/src/components/ui/accordion.tsx b/ui/src/components/ui/accordion.tsx
@@ -34,7 +34,7 @@ const AccordionTrigger = React.forwardRef<
         >
             {children}
             <ChevronDownIcon 
-                className="text-black h-4 w-4 shrink-0 text-muted-foreground transition-transform duration-200"
+                className="size-5 transition-transform duration-200"
             />
         </AccordionPrimitive.Trigger>
     </AccordionPrimitive.Header>