diff --git a/Backend/.gitignore b/Backend/.gitignore index ec7fac9..cf167b1 100644 --- a/Backend/.gitignore +++ b/Backend/.gitignore @@ -282,4 +282,5 @@ __pycache__/ PublishProfiles/ src/Trackable.Web/wwwroot/dist/** !src/Trackable.Web/wwwroot/dist/swagger/ +!src/Trackable.Web/wwwroot/dist/swagger/swagger.css !src/Trackable.Web/wwwroot/dist/swagger/swagger.js diff --git a/Backend/src/Trackable.Web/Controllers/DevicesController.cs b/Backend/src/Trackable.Web/Controllers/DevicesController.cs index fb06df4..bb1e354 100644 --- a/Backend/src/Trackable.Web/Controllers/DevicesController.cs +++ b/Backend/src/Trackable.Web/Controllers/DevicesController.cs @@ -205,7 +205,7 @@ namespace Trackable.Web.Controllers } /// - /// Register TrackingPoints related to device, check geofences + /// Register TrackingPoints related to device and check geofences /// /// The device id /// List of TrackingPoints diff --git a/Backend/src/Trackable.Web/Controllers/LocationsController.cs b/Backend/src/Trackable.Web/Controllers/LocationsController.cs index 13dba28..3204307 100644 --- a/Backend/src/Trackable.Web/Controllers/LocationsController.cs +++ b/Backend/src/Trackable.Web/Controllers/LocationsController.cs @@ -155,6 +155,11 @@ namespace Trackable.Web.Controllers return this.dtoMapper.Map(result); } + /// + /// Delete location + /// + /// The location id + /// Ok response // DELETE api/locations/5 [HttpDelete("{id}")] [Authorize(UserRoles.Administrator)] diff --git a/Backend/src/Trackable.Web/Startup.cs b/Backend/src/Trackable.Web/Startup.cs index 18ae04e..e7cf39d 100644 --- a/Backend/src/Trackable.Web/Startup.cs +++ b/Backend/src/Trackable.Web/Startup.cs @@ -169,7 +169,6 @@ namespace Trackable.Web return description.RelativePath.StartsWith("api"); }); - var filePath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Trackable.Web.xml"); c.IncludeXmlComments(filePath); }); @@ -246,7 +245,7 @@ namespace Trackable.Web app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "BMFT APIs V1"); - c.HeadContent = ""; + c.HeadContent = ""; c.DocumentTitle = "BMFT Swagger"; }); } diff --git a/Backend/src/Trackable.Web/wwwroot/dist/swagger/swagger.css b/Backend/src/Trackable.Web/wwwroot/dist/swagger/swagger.css new file mode 100644 index 0000000..6ecac45 --- /dev/null +++ b/Backend/src/Trackable.Web/wwwroot/dist/swagger/swagger.css @@ -0,0 +1,3 @@ +.swagger-ui .scheme-container { + display: none; +} diff --git a/Backend/src/Trackable.Web/wwwroot/dist/swagger/swagger.js b/Backend/src/Trackable.Web/wwwroot/dist/swagger/swagger.js index 6345d62..7e59f10 100644 --- a/Backend/src/Trackable.Web/wwwroot/dist/swagger/swagger.js +++ b/Backend/src/Trackable.Web/wwwroot/dist/swagger/swagger.js @@ -7,9 +7,6 @@ xhttp.onreadystatechange = function () { if (this.readyState == 4 && this.status != 200) { window.location.href = "../api/users/login?redirectUri=" + window.location.href; } - if (document.getElementsByClassName('auth-wrapper')) { - document.getElementsByClassName('auth-wrapper')[0].parentNode.parentNode.style.display = 'none'; - } }; xhttp.open("GET", "../api/users/me", true); -xhttp.send(); +xhttp.send(); \ No newline at end of file