From eb74f146023d9c8c0f2af97d8f5f5ee94670a82c Mon Sep 17 00:00:00 2001 From: Jason Hodges Date: Wed, 23 Aug 2017 09:22:00 -0600 Subject: [PATCH] feat(parser):more work on parsing - get markdown from posts.json - parse raw markdown --- config/dir-parse.js | 65 ++++++++++--------- .../components/post/post.component.js | 4 +- .../components/post/post.component.js.map | 2 +- .../components/post/post.component.ts | 4 +- .../components/posts/posts.component.html | 6 ++ .../components/posts/posts.component.js | 17 +++-- .../components/posts/posts.component.js.map | 2 +- .../components/posts/posts.component.ts | 17 +++-- .../containers/home/home.component.html | 8 ++- src/assets/_posts/post.json | 1 - src/assets/_posts/posts.json | 2 +- 11 files changed, 76 insertions(+), 52 deletions(-) delete mode 100644 src/assets/_posts/post.json diff --git a/config/dir-parse.js b/config/dir-parse.js index bb0c95c..c57c7cf 100644 --- a/config/dir-parse.js +++ b/config/dir-parse.js @@ -4,7 +4,7 @@ const fs = require('fs'); const fm = require('front-matter'); const path = require('path'); const jsonfile = require('jsonfile'); -const postsjson = 'src/assets/_posts/post.json'; +const postsjson = 'src/assets/_posts/posts.json'; const dir = 'src/assets/_posts'; const extFilter = 'md'; @@ -19,37 +19,40 @@ function extension(element) { * cycle through directory for files */ fs.readdir(pathSupplied, function (err, items) { - let opener = '{ "post": '; - let closer = ' }'; - let posts = []; - let file = ''; - let fileContent = ''; - let content = ''; - let body = ''; - let attributes = {}; - let title = ''; - let description = ''; - /** - * cycle over items, filtering for files matching extension - * @type {Array} - */ - posts = items.filter(extension).map((item) => { - file = pathSupplied + '/' + item; - fileContent = fs.readFileSync(file, 'utf8'); - content = fm(fileContent); - console.log('*** content ***\n', content); - body = content.body; - attributes = content.attributes; - title = attributes.title; - description = attributes.description; + let opener = '{ "entries": ', + closer = ' }', + posts = [], + file = '', + fileContent = '', + content = '', + body = '', + attributes = {}, + title = '', + description = ''; + /** + * cycle over items, filtering for files matching extension + * @type {Array} + */ + posts = items.filter(extension).map((item) => { + file = pathSupplied + '/' + item; + fileContent = fs.readFileSync(file, 'utf8'); + content = fm(fileContent); + console.log('*** content ***\n', content); + body = content.body; + attributes = content.attributes; + title = attributes.title; + description = attributes.description; - return { - file: file, - title: title, - description: description, - body: body - }; - }); + return { + post: content + }; + // return { + // file: file, + // title: title, + // description: description, + // body: body + // }; + }); opener += JSON.stringify(posts); opener += closer; diff --git a/src/app/ngx-blog/components/post/post.component.js b/src/app/ngx-blog/components/post/post.component.js index b5b3cf3..caf50cd 100644 --- a/src/app/ngx-blog/components/post/post.component.js +++ b/src/app/ngx-blog/components/post/post.component.js @@ -12,6 +12,7 @@ import { PostsService } from '../../services/posts.service'; import * as marked from 'marked'; import * as Prism from 'prismjs'; import 'prismjs/prism'; +import 'prismjs/components/prism-bash'; import 'prismjs/components/prism-c'; import 'prismjs/components/prism-cpp'; import 'prismjs/components/prism-csharp'; @@ -69,7 +70,8 @@ var PostComponent = (function () { }); }; PostComponent.prototype.handleRaw = function (raw) { - var markdown = this.prepare(raw); + // const markdown = this.prepare(raw); + var markdown = raw; this.element.nativeElement.innerHTML = marked(markdown); Prism.highlightAll(false); }; diff --git a/src/app/ngx-blog/components/post/post.component.js.map b/src/app/ngx-blog/components/post/post.component.js.map index 6534720..4569c9e 100644 --- a/src/app/ngx-blog/components/post/post.component.js.map +++ b/src/app/ngx-blog/components/post/post.component.js.map @@ -1 +1 @@ -{"version":3,"file":"post.component.js","sourceRoot":"","sources":["post.component.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"post.component.js","sourceRoot":"","sources":["post.component.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/app/ngx-blog/components/post/post.component.ts b/src/app/ngx-blog/components/post/post.component.ts index 6b9b22b..ad77e0d 100644 --- a/src/app/ngx-blog/components/post/post.component.ts +++ b/src/app/ngx-blog/components/post/post.component.ts @@ -4,6 +4,7 @@ import * as marked from 'marked'; import * as Prism from 'prismjs'; import 'prismjs/prism'; +import 'prismjs/components/prism-bash'; import 'prismjs/components/prism-c'; import 'prismjs/components/prism-cpp'; import 'prismjs/components/prism-csharp'; @@ -79,7 +80,8 @@ export class PostComponent implements OnInit, OnChanges, AfterViewInit { } handleRaw(raw: string) { - const markdown = this.prepare(raw); + // const markdown = this.prepare(raw); + const markdown = raw; this.element.nativeElement.innerHTML = marked(markdown); Prism.highlightAll(false); } diff --git a/src/app/ngx-blog/components/posts/posts.component.html b/src/app/ngx-blog/components/posts/posts.component.html index f94e944..0feead9 100644 --- a/src/app/ngx-blog/components/posts/posts.component.html +++ b/src/app/ngx-blog/components/posts/posts.component.html @@ -2,4 +2,10 @@
+
+ {{post.title}} + + {{post.body}} + +
\ No newline at end of file diff --git a/src/app/ngx-blog/components/posts/posts.component.js b/src/app/ngx-blog/components/posts/posts.component.js index 5c10bf3..2dabf5f 100644 --- a/src/app/ngx-blog/components/posts/posts.component.js +++ b/src/app/ngx-blog/components/posts/posts.component.js @@ -16,19 +16,24 @@ var PostsComponent = (function () { } PostsComponent.prototype.ngOnInit = function () { var _this = this; - this.postsService.getPosts().subscribe(function (p) { + this.postsService.getPosts().subscribe(function (e) { debugger; - console.log('%c*** COMP: PostsComponent | function ngOnInit ***', 'background-color: blue;color:white;font-style:bold;', p); - p.posts.map(function (t) { + console.log('%c*** COMP: PostsComponent | function ngOnInit ***', 'background-color: blue;color:white;font-style:bold;', e); + e.entries.map(function (p) { + _this.tap(p, 'p: '); _this.mainPosts.push({ - title: t.title, - file: t.file, - body: _this.postsService.convert(t.body) + 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); }); }; + PostsComponent.prototype.tap = function (x, w) { + console.log("%c " + (w ? w : '*****'), 'background-color:yellow;color:black;font-style:bold;padding-right: 20px;', x); + return x; + }; + ; return PostsComponent; }()); PostsComponent = __decorate([ diff --git a/src/app/ngx-blog/components/posts/posts.component.js.map b/src/app/ngx-blog/components/posts/posts.component.js.map index a98ebf7..36ec57a 100644 --- a/src/app/ngx-blog/components/posts/posts.component.js.map +++ b/src/app/ngx-blog/components/posts/posts.component.js.map @@ -1 +1 @@ -{"version":3,"file":"posts.component.js","sourceRoot":"","sources":["posts.component.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAO5D,IAAa,cAAc;IAGzB,wBAAmB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QAF7C,cAAS,GAAQ,EAAE,CAAC;IAE6B,CAAC;IAElD,iCAAQ,GAAR;QAAA,iBAaC;QAZC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,UAAC,CAAC;YACvC,QAAQ,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,oDAAoD,EAAE,qDAAqD,EAAE,CAAC,CAAC,CAAA;YACrH,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,CAAM;gBACjB,KAAI,CAAC,SAAS,CAAC,IAAI,CAAC;oBAClB,KAAK,EAAE,CAAC,CAAC,KAAK;oBACd,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,IAAI,EAAE,KAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;iBACxC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,oDAAoD,EAAE,qDAAqD,EAAE,KAAI,CAAC,SAAS,CAAC,CAAA;QACpI,CAAC,CAAC,CAAC;IACL,CAAC;IACH,qBAAC;AAAD,CAAC,AAnBD,IAmBC;AAnBY,cAAc;IAL1B,SAAS,CAAC;QACT,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,sBAAsB;KACpC,CAAC;qCAKiC,YAAY;GAHlC,cAAc,CAmB1B;SAnBY,cAAc"} \ No newline at end of file +{"version":3,"file":"posts.component.js","sourceRoot":"","sources":["posts.component.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAO5D,IAAa,cAAc;IAGzB,wBAAmB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QAF7C,cAAS,GAAQ,EAAE,CAAC;IAE6B,CAAC;IAElD,iCAAQ,GAAR;QAAA,iBAaC;QAZC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,UAAC,CAAC;YACvC,QAAQ,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,oDAAoD,EAAE,qDAAqD,EAAE,CAAC,CAAC,CAAA;YACrH,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,UAAC,CAAM;gBACzB,KAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;gBACb,KAAI,CAAC,SAAS,CAAC,IAAI,CAAC;oBAClB,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK;oBAC9B,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI;iBAClB,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,oDAAoD,EAAE,qDAAqD,EAAE,KAAI,CAAC,SAAS,CAAC,CAAA;QACpI,CAAC,CAAC,CAAC;IACL,CAAC;IAED,4BAAG,GAAH,UAAI,CAAM,EAAE,CAAU;QACpB,OAAO,CAAC,GAAG,CAAC,UAAQ,CAAC,GAAG,CAAC,GAAG,OAAO,CAAE,EAAE,0EAA0E,EAAE,CAAC,CAAC,CAAC;QACtH,MAAM,CAAC,CAAC,CAAC;IACX,CAAC;IAAA,CAAC;IACJ,qBAAC;AAAD,CAAC,AAxBD,IAwBC;AAxBY,cAAc;IAL1B,SAAS,CAAC;QACT,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,sBAAsB;KACpC,CAAC;qCAKiC,YAAY;GAHlC,cAAc,CAwB1B;SAxBY,cAAc"} \ No newline at end of file diff --git a/src/app/ngx-blog/components/posts/posts.component.ts b/src/app/ngx-blog/components/posts/posts.component.ts index f40b877..05b8900 100644 --- a/src/app/ngx-blog/components/posts/posts.component.ts +++ b/src/app/ngx-blog/components/posts/posts.component.ts @@ -12,17 +12,22 @@ export class PostsComponent implements OnInit { constructor(public postsService: PostsService) { } ngOnInit() { - this.postsService.getPosts().subscribe((p) => { + this.postsService.getPosts().subscribe((e) => { debugger; -console.log('%c*** COMP: PostsComponent | function ngOnInit ***', 'background-color: blue;color:white;font-style:bold;', p) - p.posts.map((t: any) => { +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: t.title, - file: t.file, - body: this.postsService.convert(t.body) + 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; + }; } diff --git a/src/app/ngx-blog/containers/home/home.component.html b/src/app/ngx-blog/containers/home/home.component.html index cff3161..8942a5a 100644 --- a/src/app/ngx-blog/containers/home/home.component.html +++ b/src/app/ngx-blog/containers/home/home.component.html @@ -6,9 +6,11 @@

Home

+ - ```typescript -const someVal - ``` + ```typescript + const someVal = 'this is raw on home.component' + + ``` \ No newline at end of file diff --git a/src/assets/_posts/post.json b/src/assets/_posts/post.json deleted file mode 100644 index 6112a5f..0000000 --- a/src/assets/_posts/post.json +++ /dev/null @@ -1 +0,0 @@ -{ "post": [{"file":"src/assets/_posts/2017-08-09-test-post.md","title":"August 09, 2017 Test Post","description":"just another test post","body":"\nYet another test post but with yaml front-matter"},{"file":"src/assets/_posts/2017-08-10-test-post.md","title":"August 10th, 2017 Test Post","description":"Description for the August 10th post","body":""},{"file":"src/assets/_posts/2017-08-11-test-post.md","title":"August 11, 2017 Test Post","description":"Description for August 11th post","body":"\n\nTo write an asset, you have to use [webpack-sources](https://www.npmjs.com/package/webpack-sources) file abstraction.\n\n```bash\nyarn add --dev webpack-sources\n```\n\n## enum\n\n```Typescript\nenum Color {\n Gray, // 0\n Green = 100, // 100\n Blue = 2 // 2\n}\nlet myColor: Color = Color.Blue\nconsole.log(myColor); // \n```"}] } \ No newline at end of file diff --git a/src/assets/_posts/posts.json b/src/assets/_posts/posts.json index deb2811..836e97a 100644 --- a/src/assets/_posts/posts.json +++ b/src/assets/_posts/posts.json @@ -1 +1 @@ -{ "posts": [{"file":"src/assets/_posts/2017-08-09-test-post.md","title":"August 09, 2017 Test Post","description":"just another test post","body":"\nYet another test post but with yaml front-matter"},{"file":"src/assets/_posts/2017-08-10-test-post.md","title":"August 10th, 2017 Test Post","description":"Description for the August 10th post","body":""},{"file":"src/assets/_posts/2017-08-11-test-post.md","title":"August 11, 2017 Test Post","description":"Description for August 11th post","body":"\n\nTo write an asset, you have to use [webpack-sources](https://www.npmjs.com/package/webpack-sources) file abstraction.\n\n```bash\nyarn add --dev webpack-sources\n```\n\n## enum\n\n```Typescript\nenum Color {\n Gray, // 0\n Green = 100, // 100\n Blue = 2 // 2\n}\nlet myColor: Color = Color.Blue\nconsole.log(myColor); // \n```"}] } \ No newline at end of file +{ "entries": [{"post":{"attributes":{"title":"August 09, 2017 Test Post","description":"just another test post"},"body":"\nYet another test post but with yaml front-matter","frontmatter":"title: August 09, 2017 Test Post\ndescription: just another test post"}},{"post":{"attributes":{"title":"August 10th, 2017 Test Post","description":"Description for the August 10th post"},"body":"","frontmatter":"title: August 10th, 2017 Test Post\ndescription: Description for the August 10th post"}},{"post":{"attributes":{"title":"August 11, 2017 Test Post","description":"Description for August 11th post"},"body":"\n\nTo write an asset, you have to use [webpack-sources](https://www.npmjs.com/package/webpack-sources) file abstraction.\n\n```bash\nyarn add --dev webpack-sources\n```\n\n## enum\n\n```Typescript\nenum Color {\n Gray, // 0\n Green = 100, // 100\n Blue = 2 // 2\n}\nlet myColor: Color = Color.Blue\nconsole.log(myColor); // \n```","frontmatter":"title: August 11, 2017 Test Post\ndescription: Description for August 11th post"}}] } \ No newline at end of file