From e4bb89d401f4d1145626e1d0d831879d0610810d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 4 Dec 2020 16:10:10 +0100
Subject: [PATCH] MOBILE-3591 courses: Fix courses navigation

---
 .../components/course-list-item/course-list-item.ts       | 4 ++--
 .../features/courses/pages/categories/categories.html     | 2 +-
 src/core/features/courses/pages/dashboard/dashboard.ts    | 2 +-
 src/core/features/sitehome/pages/index/index.html         | 8 ++++----
 src/core/features/sitehome/pages/index/index.ts           | 2 +-
 src/theme/variables.scss                                  | 3 +++
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts
index 6de42cd1f..5d6361075 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/features/courses/components/course-list-item/course-list-item.ts
@@ -98,10 +98,10 @@ export class CoreCoursesCourseListItemComponent implements OnInit {
         /* if (this.isEnrolled) {
             CoreCourseHelper.instance.openCourse(this.course);
         } else {
-            this.navCtrl.navigateForward('/courses/preview', { queryParams: { course: this.course } });
+            this.navCtrl.navigateForward('/main/home/courses/preview', { queryParams: { course: this.course } });
         } */
         // @todo while opencourse function is not completed, open preview page.
-        this.navCtrl.navigateForward('/courses/preview', { queryParams: { course: this.course } });
+        this.navCtrl.navigateForward('/main/home/courses/preview', { queryParams: { course: this.course } });
     }
 
 }
diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index 1ff31c8ab..b9b5aa421 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -39,7 +39,7 @@
                 </ion-label>
             </ion-item-divider>
             <section *ngFor="let category of categories">
-                <ion-item class="ion-text-wrap" router-direction="forward" [routerLink]="['/courses/categories', category.id]"
+                <ion-item class="ion-text-wrap" router-direction="forward" [routerLink]="['/main/home/courses/categories', category.id]"
                 [title]="category.name" detail>
                     <ion-icon name="fas-folder" slot="start"></ion-icon>
                     <ion-label>
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index 8e9d0ce84..997f5e5ac 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -83,7 +83,7 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
      * Open page to manage courses storage.
      */
     manageCoursesStorage(): void {
-        // @todo this.navCtrl.navigateForward(['/courses/storage']);
+        // @todo this.navCtrl.navigateForward(['/main/home/courses/storage']);
     }
 
     /**
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index ba85e91f8..e816db78e 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -60,7 +60,7 @@
 </ion-content>
 
 <ng-template #allCourseList>
-    <ion-item button class="ion-text-wrap" router-direction="forward" routerLink="/courses/all" detail>
+    <ion-item button class="ion-text-wrap" router-direction="forward" routerLink="/main/home/courses/all" detail>
         <ion-icon name="fas-graduation-cap" fixed-width slot="start"></ion-icon>
         <ion-label>
             <h2>{{ 'core.courses.availablecourses' | translate}}</h2>
@@ -76,7 +76,7 @@
 </ng-template>
 
 <ng-template #categories>
-    <ion-item button class="ion-text-wrap" router-direction="forward" routerLink="/courses/categories" detail>
+    <ion-item button class="ion-text-wrap" router-direction="forward" routerLink="/main/home/courses/categories" detail>
         <ion-icon name="folder" slot="start"></ion-icon>
         <ion-label>
             <h2>{{ 'core.courses.categories' | translate}}</h2>
@@ -85,7 +85,7 @@
 </ng-template>
 
 <ng-template #enrolledCourseList>
-    <ion-item button class="ion-text-wrap" router-direction="forward" routerLink="/courses/my" detail>
+    <ion-item button class="ion-text-wrap" router-direction="forward" routerLink="/main/home/courses/my" detail>
         <ion-icon name="fas-graduation-cap" fixed-width slot="start">
         </ion-icon>
         <ion-label><h2>{{ 'core.courses.mycourses' | translate}}</h2></ion-label>
@@ -93,7 +93,7 @@
 </ng-template>
 
 <ng-template #courseSearch>
-    <ion-item button class="ion-text-wrap" router-direction="forward" routerLink="/courses/search" detail>
+    <ion-item button class="ion-text-wrap" router-direction="forward" routerLink="/main/home/courses/search" detail>
         <ion-icon name="fas-search" slot="start"></ion-icon>
         <ion-label><h2>{{ 'core.courses.searchcourses' | translate}}</h2></ion-label>
     </ion-item>
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index f9ce81694..bf62e8373 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -194,7 +194,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
      * Open page to manage courses storage.
      */
     manageCoursesStorage(): void {
-        // @todo this.navCtrl.navigateForward(['/courses/storage']);
+        // @todo this.navCtrl.navigateForward(['/main/home/courses/storage']);
     }
 
     /**
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index aeb85e89e..29eebdf2c 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -104,6 +104,9 @@
     ion-toolbar {
         --color: var(--custom-toolbar-color, var(--ion-color-primary-contrast));
         --background: var(--ion-statusbar-background);
+        ion-button {
+            --ion-toolbar-color: transparent;
+        }
 
         ion-spinner {
             --color: var(--custom-toolbar-color, var(--ion-color-primary-contrast));