martials/old.martials.no
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to next version of backend

Browse Source
This commit is contained in:
Martin Berg Alstad 2023-03-19 23:13:09 +01:00
parent 401e5bda08
commit f13b74a94f
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/truth-table.tsx
View File

@ -25,6 +25,10 @@ import { exportToExcel } from "./functions/export";
import { Link } from "./components/link"; import { Link } from "./components/link";
import { isTouch } from "./functions/touch"; import { isTouch } from "./functions/touch";
const endpoint = "https://api.martials.no/simplify-truths/do/simplify/table";
const localhost = "http://localhost:8080/simplify/table";
const useDev = true;
type Option = { name: string, value: "NONE" | "TRUE" | "FALSE" | "DEFAULT" | "TRUE_FIRST" | "FALSE_FIRST" }; type Option = { name: string, value: "NONE" | "TRUE" | "FALSE" | "DEFAULT" | "TRUE_FIRST" | "FALSE_FIRST" };
// TODO move some code to new components // TODO move some code to new components
@ -80,7 +84,7 @@ const TruthTablePage: Component = () => {
const [isLoaded, setIsLoaded] = createSignal<boolean | null>(null); const [isLoaded, setIsLoaded] = createSignal<boolean | null>(null);
const [error, setError] = createSignal<string | null>(null); const [error, setError] = createSignal<{ title: string, message: string } | null>(null);
/** /**
* Updates the state of the current expression to the new search with all whitespace removed. * Updates the state of the current expression to the new search with all whitespace removed.
@ -107,12 +111,17 @@ hide=${ hideValues().value }&sort=${ sortValues().value }&hideIntermediate=${ hi
setError(null); setError(null);
setIsLoaded(false); setIsLoaded(false);
fetch(`https://api.martials.no/simplify-truths/do/simplify/table?exp=${ encodeURIComponent(exp) }& fetch(`${ useDev ? localhost : endpoint }/${ encodeURIComponent(exp) }?
simplify=${ simplifyEnabled() }&hide=${ hideValues().value }&sort=${ sortValues().value }&caseSensitive=false& simplify=${ simplifyEnabled() }&hide=${ hideValues().value }&sort=${ sortValues().value }&caseSensitive=false&
hideIntermediate=${ hideIntermediates() }`) hideIntermediate=${ hideIntermediates() }`)
.then(res => res.json()) .then(res => res.json())
.then(res => setFetchResult(res)) .then(res => {
.catch(err => setError(err.toString())) if (res.status !== "OK" && !res.ok) {
return setError({ title: "Input error", message: res.message });
}
return setFetchResult(res);
})
.catch(err => setError({ title: "Fetch error", message: err.toString() }))
.finally(() => setIsLoaded(true)); .finally(() => setIsLoaded(true));
} }
} }
@ -301,12 +310,9 @@ hideIntermediate=${ hideIntermediates() }`)
<Icon path={ arrowPath } aria-label={ "Loading indicator" } class={ "animate-spin mx-auto" } /> <Icon path={ arrowPath } aria-label={ "Loading indicator" } class={ "animate-spin mx-auto" } />
</Show> </Show>
<Show when={ error() } keyed> <Show when={ error() && isLoaded() } keyed>
<ErrorBox title={ "Fetch error" } error={ error() } /> <ErrorBox title={ error().title ?? "Error" }
</Show> error={ error().message ?? "Something went wrong" } />
<Show when={ error() === null && isLoaded() && fetchResult()?.status.code !== 200 } keyed>
<ErrorBox title={ "Input error" } error={ fetchResult()?.status.message } />
</Show> </Show>
<Show when={ simplifyEnabled() && fetchResult()?.orderOperations?.length > 0 } keyed> <Show when={ simplifyEnabled() && fetchResult()?.orderOperations?.length > 0 } keyed>
@ -315,7 +321,7 @@ hideIntermediate=${ hideIntermediates() }`)
</div> </div>
<Show when={ isLoaded() && fetchResult()?.status?.code === 200 } keyed> <Show when={ isLoaded() && error() === null } keyed>
<Show when={ simplifyEnabled() } keyed> <Show when={ simplifyEnabled() } keyed>
<InfoBox className={ "w-fit mx-auto pb-1 text-lg text-center" } <InfoBox className={ "w-fit mx-auto pb-1 text-lg text-center" }
title={ "Output:" } id={ "expression-output" }> title={ "Output:" } id={ "expression-output" }>

5
src/types/interfaces.ts
View File

@ -58,10 +58,7 @@ export type OrderOfOperations = {
}[]; }[];
export type FetchResult = { export type FetchResult = {
status: { status: string,
code: number,
message: string,
},
before: string, before: string,
after: string, after: string,
orderOperations: OrderOfOperations | null, orderOperations: OrderOfOperations | null,