diff --git a/frontend/src/components/v2/Pagination/Pagination.tsx b/frontend/src/components/v2/Pagination/Pagination.tsx index f4a75eac7..cdde53640 100644 --- a/frontend/src/components/v2/Pagination/Pagination.tsx +++ b/frontend/src/components/v2/Pagination/Pagination.tsx @@ -44,18 +44,18 @@ export const Pagination = ({ return (
-
+
{(page - 1) * perPage} - {(page - 1) * perPage + perPage} of {count}
- + @@ -79,7 +79,7 @@ export const Pagination = ({ onClick={() => onChangePage(prevPageNumber)} isDisabled={!canGoPrev} > - + onChangePage(nextPageNumber)} isDisabled={!canGoNext} > - +
diff --git a/frontend/src/components/v2/Select/Select.tsx b/frontend/src/components/v2/Select/Select.tsx index cdf790634..1172000c9 100644 --- a/frontend/src/components/v2/Select/Select.tsx +++ b/frontend/src/components/v2/Select/Select.tsx @@ -40,7 +40,7 @@ export const Select = forwardRef( ref={ref} className={twMerge( `inline-flex items-center justify-between rounded-md - bg-mineshaft-900 px-3 py-2 font-inter text-sm font-normal text-bunker-200 outline-none data-[placeholder]:text-gray-500`, + bg-mineshaft-900 px-3 py-2 font-inter text-sm font-normal text-bunker-200 outline-none data-[placeholder]:text-mineshaft-200`, className )} > diff --git a/frontend/src/views/Project/LogsPage/components/LogsFilter.tsx b/frontend/src/views/Project/LogsPage/components/LogsFilter.tsx index 88523e012..19edfc150 100644 --- a/frontend/src/views/Project/LogsPage/components/LogsFilter.tsx +++ b/frontend/src/views/Project/LogsPage/components/LogsFilter.tsx @@ -1,10 +1,7 @@ import { useState } from "react"; import { Control, Controller, UseFormReset } from "react-hook-form"; -import { faFilterCircleXmark } from "@fortawesome/free-solid-svg-icons"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { - Button, DatePicker, FormControl, Select, @@ -76,7 +73,7 @@ export const LogsFilter = ({ {...(field.value ? { value: field.value } : { placeholder: "Select" })} {...field} onValueChange={(e) => onChange(e)} - className="w-full" + className="w-full bg-mineshaft-700 border border-mineshaft-500 text-mineshaft-100" > {eventTypes.map(({ label, value }) => ( @@ -102,7 +99,7 @@ export const LogsFilter = ({ {...(field.value ? { value: field.value } : { placeholder: "Select" })} {...field} onValueChange={(e) => onChange(e)} - className="w-full" + className="w-full bg-mineshaft-700 border border-mineshaft-500 text-mineshaft-100" > {data.map((actor) => renderActorSelectItem(actor))} @@ -124,7 +121,7 @@ export const LogsFilter = ({ {...(field.value ? { value: field.value } : { placeholder: "Select" })} {...field} onValueChange={(e) => onChange(e)} - className="w-full" + className="w-full bg-mineshaft-700 border border-mineshaft-500 text-mineshaft-100" > {userAgentTypes.map(({ label, value }) => ( diff --git a/frontend/src/views/Project/LogsPage/components/LogsTableRow.tsx b/frontend/src/views/Project/LogsPage/components/LogsTableRow.tsx index d4d5bfa97..c9cffba26 100644 --- a/frontend/src/views/Project/LogsPage/components/LogsTableRow.tsx +++ b/frontend/src/views/Project/LogsPage/components/LogsTableRow.tsx @@ -2,10 +2,9 @@ import { Td, Tr } from "@app/components/v2"; - -import { eventToNameMap, userAgentTTypeoNameMap } from "~/hooks/api/auditLogs/constants"; -import { ActorType, EventType } from "~/hooks/api/auditLogs/enums"; -import { Actor, AuditLog, Event } from "~/hooks/api/auditLogs/types"; +import { eventToNameMap, userAgentTTypeoNameMap } from "@app/hooks/api/auditLogs/constants"; +import { ActorType, EventType } from "@app/hooks/api/auditLogs/enums"; +import { Actor, AuditLog, Event } from "@app/hooks/api/auditLogs/types"; type Props = { auditLog: AuditLog @@ -278,7 +277,7 @@ export const LogsTableRow = ({ ); default: return ( - + ); } } @@ -302,7 +301,7 @@ export const LogsTableRow = ({ } return ( - + {formatDate(auditLog.createdAt)} {`${eventToNameMap[auditLog.event.type]}`} {renderActor(auditLog.actor)}