diff --git a/ui/frontend/build_src/src/components/molecules/clearQueue/index.tsx b/ui/frontend/build_src/src/components/molecules/clearQueue/index.tsx index 4f3d8196..ba1594ae 100644 --- a/ui/frontend/build_src/src/components/molecules/clearQueue/index.tsx +++ b/ui/frontend/build_src/src/components/molecules/clearQueue/index.tsx @@ -3,8 +3,9 @@ import { doStopImage } from "../../../api"; import { useRequestQueue } from "../../../stores/requestQueueStore"; import { - ClearQueueButton -} from "./clearQueue.css"; + buttonStyle +} from "../../_recipes/button.css"; + export default function ClearQueue() { @@ -21,7 +22,13 @@ export default function ClearQueue() { }; return ( - ); diff --git a/ui/frontend/build_src/src/components/molecules/stopButton/index.tsx b/ui/frontend/build_src/src/components/molecules/stopButton/index.tsx index 7f4f66b9..64744ff8 100644 --- a/ui/frontend/build_src/src/components/molecules/stopButton/index.tsx +++ b/ui/frontend/build_src/src/components/molecules/stopButton/index.tsx @@ -1,7 +1,11 @@ import React from "react"; import { doStopImage } from "../../../api"; -import { BrandedButton } from "../../../styles/shared.css"; +// import { BrandedButton } from "../../../styles/shared.css"; + +import { + buttonStyle +} from "../../_recipes/button.css"; export default function StopButton() { @@ -13,5 +17,11 @@ export default function StopButton() { } }; - return ; + return ; } diff --git a/ui/frontend/build_src/src/components/organisms/displayPanel/completedImages/completedImages.css.ts b/ui/frontend/build_src/src/components/organisms/displayPanel/completedImages/completedImages.css.ts index b7554cbc..7f9b4661 100644 --- a/ui/frontend/build_src/src/components/organisms/displayPanel/completedImages/completedImages.css.ts +++ b/ui/frontend/build_src/src/components/organisms/displayPanel/completedImages/completedImages.css.ts @@ -48,12 +48,3 @@ globalStyle(`${imageContain} img`, { width: "100%", objectFit: "contain", }); - -export const RemoveButton = style({ - marginLeft: vars.spacing.small, - backgroundColor: vars.colors.brand, - border: "0 none", - padding: vars.spacing.small, - cursor: "pointer", - borderRadius: vars.trim.smallBorderRadius, -}); diff --git a/ui/frontend/build_src/src/components/organisms/displayPanel/completedImages/index.tsx b/ui/frontend/build_src/src/components/organisms/displayPanel/completedImages/index.tsx index 1237003e..abe65b39 100644 --- a/ui/frontend/build_src/src/components/organisms/displayPanel/completedImages/index.tsx +++ b/ui/frontend/build_src/src/components/organisms/displayPanel/completedImages/index.tsx @@ -10,6 +10,10 @@ import { RemoveButton, } from "./completedImages.css"; +import { + buttonStyle +} from "../../../_recipes/button.css"; + export default function CompletedImages( @@ -31,7 +35,7 @@ export default function CompletedImages( {/* Adjust the dom do we dont do this check twice */} {images != null && images.length > 0 && ( @@ -51,4 +48,4 @@ export default function QueueDisplay() { })} ); -} +}; diff --git a/ui/frontend/build_src/src/components/organisms/queueDisplay/queueDisplay.css.ts b/ui/frontend/build_src/src/components/organisms/queueDisplay/queueDisplay.css.ts index a23b806a..3d673caf 100644 --- a/ui/frontend/build_src/src/components/organisms/queueDisplay/queueDisplay.css.ts +++ b/ui/frontend/build_src/src/components/organisms/queueDisplay/queueDisplay.css.ts @@ -26,14 +26,4 @@ globalStyle(`${QueueListButtons} button`, { globalStyle(`${QueueListButtons} button:first-child`, { marginRight: vars.spacing.medium, -}); - - -// TODO these should be a button recipe? -export const CompleteButtton = style([BrandedButton, { - -}]); - -export const ErrorButton = style([BrandedButton, { - -}]); \ No newline at end of file +}); \ No newline at end of file diff --git a/ui/frontend/build_src/src/components/organisms/queueDisplay/queueItem/index.tsx b/ui/frontend/build_src/src/components/organisms/queueDisplay/queueItem/index.tsx index 1137fb8f..bc5c2609 100644 --- a/ui/frontend/build_src/src/components/organisms/queueDisplay/queueItem/index.tsx +++ b/ui/frontend/build_src/src/components/organisms/queueDisplay/queueItem/index.tsx @@ -14,15 +14,20 @@ import { QueueItemMain, QueueItemInfo, QueueButtons, - CompleteButtton, - PauseButton, - ResumeButton, - CancelButton, - RetryButton, - SendToTopButton, + // CompleteButtton, + // PauseButton, + // ResumeButton, + // CancelButton, + // RetryButton, + // SendToTopButton, } from "./queueItem.css"; +import { + buttonStyle +} from "../../../_recipes/button.css"; + + interface QueueItemProps { request: QueuedRequest; } @@ -84,23 +89,41 @@ export default function QueueItem({ request }: QueueItemProps) { )} {status === QueueStatus.complete && ( - + )} {status === QueueStatus.pending && ( <> - - - + + + )} {status === QueueStatus.paused && ( - + )} {status === QueueStatus.error && ( - + )} diff --git a/ui/frontend/build_src/src/components/organisms/queueDisplay/queueItem/queueItem.css.ts b/ui/frontend/build_src/src/components/organisms/queueDisplay/queueItem/queueItem.css.ts index af8ebcef..5c5062ab 100644 --- a/ui/frontend/build_src/src/components/organisms/queueDisplay/queueItem/queueItem.css.ts +++ b/ui/frontend/build_src/src/components/organisms/queueDisplay/queueItem/queueItem.css.ts @@ -55,26 +55,26 @@ export const QueueButtons = style({ // TODO these should be a button recipe? -export const CompleteButtton = style([BrandedButton, { +// export const CompleteButtton = style([BrandedButton, { -}]); +// }]); -export const PauseButton = style([BrandedButton, { +// export const PauseButton = style([BrandedButton, { -}]); +// }]); -export const ResumeButton = style([BrandedButton, { +// export const ResumeButton = style([BrandedButton, { -}]); +// }]); -export const CancelButton = style([BrandedButton, { +// export const CancelButton = style([BrandedButton, { -}]); +// }]); -export const RetryButton = style([BrandedButton, { +// export const RetryButton = style([BrandedButton, { -}]); +// }]); -export const SendToTopButton = style([BrandedButton, { +// export const SendToTopButton = style([BrandedButton, { -}]); +// }]);