feat: Changed the color usage of the action buttons and made the stat…

…us badge generic Signed-off-by: Tom Lanser <[email protected]>
animo · Jan 4, 2023 · 226c506 · 226c506
1 parent 3644dab
commit 226c506
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 17 deletions.
diff --git a/packages/toolbox-ui/src/components/RecordActions.tsx b/packages/toolbox-ui/src/components/RecordActions.tsx
@@ -2,7 +2,7 @@ import { ActionIcon, Group, Loader } from '@mantine/core'
 import { IconTrash } from '@tabler/icons'
 import React from 'react'
 
-import { DangerButton, PrimaryButton } from './generic'
+import { PrimaryButton, SecondaryButton } from './generic'
 
 interface RecordActionsProps {
   onDelete?: () => void
@@ -20,9 +20,9 @@ export const RecordActions = ({ onAccept, onDecline, onDelete, isLoading }: Reco
     ),
 
     onDecline && (
-      <DangerButton key="reject" size="xs" variant="light" onClick={onDecline}>
+      <SecondaryButton key="reject" size="xs" onClick={onDecline}>
         Decline
-      </DangerButton>
+      </SecondaryButton>
     ),
 
     onDelete && (

diff --git a/packages/toolbox-ui/src/components/connections/ConnectionsTable.tsx b/packages/toolbox-ui/src/components/connections/ConnectionsTable.tsx
@@ -1,11 +1,12 @@
 import type { ConnectionRecord } from '@aries-framework/core'
 
 import { ConnectionsUtil } from '@animo/toolbox-core/src/utils/records/ConnectionsUtil'
-import { Badge, createStyles, Group, ScrollArea, Table, Text, useMantineTheme } from '@mantine/core'
+import { createStyles, Group, ScrollArea, Table, Text } from '@mantine/core'
 import React from 'react'
 
 import { RecordActions } from '../RecordActions'
 import { SmartAvatar } from '../SmartAvatar'
+import { StatusBadge } from '../generic/table/StatusBadge'
 
 interface ConnectionsTableProps {
   records: ConnectionRecord[]
@@ -35,7 +36,6 @@ const useStyles = createStyles(() => ({
 
 export const ConnectionsTable = ({ records, onDelete, onAccept }: ConnectionsTableProps) => {
   const { classes } = useStyles()
-  const theme = useMantineTheme()
 
   return (
     <ScrollArea>
@@ -71,9 +71,7 @@ export const ConnectionsTable = ({ records, onDelete, onAccept }: ConnectionsTab
                   </Text>
                 </td>
                 <td className={classes.stateSize}>
-                  <Badge variant={theme.colorScheme === 'dark' ? 'light' : 'outline'} color="blue">
-                    {record.state}
-                  </Badge>
+                  <StatusBadge>{record.state}</StatusBadge>
                 </td>
                 <td className={classes.actionsSize}>
                   <RecordActions

diff --git a/packages/toolbox-ui/src/components/credentials/CredentialsTable.tsx b/packages/toolbox-ui/src/components/credentials/CredentialsTable.tsx
@@ -2,12 +2,13 @@ import type { ConnectionRecord, CredentialExchangeRecord } from '@aries-framewor
 
 import { formatSchemaName } from '@animo/toolbox-core/src/utils'
 import { CredentialsUtil } from '@animo/toolbox-core/src/utils/records/CredentialsUtil'
-import { Badge, createStyles, Group, ScrollArea, Table, Text, useMantineTheme } from '@mantine/core'
+import { createStyles, Group, ScrollArea, Table, Text } from '@mantine/core'
 import React from 'react'
 
 import { useCredentialsFormatData } from '../../contexts/CredentialFormatDataProvider'
 import { RecordActions } from '../RecordActions'
 import { SmartAvatar } from '../SmartAvatar'
+import { StatusBadge } from '../generic/table/StatusBadge'
 
 interface CredentialsTableProps {
   records: CredentialExchangeRecord[]
@@ -36,7 +37,6 @@ const useStyles = createStyles(() => ({
 
 export const CredentialsTable = ({ records, connections, onDelete, onAccept, onDecline }: CredentialsTableProps) => {
   const { classes } = useStyles()
-  const theme = useMantineTheme()
   const { formattedData } = useCredentialsFormatData()
 
   return (
@@ -70,7 +70,7 @@ export const CredentialsTable = ({ records, connections, onDelete, onAccept, onD
                   </Group>
                 </td>
                 <td className={classes.stateSize}>
-                  <Badge variant={theme.colorScheme === 'dark' ? 'light' : 'outline'}>{record.state}</Badge>
+                  <StatusBadge>{record.state}</StatusBadge>
                 </td>
                 <td className={classes.actionsSize}>
                   <RecordActions

diff --git a/packages/toolbox-ui/src/components/generic/buttons/Buttons.tsx b/packages/toolbox-ui/src/components/generic/buttons/Buttons.tsx
@@ -20,6 +20,10 @@ const useStyles = createStyles((theme) => ({
   secondary: {
     backgroundColor: theme.colorScheme === 'dark' ? theme.colors.animoBlack[0] : theme.colors.animoWhite[0],
     color: theme.colorScheme === 'dark' ? theme.colors.animoWhite[0] : theme.colors.animoBlack[0],
+
+    '&:hover': {
+      backgroundColor: theme.colorScheme === 'dark' ? theme.colors.animoBlack[1] : theme.colors.animoWhite[1],
+    },
   },
 }))
 

diff --git a/packages/toolbox-ui/src/components/generic/table/StatusBadge.tsx b/packages/toolbox-ui/src/components/generic/table/StatusBadge.tsx
@@ -0,0 +1,10 @@
+import type { BadgeProps } from '@mantine/core'
+
+import { Badge, useMantineTheme } from '@mantine/core'
+import React from 'react'
+
+export const StatusBadge = (props: BadgeProps) => {
+  const { colorScheme } = useMantineTheme()
+
+  return <Badge variant={colorScheme === 'dark' ? 'light' : 'outline'} color="blue" {...props} />
+}
diff --git a/packages/toolbox-ui/src/components/proofs/ProofsTable.tsx b/packages/toolbox-ui/src/components/proofs/ProofsTable.tsx
@@ -1,12 +1,13 @@
 import type { ConnectionRecord, ProofExchangeRecord } from '@aries-framework/core'
 
 import { ProofsUtil } from '@animo/toolbox-core/src/utils/records/ProofsUtil'
-import { Badge, createStyles, Group, ScrollArea, Table, Text, useMantineTheme } from '@mantine/core'
+import { createStyles, Group, ScrollArea, Table, Text } from '@mantine/core'
 import React from 'react'
 
 import { useProofsFormatData } from '../../contexts/ProofsFormatDataProvider'
 import { RecordActions } from '../RecordActions'
 import { SmartAvatar } from '../SmartAvatar'
+import { StatusBadge } from '../generic/table/StatusBadge'
 
 interface ProofsTableProps {
   records: ProofExchangeRecord[]
@@ -38,7 +39,6 @@ const useStyles = createStyles(() => ({
 
 export const ProofsTable = ({ records, connections, onDelete, onAccept, onDecline }: ProofsTableProps) => {
   const { classes } = useStyles()
-  const theme = useMantineTheme()
   const { formattedData } = useProofsFormatData()
 
   return (
@@ -80,7 +80,7 @@ export const ProofsTable = ({ records, connections, onDelete, onAccept, onDeclin
                   </Text>
                 </td>
                 <td className={classes.stateSize}>
-                  <Badge variant={theme.colorScheme === 'dark' ? 'light' : 'outline'}>{record.state}</Badge>
+                  <StatusBadge>{record.state}</StatusBadge>
                 </td>
                 <td className={classes.actionsSize}>
                   <RecordActions

diff --git a/packages/toolbox-ui/src/pages/AgentSelectionScreen.tsx b/packages/toolbox-ui/src/pages/AgentSelectionScreen.tsx
@@ -1,4 +1,4 @@
-import { Card, Container, Flex, Group, Space, Text, Title, UnstyledButton } from '@mantine/core'
+import { Card, Container, createStyles, Flex, Group, Space, Text, Title, UnstyledButton } from '@mantine/core'
 import { IconPlus } from '@tabler/icons'
 import React from 'react'
 
@@ -7,7 +7,20 @@ import { SmartAvatar } from '../components/SmartAvatar'
 import { useAgentManager } from '../contexts/AgentManagerContext'
 import { useNavigation } from '../hooks/useNavigation'
 
+const useStyles = createStyles((theme) => ({
+  card: {
+    backgroundColor: theme.colorScheme === 'dark' ? theme.colors.dark[6] : theme.colors.gray[0],
+    boxShadow: theme.shadows.xs,
+    transition: 'background-color 0.2s ease',
+
+    '&:hover': {
+      backgroundColor: theme.colorScheme === 'dark' ? theme.colors.dark[5] : theme.colors.gray[1],
+    },
+  },
+}))
+
 export const AgentSelectionScreen = () => {
+  const { classes } = useStyles()
   const navigation = useNavigation()
   const { agents, setCurrentAgentId, loading } = useAgentManager()
 
@@ -22,12 +35,12 @@ export const AgentSelectionScreen = () => {
 
   return (
     <Container mt={20}>
-      <Title size="h3">Agents</Title>
+      <Title size="h2">Agents</Title>
       <Space h="md" />
       <Flex gap="md" wrap="wrap">
         {agents.map((agent) => (
           <UnstyledButton key={agent.id} onClick={() => switchToAgent(agent.id)}>
-            <Card h={100} w={220}>
+            <Card h={100} w={220} className={classes.card}>
               <Group noWrap>
                 <SmartAvatar src={agent.agentConfig.connectionImageUrl} size={64} radius="md">
                   {agent.agentConfig.label}