Skip to content

Commit

Permalink
feat(daffio): create packages sidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
xelaint committed Jan 17, 2024
1 parent e2eaad7 commit 54cd9f3
Show file tree
Hide file tree
Showing 25 changed files with 218 additions and 164 deletions.
3 changes: 2 additions & 1 deletion apps/daffio/src/app/api/api.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { DaffioApiListPageComponent } from './pages/api-list-page/api-list-page.
import { DaffioApiPageComponent } from './pages/api-page/api-page.component';
import { DaffioDocsSidebarComponentModule } from '../core/sidebar/components/docs-sidebar/docs-sidebar.module';
import { DaffioDocViewerModule } from '../docs/components/doc-viewer/doc-viewer.module';
import { DaffioDocsSidebarModule } from '../docs/containers/sidebar/sidebar.module';
import { DaffioDocsPackagesSidebarComponentModule } from '../guides/components/packages-sidebar/packages-sidebar.module';

@NgModule({
imports: [
Expand All @@ -20,6 +20,7 @@ import { DaffioDocsSidebarModule } from '../docs/containers/sidebar/sidebar.modu
DaffioApiListModule,
DaffioDocViewerModule,
DaffioDocsSidebarComponentModule,
DaffioDocsPackagesSidebarComponentModule,

DaffContainerModule,
],
Expand Down
2 changes: 2 additions & 0 deletions apps/daffio/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { DaffioMarketingHeaderContainerModule } from './core/header/containers/m
import { DaffioDocsSidebarComponentModule } from './core/sidebar/components/docs-sidebar/docs-sidebar.module';
import { DaffioMarketingSidebarComponentModule } from './core/sidebar/components/marketing-sidebar/marketing-sidebar.module';
import { TemplateModule } from './core/template/template.module';
import { DaffioDocsPackagesSidebarComponentModule } from './guides/components/packages-sidebar/packages-sidebar.module';
import { environment } from '../environments/environment';

@NgModule({
Expand All @@ -36,6 +37,7 @@ import { environment } from '../environments/environment';
DaffioDocsHeaderContainerModule,
DaffioMarketingSidebarComponentModule,
DaffioDocsSidebarComponentModule,
DaffioDocsPackagesSidebarComponentModule,

//Make sure this loads after Router and Store
StoreRouterConnectingModule.forRoot({ serializer: FullRouterStateSerializer,
Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions apps/daffio/src/app/core/sidebar/sidebar.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { DaffRouterNamedViewOutletModule } from '@daffodil/router';

import { DaffioSidebarViewportContainer } from './containers/sidebar-viewport/sidebar-viewport.component';
import { DaffioSidebarStateModule } from './sidebar.state.module';
import { DaffioGuidesNavModule } from '../../guides/components/guides-nav/guides-nav.module';
import { DaffioDocsPackagesListContainerModule } from '../../guides/containers/packages-list/packages-list.module';

@NgModule({
imports: [
Expand All @@ -21,7 +21,7 @@ import { DaffioGuidesNavModule } from '../../guides/components/guides-nav/guides
DaffButtonModule,

DaffioSidebarStateModule,
DaffioGuidesNavModule,
DaffioDocsPackagesListContainerModule,
DaffRouterNamedViewOutletModule,
],
declarations: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- <button class="daffio-doc-viewer__packages-button">
<button class="daffio-doc-viewer__packages-button" (click)="open()">
<fa-icon [icon]="faBars"></fa-icon>
<div>Packages Menu</div>
</button> -->
</button>
<div class="daffio-doc-viewer__grid">
<daff-article
class="daffio-doc-viewer__content"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import {
SafeHtml,
} from '@angular/platform-browser';
import { faBars } from '@fortawesome/free-solid-svg-icons';
import { Store } from '@ngrx/store';

import { ToggleSidebar } from '../../../core/sidebar/actions/sidebar.actions';
import { DaffioDoc } from '../../models/doc';

@Component({
Expand All @@ -21,7 +23,7 @@ import { DaffioDoc } from '../../models/doc';
export class DaffioDocViewerComponent implements OnChanges {
faBars = faBars;

constructor(private sanitizer: DomSanitizer) {}
constructor(private sanitizer: DomSanitizer, private store: Store<any>) {}

/**
* The doc to render
Expand All @@ -34,4 +36,8 @@ export class DaffioDocViewerComponent implements OnChanges {
//It is necessary to bypass the default angular sanitization to keep id tags in the injected html. These id tags are used for fragment routing.
this.sanitizedContent = this.sanitizer.bypassSecurityTrustHtml(this.doc.contents);
}

open() {
this.store.dispatch(new ToggleSidebar('content'));
}
}

This file was deleted.

Empty file.

This file was deleted.

27 changes: 0 additions & 27 deletions apps/daffio/src/app/docs/containers/sidebar/sidebar.component.ts

This file was deleted.

24 changes: 0 additions & 24 deletions apps/daffio/src/app/docs/containers/sidebar/sidebar.module.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ import { RouterTestingModule } from '@angular/router/testing';

import { DaffTreeModule } from '@daffodil/design/tree';

import { DaffioGuidesNavComponent } from './guides-nav.component';
import { DaffioDocsPackagesListComponent } from './packages-list.component';

describe('DaffioGuidesNavComponent', () => {
let component: DaffioGuidesNavComponent;
let fixture: ComponentFixture<DaffioGuidesNavComponent>;
describe('DaffioDocsPackagesListComponent', () => {
let component: DaffioDocsPackagesListComponent;
let fixture: ComponentFixture<DaffioDocsPackagesListComponent>;

beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
DaffioGuidesNavComponent,
DaffioDocsPackagesListComponent,
],
imports: [
RouterTestingModule,
Expand All @@ -30,7 +30,7 @@ describe('DaffioGuidesNavComponent', () => {
}));

beforeEach(() => {
fixture = TestBed.createComponent(DaffioGuidesNavComponent);
fixture = TestBed.createComponent(DaffioDocsPackagesListComponent);
component = fixture.componentInstance;
const guideWithoutChildren = {
id: 'id2',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ const visit = (guide: DaffioGuideList): DaffTreeData<unknown> => ({
});

@Component({
selector: 'daffio-guides-nav',
templateUrl: './guides-nav.component.html',
selector: 'daffio-docs-packages-list',
templateUrl: './packages-list.component.html',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class DaffioGuidesNavComponent {
export class DaffioDocsPackagesListComponent {

_guideList: DaffioGuideList;
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ import { RouterModule } from '@angular/router';

import { DaffTreeModule } from '@daffodil/design/tree';

import { DaffioGuidesNavComponent } from './guides-nav.component';
import { DaffioDocsPackagesListComponent } from './packages-list.component';

@NgModule({
declarations: [
DaffioGuidesNavComponent,
DaffioDocsPackagesListComponent,
],
exports: [
DaffioGuidesNavComponent,
DaffioDocsPackagesListComponent,
],
imports: [
CommonModule,
RouterModule,
DaffTreeModule,
],
})
export class DaffioGuidesNavModule { }
export class DaffioDocsPackagesListComponentModule { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<ng-container *ngrxLet="sidebarKind$; let sidebarKind">
<daffio-docs-packages-list-container *ngIf="sidebarKind === 'content'"></daffio-docs-packages-list-container>

<daffio-docs-sidebar-content *ngIf="!sidebarKind"></daffio-docs-sidebar-content>
</ng-container>

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
:host {
display: block;
padding: 24px 0;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import {
ComponentFixture,
TestBed,
waitForAsync,
} from '@angular/core/testing';

import { DaffioDocsPackagesSidebarComponent } from './packages-sidebar.component';
import { DaffioDocsPackagesListContainerModule } from '../../containers/packages-list/packages-list.module';

describe('DaffioDocsPackagesSidebarComponent', () => {
let component: DaffioDocsPackagesSidebarComponent;
let fixture: ComponentFixture<DaffioDocsPackagesSidebarComponent>;

beforeEach(waitForAsync(() => {

TestBed.configureTestingModule({
imports: [
DaffioDocsPackagesListContainerModule,
],
declarations: [
DaffioDocsPackagesSidebarComponent,
],
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(DaffioDocsPackagesSidebarComponent);
component = fixture.componentInstance;

fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import {
ChangeDetectionStrategy,
Component,
OnInit,
} from '@angular/core';
import {
select,
Store,
} from '@ngrx/store';
import { Observable } from 'rxjs';

import { selectSidebarKind } from '../../../core/sidebar/reducers';

@Component({
selector: 'daffio-docs-packages-sidebar',
templateUrl: './packages-sidebar.component.html',
styleUrls: ['./packages-sidebar.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class DaffioDocsPackagesSidebarComponent implements OnInit {
constructor(private store: Store) {}

sidebarKind$: Observable<string | undefined>;

ngOnInit() {
this.sidebarKind$ = this.store.pipe(select(selectSidebarKind));
}
}
Loading

0 comments on commit 54cd9f3

Please sign in to comment.