From fcc398d5b52207a428a6341493e68a582c74e4d9 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 26 Oct 2024 14:19:31 +0200
Subject: [PATCH] Refactoring

---
 apps/client/src/app/app.component.ts           |  2 +-
 .../resources/resources-page-routing.module.ts |  6 +++---
 .../resources/resources-page.component.ts      | 18 +++++++++---------
 .../app/pages/resources/resources-page.scss    | 10 +++-------
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts
index b67165b68..75841686c 100644
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@@ -183,6 +183,7 @@ export class AppComponent implements OnDestroy, OnInit {
         this.hasTabs =
           (this.currentRoute === this.routerLinkAbout[0].slice(1) ||
             this.currentRoute === this.routerLinkFaq[0].slice(1) ||
+            this.currentRoute === this.routerLinkResources[0].slice(1) ||
             this.currentRoute === 'account' ||
             this.currentRoute === 'admin' ||
             this.currentRoute === 'home' ||
@@ -198,7 +199,6 @@ export class AppComponent implements OnDestroy, OnInit {
             this.currentRoute === 'p' ||
             this.currentRoute === this.routerLinkPricing[0].slice(1) ||
             this.currentRoute === this.routerLinkRegister[0].slice(1) ||
-            this.currentRoute === this.routerLinkResources[0].slice(1) ||
             this.currentRoute === 'start') &&
           this.deviceType !== 'mobile';
 
diff --git a/apps/client/src/app/pages/resources/resources-page-routing.module.ts b/apps/client/src/app/pages/resources/resources-page-routing.module.ts
index 6983ac9f5..70f8d3c8b 100644
--- a/apps/client/src/app/pages/resources/resources-page-routing.module.ts
+++ b/apps/client/src/app/pages/resources/resources-page-routing.module.ts
@@ -7,9 +7,8 @@ import { ResourcesPageComponent } from './resources-page.component';
 
 const routes: Routes = [
   {
-    path: '',
-    component: ResourcesPageComponent,
     canActivate: [AuthGuard],
+    component: ResourcesPageComponent,
     children: [
       {
         path: '',
@@ -39,7 +38,8 @@ const routes: Routes = [
             (m) => m.ResourcesMarketsModule
           )
       }
-    ]
+    ],
+    path: ''
   }
 ];
 
diff --git a/apps/client/src/app/pages/resources/resources-page.component.ts b/apps/client/src/app/pages/resources/resources-page.component.ts
index 010dd4cb5..c61f1557f 100644
--- a/apps/client/src/app/pages/resources/resources-page.component.ts
+++ b/apps/client/src/app/pages/resources/resources-page.component.ts
@@ -9,8 +9,8 @@ import { Subject } from 'rxjs';
 @Component({
   host: { class: 'page has-tabs' },
   selector: 'gf-resources-page',
-  templateUrl: './resources-page.html',
-  styleUrls: ['./resources-page.scss']
+  styleUrls: ['./resources-page.scss'],
+  templateUrl: './resources-page.html'
 })
 export class ResourcesPageComponent implements OnInit {
   public deviceType: string;
@@ -25,22 +25,22 @@ export class ResourcesPageComponent implements OnInit {
     {
       path: '.',
       label: $localize`Overview`,
-      iconName: 'information-circle-outline'
+      iconName: 'reader-outline'
     },
     {
       path: 'guides',
       label: $localize`Guides`,
       iconName: 'book-outline'
     },
-    {
-      path: 'glossary',
-      label: $localize`Glossary`,
-      iconName: 'list-outline'
-    },
     {
       path: 'markets',
       label: $localize`Markets`,
-      iconName: 'trending-up-outline'
+      iconName: 'newspaper-outline'
+    },
+    {
+      path: 'glossary',
+      label: $localize`Glossary`,
+      iconName: 'library-outline'
     }
   ];
 
diff --git a/apps/client/src/app/pages/resources/resources-page.scss b/apps/client/src/app/pages/resources/resources-page.scss
index 5b975ff60..b536ec216 100644
--- a/apps/client/src/app/pages/resources/resources-page.scss
+++ b/apps/client/src/app/pages/resources/resources-page.scss
@@ -1,11 +1,7 @@
 :host {
-  display: flex;
-  flex-direction: row;
-  height: 100%;
+  color: rgb(var(--dark-primary-text));
 }
 
-@media (max-width: 599px) {
-  :host {
-    flex-direction: column-reverse;
-  }
+:host-context(.theme-dark) {
+  color: rgb(var(--light-primary-text));
 }