diff --git a/api/Controllers/LocationController.cs b/api/Controllers/LocationController.cs index 3a42896b..9ba70a33 100644 --- a/api/Controllers/LocationController.cs +++ b/api/Controllers/LocationController.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; @@ -31,6 +32,8 @@ public async Task>> GetLocationsAndCourtRooms() { var locations = await _locationService.GetLocations(); + Console.WriteLine("123"); + var locationList = locations.Select(location => new Location { Name = location.LongDesc, @@ -44,7 +47,7 @@ public async Task>> GetLocationsAndCourtRooms() foreach (var location in locationList) { location.CourtRooms = courtRooms.Where(cr => cr.Flex == location.LocationId && (cr.ShortDesc == "CRT" || cr.ShortDesc == "HGR")) - .Select(cr => new CourtRoom {LocationId = cr.Flex, Room = cr.Code, Type = cr.ShortDesc}).ToList(); + .Select(cr => new CourtRoom { LocationId = cr.Flex, Room = cr.Code, Type = cr.ShortDesc }).ToList(); } return Ok(locationList); diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index feb94b7e..8d2db1e4 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -70,9 +70,9 @@ services: ports: - 5000:5000 volumes: - - ../api/:/opt/app-root/src/api - - ../db/:/opt/app-root/src/db - - ../jc-interface-client/:/opt/app-root/src/jc-interface-client + - ${LOCAL_WORKSPACE_FOLDER-..}/api/:/opt/app-root/src/api + - ${LOCAL_WORKSPACE_FOLDER-..}/db/:/opt/app-root/src/db + - ${LOCAL_WORKSPACE_FOLDER-..}/jc-interface-client/:/opt/app-root/src/jc-interface-client - api-dev-bin:/opt/app-root/src/api/bin - api-dev-obj:/opt/app-root/src/api/obj - ./seed:/opt/app-root/data diff --git a/web/vue.config.js b/web/vue.config.js index 24cc6d6a..7f2781d4 100644 --- a/web/vue.config.js +++ b/web/vue.config.js @@ -22,7 +22,7 @@ module.exports = { //This is for WEB_BASE_HREF = '/' specifically. //If having problems connecting, try adding: netsh http add iplisten 127.0.0.1 '^/api': { - target: "http://host.docker.internal:5000", + target: "http://api:5000", headers: { Connection: 'keep-alive', 'X-Forwarded-Host': 'localhost',