merged and resolved conflicts

This commit is contained in:
2025-10-02 22:59:07 +01:00
16 changed files with 181 additions and 202 deletions

14
.env
View File

@@ -6,16 +6,4 @@ VITE_OUTSIDE_BASEURL=http://100.82.205.44
VITE_FOLKESTONE_URL=http://100.116.253.81/mergedHistory/sightingSummary?mostRecentRef=
VITE_MAV_URL=http://192.168.75.11/SightingListFront/sightingSummary?mostRecentRef=
VITE_AGX_BOX_FRONT_URL=http://192.168.0.90:8080/SightingListFront/sightingSummary?mostRecentRef=
VITE_AGX_BOX_REAR_URL=http://192.168.0.90:8080/SightingListRear/sightingSummary?mostRecentRef=
VITE_AGX=http://100.72.72.70:8080/SightingListRear/sightingSummary?mostRecentRef=
VITE_AGX_FRONT=http://100.72.72.70:8080/SightingListFront/sightingSummary?mostRecentRef=
VITE_AGX_FRONT_BASE=http://100.72.72.70:8080/
VITE_LOCAL=http://10.42.0.1:8080/SightingListRear/sightingSummary?mostRecentRef=
VITE_LOCAL_FRONT=http://10.42.0.1:8080/SightingListFront/sightingSummary?mostRecentRef=
VITE_LOCAL_BASE=http://10.42.0.1:8080/
VITE_LOCAL_BASE_NEW=http://100.113.222.39
VITE_AGX_BOX_URL=http://100.118.196.113:8080