demo assumes index.md file

ShMcK · ShMcK · commit d02b4cdd760b · 2016-06-02T18:49:52.000-07:00
diff --git a/lib/build/index.js b/lib/build/index.js
@@ -28,7 +28,6 @@ function build(dir, filePath, output) {
     }
     var lines = fs_1.readFileSync(filePath, 'utf8').split('\n');
     var result = cleanup_1.cleanup(parseAndBuild(dir, lines));
-    console.log('result', result);
     if (!result) {
         return false;
     }
diff --git a/lib/build/parser/import.js b/lib/build/parser/import.js
@@ -7,7 +7,12 @@ var settings_1 = require('./settings');
 function loadImport(dir, lines, pathToMd) {
     pathToMd = cleanup_1.trimQuotes(pathToMd);
     if (!pathToMd.match(/\.md$/)) {
-        pathToMd = pathToMd.concat('.md');
+        if (node_file_exists_1.default(path_1.join(dir, settings_1.tutorialDir, pathToMd.concat('.md')))) {
+            pathToMd = pathToMd.concat('.md');
+        }
+        else {
+            pathToMd = path_1.join(pathToMd, 'index.md');
+        }
     }
     var realPath = path_1.join(dir, settings_1.tutorialDir, pathToMd);
     if (!node_file_exists_1.default(realPath)) {
diff --git a/lib/build/readme.js b/lib/build/readme.js
@@ -3,8 +3,6 @@ var fs_1 = require('fs');
 var node_file_exists_1 = require('node-file-exists');
 var chalk_1 = require('chalk');
 function createReadme() {
-    if (!node_file_exists_1.default('./README.md')) {
-    }
     if (!node_file_exists_1.default('./coderoad.json')) {
         console.log(chalk_1.red('No coderoad.json file found'));
         return false;
diff --git a/lib/create/write-demo.js b/lib/create/write-demo.js
@@ -33,10 +33,10 @@ var folders = function (dir) { return [
 var files = [
     path_1.join('.gitignore'),
     path_1.join('tutorial', 'tutorial.md'),
-    path_1.join('tutorial', '01', 'page-one.md'),
+    path_1.join('tutorial', '01', 'index.md'),
     path_1.join('tutorial', '01', '01.spec.js'),
     path_1.join('tutorial', '01', '02.spec.js'),
-    path_1.join('tutorial', '02', 'page-two.md'),
+    path_1.join('tutorial', '02', 'index.md'),
     path_1.join('tutorial', '02', '01.spec.js'),
     path_1.join('tutorial', '02', '02.spec.js')
 ];
diff --git a/setup/tutorial/01/index.md b/setup/tutorial/01/index.md
diff --git a/setup/tutorial/02/index.md b/setup/tutorial/02/index.md
diff --git a/setup/tutorial/tutorial.md b/setup/tutorial/tutorial.md
@@ -1,5 +1,5 @@
 # Project Title
 Project description.
 
-@import('01/page-one')
-@import('02/page-two')
+@import('01')
+@import('02')
diff --git a/src/build/index.ts b/src/build/index.ts
@@ -35,8 +35,6 @@ export default function build(dir: string, filePath: string, output = './coderoa
   // build coeroad.json
   const result = cleanup(parseAndBuild(dir, lines));
 
-  console.log('result', result);
-
   // error parsing or building coderoad.json
   if (!result) { return false; }
 
diff --git a/src/build/parser/import.ts b/src/build/parser/import.ts
@@ -8,7 +8,11 @@ export function loadImport(dir: string, lines: string[], pathToMd: string): stri
   // add .md suffix
   pathToMd = trimQuotes(pathToMd);
   if (!pathToMd.match(/\.md$/)) {
-    pathToMd = pathToMd.concat('.md');
+    if (fileExists(join(dir, tutorialDir, pathToMd.concat('.md')))) {
+      pathToMd = pathToMd.concat('.md');
+    } else {
+      pathToMd = join(pathToMd, 'index.md');
+    }
   }
   // get path to imports
   let realPath: string = join(dir, tutorialDir, pathToMd);
diff --git a/src/build/readme.ts b/src/build/readme.ts
@@ -3,12 +3,8 @@ import fileExists from 'node-file-exists';
 import {red} from 'chalk';
 
 export function createReadme(): boolean {
-  if (!fileExists('./README.md')) {
-    // prompt.start();
-    // prompt.get(['overwriteReadme'], function (err, result) {
-    //   console.log(result);
-    // });
-  }
+  // if (!fileExists('./README.md')) {
+  // }
   if (!fileExists('./coderoad.json')) {
     console.log(red('No coderoad.json file found'));
     return false;
diff --git a/src/create/write-demo.ts b/src/create/write-demo.ts
@@ -34,10 +34,10 @@ const folders = dir => [
 const files = [
   join('.gitignore'),
   join('tutorial', 'tutorial.md'),
-  join('tutorial', '01', 'page-one.md'),
+  join('tutorial', '01', 'index.md'),
   join('tutorial', '01', '01.spec.js'),
   join('tutorial', '01', '02.spec.js'),
-  join('tutorial', '02', 'page-two.md'),
+  join('tutorial', '02', 'index.md'),
   join('tutorial', '02', '01.spec.js'),
   join('tutorial', '02', '02.spec.js')
 ];

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ function build(dir, filePath, output) {`
`28`	`28`	`}`
`29`	`29`	`var lines = fs_1.readFileSync(filePath, 'utf8').split('\n');`
`30`	`30`	`var result = cleanup_1.cleanup(parseAndBuild(dir, lines));`
`31`		`- console.log('result', result);`
`32`	`31`	`if (!result) {`
`33`	`32`	`return false;`
`34`	`33`	`}`