Merge branch 'fix/new-urls' into 'dev'

Fix/new urls

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!100

src/app/app-routing.module.ts

@@ -6,7 +6,7 @@ import { FormComponent } from './form/form.component';
 import { AdminGuard } from './guards/admin.guard';
 import { AuthGuard } from './guards/auth.guard';
 import { DeactivateGuard } from './guards/deactivate.guard';
-import { HomeComponent } from './home/home.component';
+import { CartoComponent } from './carto/carto.component';
 import { LegalNoticeComponent } from './legal-notice/legal-notice.component';
 import { ProfileComponent } from './profile/profile.component';
 import { ResetEmailComponent } from './reset-email/reset-email.component';
@@ -20,25 +20,17 @@ import { UserVerificationComponent } from './user-verification/user-verification
 const routes: Routes = [
   { path: 'print', outlet: 'print', children: [{ path: 'structure', component: StructureDetailsComponent }] },
   {
-    path: 'home',
-    component: HomeComponent,
-  },
-  {
-    path: 'projects',
-    component: HomeComponent,
+    path: 'acteurs',
+    component: CartoComponent,
   },
   {
     path: 'login',
-    component: HomeComponent,
+    component: CartoComponent,
   },
   {
-    path: 'sturctures',
+    path: 'structures',
     component: StructureListComponent,
   },
-  {
-    path: 'resources',
-    component: HomeComponent,
-  },
   {
     path: 'legal-notice',
     component: LegalNoticeComponent,
@@ -91,9 +83,13 @@ const routes: Routes = [
     path: 'news',
     loadChildren: () => import('./post/post.module').then((m) => m.PostModule),
   },
+  {
+    path: 'home',
+    redirectTo: 'news',
+  },
   {
     path: '**',
-    redirectTo: 'home',
+    redirectTo: 'news',
   },
 ];
 

src/app/app.module.ts

@@ -5,7 +5,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { AppRoutingModule } from './app-routing.module';
 
 import { AppComponent } from './app.component';
-import { HomeComponent } from './home/home.component';
+import { CartoComponent } from './carto/carto.component';
 import { CustomBreakPointsProvider } from './config/custom-breakpoint';
 import { FooterComponent } from './footer/footer.component';
 import { HeaderComponent } from './header/header.component';
@@ -39,7 +39,7 @@ import { RouterListenerService } from './services/routerListener.service';
     AppComponent,
     HeaderComponent,
     FooterComponent,
-    HomeComponent,
+    CartoComponent,
     StructureListComponent,
     CardComponent,
     SearchComponent,

src/app/home/home.component.spec.ts → src/app/carto/carto.component.spec.ts

 import { HttpClientModule } from '@angular/common/http';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { HomeComponent } from './home.component';
+import { CartoComponent } from './carto.component';
 
 describe('HomeComponent', () => {
-  let component: HomeComponent;
-  let fixture: ComponentFixture<HomeComponent>;
+  let component: CartoComponent;
+  let fixture: ComponentFixture<CartoComponent>;
   let originalTimeout;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [HomeComponent],
+      declarations: [CartoComponent],
       imports: [HttpClientModule],
     }).compileComponents();
   });
@@ -22,7 +22,7 @@ describe('HomeComponent', () => {
   beforeEach(() => {
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
-    fixture = TestBed.createComponent(HomeComponent);
+    fixture = TestBed.createComponent(CartoComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/home/home.component.ts → src/app/carto/carto.component.ts

@@ -10,11 +10,11 @@ import { GeojsonService } from '../services/geojson.service';
 import { CustomRegExp } from '../utils/CustomRegExp';
 
 @Component({
-  selector: 'app-home',
-  templateUrl: './home.component.html',
-  styleUrls: ['./home.component.scss'],
+  selector: 'app-carto',
+  templateUrl: './carto.component.html',
+  styleUrls: ['./carto.component.scss'],
 })
-export class HomeComponent implements OnInit {
+export class CartoComponent implements OnInit {
   public structures: Structure[] = [];
   public displayMarkerId: string;
   public selectedMarkerId: string;

src/app/header/header.component.html

@@ -10,7 +10,7 @@
   </div>
   <div fxLayout="row" class="right-header" fxLayoutAlign="center center" fxLayoutGap="3vw">
     <a routerLink="/news" [routerLinkActive]="'active'" i18n>Actualités</a>
-    <a routerLink="/home" [routerLinkActive]="'active'" i18n>Cartographie de acteurs</a>
+    <a routerLink="/acteurs" [routerLinkActive]="'active'" i18n>Cartographie de acteurs</a>
     <a routerLink="/about" [routerLinkActive]="'active'" i18n>Qui sommes-nous ?</a>
     <a *ngIf="isAdmin" routerLink="/admin" [routerLinkActive]="'active'">Administration</a>
     <button *ngIf="isLoggedIn" class="red" routerLink="/profile" [routerLinkActive]="'active'">