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

Updated dependencies, fixed remove button not showing when the expression is recieved from url, added hideIntermediate from url

Browse Source
This commit is contained in:
Martin Berg Alstad
2023-02-22 22:54:53 +01:00
parent 0e515fd38e
commit 35b8e05242
4 changed files with 423 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/input.tsx
View File

@ -40,6 +40,7 @@ interface Input<T> extends InputProps<T> {
leading?: JSX.Element,
trailing?: JSX.Element,
onChange?: () => void,
inputClass?: string,
}
export const Input: Component<Input<HTMLInputElement>> = (
@ -53,7 +54,8 @@ export const Input: Component<Input<HTMLInputElement>> = (
required = false,
onChange,
leading,
trailing
trailing,
inputClass
}): JSX.Element => {
/**
@ -76,12 +78,12 @@ export const Input: Component<Input<HTMLInputElement>> = (
});
return (
<Row className={ "relative" }>
<Row className={ `relative ${ className }` }>
{ leading }
<HoverTitle title={ title } isActive={ isFocused() || isHover() || isText() } htmlFor={ id } />
<input
class={ `bg-default-bg focus:border-cyan-500 outline-none border-2 border-gray-500
hover:border-t-cyan-400 ${ className }` }
hover:border-t-cyan-400 ${ inputClass }` }
id={ id }
onFocus={ () => setIsFocused(true) }
onBlur={ () => setIsFocused(false) }

31
src/truth-table.tsx
View File

@ -30,12 +30,17 @@ type Option = { name: string, value: "NONE" | "TRUE" | "FALSE" | "DEFAULT" | "TR
const TruthTablePage: Component = () => {
let searchParams: URLSearchParams;
let simplifyDefault = true
let simplifyDefault = true, inputContent = false;
if (typeof location !== "undefined") {
searchParams = new URLSearchParams(location.search);
if (searchParams.has("simplify")) {
simplifyDefault = searchParams.get("simplify") === "true";
}
if (searchParams.has("exp")) {
inputContent = true;
}
}
/**
@ -49,7 +54,7 @@ const TruthTablePage: Component = () => {
/**
* If the searchbar is empty, this state is 'false', otherwise 'true'
*/
const [typing, setTyping] = createSignal(false);
const [typing, setTyping] = createSignal(inputContent);
const hideOptions: Option[] = [
{ name: "Show all result", value: "NONE" },
@ -67,6 +72,8 @@ const TruthTablePage: Component = () => {
const [sortValues, setSortValues] = createSignal(sortOptions[0]);
const [hideIntermediates, setHideIntermediates] = createSignal(false);
const [isLoaded, setIsLoaded] = createSignal<boolean | null>(null);
const [error, setError] = createSignal<string | null>(null);
@ -83,19 +90,21 @@ const TruthTablePage: Component = () => {
if (exp) {
history.pushState(null, "", `?exp=${ encodeURIComponent(exp) }&simplify=${ simplifyEnabled() }&
hide=${ hideValues().value }&sort=${ sortValues().value }`);
getFetchResult(exp).then(null);
hide=${ hideValues().value }&sort=${ sortValues().value }&hideIntermediate=${ hideIntermediates() }`);
getFetchResult(exp);
}
}
async function getFetchResult(exp: string): Promise<void> {
function getFetchResult(exp: string): void {
setFetchResult(null);
if (exp !== "") {
setError(null);
setIsLoaded(false);
fetch(`https://api.martials.no/simplify-truths/do/simplify/table?exp=${ encodeURIComponent(exp) }&
simplify=${ simplifyEnabled() }&hide=${ hideValues().value }&sort=${ sortValues().value }&caseSensitive=false`)
simplify=${ simplifyEnabled() }&hide=${ hideValues().value }&sort=${ sortValues().value }&caseSensitive=false&
hideIntermediate=${ hideIntermediates() }`)
.then(res => res.json())
.then(res => setFetchResult(res))
.catch(err => setError(err.toString()))
@ -143,8 +152,12 @@ simplify=${ simplifyEnabled() }&hide=${ hideValues().value }&sort=${ sortValues(
if (sort) {
setSortValues(sortOptions.find(o => o.value === sort) ?? sortOptions[0]);
}
const hideIntermediate = searchParams.get("hideIntermediate");
if (hideIntermediate) {
setHideIntermediates(hideIntermediate === "true");
}
getFetchResult(exp).then(null);
getFetchResult(exp);
}
// Focuses searchbar on load
@ -181,7 +194,7 @@ simplify=${ simplifyEnabled() }&hide=${ hideValues().value }&sort=${ sortValues(
<form class={ "flex-row-center" } onSubmit={ onClick } autocomplete={ "off" }>
<Input className={ `rounded-xl pl-7 h-10 w-52 sm:w-96 pr-8` }
<Input inputClass={ `rounded-xl pl-7 h-10 w-full pr-8` } className={ "w-full" }
id={ "truth-input" }
placeholder={ "¬A & B -> C" }
type={ "text" }
@ -189,7 +202,7 @@ simplify=${ simplifyEnabled() }&hide=${ hideValues().value }&sort=${ sortValues(
leading={ <Icon path={ magnifyingGlass } aria-label={ "Magnifying glass" }
class={ "pl-2 absolute" } /> }
trailing={ <Show when={ typing() } keyed>
<button class={ "absolute left-44 sm:left-[22rem]" }
<button class={ "absolute right-2" }
title={ "Clear" }
type={ "reset" }
onClick={ clearSearch }>