diff --git a/dashboard/src/components/Atoms/WarningAlert.tsx b/dashboard/src/components/Atoms/WarningAlert.tsx index 066f3a88..ec5730b9 100644 --- a/dashboard/src/components/Atoms/WarningAlert.tsx +++ b/dashboard/src/components/Atoms/WarningAlert.tsx @@ -1,10 +1,14 @@ +import clsx from 'clsx' + export default function WarningAlert({ children, + className, }: { - children: React.ReactNode; + children: React.ReactNode, + className?: string, }) { return ( -
+
{children}
); diff --git a/dashboard/src/pages/login/CoreConnect.tsx b/dashboard/src/pages/login/CoreConnect.tsx index fae4d2f2..e4d89918 100644 --- a/dashboard/src/pages/login/CoreConnect.tsx +++ b/dashboard/src/pages/login/CoreConnect.tsx @@ -30,8 +30,9 @@ const CoreConnect = () => { useDocumentTitle('Connect to Core - Lodestone'); const { navigateBack, setPathname } = useContext(BrowserLocationContext); const { setCore, addCore } = useContext(LodestoneContext); - const [ ShowBlurb, setShowBlurb ] = useState(false); + const [ showBlurb, setShowBlurb ] = useState(false); const [ showPopup, setShowPopup ] = useState(false); + const [ httpProtocol, setHttpProtocol ] = useState(true); const initialValues: CoreConnectionInfo = { address: '', @@ -44,6 +45,7 @@ const CoreConnect = () => { values: CoreConnectionInfo, actions: FormikHelpers ) => { + setHttpProtocol(values.protocol == "http"); // check if core can be reached axios .get(`/info`, { @@ -89,9 +91,9 @@ const CoreConnect = () => { return (
- {showPopup && ( + {httpProtocol && showPopup && ( setShowPopup(false)} title="HTTP Error" type="danger" @@ -112,22 +114,22 @@ const CoreConnect = () => {

Add a new core

- {ShowBlurb && ( - -

- You may need to adjust your network and browser settings. {' '} - - Learn more. - -

+ {showBlurb && ( + +

+ You may need to adjust your network and browser settings. {' '} + + Learn more. + +

)} -
+
{ autoComplete={DISABLE_AUTOFILL} > {status && ( - +

{status.error}: Please ensure your fields are filled out correctly.