Merge branch 'Luke-zhang-04-sort-filetree'

src/site/_data/filetree.js

@@ -6,8 +6,12 @@ module.exports = async () => {
     const tree = await fsFileTree("src/site/notes");
     populateWithPermalink(tree);
 
+    return sortTree(tree);
+}
+
+const sortTree = (unsorted) => {
     //Sort by folder before file, then by name
-    const orderedTree = Object.keys(tree).sort((a,b)=>{
+    const orderedTree = Object.keys(unsorted).sort((a, b) => {
         if (a.indexOf(".md") > -1 && b.indexOf(".md") === -1) {
             return 1;
         }
@@ -16,18 +20,26 @@ module.exports = async () => {
             return -1;
         }
 
-        if(a>b){
+        if (a.toLowerCase() > b.toLowerCase()) {
             return 1;
         }
 
         return -1;
     }).reduce(
         (obj, key) => {
-            obj[key] = tree[key];
+            obj[key] = unsorted[key];
+
             return obj;
         },
         {}
     );
+
+    for (const key of Object.keys(orderedTree)) {
+        if (!orderedTree[key].path) {
+            orderedTree[key] = sortTree(orderedTree[key])
+        }
+    }
+
     return orderedTree;
 }