diff --git a/frontend/src/App.js b/frontend/src/App.js index 1eb1d7e..fda7d8e 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -6,7 +6,7 @@ import { RouterProvider, createRoutesFromElements, } from 'react-router-dom' -import { ChakraProvider } from '@chakra-ui/react' +import { ChakraProvider, extendTheme } from '@chakra-ui/react' import { AuthLayout } from './contexts/AuthContext' import { PrivateRoute, LoggedInRedirect } from './contexts/CustomRoutes' @@ -39,11 +39,77 @@ const router = createBrowserRouter( const App = () => { return ( - + ) } +const WATonomousTheme = extendTheme({ + colors: { + wato: { + offBlack: '#222222', + grey: '#414141', + offWhite: '#c7cfd8', + + primaryDark: '#08192d', + primary: '#0f4271', + secondary: '#1f5d96', + + greenDark: '#0c4842', + greenLight: '#66ddc8', + + redDark: '#92093a', + redLight: '#d8436d', + }, + }, + components: { + Button: { + variants: { + offWhite: { + bgColor: 'wato.offWhite', + _hover: { + bgColor: 'wato.offWhite', + }, + }, + grey: { + color: 'white', + bgColor: 'wato.grey', + _hover: { + bgColor: 'wato.grey', + }, + }, + secondary: { + color: 'white', + bgColor: 'wato.secondary', + _hover: { + bgColor: 'wato.secondary', + }, + }, + greenDark: { + color: 'white', + bgColor: 'wato.greenDark', + _hover: { + bgColor: 'wato.greenDark', + }, + }, + greenLight: { + bgColor: 'wato.greenLight', + _hover: { + bgColor: 'wato.greenLight', + }, + }, + redDark: { + color: 'white', + bgColor: 'wato.redDark', + _hover: { + bgColor: 'wato.redDark', + }, + }, + }, + }, + }, +}) + export default App diff --git a/frontend/src/components/CommentInput.js b/frontend/src/components/CommentInput.js index 363dbd9..60895e2 100644 --- a/frontend/src/components/CommentInput.js +++ b/frontend/src/components/CommentInput.js @@ -133,7 +133,7 @@ const CommentInput = ({ code, getComments, reply, onClose, ticket }) => { onClick={onClose} padding="10px" height="32px" - colorScheme="red" + variant="redDark" > Cancel @@ -143,7 +143,7 @@ const CommentInput = ({ code, getComments, reply, onClose, ticket }) => { disabled={val.length === 0 || invalidInput(val)} padding="10px" height="32px" - colorScheme="blue" + variant="secondary" onClick={() => { handleSubmit(code, ticket) }} diff --git a/frontend/src/components/ConfirmationModal.js b/frontend/src/components/ConfirmationModal.js index 7ab4b61..36863d0 100644 --- a/frontend/src/components/ConfirmationModal.js +++ b/frontend/src/components/ConfirmationModal.js @@ -19,11 +19,11 @@ const ConfirmationModal = ({ title, body, onConfirm, isOpen, onClose }) => { {body} - )} diff --git a/frontend/src/components/TicketContent/PPRAdminContentTable.js b/frontend/src/components/TicketContent/PPRAdminContentTable.js index 4ce17e0..02b4b6c 100644 --- a/frontend/src/components/TicketContent/PPRAdminContentTable.js +++ b/frontend/src/components/TicketContent/PPRAdminContentTable.js @@ -61,7 +61,7 @@ const PPRAdminContentTable = () => { return (
diff --git a/frontend/src/components/TicketContent/TicketContentTableRow.js b/frontend/src/components/TicketContent/TicketContentTableRow.js index 0965f9d..41bd932 100644 --- a/frontend/src/components/TicketContent/TicketContentTableRow.js +++ b/frontend/src/components/TicketContent/TicketContentTableRow.js @@ -26,7 +26,11 @@ const TicketContentTableRow = ({ heading, value, onChange, type }) => { {onChange ? ( ) : type === 'URL' ? ( - + {value} ) : ( diff --git a/frontend/src/components/TicketContent/UPRAdminContentTable.js b/frontend/src/components/TicketContent/UPRAdminContentTable.js index a80b256..c01b6cd 100644 --- a/frontend/src/components/TicketContent/UPRAdminContentTable.js +++ b/frontend/src/components/TicketContent/UPRAdminContentTable.js @@ -111,7 +111,7 @@ const UPRAdminContentTable = () => {
{currentTicket.status === 'SENT_TO_COORDINATOR' && ( )}