From 4743b658d1faf82889043b909192a27599d6c394 Mon Sep 17 00:00:00 2001
From: Jacob Yi <jacobyi@Jacobs-MacBook-Pro.local>
Date: Wed, 3 Jan 2024 14:18:11 -0800
Subject: [PATCH 1/2] updated homepage

---
 .../df-welcome-page.component.ts              |  6 ++
 src/app/adf-home/routes.ts                    | 59 +++++++++++--------
 .../df-side-nav/df-side-nav.component.ts      |  3 +-
 src/app/shared/utilities/route.ts             |  8 +--
 src/assets/i18n/en.json                       | 11 +---
 5 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/src/app/adf-home/df-welcome-page/df-welcome-page.component.ts b/src/app/adf-home/df-welcome-page/df-welcome-page.component.ts
index 3a956c65..fe24a5a7 100644
--- a/src/app/adf-home/df-welcome-page/df-welcome-page.component.ts
+++ b/src/app/adf-home/df-welcome-page/df-welcome-page.component.ts
@@ -19,6 +19,9 @@ import {
   faHeart,
 } from '@fortawesome/free-solid-svg-icons';
 import { TranslocoPipe } from '@ngneat/transloco';
+import { DfQuickstartPageComponent } from '../df-quickstart-page/df-quickstart-page.component';
+import { DfResourcesPageComponent } from '../df-resources-page/df-resources-page.component';
+import { DfDownloadPageComponent } from '../df-download-page/df-download-page.component';
 
 @Component({
   selector: 'df-welcome-page',
@@ -34,6 +37,9 @@ import { TranslocoPipe } from '@ngneat/transloco';
     DfIconCardLinkComponent,
     AsyncPipe,
     TranslocoPipe,
+    DfQuickstartPageComponent,
+    DfResourcesPageComponent,
+    DfDownloadPageComponent,
   ],
 })
 export class DfWelcomePageComponent {
diff --git a/src/app/adf-home/routes.ts b/src/app/adf-home/routes.ts
index dea8961e..5a5f0c95 100644
--- a/src/app/adf-home/routes.ts
+++ b/src/app/adf-home/routes.ts
@@ -2,33 +2,46 @@ import { Routes } from '@angular/router';
 import { ROUTES } from '../shared/types/routes';
 
 export const HomeRoutes: Routes = [
-  { path: '', redirectTo: ROUTES.WELCOME, pathMatch: 'full' },
   {
-    path: ROUTES.WELCOME,
+    path: '',
     loadComponent: () =>
       import('./df-welcome-page/df-welcome-page.component').then(
         m => m.DfWelcomePageComponent
       ),
   },
-  {
-    path: ROUTES.QUICKSTART,
-    loadComponent: () =>
-      import('./df-quickstart-page/df-quickstart-page.component').then(
-        m => m.DfQuickstartPageComponent
-      ),
-  },
-  {
-    path: ROUTES.RESOURCES,
-    loadComponent: () =>
-      import('./df-resources-page/df-resources-page.component').then(
-        m => m.DfResourcesPageComponent
-      ),
-  },
-  {
-    path: ROUTES.DOWNLOAD,
-    loadComponent: () =>
-      import('./df-download-page/df-download-page.component').then(
-        m => m.DfDownloadPageComponent
-      ),
-  },
+    // {
+  //   path: ROUTES.WELCOME,
+  //   loadComponent: () =>
+  //     import('./df-welcome-page/df-welcome-page.component').then(
+  //       m => m.DfWelcomePageComponent
+  //     ),
+  // },
+  // {
+  //   path: ROUTES.WELCOME,
+  //   loadComponent: () =>
+  //     import('./df-welcome-page/df-welcome-page.component').then(
+  //       m => m.DfWelcomePageComponent
+  //     ),
+  // },
+  // {
+  //   path: ROUTES.QUICKSTART,
+  //   loadComponent: () =>
+  //     import('./df-quickstart-page/df-quickstart-page.component').then(
+  //       m => m.DfQuickstartPageComponent
+  //     ),
+  // },
+  // {
+  //   path: ROUTES.RESOURCES,
+  //   loadComponent: () =>
+  //     import('./df-resources-page/df-resources-page.component').then(
+  //       m => m.DfResourcesPageComponent
+  //     ),
+  // },
+  // {
+  //   path: ROUTES.DOWNLOAD,
+  //   loadComponent: () =>
+  //     import('./df-download-page/df-download-page.component').then(
+  //       m => m.DfDownloadPageComponent
+  //     ),
+  // },
 ];
diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.ts b/src/app/shared/components/df-side-nav/df-side-nav.component.ts
index 7c3fabb0..2aa44f6e 100644
--- a/src/app/shared/components/df-side-nav/df-side-nav.component.ts
+++ b/src/app/shared/components/df-side-nav/df-side-nav.component.ts
@@ -32,7 +32,7 @@ import { of, switchMap } from 'rxjs';
 import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { DfSearchDialogComponent } from '../df-search-dialog/df-search-dialog.component';
 import { UntilDestroy } from '@ngneat/until-destroy';
-
+import { CommonModule } from '@angular/common';
 @UntilDestroy({ checkProperties: true })
 @Component({
   selector: 'df-side-nav',
@@ -54,6 +54,7 @@ import { UntilDestroy } from '@ngneat/until-destroy';
     NgFor,
     NgTemplateOutlet,
     MatDialogModule,
+    CommonModule
   ],
 })
 export class DfSideNavComponent implements OnInit {
diff --git a/src/app/shared/utilities/route.ts b/src/app/shared/utilities/route.ts
index 480340fc..bf15fbdb 100644
--- a/src/app/shared/utilities/route.ts
+++ b/src/app/shared/utilities/route.ts
@@ -44,13 +44,7 @@ export function accessibleRoutes(
   navs: Array<Nav>,
   allowedTabs: Array<string>
 ): Array<Nav> {
-  const allowed: Array<ROUTES> = [
-    ROUTES.QUICKSTART,
-    ROUTES.WELCOME,
-    ROUTES.RESOURCES,
-    ROUTES.DOWNLOAD,
-    ROUTES.SYSTEM_INFO,
-  ];
+  const allowed: Array<ROUTES> = [ROUTES.SYSTEM_INFO];
   allowedTabs?.forEach(tab => {
     switch (tab) {
       case 'apps':
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 323e36c7..402d5729 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -114,16 +114,7 @@
     },
     "home": {
       "nav": "Home",
-      "welcome": { "nav": "Welcome", "header": "{{nav.home.welcome.nav}}" },
-      "resources": {
-        "nav": "Resources",
-        "header": "{{nav.home.resources.nav}}"
-      },
-      "quickstart": {
-        "nav": "Quickstart",
-        "header": "{{nav.home.quickstart.nav}}"
-      },
-      "download": { "nav": "Download", "header": "{{nav.home.download.nav}}" }
+      "header": "{{nav.home.nav}}"
     },
     "api-connections": {
       "nav": "API Generation & Connections",

From c3d3650c71d5e8704bc6e1831689bb6d702f0a2d Mon Sep 17 00:00:00 2001
From: Jacob Yi <jacobyi@Jacobs-MacBook-Pro.local>
Date: Wed, 3 Jan 2024 17:20:39 -0800
Subject: [PATCH 2/2] updated homepage

---
 .../df-welcome-page/df-welcome-page.component.html     | 10 +++++++++-
 src/app/adf-home/routes.ts                             |  2 +-
 .../components/df-side-nav/df-side-nav.component.ts    |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/app/adf-home/df-welcome-page/df-welcome-page.component.html b/src/app/adf-home/df-welcome-page/df-welcome-page.component.html
index d9331d40..9a65dbed 100644
--- a/src/app/adf-home/df-welcome-page/df-welcome-page.component.html
+++ b/src/app/adf-home/df-welcome-page/df-welcome-page.component.html
@@ -61,9 +61,15 @@ <h3>
 
 <section class="platforms-section">
   <h3>
-    {{ 'home.welcomePage.clientPlatformHeading' | transloco }}
+    {{ 'home.quickstartPage.quickstartSubHeading' | transloco }}
   </h3>
 
+  <ol aria-labelledby="quickstart-instructions-heading">
+    <li>{{ 'home.quickstartPage.quickstartSteps.stepOne' | transloco }}</li>
+    <li>{{ 'home.quickstartPage.quickstartSteps.stepTwo' | transloco }}</li>
+    <li>{{ 'home.quickstartPage.quickstartSteps.stepThree' | transloco }}</li>
+  </ol>
+
   <article>
     <h4 id="native-examples-heading">
       {{ 'home.welcomePage.nativeExamplesHeading' | transloco }}
@@ -94,3 +100,5 @@ <h4 id="javascript-examples-heading">
     </ul>
   </article>
 </section>
+<mat-divider></mat-divider>
+<df-download-page></df-download-page>
diff --git a/src/app/adf-home/routes.ts b/src/app/adf-home/routes.ts
index 5a5f0c95..0c35be04 100644
--- a/src/app/adf-home/routes.ts
+++ b/src/app/adf-home/routes.ts
@@ -9,7 +9,7 @@ export const HomeRoutes: Routes = [
         m => m.DfWelcomePageComponent
       ),
   },
-    // {
+  // {
   //   path: ROUTES.WELCOME,
   //   loadComponent: () =>
   //     import('./df-welcome-page/df-welcome-page.component').then(
diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.ts b/src/app/shared/components/df-side-nav/df-side-nav.component.ts
index 2aa44f6e..6535fed8 100644
--- a/src/app/shared/components/df-side-nav/df-side-nav.component.ts
+++ b/src/app/shared/components/df-side-nav/df-side-nav.component.ts
@@ -54,7 +54,7 @@ import { CommonModule } from '@angular/common';
     NgFor,
     NgTemplateOutlet,
     MatDialogModule,
-    CommonModule
+    CommonModule,
   ],
 })
 export class DfSideNavComponent implements OnInit {