refactor

abecms · Oct 4, 2016 · e3c8933 · e3c8933
1 parent f37dd68
commit e3c8933
Show file tree

Hide file tree

Showing 23 changed files with 755 additions and 758 deletions.
diff --git a/src/cli/Builder.js b/src/cli/Builder.js
@@ -8,7 +8,7 @@ import {
   config,
   fileUtils,
   fileAttr,
-  getTemplate,
+  cmsTemplate,
   Page
 } from './'
 
@@ -29,7 +29,7 @@ class Builder {
                              .replace('.' + config.files.templates.extension, '.json')
 
         var json = fse.readJsonSync(file.path)
-        var text = getTemplate(json.abe_meta.template)
+        var text = cmsTemplate.template.getTemplate(json.abe_meta.template)
 
         Util.getDataList(fileUtils.removeLast(json.abe_meta.link), text, json)
           .then(() => {
@@ -43,7 +43,7 @@ class Builder {
       }
       else if(file.path.indexOf('.json') > -1){
         var json = fse.readJsonSync(file.path)
-        var text = getTemplate(json.abe_meta.template)
+        var text = cmsTemplate.template.getTemplate(json.abe_meta.template)
 
         Util.getDataList(fileUtils.removeLast(json.abe_meta.link), text, json)
           .then(() => {

diff --git a/src/cli/cms/data/index.js b/src/cli/cms/data/index.js
@@ -1,5 +1,5 @@
 import removeDuplicateAttr from './remove-duplicate-attr'
-import sql from './sql'
+import * as sql from './sql'
 
 export {
 	removeDuplicateAttr