path fixes

mlapaglia · Jan 29, 2024 · 5e956f2 · 5e956f2
1 parent e73e07b
commit 5e956f2
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 19 deletions.
diff --git a/OpenAlprWebhookProcessor.sln b/OpenAlprWebhookProcessor.sln
@@ -4,16 +4,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.7.34031.279
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{350E0804-C372-49AB-B670-75E037878FAF}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\docker-publish.yml = .github\workflows\docker-publish.yml
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenAlprWebhookProcessor.Server", "OpenAlprWebhookProcessor.Server\OpenAlprWebhookProcessor.Server.csproj", "{F296E683-25F3-49B9-B82B-E17985808B3C}"
 EndProject
 Project("{54A90642-561A-4BB1-A94E-469ADEE60C69}") = "openalprwebhookprocessor.client", "openalprwebhookprocessor.client\openalprwebhookprocessor.client.esproj", "{C64F8F6D-B621-454A-AB2A-3E4B871FF8E8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{620FC6F0-76E5-4E25-B1F4-35CF300BD22B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{A7D26F37-32A1-4955-A106-06EB26086033}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{10CE0744-F0DE-4BB7-B31B-FEFF65327CCB}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\docker-publish.yml = .github\workflows\docker-publish.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -38,6 +42,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{A7D26F37-32A1-4955-A106-06EB26086033} = {350E0804-C372-49AB-B670-75E037878FAF}
+		{10CE0744-F0DE-4BB7-B31B-FEFF65327CCB} = {A7D26F37-32A1-4955-A106-06EB26086033}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CF708D1D-8C28-4A78-82C3-4E5A0D51B1A2}
 	EndGlobalSection

diff --git a/openalprwebhookprocessor.client/src/app/account/account.service.ts b/openalprwebhookprocessor.client/src/app/account/account.service.ts
@@ -81,7 +81,7 @@ export class AccountService {
     }
 
     update(id, params) {
-        return this.http.post(`/users/${id}`, params)
+        return this.http.post(`/api/users/${id}`, params)
             .pipe(map(x => {
                 // update stored user if the logged in user updated their own record
                 if (id == this.userValue.id) {

diff --git a/...rocessor.client/src/app/settings/cameras/edit-camera/camera-mask/camera-mask.component.ts b/...rocessor.client/src/app/settings/cameras/edit-camera/camera-mask/camera-mask.component.ts
@@ -72,7 +72,7 @@ export class CameraMaskComponent implements OnInit {
 
     public handleToggleChange(toggleEvent: MatButtonToggleChange) {
         if (toggleEvent.value === 'snapshot') {
-            this.samplePlates = [`/images/${this.camera.id}/snapshot`];
+            this.samplePlates = [`/api/images/${this.camera.id}/snapshot`];
             this.loadImageIntoCanvas(this.samplePlates[0]);
         } else {
             this.getSamplePlates();
@@ -464,4 +464,4 @@ export class CameraMaskComponent implements OnInit {
             Math.sqrt((p.x - mousePos.x) ** 2 + (p.y - mousePos.y) ** 2) < this.dotRadius * 2
         );
     }
-}
+}
diff --git a/...kprocessor.client/src/app/settings/cameras/edit-camera/camera-mask/camera-mask.service.ts b/...kprocessor.client/src/app/settings/cameras/edit-camera/camera-mask/camera-mask.service.ts
@@ -28,6 +28,6 @@ export class CameraMaskService {
     }
 
     upsertImageMask(imageMask: CameraMask) {
-        return this.http.post(`/cameras/${imageMask.cameraId}/mask`, imageMask);
+        return this.http.post(`/api/cameras/${imageMask.cameraId}/mask`, imageMask);
     }
-}
+}
diff --git a/openalprwebhookprocessor.client/src/app/settings/cameras/edit-camera/edit-camera.service.ts b/openalprwebhookprocessor.client/src/app/settings/cameras/edit-camera/edit-camera.service.ts
@@ -11,26 +11,26 @@ export class EditCameraService {
     constructor(private http: HttpClient) { }
 
     triggerDayMode(cameraId: string) {
-        return this.http.post(`/cameras/${cameraId}/test/day`, null);
+        return this.http.post(`/api/cameras/${cameraId}/test/day`, null);
     }
 
     triggerNightMode(cameraId: string) {
-        return this.http.post(`/cameras/${cameraId}/test/night`, null);
+        return this.http.post(`/api/cameras/${cameraId}/test/night`, null);
     }
 
     triggerTestOverlay(cameraId: string) {
-        return this.http.post(`/cameras/${cameraId}/test/overlay`, null);
+        return this.http.post(`/api/cameras/${cameraId}/test/overlay`, null);
     }
 
     getZoomAndFocus(cameraId: string): Observable<ZoomFocus> {
         return this.http.get<ZoomFocus>(`/api/cameras/${cameraId}/zoomAndFocus`);
     }
 
     setZoomAndFocus(cameraId: string, zoomFocus: ZoomFocus) {
-        return this.http.post(`/cameras/${cameraId}/zoomAndFocus`, zoomFocus);
+        return this.http.post(`/api/cameras/${cameraId}/zoomAndFocus`, zoomFocus);
     }
 
     triggerAutofocus(cameraId: string) { 
-        return this.http.post(`/cameras/${cameraId}/triggerAutofocus`, null);
+        return this.http.post(`/api/cameras/${cameraId}/triggerAutofocus`, null);
     }
-}
+}
diff --git a/openalprwebhookprocessor.client/src/app/settings/forwards/forwards.service.ts b/openalprwebhookprocessor.client/src/app/settings/forwards/forwards.service.ts
@@ -10,11 +10,11 @@ export class ForwardsService {
     constructor(private http: HttpClient) { }
 
     getForwards(): Observable<Forward[]> {
-        return this.http.get<Forward[]>('settings/forwards');
+        return this.http.get<Forward[]>('/api/settings/forwards');
     }
 
     deleteForward(forwardsId: string) {
-        return this.http.delete(`/settings/forwards/${forwardsId}`);
+        return this.http.delete(`/api/settings/forwards/${forwardsId}`);
     }
 
     upsertForwards(forwards: Forward[]) {

diff --git a/openalprwebhookprocessor.client/src/app/settings/settings.service.ts b/openalprwebhookprocessor.client/src/app/settings/settings.service.ts
@@ -15,15 +15,15 @@ export class SettingsService {
     constructor(private http: HttpClient) { }
 
     getCameras(): Observable<Camera[]> {
-        return this.http.get<Camera[]>('cameras');
+        return this.http.get<Camera[]>('/api/cameras');
     }
 
     deleteCamera(cameraId: string): Observable<void> {
-        return this.http.post<void>(`cameras/${cameraId}/delete`, null);
+        return this.http.post<void>(`/api/cameras/${cameraId}/delete`, null);
     }
 
     upsertCamera(camera: Camera) {
-        return this.http.post('cameras', camera);
+        return this.http.post('/api/cameras', camera);
     }
 
     upsertAgent(agent: Agent) {