improve route names (#121)

b310-digital · Oct 7, 2022 · 4e90389 · 4e90389
1 parent 1a400b4
commit 4e90389
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 9 deletions.
diff --git a/teammapper-backend/src/map/controllers/maps.controller.ts b/teammapper-backend/src/map/controllers/maps.controller.ts
@@ -5,7 +5,7 @@ import { MmpMap } from '../entities/mmpMap.entity';
 import { MapsService } from '../services/maps.service';
 import { IMmpClientDeleteRequest, IMmpClientMap, IMmpClientMapWithAdminId } from '../types';
 
-@Controller('maps')
+@Controller('api/maps')
 export default class MapsController {
   constructor(private mapsService: MapsService) {}
 

diff --git a/teammapper-backend/test/app.e2e-spec.ts b/teammapper-backend/test/app.e2e-spec.ts
@@ -40,15 +40,15 @@ describe('AppController (e2e)', () => {
     await app.close();
   });
 
-  it('/maps/:id(GET)', async () => {
+  it('/api/maps/:id(GET)', async () => {
     const map: MmpMap = await mapRepo.save({ name: 'test' });
     await nodesRepo.save({
       nodeMapId: map.id,
       coordinatesX: 3,
       coordinatesY: 1,
     });
     const response: request.Response = await request(server).get(
-      `/maps/${map.id}`,
+      `/api/maps/${map.id}`,
     );
     expect(response.body.uuid).toEqual(map.id);
   });

diff --git a/teammapper-frontend/src/app/core/http/http.service.ts b/teammapper-frontend/src/app/core/http/http.service.ts
@@ -5,7 +5,7 @@ import { Injectable } from '@angular/core'
  */
 export enum API_URL {
   LOCAL_ASSETS = './assets/data/',
-  ROOT = ''
+  ROOT = 'api'
 }
 
 @Injectable({

diff --git a/teammapper-frontend/src/app/core/services/shortcuts/shortcuts.service.ts b/teammapper-frontend/src/app/core/services/shortcuts/shortcuts.service.ts
@@ -35,7 +35,7 @@ export class ShortcutsService {
       description: 'TOOLTIPS.NEW_MAP',
       callback: () => {
         // use a full page reload here to reload all singleton services
-        window.location.replace('/app')
+        window.location.replace('/map')
       }
     }, {
       keys: 'c',

diff --git a/teammapper-frontend/src/app/modules/about/components/jumbotron/jumbotron.component.html b/teammapper-frontend/src/app/modules/about/components/jumbotron/jumbotron.component.html
@@ -27,7 +27,7 @@ <h4 mat-line>{{ "PAGES.ABOUT.INTRODUCTION.APPLICATION_PROPERTIES.3" | translate
             </mat-list>
         </div>
 
-        <a color="accent" mat-flat-button routerLink="/app">
+        <a color="accent" mat-flat-button routerLink="/map">
             {{ "GENERAL.TRY_IT" | translate }}
         </a>
     </div>

diff --git a/teammapper-frontend/src/app/modules/application/components/toolbar/toolbar.component.html b/teammapper-frontend/src/app/modules/application/components/toolbar/toolbar.component.html
@@ -1,5 +1,5 @@
 <mat-toolbar>
-    <a href="/app" target="_blank">
+    <a href="/map" target="_blank">
         <button [title]="'TOOLTIPS.NEW_MAP' | translate"
         color="primary" mat-icon-button>
             <mat-icon>note_add</mat-icon>

diff --git a/teammapper-frontend/src/app/modules/application/pages/application/application.component.ts b/teammapper-frontend/src/app/modules/application/pages/application/application.component.ts
@@ -67,7 +67,7 @@ export class ApplicationComponent implements OnInit {
     const attachedMap = this.mapSyncService.getAttachedMap()
 
     if (!givenId) {
-      history.replaceState({}, '', `/mmp/${attachedMap.cachedMap.uuid}`)
+      history.replaceState({}, '', `/map/${attachedMap.cachedMap.uuid}`)
     }
 
     this.node = this.mmpService.selectNode(this.mmpService.getRootNode().id)

diff --git a/teammapper-frontend/src/app/root-routing.module.ts b/teammapper-frontend/src/app/root-routing.module.ts
@@ -4,6 +4,12 @@ import { RouterModule, Routes } from '@angular/router'
 const routes: Routes = [{
   path: '',
   loadChildren: () => import('./modules/about/about.module').then(m => m.AboutModule)
+}, {
+  path: 'map',
+  loadChildren: () => import('./modules/application/application.module').then(m => m.ApplicationModule)
+}, {
+  path: 'map/:id',
+  loadChildren: () => import('./modules/application/application.module').then(m => m.ApplicationModule)
 }, {
   path: 'app',
   loadChildren: () => import('./modules/application/application.module').then(m => m.ApplicationModule)

diff --git a/teammapper-frontend/src/proxy.conf.json b/teammapper-frontend/src/proxy.conf.json
@@ -4,7 +4,7 @@
         "secure": false,
         "changeOrigin": true
     },
-    "/maps/*": {
+    "/api/*": {
         "target": "http://localhost:3000",
         "secure": false,
         "changeOrigin": true