diff --git a/ui/frontend/build_src/src/components/layouts/App.tsx b/ui/frontend/build_src/src/components/layouts/App.tsx index f13ac47a..7d53cc82 100644 --- a/ui/frontend/build_src/src/components/layouts/App.tsx +++ b/ui/frontend/build_src/src/components/layouts/App.tsx @@ -1,13 +1,12 @@ import React, { useEffect, useState } from "react"; -import { +import { AppLayout, HeaderLayout, CreateLayout, DisplayLayout, - FooterLayout -} // @ts-ignore -from './app.css.ts'; + FooterLayout, // @ts-ignore +} from "./app.css.ts"; import { useQuery } from "@tanstack/react-query"; import { getSaveDirectory } from "../../api"; diff --git a/ui/frontend/build_src/src/components/layouts/app.css.ts b/ui/frontend/build_src/src/components/layouts/app.css.ts index e2076867..919047c7 100644 --- a/ui/frontend/build_src/src/components/layouts/app.css.ts +++ b/ui/frontend/build_src/src/components/layouts/app.css.ts @@ -1,24 +1,24 @@ -import { style } from '@vanilla-extract/css'; +import { style } from "@vanilla-extract/css"; export const AppLayout = style({ - position: 'relative', - width: '100%', - height: '100%', - pointerEvents: 'auto', - display: 'grid', - backgroundColor: 'rgb(32, 33, 36)', - gridTemplateColumns: '400px 1fr', - gridTemplateRows: '100px 1fr 50px', + position: "relative", + width: "100%", + height: "100%", + pointerEvents: "auto", + display: "grid", + backgroundColor: "rgb(32, 33, 36)", + gridTemplateColumns: "400px 1fr", + gridTemplateRows: "100px 1fr 50px", gridTemplateAreas: ` "header header header" "create display display" "create footer footer" `, - '@media': { - 'screen and (max-width: 800px)': { - gridTemplateColumns: '1fr', - gridTemplateRows: '100px 1fr 1fr 50px', + "@media": { + "screen and (max-width: 800px)": { + gridTemplateColumns: "1fr", + gridTemplateRows: "100px 1fr 1fr 50px", gridTemplateAreas: ` "header" "create" @@ -30,19 +30,19 @@ export const AppLayout = style({ }); export const HeaderLayout = style({ - gridArea: 'header', + gridArea: "header", }); -export const CreateLayout = style({ - gridArea: 'create', - overflow: 'auto', +export const CreateLayout = style({ + gridArea: "create", + overflow: "auto", }); export const DisplayLayout = style({ - gridArea: 'display', - overflow: 'auto', + gridArea: "display", + overflow: "auto", }); export const FooterLayout = style({ - gridArea: 'footer', -}); \ No newline at end of file + gridArea: "footer", +}); diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/activeTags/index.tsx b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/activeTags/index.tsx index 85c26de5..9eb17e5c 100644 --- a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/activeTags/index.tsx +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/activeTags/index.tsx @@ -7,14 +7,14 @@ export default function ActiveTags() { const selectedtags = useImageCreate((state) => state.selectedTags()); return (
-

Active Tags

- -
+

Active Tags

+ + ); -} \ No newline at end of file +} diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/basicCreation.css.ts b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/basicCreation.css.ts index b52c2be2..1d9d9036 100644 --- a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/basicCreation.css.ts +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/basicCreation.css.ts @@ -1,28 +1,27 @@ -import { style, globalStyle } from '@vanilla-extract/css'; +import { style, globalStyle } from "@vanilla-extract/css"; export const CreationBasicMain = style({ - position: 'relative', - width: '100%', + position: "relative", + width: "100%", }); globalStyle(`${CreationBasicMain} > *`, { - marginBottom: '10px' + marginBottom: "10px", }); -export const PromptDisplay = style({ -}); +export const PromptDisplay = style({}); globalStyle(`${PromptDisplay} > p`, { - fontSize: '1.5em', - fontWeight: 'bold', - marginBottom: '10px' + fontSize: "1.5em", + fontWeight: "bold", + marginBottom: "10px", }); globalStyle(`${PromptDisplay} > textarea`, { - fontSize: '1.2em', - fontWeight: 'bold', - fontFamily: 'Arial', - width: '100%', - resize:'vertical', - height: '100px', + fontSize: "1.2em", + fontWeight: "bold", + fontFamily: "Arial", + width: "100%", + resize: "vertical", + height: "100px", }); diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/index.tsx b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/index.tsx index f8b7b70e..f9a09052 100644 --- a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/index.tsx +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/index.tsx @@ -1,21 +1,16 @@ - -import React, {ChangeEvent} from "react"; +import React, { ChangeEvent } from "react"; import { useImageCreate } from "../../../../store/imageCreateStore"; - - import { CreationBasicMain, - PromptDisplay, -} // @ts-ignore -from "./basicCreation.css.ts"; + PromptDisplay, // @ts-ignore +} from "./basicCreation.css.ts"; import SeedImage from "./seedImage"; import ActiveTags from "./activeTags"; import MakeButton from "./makeButton"; export default function BasicCreation() { - const promptText = useImageCreate((state) => state.getValueForRequestKey("prompt") ); @@ -27,17 +22,16 @@ export default function BasicCreation() { return (
- -
-

Prompt

- +
+

Prompt

+ +
+ + + + + +
- - - - - - -
- ) -} \ No newline at end of file + ); +} diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/makeButton/index.tsx b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/makeButton/index.tsx index d74debea..d4ffcbc0 100644 --- a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/makeButton/index.tsx +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/makeButton/index.tsx @@ -6,11 +6,9 @@ import { v4 as uuidv4 } from "uuid"; import { useRandomSeed } from "../../../../../utils"; -import { - MakeButtonStyle -} from // @ts-ignore -"./makeButton.css.ts"; - +import { + MakeButtonStyle, // @ts-ignore +} from "./makeButton.css.ts"; export default function MakeButton() { const parallelCount = useImageCreate((state) => state.parallelCount); @@ -71,8 +69,11 @@ export default function MakeButton() { // update the seed for the next time we click the button setRequestOption("seed", useRandomSeed()); } - }; - return ; + return ( + + ); } diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/makeButton/makeButton.css.ts b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/makeButton/makeButton.css.ts index 28f04382..16a10986 100644 --- a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/makeButton/makeButton.css.ts +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/makeButton/makeButton.css.ts @@ -1,11 +1,11 @@ -import { style } from '@vanilla-extract/css'; +import { style } from "@vanilla-extract/css"; export const MakeButtonStyle = style({ - width: '100%', - backgroundColor: 'rgb(38, 77, 141)', - fontSize: '1.5em', - fontWeight: 'bold', - color: 'white', - padding:'8px', - borderRadius: '5px', -}); \ No newline at end of file + width: "100%", + backgroundColor: "rgb(38, 77, 141)", + fontSize: "1.5em", + fontWeight: "bold", + color: "white", + padding: "8px", + borderRadius: "5px", +}); diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/seedImage/index.tsx b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/seedImage/index.tsx index ec06d432..d07e7f94 100644 --- a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/seedImage/index.tsx +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/seedImage/index.tsx @@ -1,21 +1,18 @@ -import React , {useRef, ChangeEvent} from "react"; +import React, { useRef, ChangeEvent } from "react"; -import { - ImageInputDisplay, +import { + ImageInputDisplay, InputLabel, ImageInput, ImageInputButton, - ImageFixer, - XButton -} from // @ts-ignore -"./seedImage.css.ts"; + ImageFixer, + XButton, // @ts-ignore +} from "./seedImage.css.ts"; import { useImageCreate } from "../../../../../store/imageCreateStore"; - // TODO : figure out why this needs props to be passed in.. fixes a type error // when the component is used in the parent component -export default function SeedImage(_props:any) { - +export default function SeedImage(_props: any) { const imageInputRef = useRef(null); const init_image = useImageCreate((state) => @@ -25,7 +22,7 @@ export default function SeedImage(_props:any) { const _startFileSelect = () => { imageInputRef.current?.click(); - } + }; const _handleFileSelect = (event: ChangeEvent) => { //@ts-ignore const file = event.target.files[0]; @@ -41,14 +38,12 @@ export default function SeedImage(_props:any) { } }; - const _handleClearImage = () => { setRequestOption("init_image", undefined); }; return (
-
{init_image && ( <> - + - - + + )}
- -
); -}; \ No newline at end of file +} diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/seedImage/seedImage.css.ts b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/seedImage/seedImage.css.ts index d9b30b1f..56d4b4f0 100644 --- a/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/seedImage/seedImage.css.ts +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/seedImage/seedImage.css.ts @@ -1,48 +1,46 @@ -import { style } from '@vanilla-extract/css'; +import { style } from "@vanilla-extract/css"; export const ImageInputDisplay = style({ - display: 'flex', + display: "flex", // justifyContent:'space-around', }); export const InputLabel = style({ - marginBottom: '5px', - display:'block' - + marginBottom: "5px", + display: "block", }); export const ImageInput = style({ - display:'none', + display: "none", }); export const ImageInputButton = style({ - backgroundColor: 'rgb(38, 77, 141)', - fontSize: '1.2em', - fontWeight: 'bold', - color: 'white', - padding:'8px', - borderRadius: '5px', + backgroundColor: "rgb(38, 77, 141)", + fontSize: "1.2em", + fontWeight: "bold", + color: "white", + padding: "8px", + borderRadius: "5px", }); // this is needed to fix an issue with the image input text // when that is a drag an drop we can remove this export const ImageFixer = style({ - marginLeft: '20px', + marginLeft: "20px", }); export const XButton = style({ - position: 'absolute', - transform: 'translateX(-50%) translateY(-35%)', - background: 'black', - color: 'white', - border: '2pt solid #ccc', - padding: '0', - cursor: 'pointer', - outline: 'inherit', - borderRadius: '8pt', - width: '16pt', - height: '16pt', - fontFamily: 'Verdana', - fontSize: '8pt', + position: "absolute", + transform: "translateX(-50%) translateY(-35%)", + background: "black", + color: "white", + border: "2pt solid #ccc", + padding: "0", + cursor: "pointer", + outline: "inherit", + borderRadius: "8pt", + width: "16pt", + height: "16pt", + fontFamily: "Verdana", + fontSize: "8pt", }); - diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/creationpane.css.ts b/ui/frontend/build_src/src/components/organisms/creationPanel/creationpane.css.ts index c61f5f1c..da211031 100644 --- a/ui/frontend/build_src/src/components/organisms/creationPanel/creationpane.css.ts +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/creationpane.css.ts @@ -1,8 +1,8 @@ -import { style } from '@vanilla-extract/css'; +import { style } from "@vanilla-extract/css"; export const CreationPaneMain = style({ - position: 'relative', - width: '100%', - height: '100%', - padding:'0 10px', + position: "relative", + width: "100%", + height: "100%", + padding: "0 10px", }); diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/index.tsx b/ui/frontend/build_src/src/components/organisms/creationPanel/index.tsx index 604a140b..7b7ebb18 100644 --- a/ui/frontend/build_src/src/components/organisms/creationPanel/index.tsx +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/index.tsx @@ -12,10 +12,8 @@ import { CreationPaneMain } from "./creationpane.css.ts"; import BasicCreation from "./basicCreation"; export default function CreationPanel() { - return (
-
@@ -24,4 +22,4 @@ export default function CreationPanel() {
); -} \ No newline at end of file +} diff --git a/ui/frontend/build_src/src/components/organisms/displayPanel/generatedImage/index.tsx b/ui/frontend/build_src/src/components/organisms/displayPanel/generatedImage/index.tsx index cbca2736..08511ccf 100644 --- a/ui/frontend/build_src/src/components/organisms/displayPanel/generatedImage/index.tsx +++ b/ui/frontend/build_src/src/components/organisms/displayPanel/generatedImage/index.tsx @@ -1,6 +1,9 @@ import React, { useCallback } from "react"; -import { ImageRequest, useImageCreate } from "../../../../store/imageCreateStore"; +import { + ImageRequest, + useImageCreate, +} from "../../../../store/imageCreateStore"; import "./generatedImage.css"; diff --git a/ui/frontend/build_src/src/components/organisms/displayPanel/index.tsx b/ui/frontend/build_src/src/components/organisms/displayPanel/index.tsx index c0c033ff..5f528b17 100644 --- a/ui/frontend/build_src/src/components/organisms/displayPanel/index.tsx +++ b/ui/frontend/build_src/src/components/organisms/displayPanel/index.tsx @@ -11,7 +11,7 @@ import AudioDing from "./audioDing"; import GeneratedImage from "./generatedImage"; -import './displayPanel.css'; +import "./displayPanel.css"; type CompletedImagesType = { id: string; @@ -102,12 +102,11 @@ export default function DisplayPanel() {
{completedImages.map((image, index) => { - if (void 0 !== image) { debugger; - if(index == 0){ - return null; - } + if (index == 0) { + return null; + } return ( ); - } else { - console.warn("image is undefined", image, index); - return null; + console.warn("image is undefined", image, index); + return null; } })}
- )} diff --git a/ui/frontend/build_src/src/main.tsx b/ui/frontend/build_src/src/main.tsx index 59e64a17..9d3ed7c2 100644 --- a/ui/frontend/build_src/src/main.tsx +++ b/ui/frontend/build_src/src/main.tsx @@ -8,7 +8,7 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; import { enableMapSet } from "immer"; import App from "./components/layouts/App"; -import './styles.css.ts'; +import "./styles.css.ts"; const queryClient = new QueryClient({ defaultOptions: { diff --git a/ui/frontend/build_src/src/styles.css.ts b/ui/frontend/build_src/src/styles.css.ts index e33ea76a..13234aa5 100644 --- a/ui/frontend/build_src/src/styles.css.ts +++ b/ui/frontend/build_src/src/styles.css.ts @@ -1,24 +1,22 @@ +import { globalStyle } from "@vanilla-extract/css"; -import { globalStyle } from '@vanilla-extract/css'; - -globalStyle('body', { +globalStyle("body", { margin: 0, - minWidth: '320px', - minHeight: '100vh', + minWidth: "320px", + minHeight: "100vh", }); -globalStyle('#root', { - position: 'absolute', +globalStyle("#root", { + position: "absolute", top: 0, left: 0, - width: '100vw', - height: '100vh', - overflow: 'hidden', + width: "100vw", + height: "100vh", + overflow: "hidden", }); - globalStyle(`*`, { - boxSizing: 'border-box', + boxSizing: "border-box", }); globalStyle(`p`, { @@ -28,5 +26,5 @@ globalStyle(`p`, { globalStyle(`textarea`, { margin: 0, padding: 0, - border: 'none', -}); \ No newline at end of file + border: "none", +}); diff --git a/ui/frontend/build_src/vite.config.ts b/ui/frontend/build_src/vite.config.ts index 3625a80f..35317af2 100644 --- a/ui/frontend/build_src/vite.config.ts +++ b/ui/frontend/build_src/vite.config.ts @@ -1,7 +1,6 @@ import { defineConfig } from "vite"; import react from "@vitejs/plugin-react"; -import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin'; - +import { vanillaExtractPlugin } from "@vanilla-extract/vite-plugin"; // https://vitejs.dev/config/ export default defineConfig({ @@ -9,12 +8,12 @@ export default defineConfig({ react(), vanillaExtractPlugin({ // configuration - }) + }), ], server: { port: 9001, }, - + build: { // make sure everythign is in the same directory outDir: "../dist", @@ -26,7 +25,6 @@ export default defineConfig({ chunkFileNames: `[name].js`, assetFileNames: `[name].[ext]`, }, - }, }, });