foo

Author: fmalcher

build/blog.service.ts

@@ -1,4 +1,3 @@
-import axios from 'axios';
 import * as emoji from 'node-emoji'
 import { JekyllMarkdownParser } from './jekyll-markdown-parser';
 import { readdir, readFile } from 'fs/promises';
@@ -7,21 +6,9 @@ import { BlogEntry } from './types';
 
 export class BlogService {
 
-  private blogListFetched = this.getBlogListFromAPI();
+  constructor(private markdownBaseUrl: string) {}
 
-  constructor(private settings: {
-    headers: {
-      'User-Agent': string,
-      'Authorization': string
-    },
-    contentsRepo: string,
-    branch: string,
-    markdownBaseUrl: string
-  }) {}
 
-  getBlogList() {
-    return this.blogListFetched;
-  }
 
   async getBlogEntry(slug: string): Promise<BlogEntry> {
     const blogList = await this.getBlogList();
@@ -53,29 +40,26 @@ export class BlogService {
     return readFile(path, 'utf8');
   }
 
-  private async getBlogListFromAPI() {
+  async getBlogList() {
     const blogDirs = await this.readBlogFolders();
     const blogEntries: BlogEntry[] = [];
 
     for (const blogDir of blogDirs) {
-
       try {
         const readme = await this.readBlogFileFromFolder(blogDir);
         const blogEntry = this.readmeToBlogEntry(readme, blogDir);
         blogEntries.push(blogEntry);
 
       } catch (e: any) {
           const errorBlogEntry = {
-            slug: this.slugifyPath(blogDir),
-            html_url: '',
+            slug: blogDir,
             error: e.message || 'Error',
             meta: {
               title: 'A minor error occurred while reading: ' + blogDir,
               hidden: true
             }
           } as BlogEntry;
           blogEntries.push(errorBlogEntry);
-
       }
     }
 
@@ -84,36 +68,23 @@ export class BlogService {
 
 
   private readmeToBlogEntry(readme: string, folder: string) {
-    const parser = new JekyllMarkdownParser(this.settings.markdownBaseUrl + folder);
+    const parser = new JekyllMarkdownParser(this.markdownBaseUrl + folder);
     const parsedJekyllMarkdown = parser.parse(readme);
 
     const meta = parsedJekyllMarkdown.parsedYaml || {};
 
     if (meta.thumbnail &&
       !meta.thumbnail.startsWith('http') &&
       !meta.thumbnail.startsWith('//')) {
-      meta.thumbnail
-        = this.settings.markdownBaseUrl + folder + meta.thumbnail;
+      meta.thumbnail = this.markdownBaseUrl + folder + '/' + meta.thumbnail;
     }
 
     return {
-      slug: this.slugifyPath(folder),
+      slug: folder,
       html: emoji.emojify(parsedJekyllMarkdown.html),
       meta: meta
     } as BlogEntry;
   }
-
-  private slugifyPath(path: string): string {
-    if (!path) {
-      return 'error - no path??';
-    }
-
-    return path
-      .replace(/README\.md$/, '')
-      .replace('blog/', '')
-      .replace(/\/$/, '')
-      .replace('/', '|');
-  }
 }
 
 

build/config.ts

@@ -1,10 +1,3 @@
-export const githubConfig = {
-  headers: {
-    'User-Agent': 'No1 Fancy AngularSchule Request Handler',
-    Authorization: 'token ba1ad58d9eb880fbd128abddb0df8ffae47cd407',
-  },
-  org: 'angular-schule',
-  contentsRepo: 'website-articles',
-  branch: 'gh-pages',
+export const config = {
   markdownBaseUrl: 'https://angular-schule.github.io/website-articles/',
 };

build/fetch-data.ts

@@ -1,9 +1,9 @@
-import { githubConfig } from './config';
+import { config } from './config';
 import { BlogService } from './blog.service';
 import { writeJSON, makeLightBlogList, createFolderIfNotExists } from './utils';
 
 (async () => {
-  const blogService = new BlogService(githubConfig);
+  const blogService = new BlogService(config.markdownBaseUrl);
 
   await createFolderIfNotExists('./dist/posts');
 

build/types.ts

@@ -24,7 +24,6 @@ export interface BlogEntryMeta {
 
 export interface BlogEntry {
   slug: string; // SEO-friendly path
-  html_url: string;  // preview url on github
   html: string;
   error: string;
   meta: BlogEntryMeta;