diff --git a/frontend/react/src/ui/modals/components/card.tsx b/frontend/react/src/ui/modals/components/card.tsx new file mode 100644 index 00000000..803b20b8 --- /dev/null +++ b/frontend/react/src/ui/modals/components/card.tsx @@ -0,0 +1,13 @@ +import React from 'react' +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' +import { faArrowRight, faCheckCircle, faExternalLink, faLink, faUnlink } from '@fortawesome/free-solid-svg-icons' + +export function Card(props: { + children?: JSX.Element | JSX.Element[], + className?: string +}) { + 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 d3d740a5..2edcb5c6 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 e2465bda..8e7bc1eb 100644 --- a/frontend/react/src/ui/modals/login.tsx +++ b/frontend/react/src/ui/modals/login.tsx @@ -1,5 +1,6 @@ import React, { useState, version } from 'react' import { Modal } from './components/modal' +import { Card } from './components/card' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { faArrowRight, faCheckCircle, faExternalLink, faLink, faUnlink } from '@fortawesome/free-solid-svg-icons' import { VERSION, connectedToServer } from '../../olympusapp' @@ -11,59 +12,77 @@ export function LoginModal(props: { }) { const [password, setPassword] = useState(""); - return - -
-
- { - !props.checkingPassword ? - <> -
-
Connect to
-
{window.location.toString()}
-
-
-

DCS Olympus

-
Version {VERSION}
-
- { - !props.loginError ? - <> -
- - setPassword(ev.currentTarget.value)} className="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 /> + return +
+
+
+ { + !props.checkingPassword ? + <> +
+
Connect to
+
{window.location.toString()}
+
+
+

DCS Olympus

+
Version {VERSION}
+
+ { + !props.loginError ? + <> +
+ + setPassword(ev.currentTarget.value)} className="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 /> +
+
+ + +
+ + : +
+ There was an issue connecting you dog cunt
-
- - -
- - : -
- There was an issue connecting you dog cunt -
- } - -
- 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. + } + + : +
+
- - : -
- + } +
+
+ + +
+ 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 +
+
+ Find out more about Olympus through our online wiki guide. +
+
+
-
- +
+ 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.
+ } \ No newline at end of file