clean build, and moved assets

This commit is contained in:
caranicas 2022-09-14 11:16:36 -04:00
parent 29e5263fcc
commit 716491a68e
11 changed files with 261 additions and 43 deletions

View File

@ -20,23 +20,42 @@
"16-bit", "16-bit",
"Anaglyph", "Anaglyph",
"Anime", "Anime",
"Art Nouveau",
"Bauhaus",
"Baroque",
"CGI", "CGI",
"Cartoon", "Cartoon",
"Comic Book", "Comic Book",
"Concept Art", "Concept Art",
"Constructivist",
"Cubist",
"Digital Art", "Digital Art",
"Dadaist",
"Expressionist",
"Fantasy", "Fantasy",
"Fauvist",
"Figurative",
"Graphic Novel", "Graphic Novel",
"Geometric",
"Hard Edge Painting", "Hard Edge Painting",
"Hydrodipped", "Hydrodipped",
"Impressionistic",
"Lithography", "Lithography",
"Manga", "Manga",
"Minimalist",
"Modern Art", "Modern Art",
"Mosaic", "Mosaic",
"Mural", "Mural",
"Naive",
"Neoclassical",
"Photo", "Photo",
"Realistic", "Realistic",
"Rococo",
"Romantic",
"Street Art", "Street Art",
"Symbolist",
"Stuckist",
"Surrealist",
"Visual Novel", "Visual Novel",
"Watercolor" "Watercolor"
] ]
@ -78,9 +97,13 @@
"Glamor Shot", "Glamor Shot",
"Golden Hour", "Golden Hour",
"HD", "HD",
"Landscape",
"Lens Flare", "Lens Flare",
"Macro", "Macro",
"Polaroid", "Polaroid",
"Photoshoot",
"Portrait",
"Studio Lighting",
"Vintage", "Vintage",
"War Photography", "War Photography",
"White Balance", "White Balance",
@ -91,10 +114,13 @@
"Color", "Color",
[ [
"Beautiful Lighting", "Beautiful Lighting",
"Cold Color Palette",
"Colorful", "Colorful",
"Dynamic Lighting", "Dynamic Lighting",
"Electric Colors", "Electric Colors",
"Infrared", "Infrared",
"Pastel",
"Neon",
"Synthwave", "Synthwave",
"Warm Color Palette" "Warm Color Palette"
] ]
@ -103,49 +129,130 @@
"Emotions", "Emotions",
[ [
"Angry", "Angry",
"Bitter",
"Disgusted", "Disgusted",
"Embarrassed", "Embarrassed",
"Evil", "Evil",
"Excited", "Excited",
"Fear", "Fear",
"Funny",
"Happy", "Happy",
"Horrifying",
"Lonely", "Lonely",
"Sad", "Sad",
"Surprised" "Serene",
"Surprised",
"Melancholic"
] ]
], ],
[ [
"Style of an artist or community", "Style of an artist or community",
[ [
"Artstation", "Artstation",
"trending on Artstation",
"by Agnes Lawrence Pelton", "by Agnes Lawrence Pelton",
"by Akihito Yoshida", "by Akihito Yoshida",
"by Alex Grey",
"by Alexander Jansson",
"by Alphonse Mucha",
"by Andy Warhol", "by Andy Warhol",
"by Artgerm", "by Artgerm",
"by Asaf Hanuka", "by Asaf Hanuka",
"by Aubrey Beardsley", "by Aubrey Beardsley",
"by Banksy", "by Banksy",
"by Beeple",
"by Ben Enwonwu", "by Ben Enwonwu",
"by Bob Eggleton",
"by Caravaggio Michelangelo Merisi", "by Caravaggio Michelangelo Merisi",
"by Caspar David Friedrich",
"by Chris Foss",
"by Claude Monet",
"by Dan Mumford",
"by David Mann", "by David Mann",
"by Diego Velázquez",
"by Disney Animation Studios",
"by Édouard Manet",
"by Esao Andrews",
"by Frida Kahlo", "by Frida Kahlo",
"by Gediminas Pranckevicius",
"by Georgia O'Keeffe",
"by Greg Rutkowski",
"by Gustave Doré",
"by Gustave Klimt",
"by H.R. Giger", "by H.R. Giger",
"by Hayao Miyazaki", "by Hayao Miyazaki",
"by Henri Matisse",
"by HP Lovecraft",
"by Ivan Shishkin", "by Ivan Shishkin",
"by Jack Kirby",
"by Jackson Pollock",
"by James Jean",
"by Jim Burns",
"by Johannes Vermeer", "by Johannes Vermeer",
"by John William Waterhouse", "by John William Waterhouse",
"by Katsushika Hokusai", "by Katsushika Hokusai",
"by Kim Tschang Yeul",
"by Ko Young Hoon", "by Ko Young Hoon",
"by Leonardo da Vinci", "by Leonardo da Vinci",
"by Lisa Frank", "by Lisa Frank",
"by M.C. Escher",
"by Mahmoud Saïd", "by Mahmoud Saïd",
"by Makoto Shinkai",
"by Marc Simonetti",
"by Mark Brooks", "by Mark Brooks",
"by Michelangelo",
"by Pablo Picasso", "by Pablo Picasso",
"by Paul Klee",
"by Peter Mohrbacher",
"by Pierre-Auguste Renoir",
"by Pixar Animation Studios",
"by Rembrandt",
"by Richard Dadd", "by Richard Dadd",
"by Rossdraws",
"by Salvador Dalí", "by Salvador Dalí",
"by Sam Does Arts",
"by Sandro Botticelli",
"by Ted Nasmith",
"by Ten Hundred",
"by Thomas Kinkade",
"by Tivadar Csontváry Kosztka", "by Tivadar Csontváry Kosztka",
"by Yoshitaka Amano", "by Victo Ngai",
"by wlop" "by Vincent Di Fate",
"by Vincent van Gogh",
"by Wes Anderson",
"by wlop",
"by Yoshitaka Amano"
]
],
[
"CGI Software",
[
"3D Model",
"3D Sculpt",
"3Ds Max Model",
"Blender Model",
"Cinema4d Model",
"Maya Model",
"Unreal Engine",
"Zbrush Sculpt"
]
],
[
"CGI Rendering",
[
"3D Render",
"Corona Render",
"Creature Design",
"Cycles Render",
"Detailed Render",
"Environment Design",
"Intricate Environment",
"LSD Render",
"Octane Render",
"PBR",
"Glass Caustics",
"Global Illumination",
"Subsurface Scattering"
] ]
] ]
] ]

View File

@ -13,8 +13,8 @@ type ModifierListProps = {
} }
function ModifierList({tags}: ModifierListProps) { function ModifierList({tags}: ModifierListProps) {
const setImageOptions = useImageCreate((state) => state.setImageOptions); // const setImageOptions = useImageCreate((state) => state.setImageOptions);
const imageOptions = useImageCreate((state) => state.imageOptions); // const imageOptions = useImageCreate((state) => state.imageOptions);
return( return(
<ul className="modifier-list"> <ul className="modifier-list">
{tags.map((tag) => ( {tags.map((tag) => (

View File

@ -23,6 +23,7 @@ export default function CreationPanel() {
const _handleFileSelect = (event: ChangeEvent<HTMLInputElement>) => { const _handleFileSelect = (event: ChangeEvent<HTMLInputElement>) => {
//console.log("file select", event); //console.log("file select", event);
//@ts-ignore
const file = event.target.files[0]; const file = event.target.files[0];
// console.log("file", file); // console.log("file", file);

View File

@ -39,6 +39,7 @@ export default function DisplayPanel() {
const temp = completedQueries.map((query, index ) => { const temp = completedQueries.map((query, index ) => {
// debugger; // debugger;
if(void 0 !== query) { if(void 0 !== query) {
//@ts-ignore
return query.output.map((data)=>{ return query.output.map((data)=>{
return {id: `${completedIds[index]}-${data.seed}`, data: data.data} return {id: `${completedIds[index]}-${data.seed}`, data: data.data}
}) })

View File

@ -14,7 +14,6 @@ export type ImageCreationUiOptions = {
isSoundEnabled: boolean; isSoundEnabled: boolean;
} }
export type ImageRequest = { export type ImageRequest = {
prompt: string; prompt: string;
seed: number; seed: number;

View File

@ -2,14 +2,14 @@ import create from 'zustand';
import produce from 'immer'; import produce from 'immer';
import { useRandomSeed } from '../utils'; import { useRandomSeed } from '../utils';
import { imageOptions } from './imageCreateStore'; import { ImageRequest } from './imageCreateStore';
interface ImageQueueState { interface ImageQueueState {
images : imageOptions[]; images : ImageRequest[];
completedImageIds: string[]; completedImageIds: string[];
addNewImage: (id:string, imageOptions: imageOptions) => void addNewImage: (id:string, imgRec: ImageRequest) => void
hasQueuedImages: () => boolean; hasQueuedImages: () => boolean;
firstInQueue: () => imageOptions | []; firstInQueue: () => ImageRequest | [];
removeFirstInQueue: () => void; removeFirstInQueue: () => void;
} }
@ -19,15 +19,14 @@ export const useImageQueue = create<ImageQueueState>((set, get) => ({
images: new Array(), images: new Array(),
completedImageIds: new Array(), completedImageIds: new Array(),
// use produce to make sure we don't mutate state // use produce to make sure we don't mutate state
addNewImage: (id: string, imageOptions: any) => { addNewImage: (id: string, imgRec: ImageRequest, isRandom= false) => {
set( produce((state) => { set( produce((state) => {
let { seed } = imageOptions; let { seed } = imgRec;
if (imageOptions.isSeedRandom) { if (isRandom) {
seed = useRandomSeed(); seed = useRandomSeed();
} }
state.images.push({ id, options: {...imgRec, seed} });
state.images.push({ id, options: {...imageOptions, seed} });
})); }));
}, },
@ -35,7 +34,7 @@ export const useImageQueue = create<ImageQueueState>((set, get) => ({
return get().images.length > 0; return get().images.length > 0;
}, },
firstInQueue: () => { firstInQueue: () => {
return get().images[0] as imageOptions || []; return get().images[0] as ImageRequest || [];
}, },
removeFirstInQueue: () => { removeFirstInQueue: () => {

View File

@ -12,8 +12,11 @@
<div id="root"></div> <div id="root"></div>
<!--- the original code for the working application --> <!-- ORIGINAL CODE BELOW FOR REFENCE -->
<!-- moved the styles into the body for complication purposes -->
<!-- KEEP FOR NOW -->
<!-- THE STYLES ARE BEING USED IN THE REACT APP -->
<!-- WE NEED TO PORT OVER THE STYLES OVER TO THE REACT COMPONENTS -->
<style> <style>
body { body {
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
@ -273,8 +276,10 @@
} }
</style> </style>
<!-- ALL OF THIS IS HERE FOR REFERNCE FOR THE TIME BEING BUT CAN BE SAFLEY REMOVED -->
<!-- All of the original DOM --> <!-- All of the original DOM -->
<div id="container"> <div id="container" style="display: none;">
<div class="flex-container"> <div class="flex-container">
<div id="editor" class="col-50"> <div id="editor" class="col-50">
<div id="meta"> <div id="meta">
@ -1248,15 +1253,14 @@
} }
} }
/* TURNED OFF */
async function init() { async function init() {
await loadModifiers() // await loadModifiers()
await getDiskPath() // await getDiskPath()
await getAppConfig() // await getAppConfig()
// setInterval(healthCheck, HEALTH_PING_INTERVAL * 1000)
setInterval(healthCheck, HEALTH_PING_INTERVAL * 1000) // healthCheck()
healthCheck() // playSound()
playSound()
} }
init() init()

File diff suppressed because one or more lines are too long

View File

@ -20,23 +20,42 @@
"16-bit", "16-bit",
"Anaglyph", "Anaglyph",
"Anime", "Anime",
"Art Nouveau",
"Bauhaus",
"Baroque",
"CGI", "CGI",
"Cartoon", "Cartoon",
"Comic Book", "Comic Book",
"Concept Art", "Concept Art",
"Constructivist",
"Cubist",
"Digital Art", "Digital Art",
"Dadaist",
"Expressionist",
"Fantasy", "Fantasy",
"Fauvist",
"Figurative",
"Graphic Novel", "Graphic Novel",
"Geometric",
"Hard Edge Painting", "Hard Edge Painting",
"Hydrodipped", "Hydrodipped",
"Impressionistic",
"Lithography", "Lithography",
"Manga", "Manga",
"Minimalist",
"Modern Art", "Modern Art",
"Mosaic", "Mosaic",
"Mural", "Mural",
"Naive",
"Neoclassical",
"Photo", "Photo",
"Realistic", "Realistic",
"Rococo",
"Romantic",
"Street Art", "Street Art",
"Symbolist",
"Stuckist",
"Surrealist",
"Visual Novel", "Visual Novel",
"Watercolor" "Watercolor"
] ]
@ -78,9 +97,13 @@
"Glamor Shot", "Glamor Shot",
"Golden Hour", "Golden Hour",
"HD", "HD",
"Landscape",
"Lens Flare", "Lens Flare",
"Macro", "Macro",
"Polaroid", "Polaroid",
"Photoshoot",
"Portrait",
"Studio Lighting",
"Vintage", "Vintage",
"War Photography", "War Photography",
"White Balance", "White Balance",
@ -91,10 +114,13 @@
"Color", "Color",
[ [
"Beautiful Lighting", "Beautiful Lighting",
"Cold Color Palette",
"Colorful", "Colorful",
"Dynamic Lighting", "Dynamic Lighting",
"Electric Colors", "Electric Colors",
"Infrared", "Infrared",
"Pastel",
"Neon",
"Synthwave", "Synthwave",
"Warm Color Palette" "Warm Color Palette"
] ]
@ -103,49 +129,130 @@
"Emotions", "Emotions",
[ [
"Angry", "Angry",
"Bitter",
"Disgusted", "Disgusted",
"Embarrassed", "Embarrassed",
"Evil", "Evil",
"Excited", "Excited",
"Fear", "Fear",
"Funny",
"Happy", "Happy",
"Horrifying",
"Lonely", "Lonely",
"Sad", "Sad",
"Surprised" "Serene",
"Surprised",
"Melancholic"
] ]
], ],
[ [
"Style of an artist or community", "Style of an artist or community",
[ [
"Artstation", "Artstation",
"trending on Artstation",
"by Agnes Lawrence Pelton", "by Agnes Lawrence Pelton",
"by Akihito Yoshida", "by Akihito Yoshida",
"by Alex Grey",
"by Alexander Jansson",
"by Alphonse Mucha",
"by Andy Warhol", "by Andy Warhol",
"by Artgerm", "by Artgerm",
"by Asaf Hanuka", "by Asaf Hanuka",
"by Aubrey Beardsley", "by Aubrey Beardsley",
"by Banksy", "by Banksy",
"by Beeple",
"by Ben Enwonwu", "by Ben Enwonwu",
"by Bob Eggleton",
"by Caravaggio Michelangelo Merisi", "by Caravaggio Michelangelo Merisi",
"by Caspar David Friedrich",
"by Chris Foss",
"by Claude Monet",
"by Dan Mumford",
"by David Mann", "by David Mann",
"by Diego Velázquez",
"by Disney Animation Studios",
"by Édouard Manet",
"by Esao Andrews",
"by Frida Kahlo", "by Frida Kahlo",
"by Gediminas Pranckevicius",
"by Georgia O'Keeffe",
"by Greg Rutkowski",
"by Gustave Doré",
"by Gustave Klimt",
"by H.R. Giger", "by H.R. Giger",
"by Hayao Miyazaki", "by Hayao Miyazaki",
"by Henri Matisse",
"by HP Lovecraft",
"by Ivan Shishkin", "by Ivan Shishkin",
"by Jack Kirby",
"by Jackson Pollock",
"by James Jean",
"by Jim Burns",
"by Johannes Vermeer", "by Johannes Vermeer",
"by John William Waterhouse", "by John William Waterhouse",
"by Katsushika Hokusai", "by Katsushika Hokusai",
"by Kim Tschang Yeul",
"by Ko Young Hoon", "by Ko Young Hoon",
"by Leonardo da Vinci", "by Leonardo da Vinci",
"by Lisa Frank", "by Lisa Frank",
"by M.C. Escher",
"by Mahmoud Saïd", "by Mahmoud Saïd",
"by Makoto Shinkai",
"by Marc Simonetti",
"by Mark Brooks", "by Mark Brooks",
"by Michelangelo",
"by Pablo Picasso", "by Pablo Picasso",
"by Paul Klee",
"by Peter Mohrbacher",
"by Pierre-Auguste Renoir",
"by Pixar Animation Studios",
"by Rembrandt",
"by Richard Dadd", "by Richard Dadd",
"by Rossdraws",
"by Salvador Dalí", "by Salvador Dalí",
"by Sam Does Arts",
"by Sandro Botticelli",
"by Ted Nasmith",
"by Ten Hundred",
"by Thomas Kinkade",
"by Tivadar Csontváry Kosztka", "by Tivadar Csontváry Kosztka",
"by Yoshitaka Amano", "by Victo Ngai",
"by wlop" "by Vincent Di Fate",
"by Vincent van Gogh",
"by Wes Anderson",
"by wlop",
"by Yoshitaka Amano"
]
],
[
"CGI Software",
[
"3D Model",
"3D Sculpt",
"3Ds Max Model",
"Blender Model",
"Cinema4d Model",
"Maya Model",
"Unreal Engine",
"Zbrush Sculpt"
]
],
[
"CGI Rendering",
[
"3D Render",
"Corona Render",
"Creature Design",
"Cycles Render",
"Detailed Render",
"Environment Design",
"Intricate Environment",
"LSD Render",
"Octane Render",
"PBR",
"Glass Caustics",
"Global Illumination",
"Subsurface Scattering"
] ]
] ]
] ]

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB