swapped colors and fixed bugs

Nerimity · Oct 27, 2024 · d694180 · d694180
1 parent 166c5ed
commit d694180
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/components/tickets/TicketItem.tsx b/src/components/tickets/TicketItem.tsx
@@ -1,5 +1,6 @@
 import { RawTicket, TicketCategory, TicketStatus } from "@/chat-api/RawData";
-import { Dynamic, Show } from "solid-js/web";
+import { Show } from "solid-js";
+import { Dynamic } from "solid-js/web";
 import { css, styled } from "solid-styled-components";
 import { CustomLink } from "../ui/CustomLink";
 import Text from "../ui/Text";
@@ -141,18 +142,18 @@ export const TicketStatusToName = (as: "mod" | "user") =>
   ({
     [TicketStatus.CLOSED_AS_DONE]: {
       text: "Resolved",
-      color: "var(--primary-color)",
+      color: "var(--success-color)",
     },
     [TicketStatus.CLOSED_AS_INVALID]: {
       text: "Invalid",
       color: "var(--alert-color)",
     },
     [TicketStatus.WAITING_FOR_MODERATOR_RESPONSE]: {
       text: as === "user" ? "Reply Sent" : "Response Needed",
-      color: as === "user" ? "var(--success-color)" : "var(--warn-color)",
+      color: as === "user" ? "var(--primary-color)" : "var(--warn-color)",
     },
     [TicketStatus.WAITING_FOR_USER_RESPONSE]: {
       text: as === "user" ? "Response Needed" : "Reply Sent",
-      color: as === "user" ? "var(--warn-color)" : "var(--success-color)",
+      color: as === "user" ? "var(--warn-color)" : "var(--primary-color)",
     },
   } as Record<string, { text: string; color: string }>);
diff --git a/src/components/tickets/TicketsPage.tsx b/src/components/tickets/TicketsPage.tsx
@@ -61,7 +61,11 @@ const TicketsPage = () => {
       >
         <Breadcrumb>
           <Show when={!isModeration()}>
-            <BreadcrumbItem href="/app" icon="home" title={t("dashboard.title")} />
+            <BreadcrumbItem
+              href="/app"
+              icon="home"
+              title={t("dashboard.title")}
+            />
           </Show>
           <Show when={isModeration()}>
             <BreadcrumbItem
@@ -115,7 +119,7 @@ const TicketStatusButtons = (props: {
 }) => {
   return (
     <FlexColumn gap={4}>
-      <Text>Sort:</Text>
+      <Text>Filter:</Text>
       <FlexRow wrap gap={4}>
         <For each={Object.keys(TicketStatusToName("mod"))}>
           {(key) => {