Merge branch 'develop' into 'main'

Develop

See merge request !3

Makefile

@@ -10,18 +10,18 @@ config:
 
 # Docker
 up:
-	docker-compose up -d
+	docker compose up -d
 
 down:
-	docker-compose down
+	docker compose down
 
 ps:
-	docker-compose ps
+	docker compose ps
 
 rebuild:
-	docker-compose down --remove-orphans
-	docker-compose build --no-cache
-	docker-compose up -d
+	docker compose down --remove-orphans
+	docker compose build --no-cache
+	docker compose up -d
 
 
 # Mkcert
@@ -34,7 +34,8 @@ endef
 
 export config_toml
 
-npm-install: docker compose run --rm node npm install
+npm-install:
+	docker compose run --rm node npm install
 
 certs:
 	mkdir -p ${HOME}/.dockerdev/traefik/certs ${HOME}/.dockerdev/traefik/conf

docker-compose.yml

@@ -14,7 +14,6 @@ services:
       - "traefik.http.routers.${PROJECT_NAME}-front.tls=true"
       - "traefik.http.routers.${PROJECT_NAME}-front.entrypoints=websecure"
       - "traefik.http.services.${PROJECT_NAME}-front.loadbalancer.server.port=4200"
-      - "traefik.http.services.${PROJECT_NAME}-nginx.loadbalancer.server.port=8080"
 
 networks:
   webgateway:

src/app/app.routes.ts

@@ -6,7 +6,7 @@ import { QuizComponent } from './views/quiz/quiz.component';
 
 export const routes: Routes = [
   {
-    path: 'quiz',
+    path: '',
     title: "Quiz Inclusif, le jeu",
     children: [
       { path: '', redirectTo: 'accueil', pathMatch: 'full' },
@@ -16,5 +16,5 @@ export const routes: Routes = [
       { path: '**',  component: QuizComponent  },
     ],
   },
-  { path: '', redirectTo: 'quiz/accueil', pathMatch: 'full' },
+  { path: '', redirectTo: 'accueil', pathMatch: 'full' },
 ];

src/app/shared/services/progress-service.ts

@@ -39,7 +39,7 @@ export class ProgressService {
   goToEnd() {
     /* Envoie sur la page de fin */
     this.hasEnded.set(true);
-    this.router.navigate(["quiz", "fin"], { replaceUrl: true });
+    this.router.navigate(["", "fin"], { replaceUrl: true });
   }
 
   goToNext() {
@@ -48,7 +48,7 @@ export class ProgressService {
       this.dataService.getNewQuestion();
       this.questionNumber.update(n => n + 1);
       this.answered.set(false);
-      this.router.navigate(["quiz", this.questionNumber().toString()], {
+      this.router.navigate(["", this.questionNumber().toString()], {
         queryParams: { theme: this.dataService.currentTopic(), theme_id: this.dataService.currentQuestionId(), repondu: "faux" },
         replaceUrl: this.questionNumber() > 0,
       });

src/app/views/quiz/quiz-endpage/quiz-endpage.component.ts

@@ -24,6 +24,6 @@ export class QuizEndpageComponent {
   }
 
   GotoQuiz(){
-    this.router.navigate(['/quiz/accueil'])
+    this.router.navigate(['/accueil'])
   }
 }

src/app/views/quiz/quiz-homepage/quiz-homepage.component.ts

@@ -23,7 +23,7 @@ export class QuizHomepageComponent {
   constructor(private router:Router) {}
 
   commencer(){
-    this.router.navigate(['/quiz/temps'])
+    this.router.navigate(['/temps'])
   }
-  
+
 }