split structure/template (if one is not create both are empty)

abecms · Sep 16, 2016 · 800fc12 · 800fc12
1 parent 75171f7
commit 800fc12
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "ajax-request": "^1.2.1",
     "babel-preset-es2015": "^6.9.0",
     "body-parser": "^1.14.1",
-    "child-process-promise": "^2.0.1",
+    "child-process-promise": "^2.1.3",
     "cli-color": "^1.1.0",
     "cli-table": "^0.3.1",
     "commander": "^2.9.0",

diff --git a/src/cli/helpers/file-parser.js b/src/cli/helpers/file-parser.js
@@ -196,9 +196,11 @@ export default class FileParser {
     let structure = config.structure.url
     let templates = config.templates.url
 
-    if(folderUtils.isFolder(path.join(site.path, structure)) && folderUtils.isFolder(path.join(site.path, templates))) {
-	    site.folders = FileParser.getFolders(path.join(site.path, structure), false)
-	    result.structure = site.folders
+    if(folderUtils.isFolder(path.join(site.path, structure))) {
+      site.folders = FileParser.getFolders(path.join(site.path, structure), false)
+      result.structure = site.folders
+    }
+    if(folderUtils.isFolder(path.join(site.path, templates))) {
 	    result.templates = result.templates.concat(FileParser.getFiles(path.join(site.path, templates), true, 10, new RegExp(`.${config.files.templates.extension}`)))
     }