diff --git a/frontend/react/public/resources/theme/images/buttons/camera/linked.svg b/frontend/react/public/images/buttons/camera/linked.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/camera/linked.svg rename to frontend/react/public/images/buttons/camera/linked.svg diff --git a/frontend/react/public/resources/theme/images/buttons/context/miss-on-purpose.svg b/frontend/react/public/images/buttons/context/miss-on-purpose.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/context/miss-on-purpose.svg rename to frontend/react/public/images/buttons/context/miss-on-purpose.svg diff --git a/frontend/react/public/resources/theme/images/buttons/context/scenic-aaa.svg b/frontend/react/public/images/buttons/context/scenic-aaa.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/context/scenic-aaa.svg rename to frontend/react/public/images/buttons/context/scenic-aaa.svg diff --git a/frontend/react/public/resources/theme/images/buttons/context/simulate-fire-fight.svg b/frontend/react/public/images/buttons/context/simulate-fire-fight.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/context/simulate-fire-fight.svg rename to frontend/react/public/images/buttons/context/simulate-fire-fight.svg diff --git a/frontend/react/public/resources/theme/images/buttons/emissions/attack.svg b/frontend/react/public/images/buttons/emissions/attack.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/emissions/attack.svg rename to frontend/react/public/images/buttons/emissions/attack.svg diff --git a/frontend/react/public/resources/theme/images/buttons/emissions/defend.svg b/frontend/react/public/images/buttons/emissions/defend.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/emissions/defend.svg rename to frontend/react/public/images/buttons/emissions/defend.svg diff --git a/frontend/react/public/resources/theme/images/buttons/emissions/free.svg b/frontend/react/public/images/buttons/emissions/free.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/emissions/free.svg rename to frontend/react/public/images/buttons/emissions/free.svg diff --git a/frontend/react/public/resources/theme/images/buttons/emissions/silent.svg b/frontend/react/public/images/buttons/emissions/silent.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/emissions/silent.svg rename to frontend/react/public/images/buttons/emissions/silent.svg diff --git a/frontend/react/public/resources/theme/images/buttons/intensity/1.svg b/frontend/react/public/images/buttons/intensity/1.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/intensity/1.svg rename to frontend/react/public/images/buttons/intensity/1.svg diff --git a/frontend/react/public/resources/theme/images/buttons/intensity/2.svg b/frontend/react/public/images/buttons/intensity/2.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/intensity/2.svg rename to frontend/react/public/images/buttons/intensity/2.svg diff --git a/frontend/react/public/resources/theme/images/buttons/intensity/3.svg b/frontend/react/public/images/buttons/intensity/3.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/intensity/3.svg rename to frontend/react/public/images/buttons/intensity/3.svg diff --git a/frontend/react/public/resources/theme/images/buttons/other/arrow-down-solid.svg b/frontend/react/public/images/buttons/other/arrow-down-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/other/arrow-down-solid.svg rename to frontend/react/public/images/buttons/other/arrow-down-solid.svg diff --git a/frontend/react/public/resources/theme/images/buttons/other/back.svg b/frontend/react/public/images/buttons/other/back.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/other/back.svg rename to frontend/react/public/images/buttons/other/back.svg diff --git a/frontend/react/public/resources/theme/images/buttons/other/clock-rotate-left-solid.svg b/frontend/react/public/images/buttons/other/clock-rotate-left-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/other/clock-rotate-left-solid.svg rename to frontend/react/public/images/buttons/other/clock-rotate-left-solid.svg diff --git a/frontend/react/public/resources/theme/images/buttons/other/delete.svg b/frontend/react/public/images/buttons/other/delete.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/other/delete.svg rename to frontend/react/public/images/buttons/other/delete.svg diff --git a/frontend/react/public/resources/theme/images/buttons/other/edit.svg b/frontend/react/public/images/buttons/other/edit.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/other/edit.svg rename to frontend/react/public/images/buttons/other/edit.svg diff --git a/frontend/react/public/resources/theme/images/buttons/other/lock-open-solid.svg b/frontend/react/public/images/buttons/other/lock-open-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/other/lock-open-solid.svg rename to frontend/react/public/images/buttons/other/lock-open-solid.svg diff --git a/frontend/react/public/resources/theme/images/buttons/other/lock-solid.svg b/frontend/react/public/images/buttons/other/lock-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/other/lock-solid.svg rename to frontend/react/public/images/buttons/other/lock-solid.svg diff --git a/frontend/react/public/resources/theme/images/buttons/roe/designated.svg b/frontend/react/public/images/buttons/roe/designated.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/roe/designated.svg rename to frontend/react/public/images/buttons/roe/designated.svg diff --git a/frontend/react/public/resources/theme/images/buttons/roe/free.svg b/frontend/react/public/images/buttons/roe/free.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/roe/free.svg rename to frontend/react/public/images/buttons/roe/free.svg diff --git a/frontend/react/public/resources/theme/images/buttons/roe/hold.svg b/frontend/react/public/images/buttons/roe/hold.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/roe/hold.svg rename to frontend/react/public/images/buttons/roe/hold.svg diff --git a/frontend/react/public/resources/theme/images/buttons/roe/return.svg b/frontend/react/public/images/buttons/roe/return.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/roe/return.svg rename to frontend/react/public/images/buttons/roe/return.svg diff --git a/frontend/react/public/resources/theme/images/buttons/scatter/1.svg b/frontend/react/public/images/buttons/scatter/1.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/scatter/1.svg rename to frontend/react/public/images/buttons/scatter/1.svg diff --git a/frontend/react/public/resources/theme/images/buttons/scatter/2.svg b/frontend/react/public/images/buttons/scatter/2.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/scatter/2.svg rename to frontend/react/public/images/buttons/scatter/2.svg diff --git a/frontend/react/public/resources/theme/images/buttons/scatter/3.svg b/frontend/react/public/images/buttons/scatter/3.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/scatter/3.svg rename to frontend/react/public/images/buttons/scatter/3.svg diff --git a/frontend/react/public/resources/theme/images/buttons/spawn/aircraft.svg b/frontend/react/public/images/buttons/spawn/aircraft.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/spawn/aircraft.svg rename to frontend/react/public/images/buttons/spawn/aircraft.svg diff --git a/frontend/react/public/resources/theme/images/buttons/spawn/explosion.svg b/frontend/react/public/images/buttons/spawn/explosion.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/spawn/explosion.svg rename to frontend/react/public/images/buttons/spawn/explosion.svg diff --git a/frontend/react/public/resources/theme/images/buttons/spawn/groundunit.svg b/frontend/react/public/images/buttons/spawn/groundunit.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/spawn/groundunit.svg rename to frontend/react/public/images/buttons/spawn/groundunit.svg diff --git a/frontend/react/public/resources/theme/images/buttons/spawn/helicopter.svg b/frontend/react/public/images/buttons/spawn/helicopter.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/spawn/helicopter.svg rename to frontend/react/public/images/buttons/spawn/helicopter.svg diff --git a/frontend/react/public/resources/theme/images/buttons/spawn/more.svg b/frontend/react/public/images/buttons/spawn/more.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/spawn/more.svg rename to frontend/react/public/images/buttons/spawn/more.svg diff --git a/frontend/react/public/resources/theme/images/buttons/spawn/navyunit.svg b/frontend/react/public/images/buttons/spawn/navyunit.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/spawn/navyunit.svg rename to frontend/react/public/images/buttons/spawn/navyunit.svg diff --git a/frontend/react/public/resources/theme/images/buttons/spawn/sam.svg b/frontend/react/public/images/buttons/spawn/sam.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/spawn/sam.svg rename to frontend/react/public/images/buttons/spawn/sam.svg diff --git a/frontend/react/public/resources/theme/images/buttons/spawn/smoke.svg b/frontend/react/public/images/buttons/spawn/smoke.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/spawn/smoke.svg rename to frontend/react/public/images/buttons/spawn/smoke.svg diff --git a/frontend/react/public/resources/theme/images/buttons/threat/evade.svg b/frontend/react/public/images/buttons/threat/evade.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/threat/evade.svg rename to frontend/react/public/images/buttons/threat/evade.svg diff --git a/frontend/react/public/resources/theme/images/buttons/threat/manoeuvre.svg b/frontend/react/public/images/buttons/threat/manoeuvre.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/threat/manoeuvre.svg rename to frontend/react/public/images/buttons/threat/manoeuvre.svg diff --git a/frontend/react/public/resources/theme/images/buttons/threat/none.svg b/frontend/react/public/images/buttons/threat/none.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/threat/none.svg rename to frontend/react/public/images/buttons/threat/none.svg diff --git a/frontend/react/public/resources/theme/images/buttons/threat/passive.svg b/frontend/react/public/images/buttons/threat/passive.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/threat/passive.svg rename to frontend/react/public/images/buttons/threat/passive.svg diff --git a/frontend/react/public/resources/theme/images/buttons/tools/draw-polygon-solid.svg b/frontend/react/public/images/buttons/tools/draw-polygon-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/tools/draw-polygon-solid.svg rename to frontend/react/public/images/buttons/tools/draw-polygon-solid.svg diff --git a/frontend/react/public/resources/theme/images/buttons/tools/ground.svg b/frontend/react/public/images/buttons/tools/ground.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/tools/ground.svg rename to frontend/react/public/images/buttons/tools/ground.svg diff --git a/frontend/react/public/resources/theme/images/buttons/tools/pen-solid.svg b/frontend/react/public/images/buttons/tools/pen-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/tools/pen-solid.svg rename to frontend/react/public/images/buttons/tools/pen-solid.svg diff --git a/frontend/react/public/resources/theme/images/buttons/tools/tower.svg b/frontend/react/public/images/buttons/tools/tower.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/tools/tower.svg rename to frontend/react/public/images/buttons/tools/tower.svg diff --git a/frontend/react/public/resources/theme/images/buttons/visibility/airbase.svg b/frontend/react/public/images/buttons/visibility/airbase.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/visibility/airbase.svg rename to frontend/react/public/images/buttons/visibility/airbase.svg diff --git a/frontend/react/public/resources/theme/images/buttons/visibility/aircraft.svg b/frontend/react/public/images/buttons/visibility/aircraft.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/visibility/aircraft.svg rename to frontend/react/public/images/buttons/visibility/aircraft.svg diff --git a/frontend/react/public/resources/theme/images/buttons/visibility/circle-dot.svg b/frontend/react/public/images/buttons/visibility/circle-dot.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/visibility/circle-dot.svg rename to frontend/react/public/images/buttons/visibility/circle-dot.svg diff --git a/frontend/react/public/resources/theme/images/buttons/visibility/dcs.svg b/frontend/react/public/images/buttons/visibility/dcs.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/visibility/dcs.svg rename to frontend/react/public/images/buttons/visibility/dcs.svg diff --git a/frontend/react/public/resources/theme/images/buttons/visibility/flag.svg b/frontend/react/public/images/buttons/visibility/flag.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/visibility/flag.svg rename to frontend/react/public/images/buttons/visibility/flag.svg diff --git a/frontend/react/public/resources/theme/images/buttons/visibility/groundunit-sam.svg b/frontend/react/public/images/buttons/visibility/groundunit-sam.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/visibility/groundunit-sam.svg rename to frontend/react/public/images/buttons/visibility/groundunit-sam.svg diff --git a/frontend/react/public/resources/theme/images/buttons/visibility/groundunit.svg b/frontend/react/public/images/buttons/visibility/groundunit.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/visibility/groundunit.svg rename to frontend/react/public/images/buttons/visibility/groundunit.svg diff --git a/frontend/react/public/resources/theme/images/buttons/visibility/helicopter.svg b/frontend/react/public/images/buttons/visibility/helicopter.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/visibility/helicopter.svg rename to frontend/react/public/images/buttons/visibility/helicopter.svg diff --git a/frontend/react/public/resources/theme/images/buttons/visibility/human.svg b/frontend/react/public/images/buttons/visibility/human.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/visibility/human.svg rename to frontend/react/public/images/buttons/visibility/human.svg diff --git a/frontend/react/public/resources/theme/images/buttons/visibility/navyunit.svg b/frontend/react/public/images/buttons/visibility/navyunit.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/visibility/navyunit.svg rename to frontend/react/public/images/buttons/visibility/navyunit.svg diff --git a/frontend/react/public/resources/theme/images/buttons/visibility/olympus.svg b/frontend/react/public/images/buttons/visibility/olympus.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/visibility/olympus.svg rename to frontend/react/public/images/buttons/visibility/olympus.svg diff --git a/frontend/react/public/resources/theme/images/buttons/visibility/shield.svg b/frontend/react/public/images/buttons/visibility/shield.svg similarity index 100% rename from frontend/react/public/resources/theme/images/buttons/visibility/shield.svg rename to frontend/react/public/images/buttons/visibility/shield.svg diff --git a/frontend/react/public/resources/theme/images/convertToFontAwesomIcons.py b/frontend/react/public/images/convertToFontAwesomIcons.py similarity index 100% rename from frontend/react/public/resources/theme/images/convertToFontAwesomIcons.py rename to frontend/react/public/images/convertToFontAwesomIcons.py diff --git a/frontend/react/public/resources/theme/images/icons/altitude.svg b/frontend/react/public/images/icons/altitude.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/altitude.svg rename to frontend/react/public/images/icons/altitude.svg diff --git a/frontend/react/public/resources/theme/images/icons/arrow-pointer-solid.svg b/frontend/react/public/images/icons/arrow-pointer-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/arrow-pointer-solid.svg rename to frontend/react/public/images/icons/arrow-pointer-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/arrows-to-eye-solid.svg b/frontend/react/public/images/icons/arrows-to-eye-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/arrows-to-eye-solid.svg rename to frontend/react/public/images/icons/arrows-to-eye-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/bomb-solid.svg b/frontend/react/public/images/icons/bomb-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/bomb-solid.svg rename to frontend/react/public/images/icons/bomb-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/burst-solid.svg b/frontend/react/public/images/icons/burst-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/burst-solid.svg rename to frontend/react/public/images/icons/burst-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/camera.svg b/frontend/react/public/images/icons/camera.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/camera.svg rename to frontend/react/public/images/icons/camera.svg diff --git a/frontend/react/public/resources/theme/images/icons/check_square.svg b/frontend/react/public/images/icons/check_square.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/check_square.svg rename to frontend/react/public/images/icons/check_square.svg diff --git a/frontend/react/public/resources/theme/images/icons/chevron-down-warning.svg b/frontend/react/public/images/icons/chevron-down-warning.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/chevron-down-warning.svg rename to frontend/react/public/images/icons/chevron-down-warning.svg diff --git a/frontend/react/public/resources/theme/images/icons/chevron-down.svg b/frontend/react/public/images/icons/chevron-down.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/chevron-down.svg rename to frontend/react/public/images/icons/chevron-down.svg diff --git a/frontend/react/public/resources/theme/images/icons/circle-info-solid.svg b/frontend/react/public/images/icons/circle-info-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/circle-info-solid.svg rename to frontend/react/public/images/icons/circle-info-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/circle-question-regular.svg b/frontend/react/public/images/icons/circle-question-regular.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/circle-question-regular.svg rename to frontend/react/public/images/icons/circle-question-regular.svg diff --git a/frontend/react/public/resources/theme/images/icons/climb.svg b/frontend/react/public/images/icons/climb.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/climb.svg rename to frontend/react/public/images/icons/climb.svg diff --git a/frontend/react/public/resources/theme/images/icons/crosshairs-solid.svg b/frontend/react/public/images/icons/crosshairs-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/crosshairs-solid.svg rename to frontend/react/public/images/icons/crosshairs-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/descent.svg b/frontend/react/public/images/icons/descent.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/descent.svg rename to frontend/react/public/images/icons/descent.svg diff --git a/frontend/react/public/resources/theme/images/icons/diamond.svg b/frontend/react/public/images/icons/diamond.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/diamond.svg rename to frontend/react/public/images/icons/diamond.svg diff --git a/frontend/react/public/resources/theme/images/icons/echelon-lh.svg b/frontend/react/public/images/icons/echelon-lh.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/echelon-lh.svg rename to frontend/react/public/images/icons/echelon-lh.svg diff --git a/frontend/react/public/resources/theme/images/icons/echelon-rh.svg b/frontend/react/public/images/icons/echelon-rh.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/echelon-rh.svg rename to frontend/react/public/images/icons/echelon-rh.svg diff --git a/frontend/react/public/resources/theme/images/icons/echelon.svg b/frontend/react/public/images/icons/echelon.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/echelon.svg rename to frontend/react/public/images/icons/echelon.svg diff --git a/frontend/react/public/resources/theme/images/icons/explosion-solid.svg b/frontend/react/public/images/icons/explosion-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/explosion-solid.svg rename to frontend/react/public/images/icons/explosion-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/eye-solid.svg b/frontend/react/public/images/icons/eye-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/eye-solid.svg rename to frontend/react/public/images/icons/eye-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/fire-solid.svg b/frontend/react/public/images/icons/fire-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/fire-solid.svg rename to frontend/react/public/images/icons/fire-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/follow.svg b/frontend/react/public/images/icons/follow.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/follow.svg rename to frontend/react/public/images/icons/follow.svg diff --git a/frontend/react/public/resources/theme/images/icons/formation-end.svg b/frontend/react/public/images/icons/formation-end.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/formation-end.svg rename to frontend/react/public/images/icons/formation-end.svg diff --git a/frontend/react/public/resources/theme/images/icons/formation-middle.svg b/frontend/react/public/images/icons/formation-middle.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/formation-middle.svg rename to frontend/react/public/images/icons/formation-middle.svg diff --git a/frontend/react/public/resources/theme/images/icons/front.svg b/frontend/react/public/images/icons/front.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/front.svg rename to frontend/react/public/images/icons/front.svg diff --git a/frontend/react/public/resources/theme/images/icons/fuel.svg b/frontend/react/public/images/icons/fuel.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/fuel.svg rename to frontend/react/public/images/icons/fuel.svg diff --git a/frontend/react/public/resources/theme/images/icons/gamepad-solid.svg b/frontend/react/public/images/icons/gamepad-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/gamepad-solid.svg rename to frontend/react/public/images/icons/gamepad-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/gears-solid.svg b/frontend/react/public/images/icons/gears-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/gears-solid.svg rename to frontend/react/public/images/icons/gears-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/grip-lines-solid.svg b/frontend/react/public/images/icons/grip-lines-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/grip-lines-solid.svg rename to frontend/react/public/images/icons/grip-lines-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/group-ground.svg b/frontend/react/public/images/icons/group-ground.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/group-ground.svg rename to frontend/react/public/images/icons/group-ground.svg diff --git a/frontend/react/public/resources/theme/images/icons/group-navy.svg b/frontend/react/public/images/icons/group-navy.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/group-navy.svg rename to frontend/react/public/images/icons/group-navy.svg diff --git a/frontend/react/public/resources/theme/images/icons/hand-solid.svg b/frontend/react/public/images/icons/hand-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/hand-solid.svg rename to frontend/react/public/images/icons/hand-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/heading.svg b/frontend/react/public/images/icons/heading.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/heading.svg rename to frontend/react/public/images/icons/heading.svg diff --git a/frontend/react/public/resources/theme/images/icons/health.svg b/frontend/react/public/images/icons/health.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/health.svg rename to frontend/react/public/images/icons/health.svg diff --git a/frontend/react/public/resources/theme/images/icons/jet-fighter-up-solid.svg b/frontend/react/public/images/icons/jet-fighter-up-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/jet-fighter-up-solid.svg rename to frontend/react/public/images/icons/jet-fighter-up-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/keyboard-solid.svg b/frontend/react/public/images/icons/keyboard-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/keyboard-solid.svg rename to frontend/react/public/images/icons/keyboard-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/land-at-point.svg b/frontend/react/public/images/icons/land-at-point.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/land-at-point.svg rename to frontend/react/public/images/icons/land-at-point.svg diff --git a/frontend/react/public/resources/theme/images/icons/line-abreast.svg b/frontend/react/public/images/icons/line-abreast.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/line-abreast.svg rename to frontend/react/public/images/icons/line-abreast.svg diff --git a/frontend/react/public/resources/theme/images/icons/map-source.svg b/frontend/react/public/images/icons/map-source.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/map-source.svg rename to frontend/react/public/images/icons/map-source.svg diff --git a/frontend/react/public/resources/theme/images/icons/miss-blue.svg b/frontend/react/public/images/icons/miss-blue.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/miss-blue.svg rename to frontend/react/public/images/icons/miss-blue.svg diff --git a/frontend/react/public/resources/theme/images/icons/miss-red.svg b/frontend/react/public/images/icons/miss-red.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/miss-red.svg rename to frontend/react/public/images/icons/miss-red.svg diff --git a/frontend/react/public/resources/theme/images/icons/miss.svg b/frontend/react/public/images/icons/miss.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/miss.svg rename to frontend/react/public/images/icons/miss.svg diff --git a/frontend/react/public/resources/theme/images/icons/napalm.svg b/frontend/react/public/images/icons/napalm.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/napalm.svg rename to frontend/react/public/images/icons/napalm.svg diff --git a/frontend/react/public/resources/theme/images/icons/person-military-pointing-solid.svg b/frontend/react/public/images/icons/person-military-pointing-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/person-military-pointing-solid.svg rename to frontend/react/public/images/icons/person-military-pointing-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/pin.svg b/frontend/react/public/images/icons/pin.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/pin.svg rename to frontend/react/public/images/icons/pin.svg diff --git a/frontend/react/public/resources/theme/images/icons/plane.svg b/frontend/react/public/images/icons/plane.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/plane.svg rename to frontend/react/public/images/icons/plane.svg diff --git a/frontend/react/public/resources/theme/images/icons/ruler.svg b/frontend/react/public/images/icons/ruler.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/ruler.svg rename to frontend/react/public/images/icons/ruler.svg diff --git a/frontend/react/public/resources/theme/images/icons/scenic-blue.svg b/frontend/react/public/images/icons/scenic-blue.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/scenic-blue.svg rename to frontend/react/public/images/icons/scenic-blue.svg diff --git a/frontend/react/public/resources/theme/images/icons/scenic-red.svg b/frontend/react/public/images/icons/scenic-red.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/scenic-red.svg rename to frontend/react/public/images/icons/scenic-red.svg diff --git a/frontend/react/public/resources/theme/images/icons/scenic.svg b/frontend/react/public/images/icons/scenic.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/scenic.svg rename to frontend/react/public/images/icons/scenic.svg diff --git a/frontend/react/public/resources/theme/images/icons/secondaries.svg b/frontend/react/public/images/icons/secondaries.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/secondaries.svg rename to frontend/react/public/images/icons/secondaries.svg diff --git a/frontend/react/public/resources/theme/images/icons/smog-solid.svg b/frontend/react/public/images/icons/smog-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/smog-solid.svg rename to frontend/react/public/images/icons/smog-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/speed-decrease.svg b/frontend/react/public/images/icons/speed-decrease.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/speed-decrease.svg rename to frontend/react/public/images/icons/speed-decrease.svg diff --git a/frontend/react/public/resources/theme/images/icons/speed-increase.svg b/frontend/react/public/images/icons/speed-increase.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/speed-increase.svg rename to frontend/react/public/images/icons/speed-increase.svg diff --git a/frontend/react/public/resources/theme/images/icons/speed.svg b/frontend/react/public/images/icons/speed.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/speed.svg rename to frontend/react/public/images/icons/speed.svg diff --git a/frontend/react/public/resources/theme/images/icons/square-check-solid.svg b/frontend/react/public/images/icons/square-check-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/square-check-solid.svg rename to frontend/react/public/images/icons/square-check-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/square-regular.svg b/frontend/react/public/images/icons/square-regular.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/square-regular.svg rename to frontend/react/public/images/icons/square-regular.svg diff --git a/frontend/react/public/resources/theme/images/icons/sword.svg b/frontend/react/public/images/icons/sword.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/sword.svg rename to frontend/react/public/images/icons/sword.svg diff --git a/frontend/react/public/resources/theme/images/icons/trail.svg b/frontend/react/public/images/icons/trail.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/trail.svg rename to frontend/react/public/images/icons/trail.svg diff --git a/frontend/react/public/resources/theme/images/icons/trash-can-regular.svg b/frontend/react/public/images/icons/trash-can-regular.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/trash-can-regular.svg rename to frontend/react/public/images/icons/trash-can-regular.svg diff --git a/frontend/react/public/resources/theme/images/icons/triangle-exclamation-solid.svg b/frontend/react/public/images/icons/triangle-exclamation-solid.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/triangle-exclamation-solid.svg rename to frontend/react/public/images/icons/triangle-exclamation-solid.svg diff --git a/frontend/react/public/resources/theme/images/icons/white-phosphorous.svg b/frontend/react/public/images/icons/white-phosphorous.svg similarity index 100% rename from frontend/react/public/resources/theme/images/icons/white-phosphorous.svg rename to frontend/react/public/images/icons/white-phosphorous.svg diff --git a/frontend/react/public/resources/theme/images/markers/airbase.svg b/frontend/react/public/images/markers/airbase.svg similarity index 100% rename from frontend/react/public/resources/theme/images/markers/airbase.svg rename to frontend/react/public/images/markers/airbase.svg diff --git a/frontend/react/public/resources/theme/images/markers/bullseye.svg b/frontend/react/public/images/markers/bullseye.svg similarity index 100% rename from frontend/react/public/resources/theme/images/markers/bullseye.svg rename to frontend/react/public/images/markers/bullseye.svg diff --git a/frontend/react/public/resources/theme/images/markers/draw.svg b/frontend/react/public/images/markers/draw.svg similarity index 100% rename from frontend/react/public/resources/theme/images/markers/draw.svg rename to frontend/react/public/images/markers/draw.svg diff --git a/frontend/react/public/resources/theme/images/markers/marker-icon.png b/frontend/react/public/images/markers/marker-icon.png similarity index 100% rename from frontend/react/public/resources/theme/images/markers/marker-icon.png rename to frontend/react/public/images/markers/marker-icon.png diff --git a/frontend/react/public/resources/theme/images/markers/marker-shadow.png b/frontend/react/public/images/markers/marker-shadow.png similarity index 100% rename from frontend/react/public/resources/theme/images/markers/marker-shadow.png rename to frontend/react/public/images/markers/marker-shadow.png diff --git a/frontend/react/public/resources/theme/images/markers/move.svg b/frontend/react/public/images/markers/move.svg similarity index 100% rename from frontend/react/public/resources/theme/images/markers/move.svg rename to frontend/react/public/images/markers/move.svg diff --git a/frontend/react/public/resources/theme/images/markers/smoke.svg b/frontend/react/public/images/markers/smoke.svg similarity index 100% rename from frontend/react/public/resources/theme/images/markers/smoke.svg rename to frontend/react/public/images/markers/smoke.svg diff --git a/frontend/react/public/resources/theme/images/markers/target.svg b/frontend/react/public/images/markers/target.svg similarity index 100% rename from frontend/react/public/resources/theme/images/markers/target.svg rename to frontend/react/public/images/markers/target.svg diff --git a/frontend/react/public/resources/theme/images/parrot/parrot.png b/frontend/react/public/images/parrot/parrot.png similarity index 100% rename from frontend/react/public/resources/theme/images/parrot/parrot.png rename to frontend/react/public/images/parrot/parrot.png diff --git a/frontend/react/public/resources/theme/images/splash/1.jpg b/frontend/react/public/images/splash/1.jpg similarity index 100% rename from frontend/react/public/resources/theme/images/splash/1.jpg rename to frontend/react/public/images/splash/1.jpg diff --git a/frontend/react/public/resources/theme/images/splash/2.jpg b/frontend/react/public/images/splash/2.jpg similarity index 100% rename from frontend/react/public/resources/theme/images/splash/2.jpg rename to frontend/react/public/images/splash/2.jpg diff --git a/frontend/react/public/resources/theme/images/splash/3.jpg b/frontend/react/public/images/splash/3.jpg similarity index 100% rename from frontend/react/public/resources/theme/images/splash/3.jpg rename to frontend/react/public/images/splash/3.jpg diff --git a/frontend/react/public/resources/theme/images/splash/4.jpg b/frontend/react/public/images/splash/4.jpg similarity index 100% rename from frontend/react/public/resources/theme/images/splash/4.jpg rename to frontend/react/public/images/splash/4.jpg diff --git a/frontend/react/public/resources/theme/images/splash/5.jpg b/frontend/react/public/images/splash/5.jpg similarity index 100% rename from frontend/react/public/resources/theme/images/splash/5.jpg rename to frontend/react/public/images/splash/5.jpg diff --git a/frontend/react/public/resources/theme/images/splash/6.jpg b/frontend/react/public/images/splash/6.jpg similarity index 100% rename from frontend/react/public/resources/theme/images/splash/6.jpg rename to frontend/react/public/images/splash/6.jpg diff --git a/frontend/react/public/resources/theme/images/splash/7.jpg b/frontend/react/public/images/splash/7.jpg similarity index 100% rename from frontend/react/public/resources/theme/images/splash/7.jpg rename to frontend/react/public/images/splash/7.jpg diff --git a/frontend/react/public/resources/theme/images/splash/8.jpg b/frontend/react/public/images/splash/8.jpg similarity index 100% rename from frontend/react/public/resources/theme/images/splash/8.jpg rename to frontend/react/public/images/splash/8.jpg diff --git a/frontend/react/public/resources/theme/images/states/attack.svg b/frontend/react/public/images/states/attack.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/attack.svg rename to frontend/react/public/images/states/attack.svg diff --git a/frontend/react/public/resources/theme/images/states/awacs.svg b/frontend/react/public/images/states/awacs.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/awacs.svg rename to frontend/react/public/images/states/awacs.svg diff --git a/frontend/react/public/resources/theme/images/states/dcs.svg b/frontend/react/public/images/states/dcs.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/dcs.svg rename to frontend/react/public/images/states/dcs.svg diff --git a/frontend/react/public/resources/theme/images/states/follow.svg b/frontend/react/public/images/states/follow.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/follow.svg rename to frontend/react/public/images/states/follow.svg diff --git a/frontend/react/public/resources/theme/images/states/human.svg b/frontend/react/public/images/states/human.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/human.svg rename to frontend/react/public/images/states/human.svg diff --git a/frontend/react/public/resources/theme/images/states/idle.svg b/frontend/react/public/images/states/idle.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/idle.svg rename to frontend/react/public/images/states/idle.svg diff --git a/frontend/react/public/resources/theme/images/states/land-at-point.svg b/frontend/react/public/images/states/land-at-point.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/land-at-point.svg rename to frontend/react/public/images/states/land-at-point.svg diff --git a/frontend/react/public/resources/theme/images/states/miss-on-purpose.svg b/frontend/react/public/images/states/miss-on-purpose.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/miss-on-purpose.svg rename to frontend/react/public/images/states/miss-on-purpose.svg diff --git a/frontend/react/public/resources/theme/images/states/no-task.svg b/frontend/react/public/images/states/no-task.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/no-task.svg rename to frontend/react/public/images/states/no-task.svg diff --git a/frontend/react/public/resources/theme/images/states/off.svg b/frontend/react/public/images/states/off.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/off.svg rename to frontend/react/public/images/states/off.svg diff --git a/frontend/react/public/resources/theme/images/states/refuel.svg b/frontend/react/public/images/states/refuel.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/refuel.svg rename to frontend/react/public/images/states/refuel.svg diff --git a/frontend/react/public/resources/theme/images/states/rtb.svg b/frontend/react/public/images/states/rtb.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/rtb.svg rename to frontend/react/public/images/states/rtb.svg diff --git a/frontend/react/public/resources/theme/images/states/scenic-aaa.svg b/frontend/react/public/images/states/scenic-aaa.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/scenic-aaa.svg rename to frontend/react/public/images/states/scenic-aaa.svg diff --git a/frontend/react/public/resources/theme/images/states/simulate-fire-fight.svg b/frontend/react/public/images/states/simulate-fire-fight.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/simulate-fire-fight.svg rename to frontend/react/public/images/states/simulate-fire-fight.svg diff --git a/frontend/react/public/resources/theme/images/states/tanker.svg b/frontend/react/public/images/states/tanker.svg similarity index 100% rename from frontend/react/public/resources/theme/images/states/tanker.svg rename to frontend/react/public/images/states/tanker.svg diff --git a/frontend/react/public/resources/theme/images/units/aircraft.svg b/frontend/react/public/images/units/aircraft.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/aircraft.svg rename to frontend/react/public/images/units/aircraft.svg diff --git a/frontend/react/public/resources/theme/images/units/bomb.svg b/frontend/react/public/images/units/bomb.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/bomb.svg rename to frontend/react/public/images/units/bomb.svg diff --git a/frontend/react/public/resources/theme/images/units/death.svg b/frontend/react/public/images/units/death.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/death.svg rename to frontend/react/public/images/units/death.svg diff --git a/frontend/react/public/resources/theme/images/units/groundunit-aaa.svg b/frontend/react/public/images/units/groundunit-aaa.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/groundunit-aaa.svg rename to frontend/react/public/images/units/groundunit-aaa.svg diff --git a/frontend/react/public/resources/theme/images/units/groundunit-apc.svg b/frontend/react/public/images/units/groundunit-apc.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/groundunit-apc.svg rename to frontend/react/public/images/units/groundunit-apc.svg diff --git a/frontend/react/public/resources/theme/images/units/groundunit-artillery.svg b/frontend/react/public/images/units/groundunit-artillery.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/groundunit-artillery.svg rename to frontend/react/public/images/units/groundunit-artillery.svg diff --git a/frontend/react/public/resources/theme/images/units/groundunit-ewr.svg b/frontend/react/public/images/units/groundunit-ewr.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/groundunit-ewr.svg rename to frontend/react/public/images/units/groundunit-ewr.svg diff --git a/frontend/react/public/resources/theme/images/units/groundunit-infantry.svg b/frontend/react/public/images/units/groundunit-infantry.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/groundunit-infantry.svg rename to frontend/react/public/images/units/groundunit-infantry.svg diff --git a/frontend/react/public/resources/theme/images/units/groundunit-sam-launcher.svg b/frontend/react/public/images/units/groundunit-sam-launcher.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/groundunit-sam-launcher.svg rename to frontend/react/public/images/units/groundunit-sam-launcher.svg diff --git a/frontend/react/public/resources/theme/images/units/groundunit-sam-radar.svg b/frontend/react/public/images/units/groundunit-sam-radar.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/groundunit-sam-radar.svg rename to frontend/react/public/images/units/groundunit-sam-radar.svg diff --git a/frontend/react/public/resources/theme/images/units/groundunit-sam.svg b/frontend/react/public/images/units/groundunit-sam.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/groundunit-sam.svg rename to frontend/react/public/images/units/groundunit-sam.svg diff --git a/frontend/react/public/resources/theme/images/units/groundunit-tactical.svg b/frontend/react/public/images/units/groundunit-tactical.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/groundunit-tactical.svg rename to frontend/react/public/images/units/groundunit-tactical.svg diff --git a/frontend/react/public/resources/theme/images/units/groundunit-tank.svg b/frontend/react/public/images/units/groundunit-tank.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/groundunit-tank.svg rename to frontend/react/public/images/units/groundunit-tank.svg diff --git a/frontend/react/public/resources/theme/images/units/groundunit-truck.svg b/frontend/react/public/images/units/groundunit-truck.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/groundunit-truck.svg rename to frontend/react/public/images/units/groundunit-truck.svg diff --git a/frontend/react/public/resources/theme/images/units/groundunit.svg b/frontend/react/public/images/units/groundunit.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/groundunit.svg rename to frontend/react/public/images/units/groundunit.svg diff --git a/frontend/react/public/resources/theme/images/units/helicopter.svg b/frontend/react/public/images/units/helicopter.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/helicopter.svg rename to frontend/react/public/images/units/helicopter.svg diff --git a/frontend/react/public/resources/theme/images/units/missile.svg b/frontend/react/public/images/units/missile.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/missile.svg rename to frontend/react/public/images/units/missile.svg diff --git a/frontend/react/public/resources/theme/images/units/navyunit.svg b/frontend/react/public/images/units/navyunit.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/navyunit.svg rename to frontend/react/public/images/units/navyunit.svg diff --git a/frontend/react/public/resources/theme/images/units/static.svg b/frontend/react/public/images/units/static.svg similarity index 100% rename from frontend/react/public/resources/theme/images/units/static.svg rename to frontend/react/public/images/units/static.svg diff --git a/frontend/react/src/map/map.ts b/frontend/react/src/map/map.ts index 32297a10..9c3018f0 100644 --- a/frontend/react/src/map/map.ts +++ b/frontend/react/src/map/map.ts @@ -140,8 +140,8 @@ export class Map extends L.Map { this.on("zoom", (e: any) => this.#onZoom(e)); this.on("zoomend", (e: any) => this.#onZoomEnd(e)); this.on("drag", (e: any) => this.centerOnUnit(null)); - this.on("dragstart", (e: any) => this.#onDragStart()); - this.on("dragend", (e: any) => this.#onDragEnd(null)); + this.on("dragstart", (e: any) => this.#onDragStart(e)); + this.on("dragend", (e: any) => this.#onDragEnd(e)); this.on("contextmenu", (e: any) => this.#onContextMenu(e)); this.on("selectionstart", (e: any) => this.#onSelectionStart(e)); this.on("selectionend", (e: any) => this.#onSelectionEnd(e)); diff --git a/frontend/react/src/map/markers/smokemarker.ts b/frontend/react/src/map/markers/smokemarker.ts index c282038b..b8a99c6e 100644 --- a/frontend/react/src/map/markers/smokemarker.ts +++ b/frontend/react/src/map/markers/smokemarker.ts @@ -31,7 +31,7 @@ export class SmokeMarker extends CustomMarker { el.classList.add("ol-smoke-icon"); el.setAttribute("data-color", this.#color); var img = document.createElement("img"); - img.src = "/resources/theme/images/markers/smoke.svg"; + img.src = "/images/markers/smoke.svg"; img.onload = () => SVGInjector(img); el.appendChild(img); this.getElement()?.appendChild(el); diff --git a/frontend/react/src/map/markers/stylesheets/units.css b/frontend/react/src/map/markers/stylesheets/units.css index c0598962..7b46717f 100644 --- a/frontend/react/src/map/markers/stylesheets/units.css +++ b/frontend/react/src/map/markers/stylesheets/units.css @@ -288,15 +288,15 @@ } [data-object|="unit"][data-state="rtb"] .unit-state { - background-image: url("/resources/theme/images/states/rtb.svg"); + background-image: url("/images/states/rtb.svg"); } [data-object|="unit"][data-state="land"] .unit-state { - background-image: url("/resources/theme/images/states/rtb.svg"); + background-image: url("/images/states/rtb.svg"); } [data-object|="unit"][data-state="idle"] .unit-state { - background-image: url("/resources/theme/images/states/idle.svg"); + background-image: url("/images/states/idle.svg"); } [data-object*="groundunit"][data-state="idle"] .unit-state, @@ -308,59 +308,59 @@ [data-object|="unit"][data-state="bomb-point"] .unit-state, [data-object|="unit"][data-state="carpet-bombing"] .unit-state, [data-object|="unit"][data-state="fire-at-area"] .unit-state { - background-image: url("/resources/theme/images/states/attack.svg"); + background-image: url("/images/states/attack.svg"); } [data-object|="unit"][data-state="follow"] .unit-state { - background-image: url("/resources/theme/images/states/follow.svg"); + background-image: url("/images/states/follow.svg"); } [data-object|="unit"][data-state="refuel"] .unit-state { - background-image: url("/resources/theme/images/states/refuel.svg"); + background-image: url("/images/states/refuel.svg"); } [data-object|="unit"][data-state="human"] .unit-state { - background-image: url("/resources/theme/images/states/human.svg"); + background-image: url("/images/states/human.svg"); } [data-object|="unit"][data-state="dcs"] .unit-state { - background-image: url("/resources/theme/images/states/dcs.svg"); + background-image: url("/images/states/dcs.svg"); } [data-object|="unit"][data-state="land-at-point"] .unit-state { - background-image: url("/resources/theme/images/states/land-at-point.svg"); + background-image: url("/images/states/land-at-point.svg"); } [data-object|="unit"][data-state="no-task"] .unit-state { - background-image: url("/resources/theme/images/states/no-task.svg"); + background-image: url("/images/states/no-task.svg"); } [data-object|="unit"][data-state="off"] .unit-state { - background-image: url("/resources/theme/images/states/off.svg"); + background-image: url("/images/states/off.svg"); } [data-object|="unit"][data-state="tanker"] .unit-state { - background-image: url("/resources/theme/images/states/tanker.svg"); + background-image: url("/images/states/tanker.svg"); } [data-object|="unit"][data-state="AWACS"] .unit-state { - background-image: url("/resources/theme/images/states/awacs.svg"); + background-image: url("/images/states/awacs.svg"); } [data-object|="unit"][data-state="miss-on-purpose"] .unit-state { - background-image: url("/resources/theme/images/states/miss-on-purpose.svg"); + background-image: url("/images/states/miss-on-purpose.svg"); } [data-object|="unit"][data-state="scenic-aaa"] .unit-state { - background-image: url("/resources/theme/images/states/scenic-aaa.svg"); + background-image: url("/images/states/scenic-aaa.svg"); } [data-object|="unit"][data-state="simulate-fire-fight"] .unit-state { - background-image: url("/resources/theme/images/states/simulate-fire-fight.svg"); + background-image: url("/images/states/simulate-fire-fight.svg"); } [data-object|="unit"] .unit-health::before { - background-image: url("/resources/theme/images/icons/health.svg"); + background-image: url("/images/icons/health.svg"); background-repeat: no-repeat; background-size: contain; content: " "; diff --git a/frontend/react/src/map/markers/temporaryunitmarker.ts b/frontend/react/src/map/markers/temporaryunitmarker.ts index c2ee16af..72a09228 100644 --- a/frontend/react/src/map/markers/temporaryunitmarker.ts +++ b/frontend/react/src/map/markers/temporaryunitmarker.ts @@ -67,7 +67,7 @@ export class TemporaryUnitMarker extends CustomMarker { unitIcon.classList.add("unit-icon"); var img = document.createElement("img"); - img.src = `/resources/theme/images/units/${databaseEntry?.markerFile ?? category}.svg`; + img.src = `/images/units/${databaseEntry?.markerFile ?? category}.svg`; img.onload = () => SVGInjector(img); unitIcon.appendChild(img); unitIcon.toggleAttribute("data-rotate-to-heading", false); diff --git a/frontend/react/src/mission/airbase.ts b/frontend/react/src/mission/airbase.ts index 2334ba24..50b82851 100644 --- a/frontend/react/src/mission/airbase.ts +++ b/frontend/react/src/mission/airbase.ts @@ -38,7 +38,7 @@ export class Airbase extends CustomMarker { el.classList.add("airbase-icon"); el.setAttribute("data-object", "airbase"); var img = document.createElement("img"); - img.src = "/resources/theme/images/markers/airbase.svg"; + img.src = "/images/markers/airbase.svg"; img.onload = () => SVGInjector(img); el.appendChild(img); this.getElement()?.appendChild(el); diff --git a/frontend/react/src/mission/bullseye.ts b/frontend/react/src/mission/bullseye.ts index 296951c8..b1149780 100644 --- a/frontend/react/src/mission/bullseye.ts +++ b/frontend/react/src/mission/bullseye.ts @@ -17,7 +17,7 @@ export class Bullseye extends CustomMarker { el.classList.add("bullseye-icon"); el.setAttribute("data-object", "bullseye"); var img = document.createElement("img"); - img.src = "/resources/theme/images/markers/bullseye.svg"; + img.src = "/images/markers/bullseye.svg"; img.onload = () => SVGInjector(img); el.appendChild(img); this.getElement()?.appendChild(el); diff --git a/frontend/react/src/ui/modals/login.tsx b/frontend/react/src/ui/modals/login.tsx index 3c3f74f8..940658d7 100644 --- a/frontend/react/src/ui/modals/login.tsx +++ b/frontend/react/src/ui/modals/login.tsx @@ -45,7 +45,7 @@ export function LoginModal(props: { `} >
-
+

{props.commandMode === null ? ( <> -
+
) : ( <>