refact: Loading sequence

kewitz · Dec 15, 2017 · c93f351 · c93f351
1 parent 0a65ad0
commit c93f351
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/actions.js b/app/actions.js
@@ -6,8 +6,8 @@ const init = (url = window.location.origin) => state => async actions => {
   if (state.isBeaker) {
     await medium.init(url)
     await medium.loadStyle()
-    const articles = await medium.preloadArticles()
     const { title, ...info } = await medium.loadInfo()
+    const articles = await medium.preloadArticles()
     actions.update({ articles, info, title })
   }
   actions.update({ isLoading: false })

diff --git a/app/lib/medium.js b/app/lib/medium.js
@@ -23,21 +23,19 @@ class Medium {
   }
 
   async preloadArticles () {
-    debug('Pre-loading articles...')
     const files = await this.dat.readdir('/articles', { recursive: true, stat: true })
     const articles = await Promise.all(files.filter(isMarkdown).map(file => this.loadArticle(file)))
     return articles.sort(byDate)
   }
 
   async loadInfo () {
-    debug('Loading info...')
     const info = await this.dat.getInfo()
     const blog = await this.dat.readFile('/blog.json')
       .then(
         config => JSON.parse(config),
         () => { console.error('/blog.json not found') }
       )
-    blog.author = renderInline(blog.author)
+    blog.author = blog.author && renderInline(blog.author)
     info.description = renderInline(info.description)
     debug('Info loaded:', { ...info, ...blog })
     return { ...info, ...blog }