diff --git a/frontend/react/src/ui/components/olcallout.tsx b/frontend/react/src/ui/components/olcallout.tsx index dcc9fd82..ac3f4eef 100644 --- a/frontend/react/src/ui/components/olcallout.tsx +++ b/frontend/react/src/ui/components/olcallout.tsx @@ -11,7 +11,7 @@ export function ErrorCallout(props: { {props.title && ()}
{props.title} -
+
{props.description}
diff --git a/frontend/react/src/ui/modals/components/card.tsx b/frontend/react/src/ui/modals/components/card.tsx index e551a5cb..5bafdb55 100644 --- a/frontend/react/src/ui/modals/components/card.tsx +++ b/frontend/react/src/ui/modals/components/card.tsx @@ -6,8 +6,8 @@ export function Card(props: { children?: JSX.Element | JSX.Element[], className?: string }) { - return
+ return
{props.children} -
+
} \ No newline at end of file diff --git a/frontend/react/src/ui/modals/components/modal.tsx b/frontend/react/src/ui/modals/components/modal.tsx index dbab1f23..9a8716ad 100644 --- a/frontend/react/src/ui/modals/components/modal.tsx +++ b/frontend/react/src/ui/modals/components/modal.tsx @@ -5,7 +5,7 @@ export function Modal(props: { children?: JSX.Element | JSX.Element[], className?: string }) { - return
+ return
{props.children}
} \ No newline at end of file diff --git a/frontend/react/src/ui/modals/login.tsx b/frontend/react/src/ui/modals/login.tsx index cfd99dab..75d304e4 100644 --- a/frontend/react/src/ui/modals/login.tsx +++ b/frontend/react/src/ui/modals/login.tsx @@ -3,8 +3,9 @@ import { Modal } from './components/modal' import { Card } from './components/card' import { ErrorCallout, InfoCallout, CommandCallout } from '../../ui/components/olcallout' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' -import { faArrowRight, faCheckCircle, faExternalLink, faLink, faUnlink } from '@fortawesome/free-solid-svg-icons' +import { faArrowRight, faCheckCircle, faDatabase, faExclamation, faExclamationCircle, faExternalLink, faLink, faServer, faSitemap, faUnlink, faWindowMaximize } from '@fortawesome/free-solid-svg-icons' import { VERSION, connectedToServer } from '../../olympusapp' +import { faFirefoxBrowser } from '@fortawesome/free-brands-svg-icons' export function LoginModal(props: { checkingPassword: boolean, @@ -18,7 +19,11 @@ export function LoginModal(props: { const [displayName, setDisplayName] = useState(""); return + +
+
+
{ @@ -26,7 +31,7 @@ export function LoginModal(props: { <>
Connect to
-
{window.location.toString()}
+
{window.location.toString()}

DCS Olympus

@@ -35,22 +40,24 @@ export function LoginModal(props: { { !props.loginError ? <> - { props.commandMode === null? + {props.commandMode === null ? <>
- + setPassword(ev.currentTarget.value)} className="w-full max-w-80 bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="Enter password" required />
+ {/* + View Guide + + */}
- : + : <>
@@ -68,8 +75,8 @@ export function LoginModal(props: { } : - -} + <>
Still having issues? See our troubleshooting guide here.
+ } :
@@ -80,20 +87,20 @@ export function LoginModal(props: {
}
-
- +
+ -
- YouTube Video Guide +
+ YouTube Video Guide
Check out our official video tutorial on how to get started with Olympus - so you can immediately start controlling the battlefield.
- + -
- Wiki Guide +
+ Wiki Guide
Find out more about Olympus through our online wiki guide. @@ -101,7 +108,7 @@ export function LoginModal(props: {
-
+
DCS Olympus (the "MATERIAL" or "Software") is provided completely free to users subject to the terms of the CC BY-NC-SA 4.0 Licence except where such terms conflict with this disclaimer, in which case, the terms of this disclaimer shall prevail. Any party making use of the Software in any manner agrees to be bound by the terms set out in the disclaimer. THIS MATERIAL IS NOT MADE OR SUPPORTED BY EAGLE DYNAMICS SA.
diff --git a/frontend/react/src/ui/ui.tsx b/frontend/react/src/ui/ui.tsx index 5901a4b9..9435bdfc 100644 --- a/frontend/react/src/ui/ui.tsx +++ b/frontend/react/src/ui/ui.tsx @@ -117,7 +117,7 @@ export function UI() {
{loginModalVisible && <> -
+
{ checkPassword(password) }} onContinue={(username) => { connect(username) }}