From c6300b3e6a56c326538aeed38c79a6f9fe957f7a Mon Sep 17 00:00:00 2001 From: Dogma <103559271+ArtificialDogma@users.noreply.github.com> Date: Wed, 17 Apr 2024 19:03:59 +1000 Subject: [PATCH] Updated IP and Link to be dynamic IP Address of server and connection status is now sourced from 'olympusapp' and automatically updates status in the header. --- frontend/react/src/olympusapp.ts | 2 ++ frontend/react/src/ui/panels/header.tsx | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/react/src/olympusapp.ts b/frontend/react/src/olympusapp.ts index 8f6f545e..2a91048f 100644 --- a/frontend/react/src/olympusapp.ts +++ b/frontend/react/src/olympusapp.ts @@ -41,6 +41,8 @@ import { navyUnitDatabase } from "./unit/databases/navyunitdatabase"; //import { ContextManager } from "./context/contextmanager"; //import { Context } from "./context/context"; export var VERSION = "{{OLYMPUS_VERSION_NUMBER}}"; +export var IP = "{{IP ADDRESS OF SERVER}}"; +export var connectedToServer = true; export class OlympusApp { /* Global data */ diff --git a/frontend/react/src/ui/panels/header.tsx b/frontend/react/src/ui/panels/header.tsx index 3ce10562..ed3c3c15 100644 --- a/frontend/react/src/ui/panels/header.tsx +++ b/frontend/react/src/ui/panels/header.tsx @@ -1,12 +1,12 @@ import React from 'react' import { OlRoundStateButton, OlStateButton, OlLockStateButton } from '../components/olstatebutton'; -import { faLock, faSkull, faCamera, faFlag, faCircle, faLink } from '@fortawesome/free-solid-svg-icons'; +import { faLock, faSkull, faCamera, faFlag, faCircle, faLink, faUnlink } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { EventsConsumer } from '../../eventscontext'; import { StateConsumer } from '../../statecontext'; import { OlDropdownItem, OlDropdown } from '../components/oldropdown'; import { OlLabelToggle } from '../components/ollabeltoggle'; -import { getApp } from '../../olympusapp'; +import { getApp, IP, connectedToServer } from '../../olympusapp'; import { olButtonsVisibilityAirbase, olButtonsVisibilityAircraft, olButtonsVisibilityDcs, olButtonsVisibilityGroundunit, olButtonsVisibilityGroundunitSam, olButtonsVisibilityHelicopter, olButtonsVisibilityHuman, olButtonsVisibilityNavyunit, olButtonsVisibilityOlympus } from '../components/olicons'; export function Header() { @@ -16,11 +16,11 @@ export function Header() { {(events) =>