From d027352d79d67d7245d7dc938f52e66a4aac0ff5 Mon Sep 17 00:00:00 2001 From: caranicas Date: Sun, 18 Sep 2022 11:14:17 -0400 Subject: [PATCH] disabled beta check for now --- ui/frontend/build_src/src/api/index.ts | 7 +-- .../components/molecules/betaMode/index.tsx | 63 +++++++++---------- .../creationPanel/advancedSettings/index.tsx | 1 - .../organisms/headerDisplay/index.tsx | 1 - ui/frontend/build_src/src/main.tsx | 2 +- .../build_src/src/styles/recipes/index.css.ts | 16 +++-- ui/frontend/dist/index.css | 2 +- ui/frontend/dist/index.html | 16 +---- ui/frontend/dist/index.js | 26 ++++---- 9 files changed, 56 insertions(+), 78 deletions(-) diff --git a/ui/frontend/build_src/src/api/index.ts b/ui/frontend/build_src/src/api/index.ts index f53fd737..ecb6eeb1 100644 --- a/ui/frontend/build_src/src/api/index.ts +++ b/ui/frontend/build_src/src/api/index.ts @@ -44,12 +44,11 @@ export const toggleBetaConfig = async (branch: string) => { const response = await fetch(`${API_URL}/app_config`, { method: "POST", headers: { - 'Content-Type': 'application/json' + "Content-Type": "application/json", }, body: JSON.stringify({ - 'update_branch': branch - }) - + update_branch: branch, + }), }); const data = await response.json(); return data; diff --git a/ui/frontend/build_src/src/components/molecules/betaMode/index.tsx b/ui/frontend/build_src/src/components/molecules/betaMode/index.tsx index 477a0f4f..030bbe03 100644 --- a/ui/frontend/build_src/src/components/molecules/betaMode/index.tsx +++ b/ui/frontend/build_src/src/components/molecules/betaMode/index.tsx @@ -1,70 +1,66 @@ -import React, { useState, useEffect } from 'react'; -import { useQuery, useQueryClient } from '@tanstack/react-query'; +import React, { useState, useEffect } from "react"; +import { useQuery, useQueryClient } from "@tanstack/react-query"; import { - KEY_CONFIG, getConfig, - KEY_TOGGLE_CONFIG, toggleBetaConfig -} from '../../../api'; - - - - + KEY_CONFIG, + getConfig, + KEY_TOGGLE_CONFIG, + toggleBetaConfig, +} from "../../../api"; export default function BetaMode() { - // gate for the toggle const [shouldSetCofig, setShouldSetConfig] = useState(false); - // next branch to get + // next branch to get const [branchToGetNext, setBranchToGetNext] = useState("beta"); // our basic config - const { status: configStatus, data: configData } = useQuery([KEY_CONFIG], getConfig); - const queryClient = useQueryClient() + const { status: configStatus, data: configData } = useQuery( + [KEY_CONFIG], + getConfig + ); + const queryClient = useQueryClient(); // the toggle config - const { status: toggleStatus, data: toggleData } = useQuery([KEY_TOGGLE_CONFIG], () => toggleBetaConfig(branchToGetNext), { - enabled: shouldSetCofig, - }); - + const { status: toggleStatus, data: toggleData } = useQuery( + [KEY_TOGGLE_CONFIG], + () => toggleBetaConfig(branchToGetNext), + { + enabled: shouldSetCofig, + } + ); // this is also in the Header Display // TODO: make this a custom hook useEffect(() => { - - if (configStatus === 'success') { - + if (configStatus === "success") { const { update_branch } = configData; - if (update_branch === 'main') { - setBranchToGetNext('beta'); + if (update_branch === "main") { + setBranchToGetNext("beta"); } else { // setIsBeta(true); - setBranchToGetNext('main'); + setBranchToGetNext("main"); } - } }, [configStatus, configData]); - useEffect(() => { - if (toggleStatus === 'success') { - - if (toggleData[0] == 'OK') { + if (toggleStatus === "success") { + if (toggleData[0] == "OK") { // force a refetch of the config - queryClient.invalidateQueries([KEY_CONFIG]) + queryClient.invalidateQueries([KEY_CONFIG]); } setShouldSetConfig(false); - } }, [toggleStatus, toggleData, setShouldSetConfig]); - - return ( ); } - diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/index.tsx b/ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/index.tsx index 6a4ce5e8..1b6f73f6 100644 --- a/ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/index.tsx +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/index.tsx @@ -32,7 +32,6 @@ function SettingsList() {
    • - ); } diff --git a/ui/frontend/build_src/src/components/organisms/headerDisplay/index.tsx b/ui/frontend/build_src/src/components/organisms/headerDisplay/index.tsx index 933e0985..0c884508 100644 --- a/ui/frontend/build_src/src/components/organisms/headerDisplay/index.tsx +++ b/ui/frontend/build_src/src/components/organisms/headerDisplay/index.tsx @@ -10,7 +10,6 @@ import { } from "./headerDisplay.css.ts"; export default function HeaderDisplay() { - const { status, data } = useQuery([KEY_CONFIG], getConfig); const [version, setVersion] = useState("2.1.0"); diff --git a/ui/frontend/build_src/src/main.tsx b/ui/frontend/build_src/src/main.tsx index 3a628ffe..a243bc94 100644 --- a/ui/frontend/build_src/src/main.tsx +++ b/ui/frontend/build_src/src/main.tsx @@ -7,7 +7,7 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; import { enableMapSet } from "immer"; -import App from "./app"; +import App from "./App"; import "./styles/index.css.ts"; diff --git a/ui/frontend/build_src/src/styles/recipes/index.css.ts b/ui/frontend/build_src/src/styles/recipes/index.css.ts index 1907d2db..ad7ebafb 100644 --- a/ui/frontend/build_src/src/styles/recipes/index.css.ts +++ b/ui/frontend/build_src/src/styles/recipes/index.css.ts @@ -1,22 +1,20 @@ -import { recipe } from '@vanilla-extract/recipes'; - +import { recipe } from "@vanilla-extract/recipes"; export const button = recipe({ variants: { color: { - neutral: { background: 'whitesmoke' }, - brand: { background: 'blueviolet' }, - accent: { background: 'slateblue' } + neutral: { background: "whitesmoke" }, + brand: { background: "blueviolet" }, + accent: { background: "slateblue" }, }, size: { small: { padding: 12 }, medium: { padding: 16 }, - large: { padding: 24 } - } - } + large: { padding: 24 }, + }, + }, }); - // export const card = recipe({ // variants: { // color: { diff --git a/ui/frontend/dist/index.css b/ui/frontend/dist/index.css index 6aebcc1b..513d49e9 100644 --- a/ui/frontend/dist/index.css +++ b/ui/frontend/dist/index.css @@ -1 +1 @@ -:root{--ruay188: 5px;--ruay189: 10px;--ruay18a: 25px;--ruay18b: Georgia, Times, Times New Roman, serif;--ruay18c: system-ui;--ruay18d: var(--ruay180);--ruay18e: var(--ruay181);--ruay18f: var(--ruay182);--ruay18g: var(--ruay183);--ruay18h: var(--ruay184);--ruay18i: var(--ruay185);--ruay18j: var(--ruay186);--ruay18k: var(--ruay187)}.ruay18l{--ruay180: #1E40AF;--ruay181: #DB2777;--ruay182: #EFF6FF;--ruay183: yellow;--ruay184: red;--ruay185: green;--ruay186: #1F2937;--ruay187: #6B7280}.ruay18m{--ruay180: #60A5FA;--ruay181: #F472B6;--ruay182: rgb(32, 33, 36);--ruay183: yellow;--ruay184: red;--ruay185: green;--ruay186: #F9FAFB;--ruay187: #D1D5DB}._1qevocv0{position:relative;background-color:var(--ruay182);width:100%;height:100%;pointer-events:auto;display:grid;grid-template-columns:400px 1fr;grid-template-rows:100px 1fr 50px;grid-template-areas:"header header header" "create display display" "create footer footer"}._1qevocv1{grid-area:header}._1qevocv2{grid-area:create;position:relative}._1qevocv3{grid-area:display;overflow:auto}._1qevocv4{grid-area:footer}@media screen and (max-width: 800px){._1qevocv0{grid-template-columns:1fr;grid-template-rows:100px 1fr 1fr 50px;grid-template-areas:"header" "create" "display" "footer"}}._1jo75h0{color:#f0ad4e}._1jo75h1{color:#d9534f}._1jo75h2{color:#5cb85c}._1v2cc580{color:#fff;display:flex;align-items:center;justify-content:center}._1v2cc580>h1{font-size:1.5em;font-weight:700;margin-right:10px}._11d5x3d0{font-size:9pt;margin-bottom:5px;padding-left:10px;list-style-type:none}._11d5x3d1{padding-bottom:5px}._11d5x3d2{display:block;width:100%;text-align:left;background-color:transparent;color:#fff;border:0 none;cursor:pointer;padding:0;margin-bottom:10px}._11d5x3d2>h4{color:#e7ba71;margin-top:5px!important}.fma0ug0{position:relative}.fma0ug0>canvas{position:absolute;top:0;left:0;width:100%;height:100%}.fma0ug0>canvas:first-of-type{opacity:.7}.fma0ug0>img{top:0;left:0}._2yyo4x0{position:relative;width:100%;height:100%;padding:10px}._2yyo4x1{display:flex;flex-direction:row;width:100%;flex-wrap:wrap}._2yyo4x2{display:flex;flex-direction:row;justify-content:space-evenly;align-items:center;width:100%}._2yyo4x2:first-of-type{margin:10px 0}.create-layout{padding:10px}.panel-box-toggle-btn{display:block;width:100%;text-align:left;background-color:transparent;color:#fff;border:0 none;cursor:pointer}.selected-tags{margin:10px 0}.selected-tags ul{margin:0;padding:0;display:flex;flex-wrap:wrap}li{list-style:none}.modifier-list{display:flex;flex-wrap:wrap;margin:0;padding:0}.modifierTag{display:inline-block;padding:6px;background-color:#264d8d;color:#fff;border-radius:5px;margin:5px}.modifierTag.selected{background-color:#830b79}.modifierTag p{margin:0}input[type=file]{color:transparent}.cjcdm20{position:relative;width:100%;height:100%;padding:0 10px;overflow-y:auto}.cjcdm21{position:absolute;top:10px;left:400px;z-index:1;background-color:#00000080}._1how28i0{position:relative;width:100%}._1how28i0>*{margin-bottom:10px}._1how28i1>p{font-size:1.5em;font-weight:700;margin-bottom:10px}._1how28i1>textarea{font-size:1.2em;font-weight:700;font-family:Arial;width:100%;resize:vertical;height:100px}._1rn4m8a0{display:flex}._1rn4m8a1{margin-bottom:5px;display:block}._1rn4m8a2{display:none}._1rn4m8a3{background-color:#264d8d;font-size:1.2em;font-weight:700;color:#fff;padding:8px;border-radius:5px}._1rn4m8a4{margin-left:20px}._1rn4m8a5{position:absolute;transform:translate(-50%) translateY(-35%);background:black;color:#fff;border:2pt solid #ccc;padding:0;cursor:pointer;outline:inherit;border-radius:8pt;width:16pt;height:16pt;font-family:Verdana;font-size:8pt}._1hnlbmt0{width:100%;background-color:#264d8d;font-size:1.5em;font-weight:700;color:#fff;padding:8px;border-radius:5px}._1hnlbmt0:disabled{background-color:#264d8d80}._1yvg52n0{position:relative;width:512px;height:512px}._1yvg52n1{width:512px;height:512px;background-color:#000;display:flex;justify-content:center;align-items:center}._1yvg52n2{width:512px;height:512px;object-fit:contain}._1yvg52n3{position:absolute;bottom:10px;left:10px}._1yvg52n4{position:absolute;bottom:10px;right:10px}._688lcr0{padding:10px}._688lcr1{display:flex;flex-direction:row;height:100%;width:100%;overflow:hidden}._688lcr2{width:512px;height:100%}._688lcr3{margin-left:30px;display:flex;flex:auto;flex-wrap:wrap}._688lcr4{margin:0 10px}.footer-display{color:#fff;display:flex;flex-direction:column;align-items:center;justify-content:center}body{margin:0;min-width:320px;min-height:100vh}#root{position:absolute;top:0;left:0;width:100vw;height:100vh;overflow:hidden}*{box-sizing:border-box}p,h3,h4{margin:0}textarea{margin:0;padding:0;border:none} +:root{--_4vfmtjr: 5px;--_4vfmtjs: 10px;--_4vfmtjt: 25px;--_4vfmtju: 5px;--_4vfmtjv: Arial, Helvetica, sans-serif;--_4vfmtjw: 2em;--_4vfmtjx: 1.5em;--_4vfmtjy: 1.2em;--_4vfmtjz: 1em;--_4vfmtj10: .75em;--_4vfmtj11: .5em;--_4vfmtj12: var(--_4vfmtj0);--_4vfmtj13: var(--_4vfmtj1);--_4vfmtj14: var(--_4vfmtj2);--_4vfmtj15: var(--_4vfmtj3);--_4vfmtj16: var(--_4vfmtj4);--_4vfmtj17: var(--_4vfmtj5);--_4vfmtj18: var(--_4vfmtj6);--_4vfmtj19: var(--_4vfmtj7);--_4vfmtj1a: var(--_4vfmtj8);--_4vfmtj1b: var(--_4vfmtj9);--_4vfmtj1c: var(--_4vfmtja);--_4vfmtj1d: var(--_4vfmtjb);--_4vfmtj1e: var(--_4vfmtjc);--_4vfmtj1f: var(--_4vfmtjd);--_4vfmtj1g: var(--_4vfmtje);--_4vfmtj1h: var(--_4vfmtjf);--_4vfmtj1i: var(--_4vfmtjg);--_4vfmtj1j: var(--_4vfmtjh);--_4vfmtj1k: var(--_4vfmtji);--_4vfmtj1l: var(--_4vfmtjj);--_4vfmtj1m: var(--_4vfmtjk);--_4vfmtj1n: var(--_4vfmtjl);--_4vfmtj1o: var(--_4vfmtjm);--_4vfmtj1p: var(--_4vfmtjn);--_4vfmtj1q: var(--_4vfmtjo);--_4vfmtj1r: var(--_4vfmtjp);--_4vfmtj1s: var(--_4vfmtjq)}._4vfmtj1t{--_4vfmtj0: #5000b9;--_4vfmtj1: #433852;--_4vfmtj2: #5d00d6;--_4vfmtj3: #5d00d6;--_4vfmtj4: #28004e;--_4vfmtj5: #28004e;--_4vfmtj6: #28004e;--_4vfmtj7: #0b8334;--_4vfmtj8: #0b8334;--_4vfmtj9: #0b8334;--_4vfmtja: #0b8334;--_4vfmtjb: #0b8334;--_4vfmtjc: #0b8334;--_4vfmtjd: #0b8334;--_4vfmtje: #202124;--_4vfmtjf: #383838;--_4vfmtjg: #2c2d30;--_4vfmtjh: #383838;--_4vfmtji: #ffffff;--_4vfmtjj: #d1d5db;--_4vfmtjk: #ffffff;--_4vfmtjl: #d1d5db;--_4vfmtjm: #e7ba71;--_4vfmtjn: #7d6641;--_4vfmtjo: #f0ad4e;--_4vfmtjp: #d9534f;--_4vfmtjq: #5cb85c}._4vfmtj1u{--_4vfmtj0: #1E40AF;--_4vfmtj1: #1E40AF;--_4vfmtj2: #1E40AF;--_4vfmtj3: #1E40AF;--_4vfmtj4: #1E40AF;--_4vfmtj5: #1E40AF;--_4vfmtj6: #1E40AF;--_4vfmtj7: #DB2777;--_4vfmtj8: #DB2777;--_4vfmtj9: #DB2777;--_4vfmtja: #DB2777;--_4vfmtjb: #DB2777;--_4vfmtjc: #DB2777;--_4vfmtjd: #DB2777;--_4vfmtje: #EFF6FF;--_4vfmtjf: #EFF6FF;--_4vfmtjg: #EFF6FF;--_4vfmtjh: #EFF6FF;--_4vfmtji: #1F2937;--_4vfmtjj: #6B7280;--_4vfmtjk: #1F2937;--_4vfmtjl: #6B7280;--_4vfmtjm: #1F2937;--_4vfmtjn: #6B7280;--_4vfmtjo: yellow;--_4vfmtjp: red;--_4vfmtjq: green}._1qevocv0{position:relative;background-color:var(--_4vfmtje);width:100%;height:100%;pointer-events:auto;display:grid;grid-template-columns:400px 1fr;grid-template-rows:100px 1fr 50px;grid-template-areas:"header header header" "create display display" "create footer footer"}._1qevocv1{grid-area:header}._1qevocv2{grid-area:create;position:relative}._1qevocv3{grid-area:display;overflow:auto}._1qevocv4{grid-area:footer}@media screen and (max-width: 800px){._1qevocv0{grid-template-columns:1fr;grid-template-rows:100px 1fr 1fr 50px;grid-template-areas:"header" "create" "display" "footer"}}._1jo75h0{color:var(--_4vfmtjo)}._1jo75h1{color:var(--_4vfmtjp)}._1jo75h2{color:var(--_4vfmtjq)}._1v2cc580{color:var(--_4vfmtji);display:flex;align-items:center;justify-content:center}._1v2cc580>h1{font-size:var(--_4vfmtjw);font-weight:700;margin-right:var(--_4vfmtjs)}._11d5x3d0{font-size:var(--_4vfmtjz);margin-bottom:var(--_4vfmtjr);padding-left:var(--_4vfmtjs);list-style-type:none}._11d5x3d1{padding-bottom:var(--_4vfmtjr)}._11d5x3d2{display:block;width:100%;text-align:left;background-color:transparent;color:var(--_4vfmtji);border:0 none;cursor:pointer;padding:0;margin-bottom:var(--_4vfmtjr)}._11d5x3d2>h4{color:#e7ba71;margin-top:5px!important}.fma0ug0{position:relative}.fma0ug0>canvas{position:absolute;top:0;left:0;width:100%;height:100%}.fma0ug0>canvas:first-of-type{opacity:.7}.fma0ug0>img{top:0;left:0}._2yyo4x0{position:relative;width:100%;height:100%;padding:10px}._2yyo4x1{display:flex;flex-direction:row;width:100%;flex-wrap:wrap}._2yyo4x2{display:flex;flex-direction:row;justify-content:space-evenly;align-items:center;width:100%}._2yyo4x2:first-of-type{margin:10px 0}.create-layout{padding:10px}.panel-box-toggle-btn{display:block;width:100%;text-align:left;background-color:transparent;color:#fff;border:0 none;cursor:pointer}.selected-tags{margin:10px 0}.selected-tags ul{margin:0;padding:0;display:flex;flex-wrap:wrap}li{list-style:none}.modifier-list{display:flex;flex-wrap:wrap;margin:0;padding:0}.modifierTag{display:inline-block;padding:6px;background-color:#264d8d;color:#fff;border-radius:5px;margin:5px}.modifierTag.selected{background-color:#830b79}.modifierTag p{margin:0}input[type=file]{color:transparent}.cjcdm20{position:relative;width:100%;height:100%;padding:0 10px;overflow-y:auto}.cjcdm21{position:absolute;top:10px;left:400px;z-index:1;background-color:#00000080}._1how28i0{position:relative;width:100%}._1how28i0>*{margin-bottom:10px}._1how28i1>p{font-size:1.5em;font-weight:700;margin-bottom:10px}._1how28i1>textarea{font-size:1.2em;font-weight:700;font-family:Arial;width:100%;resize:vertical;height:100px}._1rn4m8a0{display:flex}._1rn4m8a1{margin-bottom:var(--_4vfmtjr);display:block}._1rn4m8a2{display:none}._1rn4m8a3{background-color:var(--_4vfmtj0);font-size:var(--_4vfmtjy);font-weight:700;color:var(--_4vfmtji);padding:var(--_4vfmtjr);border-radius:var(--_4vfmtju)}._1rn4m8a3:hover{background-color:var(--_4vfmtj2)}._1rn4m8a3:active{background-color:var(--_4vfmtj3)}._1rn4m8a3:disabled{background-color:var(--_4vfmtj1);color:var(--_4vfmtjj)}._1rn4m8a4{margin-left:20px}._1rn4m8a5{position:absolute;transform:translate(-50%) translateY(-35%);background:black;color:#fff;border:2pt solid #ccc;padding:0;cursor:pointer;outline:inherit;border-radius:8pt;width:16pt;height:16pt;font-family:Verdana;font-size:8pt}._1hnlbmt0{width:100%;background-color:var(--_4vfmtj0);font-size:var(--_4vfmtjx);font-weight:700;color:var(--_4vfmtji);padding:var(--_4vfmtjr);border-radius:var(--_4vfmtju)}._1hnlbmt0:hover{background-color:var(--_4vfmtj2)}._1hnlbmt0:active{background-color:var(--_4vfmtj3)}._1hnlbmt0:disabled{background-color:var(--_4vfmtj1);color:var(--_4vfmtjj)}._1hnlbmt0:focus{outline:none}._1yvg52n0{position:relative;width:512px;height:512px}._1yvg52n1{width:512px;height:512px;background-color:#000;display:flex;justify-content:center;align-items:center}._1yvg52n2{width:512px;height:512px;object-fit:contain}._1yvg52n3{position:absolute;bottom:10px;left:10px}._1yvg52n4{position:absolute;bottom:10px;right:10px}._688lcr0{padding:var(--_4vfmtjs)}._688lcr1{display:flex;flex-direction:row;height:100%;width:100%;overflow:hidden}._688lcr2{width:512px;height:100%}._688lcr3{margin-left:var(--_4vfmtjt);display:flex;flex:auto;flex-wrap:wrap}._688lcr4{margin:0 var(--_4vfmtjr)}.footer-display{color:#fff;display:flex;flex-direction:column;align-items:center;justify-content:center}body{margin:0;min-width:320px;min-height:100vh;font-family:var(--_4vfmtjv)}#root{position:absolute;top:0;left:0;width:100vw;height:100vh;overflow:hidden}*{box-sizing:border-box}p,h3,h4{margin:0}textarea{margin:0;padding:0;border:none} diff --git a/ui/frontend/dist/index.html b/ui/frontend/dist/index.html index b1968078..19860cce 100644 --- a/ui/frontend/dist/index.html +++ b/ui/frontend/dist/index.html @@ -19,19 +19,7 @@