Merge pull request #42 from eyalroth/dev

Merge dev to master

Author: eyalroth

gatsby-browser.js

@@ -5,9 +5,6 @@ import littlefoot from 'littlefoot'
 import 'littlefoot/dist/littlefoot.css'
 import './src/assets/scss/_progress.scss'
 
-var sidebarState = "main"
-var lastUnderlineLink = null
-
 export const onServiceWorkerUpdateReady = () => {
     const answer = window.confirm(
       `This application has been updated. ` +
@@ -21,7 +18,6 @@ export const onServiceWorkerUpdateReady = () => {
 
 export function onRouteUpdate({ location }) {
   addLittlefoot()
-  addSidebarCollapse(location)
 }
 
 function addLittlefoot() {
@@ -39,144 +35,4 @@ function addLittlefoot() {
     </button>
   `
   littlefoot({buttonTemplate: bt})
-}
-
-function addSidebarCollapse(location) {
-
-  if (location.pathname == "/") {
-    sidebarState = "main"
-    lastUnderlineLink = null
-  }
-
-  if (document.getElementById("sidebar")) {
-    const menu = document.getElementById("sidebar__menu")
-    const menuButton = document.getElementById("sidebar__menu-button")
-    const menuLinks = document.getElementsByClassName("sidebar__menu-list-item-link")
-    const menuUnderline = document.getElementById("sidebar__menu-underline")
-
-    const contact = document.getElementById("sidebar__contact")
-    const contactButton = document.getElementById("sidebar__contact-button")
-
-    const profileImage = document.getElementById("sidebar__author-img")
-    const authorTitle = document.getElementById("sidebar__author-title")
-
-    setSidebarState(sidebarState)
-    setupUnderline(location)
-
-    menuButton.addEventListener("click", () => toggle("menu-button"))
-    contactButton.addEventListener("click", () => toggle("contact-button"))
-
-    function toggle(buttonClicked) {
-      if (buttonClicked == "menu-button") {
-        if (sidebarState == "menu") {
-          setSidebarState("main")
-        } else {
-          setSidebarState("menu")
-        }
-      } else if (buttonClicked == "contact-button") {
-          if (sidebarState == "contact") {
-            setSidebarState("main")
-          } else {
-            setSidebarState("contact")
-          }
-      }
-    }
-
-    function setSidebarState(state) {
-
-      sidebarState = state
-    
-      if (state == "main") {
-        enable(profileImage)
-        enable(authorTitle)
-        disable(menu)
-        disable(menuButton)
-        disable(contact)
-        disable(contactButton)
-      } else if (state == "menu") {
-        disable(profileImage)
-        disable(authorTitle)
-        enable(menu)
-        enable(menuButton)
-        disable(contact)
-        disable(contactButton)
-      } else if (state == "contact") {
-        enable(profileImage)
-        disable(authorTitle)
-        disable(menu)
-        disable(menuButton)
-        enable(contact)
-        enable(contactButton)
-      }
-    }
-
-    function setupUnderline(location) {
-
-      const lastLink = findMatchingLink(lastUnderlineLink)
-      const currentLink = findMatchingLink(location)
-
-      if (currentLink) {
-        if (lastLink) {
-          setUnderline(lastLink)
-          shiftUnderline({from: lastLink, to: currentLink})
-        } else {
-          if (menu.getBoundingClientRect().width > 0) {
-            setUnderline(currentLink)
-          } else {
-            menuButton.addEventListener('click', () => {
-              menu.addEventListener('transitionend', () => {
-                setUnderline(currentLink)
-              }, {once: true})
-            }, {once: true})
-          }
-        }
-        lastUnderlineLink = currentLink
-      } else {
-        lastUnderlineLink = null
-      }
-
-      function setUnderline(link) {
-        const { left, width } = link.getBoundingClientRect()
-        menuUnderline.style.left = `${left}px`
-        menuUnderline.style.width = `${width}px`
-      }
-      
-      function shiftUnderline({from, to}) {
-        const { left: fromX  } = from.getBoundingClientRect()
-        const { left: toX, width } = to.getBoundingClientRect()
-        menuUnderline.style.transform = `translateX(${toX - fromX}px)`
-        menuUnderline.style.width = `${width}px`
-      }
-    }
-    
-    function enable(item) {
-      item.classList.add(`${item.id}-enabled`)
-      item.classList.remove(`${item.id}-disabled`)
-    }
-
-    function disable(item) {
-      item.classList.add(`${item.id}-disabled`)
-      item.classList.remove(`${item.id}-enabled`)
-    }
-    
-    function findMatchingLink(location) {
-      
-      if (location == null) {
-        return null
-      }
-
-      for (let i = 0; i < menuLinks.length; i++) {
-        let link = menuLinks[i]
-        if (noTrailingSlash(link.pathname) == noTrailingSlash(location.pathname)) {
-          return link    
-        }
-      }
-
-      return null
-
-      function noTrailingSlash(pathname) {     
-        return pathname.replace(/\/$/, "")
-      }
-    }
-  }
 }

gatsby-node.js

@@ -4,16 +4,33 @@ const path = require('path')
 const slash = require('slash')
 const moment = require('moment')
 
+const menuLinks = require('./src/consts/menuLinks.jsx')
+
 exports.createPages = ({ graphql, actions }) => {
-  const { createPage } = actions
+  const { createPage, createRedirect } = actions
+  const { CategoryLinks } = menuLinks
+
+  createRedirect({
+    fromPath: '/blog',
+    toPath: '/blog/software',
+    redirectInBrowser: true,
+  })
 
   return new Promise((resolve, reject) => {
     const postTemplate = path.resolve('./src/templates/PostTemplate/index.jsx')
     const pageTemplate = path.resolve('./src/templates/PageTemplate/index.jsx')
-    const tagTemplate = path.resolve('./src/templates/TagTemplate/index.jsx')
-    const categoryTemplate = path.resolve(
-      './src/templates/CategoryTemplate/index.jsx'
-    )
+    const postListTemplate = path.resolve('./src/templates/PostListTemplate/index.jsx')
+
+    _.each(CategoryLinks, categoryLink => {
+      createPage({
+        path: `/blog/${_.kebabCase(categoryLink.id)}`,
+        component: postListTemplate,
+        context: {
+          categoryId: categoryLink.id,
+          categoryLabel: categoryLink.label
+        },
+      })
+    })
 
     graphql(`
       {
@@ -27,9 +44,7 @@ exports.createPages = ({ graphql, actions }) => {
                 slug
               }
               frontmatter {
-                tags
                 layout
-                category
               }
             }
           }
@@ -54,36 +69,6 @@ exports.createPages = ({ graphql, actions }) => {
             component: slash(postTemplate),
             context: { slug: edge.node.fields.slug },
           })
-
-          let tags = []
-          if (_.get(edge, 'node.frontmatter.tags')) {
-            tags = tags.concat(edge.node.frontmatter.tags)
-          }
-
-          tags = _.uniq(tags)
-          _.each(tags, tag => {
-            const tagPath = `/blog/tags/${_.kebabCase(tag)}/`
-            createPage({
-              path: tagPath,
-              component: tagTemplate,
-              context: { tag },
-            })
-          })
-
-          let categories = []
-          if (_.get(edge, 'node.frontmatter.category')) {
-            categories = categories.concat(edge.node.frontmatter.category)
-          }
-
-          categories = _.uniq(categories)
-          _.each(categories, category => {
-            const categoryPath = `/blog/categories/${_.kebabCase(category)}/`
-            createPage({
-              path: categoryPath,
-              component: categoryTemplate,
-              context: { category },
-            })
-          })
         }
       })
 
@@ -120,19 +105,5 @@ exports.onCreateNode = ({ node, actions, getNode }) => {
       name: 'slug',
       value: slug,
     })
-
-    if (node.frontmatter.tags) {
-      const tagSlugs = node.frontmatter.tags.map(
-        tag => `/blog/tags/${_.kebabCase(tag)}/`
-      )
-      createNodeField({ node, name: 'tagSlugs', value: tagSlugs })
-    }
-
-    if (typeof node.frontmatter.category !== 'undefined') {
-      const categorySlug = `/blog/categories/${_.kebabCase(
-        node.frontmatter.category
-      )}/`
-      createNodeField({ node, name: 'categorySlug', value: categorySlug })
-    }
   }
 }

src/assets/fonts/fontello-41f8de9d/LICENSE.txt

@@ -0,0 +1,39 @@
+Font license info
+
+
+## Font Awesome
+
+   Copyright (C) 2016 by Dave Gandy
+
+   Author:    Dave Gandy
+   License:   SIL ()
+   Homepage:  http://fortawesome.github.com/Font-Awesome/
+
+
+## Elusive
+
+   Copyright (C) 2013 by Aristeides Stathopoulos
+
+   Author:    Aristeides Stathopoulos
+   License:   SIL (http://scripts.sil.org/OFL)
+   Homepage:  http://aristeides.com/
+
+
+## Entypo
+
+   Copyright (C) 2012 by Daniel Bruce
+
+   Author:    Daniel Bruce
+   License:   SIL (http://scripts.sil.org/OFL)
+   Homepage:  http://www.entypo.com
+
+
+## Linecons
+
+   Copyright (C) 2013 by Designmodo
+
+   Author:    Designmodo for Smashing Magazine
+   License:   CC BY ()
+   Homepage:  http://designmodo.com/linecons-free/
+
+

src/assets/fonts/fontello-41f8de9d/css/fontello-embedded.css

@@ -42,12 +42,6 @@
       "code": 59392,
       "src": "fontawesome"
     },
-    {
-      "uid": "ccc2329632396dc096bb638d4b46fb98",
-      "css": "mail-alt",
-      "code": 61664,
-      "src": "fontawesome"
-    },
     {
       "uid": "bf09b1c6561dc0ced707476e2cd83d29",
       "css": "medium",
@@ -78,12 +72,6 @@
       "code": 61598,
       "src": "fontawesome"
     },
-    {
-      "uid": "de5f0a564ccf8816325330e292e11533",
-      "css": "rss-squared",
-      "code": 61763,
-      "src": "fontawesome"
-    },
     {
       "uid": "e1597911f34fea0a188ae51fe4a2d9a9",
       "css": "stackoverflow",
@@ -97,10 +85,28 @@
       "src": "fontawesome"
     },
     {
-      "uid": "9f7e588c66cfd6891f6f507cf6f6596b",
-      "css": "phone",
-      "code": 59393,
+      "uid": "7e4164950ffa4990961958b2d6318658",
+      "css": "info-circled",
+      "code": 59394,
+      "src": "entypo"
+    },
+    {
+      "uid": "0133387f2069a1b3168942b84d81dd3a",
+      "css": "gamepad",
+      "code": 61723,
       "src": "fontawesome"
+    },
+    {
+      "uid": "e36d581e4f2844db345bddc205d15dda",
+      "css": "group",
+      "code": 59393,
+      "src": "elusive"
+    },
+    {
+      "uid": "52cde78d270e411ccf22c9ec02910d69",
+      "css": "cd",
+      "code": 59396,
+      "src": "linecons"
     }
   ]
 }

src/assets/fonts/fontello-41f8de9d/font/fontello.woff

@@ -1,13 +1,14 @@
 
 .icon-mail:before { content: '\e800'; } /* '' */
-.icon-phone:before { content: '\e801'; } /* '' */
+.icon-group:before { content: '\e801'; } /* '' */
+.icon-info-circled:before { content: '\e802'; } /* '' */
+.icon-cd:before { content: '\e804'; } /* '' */
 .icon-twitter:before { content: '\f099'; } /* '' */
 .icon-github-circled:before { content: '\f09b'; } /* '' */
 .icon-rss:before { content: '\f09e'; } /* '' */
 .icon-menu:before { content: '\f0c9'; } /* '' */
-.icon-mail-alt:before { content: '\f0e0'; } /* '' */
 .icon-linkedin:before { content: '\f0e1'; } /* '' */
-.icon-rss-squared:before { content: '\f143'; } /* '' */
+.icon-gamepad:before { content: '\f11b'; } /* '' */
 .icon-stackoverflow:before { content: '\f16c'; } /* '' */
 .icon-instagram:before { content: '\f16d'; } /* '' */
 .icon-facebook-official:before { content: '\f230'; } /* '' */