Skip to content

Commit

Permalink
Merge pull request #17 from brunolm/feature/create-pipe-markdown
Browse files Browse the repository at this point in the history
Feature/create pipe markdown
  • Loading branch information
brunolm authored Jun 18, 2018
2 parents f4c27ec + 684d4a8 commit 1ee5d9b
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 4 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,7 @@ Each Pull Request will contain explanation and steps taken to complete a feature
## Services

- [Adding Nasa service, consume Nasa API](https://github.com/brunolm/angular-how-to/pull/15)

## Pipes

- [Add markdown pipe (convert text to markdown)](https://github.com/brunolm/angular-how-to/pull/17)
11 changes: 11 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"bootstrap": "^4.0.0-beta.2",
"camelcase-keys": "^4.2.0",
"core-js": "^2.4.1",
"marked": "^0.4.0",
"ngx-redux-state-props": "0.0.6",
"ngx-take-until-destroy": "^3.0.0",
"redux": "^4.0.0",
Expand All @@ -45,6 +46,7 @@
"@angular/language-service": "^6.0.5",
"@types/jasmine": "~2.5.53",
"@types/jasminewd2": "~2.0.2",
"@types/marked": "^0.4.0",
"@types/node": "~6.0.60",
"codelyzer": "^4.3.0",
"coveralls": "^3.0.0",
Expand Down
6 changes: 5 additions & 1 deletion src/app/about/about.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
</div>

<button (click)="testRedux()" class="btn btn-primary">Test redux</button>
-
<button class="btn btn-primary" (click)="getNasaApod()">APOD</button>

<div>
<h2>App State</h2>
Expand All @@ -13,4 +15,6 @@ <h2>App State</h2>

<hr>

<button class="btn btn-primary" (click)="getNasaApod()">APOD</button>
<textarea style="width: 100%; height: 200px" [(ngModel)]="md"></textarea>

<div [innerHTML]="md | markdown"></div>
7 changes: 7 additions & 0 deletions src/app/about/about.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ import { AboutActions } from './services/about.actions';
styleUrls: ['./about.component.scss'],
})
export class AboutComponent {
md = `# Write some markdown
- here and
- here
- then
- here
- or here`;

constructor(private actions: AboutActions, private redux: NgxReduxStatePropsService<AppState>) {}

get state() {
Expand Down
4 changes: 3 additions & 1 deletion src/app/about/about.module.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';

import { SharedModule } from '../shared/shared.module';
import { AboutComponent } from './about.component';
import { RoutingModule } from './about.router';
import { AboutActions } from './services/about.actions';

@NgModule({
imports: [RoutingModule, CommonModule],
imports: [RoutingModule, CommonModule, SharedModule, FormsModule],
declarations: [AboutComponent],
providers: [AboutActions],
})
Expand Down
8 changes: 8 additions & 0 deletions src/app/shared/markdown.pipe.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { MarkdownPipe } from './markdown.pipe';

describe('MarkdownPipe', () => {
it('create an instance', () => {
const pipe = new MarkdownPipe();
expect(pipe).toBeTruthy();
});
});
11 changes: 11 additions & 0 deletions src/app/shared/markdown.pipe.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Pipe, PipeTransform } from '@angular/core';
import * as marked from 'marked';

@Pipe({
name: 'markdown',
})
export class MarkdownPipe implements PipeTransform {
transform(value: any, _?: any) {
return marked(value);
}
}
5 changes: 3 additions & 2 deletions src/app/shared/shared.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';

import { LayoutComponent } from './layout/layout.component';
import { MarkdownPipe } from './markdown.pipe';
import { TitleComponent } from './title/title.component';

@NgModule({
imports: [CommonModule, RouterModule, HttpClientModule],
exports: [LayoutComponent, TitleComponent],
declarations: [LayoutComponent, TitleComponent],
exports: [LayoutComponent, TitleComponent, MarkdownPipe],
declarations: [LayoutComponent, TitleComponent, MarkdownPipe],
})
export class SharedModule {}

0 comments on commit 1ee5d9b

Please sign in to comment.