Skip to content

Issue/157 homepage consolidation #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thekevinm merged 2 commits into from
Jan 5, 2024
Merged

Issue/157 homepage consolidation #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4743b65
updated homepage
Jan 3, 2024
c3d3650
updated homepage
Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/app/adf-home/df-welcome-page/df-welcome-page.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -94,3 +100,5 @@ <h4 id="javascript-examples-heading">
</ul>
</article>
</section>
<mat-divider></mat-divider>
<df-download-page></df-download-page>
6 changes: 6 additions & 0 deletions src/app/adf-home/df-welcome-page/df-welcome-page.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -34,6 +37,9 @@ import { TranslocoPipe } from '@ngneat/transloco';
DfIconCardLinkComponent,
AsyncPipe,
TranslocoPipe,
DfQuickstartPageComponent,
DfResourcesPageComponent,
DfDownloadPageComponent,
],
})
export class DfWelcomePageComponent {
Expand Down
59 changes: 36 additions & 23 deletions src/app/adf-home/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
// ),
// },
];
3 changes: 2 additions & 1 deletion src/app/shared/components/df-side-nav/df-side-nav.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -54,6 +54,7 @@ import { UntilDestroy } from '@ngneat/until-destroy';
NgFor,
NgTemplateOutlet,
MatDialogModule,
CommonModule,
],
})
export class DfSideNavComponent implements OnInit {
Expand Down
8 changes: 1 addition & 7 deletions src/app/shared/utilities/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
11 changes: 1 addition & 10 deletions src/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down