diff --git a/builder-frontend/src/App.tsx b/builder-frontend/src/App.tsx index 1165ff73..433d7d38 100644 --- a/builder-frontend/src/App.tsx +++ b/builder-frontend/src/App.tsx @@ -59,7 +59,7 @@ function App() {
404 - Page Not Found
} + component={() =>
404 - Page Not Found
} /> ); diff --git a/builder-frontend/src/components/Header/Header.tsx b/builder-frontend/src/components/Header/Header.tsx index 290e80b0..f1d3fcc8 100644 --- a/builder-frontend/src/components/Header/Header.tsx +++ b/builder-frontend/src/components/Header/Header.tsx @@ -15,7 +15,7 @@ const HeaderButton = ({ onClick: () => void; }) => { return ( -
{buttonText} -
+ ); }; @@ -48,10 +48,10 @@ const HeaderMenu: Component = (props) => { ]; return ( -
-
+
+

Welcome {props.displayName} {props.userEmail} -

+
    @@ -62,7 +62,7 @@ const HeaderMenu: Component = (props) => { )}
-
+ ); }; diff --git a/builder-frontend/src/components/auth/AuthForm.jsx b/builder-frontend/src/components/auth/AuthForm.jsx index 0abd1f0c..b70e692d 100644 --- a/builder-frontend/src/components/auth/AuthForm.jsx +++ b/builder-frontend/src/components/auth/AuthForm.jsx @@ -35,9 +35,9 @@ export default function AuthForm() { return (
-
- Benefits Decision Tookit -
+

+ Benefit Decision Tookit +

{location.pathname === "/signup" ? ( ) : ( diff --git a/builder-frontend/src/components/auth/Login.jsx b/builder-frontend/src/components/auth/Login.jsx index f23b3564..0dccf2b5 100644 --- a/builder-frontend/src/components/auth/Login.jsx +++ b/builder-frontend/src/components/auth/Login.jsx @@ -85,12 +85,12 @@ export default function Login({ toggleMode }) { Sign In -
+
+
{error() &&

{error()}

}
diff --git a/builder-frontend/src/components/homeScreen/DeleteConfirmation.tsx b/builder-frontend/src/components/homeScreen/DeleteConfirmation.tsx index 2d958230..54c83efe 100644 --- a/builder-frontend/src/components/homeScreen/DeleteConfirmation.tsx +++ b/builder-frontend/src/components/homeScreen/DeleteConfirmation.tsx @@ -10,12 +10,13 @@ interface Props { export default function DeleteConfirmation(props: Props) { return (
-
+

Are you sure you would like to delete {props.screenerName}? -

-
- Once deleted, all associated data will be deleted and cant be recovered. -
+ +

+ Once deleted, all associated data will be deleted and can't be + recovered. +

setIsNewScreenerModalVisible(false)} @@ -138,7 +138,7 @@ export default function ProjectsList() { }; return ( item && ( -
{item.screenerName}
-
+ ) ); }} @@ -178,6 +178,6 @@ export default function ProjectsList() {
-
+ ); } diff --git a/builder-frontend/src/components/homeScreen/eligibilityCheckList/EligibilityChecksList.tsx b/builder-frontend/src/components/homeScreen/eligibilityCheckList/EligibilityChecksList.tsx index 57a31ea6..18831027 100644 --- a/builder-frontend/src/components/homeScreen/eligibilityCheckList/EligibilityChecksList.tsx +++ b/builder-frontend/src/components/homeScreen/eligibilityCheckList/EligibilityChecksList.tsx @@ -52,14 +52,14 @@ const EligibilityChecksList = () => { Manage your custom eligibility checks here. Click on a check to view or edit its details. -
setAddingNewCheck(true)} > Create New Check -
+ setAddingNewCheck(false)}> -
Save -
+ -
Saving... -
+ -
Save -
+ @@ -256,9 +256,9 @@ const FormValidationDrawer = ({ my-auto rounded-lg text-lg font-medium transition-all duration-100 " > -
+
+ -
+
+ ); diff --git a/builder-frontend/src/components/screener/EligibilityResults.tsx b/builder-frontend/src/components/screener/EligibilityResults.tsx index 590748e6..1127e1b9 100644 --- a/builder-frontend/src/components/screener/EligibilityResults.tsx +++ b/builder-frontend/src/components/screener/EligibilityResults.tsx @@ -12,15 +12,19 @@ function formatParameters(params: Record): string { .join(", "); } -export default function EligibilityResults( - { screenerResult }: { screenerResult: Accessor } -) { +export default function EligibilityResults({ + screenerResult, +}: { + screenerResult: Accessor; +}) { console.log(screenerResult()); return (

Eligibility Results

- {([benefitKey, benefitResult]) => } + {([benefitKey, benefitResult]) => ( + + )}
); @@ -28,7 +32,7 @@ export default function EligibilityResults( function BenefitResult({ benefitResult }: { benefitResult: BenefitResult }) { return ( -
+

@@ -69,11 +73,17 @@ function BenefitResult({ benefitResult }: { benefitResult: BenefitResult }) { {check.name} - ({[check.module, check.version].filter(Boolean).join(" v")}) + ( + {[check.module, check.version].filter(Boolean).join(" v")} + )

- 0}> + 0 + } + >
{formatParameters(check.parameters)}
@@ -103,6 +113,6 @@ function BenefitResult({ benefitResult }: { benefitResult: BenefitResult }) { )} */} - + ); } diff --git a/builder-frontend/src/components/screener/Screener.tsx b/builder-frontend/src/components/screener/Screener.tsx index f7f42c9d..9c986223 100644 --- a/builder-frontend/src/components/screener/Screener.tsx +++ b/builder-frontend/src/components/screener/Screener.tsx @@ -5,19 +5,27 @@ import FormRenderer from "./FormRenderer"; import Loading from "@/components/Loading"; import EligibilityResults from "./EligibilityResults"; -import { fetchPublishedScreener, evaluatePublishedScreener } from "@/api/publishedScreener"; +import { + fetchPublishedScreener, + evaluatePublishedScreener, +} from "@/api/publishedScreener"; import type { PublishedScreener, ScreenerResult } from "@/types"; export default function Screener() { const params = useParams(); - const [screener] = createResource(() => fetchPublishedScreener(params.publishedScreenerId)); + const [screener] = createResource(() => + fetchPublishedScreener(params.publishedScreenerId), + ); const [screenerResult, setScreenerResult] = createSignal(); const submitForm = async (data: any) => { try { - let evaluationResult: ScreenerResult = await evaluatePublishedScreener(params.publishedScreenerId, data); + let evaluationResult: ScreenerResult = await evaluatePublishedScreener( + params.publishedScreenerId, + data, + ); setScreenerResult(evaluationResult); } catch (err) { console.log(err); @@ -25,25 +33,23 @@ export default function Screener() { }; return ( - <> -
- {screener.loading && } - {screener() && ( -
-
- -
- -
- -
- -
- )} -
- +
+ {screener.loading && } + {screener() && ( +
+
+ +
+ +
+ +
+ +
+ )} +
); } diff --git a/builder-frontend/src/components/shared/ANavbar.tsx b/builder-frontend/src/components/shared/ANavbar.tsx index 9a22eb7a..40e59af5 100644 --- a/builder-frontend/src/components/shared/ANavbar.tsx +++ b/builder-frontend/src/components/shared/ANavbar.tsx @@ -8,13 +8,13 @@ interface Props { } const ANavBar: Component = (props) => { return ( -
+
+ ); }; diff --git a/builder-frontend/src/components/shared/BdtNavbar.tsx b/builder-frontend/src/components/shared/BdtNavbar.tsx index 14e72d27..66173bee 100644 --- a/builder-frontend/src/components/shared/BdtNavbar.tsx +++ b/builder-frontend/src/components/shared/BdtNavbar.tsx @@ -12,15 +12,15 @@ interface NavbarButtonDef { key: string; label: string; onClick: () => void; -}; +} -const BdtNavbar = ({navProps}: {navProps: Accessor}) => { +const BdtNavbar = ({ navProps }: { navProps: Accessor }) => { return ( -
+
+ ); -} +}; export default BdtNavbar; diff --git a/builder-frontend/src/components/shared/ConfirmationModal.tsx b/builder-frontend/src/components/shared/ConfirmationModal.tsx index bcc24a5f..46460ff7 100644 --- a/builder-frontend/src/components/shared/ConfirmationModal.tsx +++ b/builder-frontend/src/components/shared/ConfirmationModal.tsx @@ -1,42 +1,35 @@ -const ConfirmationModal = ( - { confirmationTitle, confirmationText, callback, closeModal }: - { - confirmationTitle: string; - confirmationText: string; - callback: () => void; - closeModal: () => void - } -) => { +const ConfirmationModal = ({ + confirmationTitle, + confirmationText, + callback, + closeModal, +}: { + confirmationTitle: string; + confirmationText: string; + callback: () => void; + closeModal: () => void; +}) => { return (
-
- {confirmationTitle} -
-
- {confirmationText} -
+

{confirmationTitle}

+

{confirmationText}

-
+
-
+
+
- ) -} + ); +}; export default ConfirmationModal; diff --git a/builder-frontend/src/components/shared/ErrorModal.tsx b/builder-frontend/src/components/shared/ErrorModal.tsx index 2c810a8b..851df253 100644 --- a/builder-frontend/src/components/shared/ErrorModal.tsx +++ b/builder-frontend/src/components/shared/ErrorModal.tsx @@ -1,37 +1,44 @@ import { For } from "solid-js"; -const ErrorDisplayModal = ( - { title, closeModal, errors }: - { title: string; closeModal: () => void, errors: string[] } -) => { +const ErrorDisplayModal = ({ + title, + closeModal, + errors, +}: { + title: string; + closeModal: () => void; + errors: string[]; +}) => { return (
-
{title}
+

{title}

-
+
    {(error, errorIndex) => ( <> -
    +
  • {error} -
    • + )}     -
+
-
{ closeModal(); }} + onClick={() => { + closeModal(); + }} > Close -
+
); -} +}; export default ErrorDisplayModal;