Skip to content
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

Jump to bottom

Markdown parser #2

Merged
merged 9 commits into from
Aug 29, 2017
Merged

Markdown parser #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
253b4ed
feat(posts):add script to parse directory to json file
Aug 11, 2017
18f52bc
feat(Home,posts):make parsed md from files render
Aug 21, 2017
f9236f4
feat(posts):make posts json contain yaml style fm
Aug 22, 2017
6fabc5e
feat(parser):sloppy parsing inspired by ng2-markdown-to-html
Aug 22, 2017
eb74f14
feat(parser):more work on parsing
Aug 23, 2017
d74ffca
feat(router):initial build up of app-routing
Aug 29, 2017
ffb7270
feat(posts):tidy up the posts area
Aug 29, 2017
bfb7af2
chore(config):minor changes to configuration
Aug 29, 2017
c7fa78c
Merge branch 'master' into markdown-parser
jasonhodges Aug 29, 2017
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
Prev Previous commit
Next Next commit
feat(posts):tidy up the posts area
  • Loading branch information
Jason Hodges committed Aug 29, 2017
commit ffb727099b7352a484aa3c2d86eafbdc7dfde53d
7 changes: 2 additions & 5 deletions src/app/ngx-blog/components/post/post.component.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/app/ngx-blog/components/post/post.component.js.map
View file
Open in desktop

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

9 changes: 3 additions & 6 deletions src/app/ngx-blog/components/post/post.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import 'prismjs/components/prism-typescript';

@Component({
selector: 'ngxb-post, [ngxb-post]',
// templateUrl: 'post.component.html',
template: `
<ng-content></ng-content>`,
encapsulation: ViewEncapsulation.None,
Expand All @@ -35,15 +34,14 @@ export class PostComponent implements OnInit, OnChanges, AfterViewInit {
constructor(public postsService: PostsService,
public element: ElementRef) { }

ngOnInit() { }
ngOnInit() { }

ngAfterViewInit() {
if (this.data) {
this.handleData();
return;
}
if (this.src) {
console.log('src: \n', this.src);
this.handleSrc();
return;
}
Expand All @@ -52,11 +50,11 @@ export class PostComponent implements OnInit, OnChanges, AfterViewInit {

// SimpleChanges parameter is required for AoT compilation (do not remove)
ngOnChanges(changes: SimpleChanges) {
if ('data' in changes) {
if (changes.data) {
this.handleData();
return;
}
if ('src' in changes) {
if (changes.src) {
this.handleSrc();
return;
}
Expand All @@ -80,7 +78,6 @@ export class PostComponent implements OnInit, OnChanges, AfterViewInit {
}

handleRaw(raw: string) {
// const markdown = this.prepare(raw);
const markdown = raw;
this.element.nativeElement.innerHTML = marked(markdown);
Prism.highlightAll(false);
Expand Down
9 changes: 0 additions & 9 deletions src/app/ngx-blog/components/posts/posts.component.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/app/ngx-blog/components/posts/posts.component.js.map
View file
Open in desktop

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

9 changes: 0 additions & 9 deletions src/app/ngx-blog/components/posts/posts.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,12 @@ export class PostsComponent implements OnInit {

ngOnInit() {
this.postsService.getPosts().subscribe((e) => {
debugger;
console.log('%c*** COMP: PostsComponent | function ngOnInit ***', 'background-color: blue;color:white;font-style:bold;', e)
e.entries.map((p: any) => {
this.tap(p, 'p: ');
this.mainPosts.push({
title: p.post.attributes.title,
body: p.post.body
});
});
console.log('%c*** COMP: PostsComponent | function ngOnInit ***', 'background-color: blue;color:white;font-style:bold;', this.mainPosts)
});
}

tap(x: any, w?: string) {
console.log(`%c ${ w ? w : '*****'}`, 'background-color:yellow;color:black;font-style:bold;padding-right: 20px;', x);
return x;
};
}
5 changes: 1 addition & 4 deletions src/app/ngx-blog/services/posts.service.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/app/ngx-blog/services/posts.service.js.map
View file
Open in desktop

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

8 changes: 1 addition & 7 deletions src/app/ngx-blog/services/posts.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,12 @@ export class PostsService {

this.md.setOptions({
gfm: true,
breaks: true,
// highlight: function (code: any) {
// return require('highlightjs').highlightAuto(code).value;
// }
breaks: true
});
}

convert(markdown: string) {
debugger;
let raw = markdown.replace(/"/g, '');
// this.prepare(raw);
return this.md(raw);
}

Expand Down Expand Up @@ -62,7 +57,6 @@ export class PostsService {
}

extractData(response: Response) {
debugger;
return response.text() || '';
}

Expand Down