zip cleanup reference feature

src/cli/cms/data/index.js

@@ -8,7 +8,6 @@ import * as source from './source'
 import * as revision from './revision'
 import * as metas from './metas'
 import * as file from './file'
-import * as reference from './reference'
 
 export {
 	values,
@@ -20,6 +19,5 @@ export {
   revision,
   regex,
   metas,
-  file,
-  reference
+  file
 }

src/cli/cms/reference/index.js

@@ -0,0 +1,5 @@
+import * as reference from './reference'
+
+export {
+  reference
+}

src/cli/cms/data/reference.js → src/cli/cms/reference/reference.js

@@ -1,17 +1,13 @@
 import path from 'path'
-import mkdirp from 'mkdirp'
-import fse from 'fs-extra'
 
 import {
-  abeExtend,
-  coreUtils,
   cmsData,
   config
 } from '../../'
 
 export function getFiles() {
   var arr = []
-  var res = []
+  var res = {}
   arr = cmsData.file.read(
     path.join(config.root, config.reference.url),
     path.join(config.root, config.reference.url),
@@ -20,11 +16,8 @@ export function getFiles() {
     /(.json*?)/
   )
 
-  arr.forEach(function (el) {
-    res.push({
-      name: el.name,
-      data: cmsData.file.get(el.path)
-    })
+  Array.prototype.forEach.call(arr, (el) => {
+    res[el.name] = cmsData.file.get(el.path)
   })
 
   return res

src/cli/core/manager/Manager.js

@@ -8,7 +8,8 @@ import {
   coreUtils,
   cmsData,
   config,
-  cmsTemplates
+  cmsTemplates,
+  cmsReference
 } from '../../'
 
 let singleton = Symbol()
@@ -130,7 +131,7 @@ class Manager {
   }
 
   updateReferences() {
-    this._references = cmsData.reference.getFiles()
+    this._references = cmsReference.reference.getFiles()
 
     return this
   }

src/cli/index.js

@@ -44,13 +44,15 @@ import * as cmsData from './cms/data'
 import * as cmsEditor from './cms/editor'
 import * as cmsOperations from './cms/operations'
 import * as cmsTemplates from './cms/templates'
+import * as cmsReference from './cms/reference'
 import * as coreUtils from './core/utils'
 import * as abeExtend from './extend'
 
 export {
 	cmsData,
 	cmsOperations,
 	cmsTemplates,
+	cmsReference,
 	coreUtils,
 	cmsEditor,
 	abeExtend,

src/server/controllers/index.js

@@ -18,7 +18,8 @@ import {
   ,getDelete
   ,postUpload
   ,postSqlRequest
-  ,writeJson
+  ,postReference
+  ,getReference
 } from '../routes'
 
 import {
@@ -43,8 +44,9 @@ router.post('/abe/draft*', postDraft)
 router.get('/abe/save-config', getSaveConfig)
 router.get('/abe/unpublish*', getUnpublish)
 router.get('/abe/delete*', getDelete)
+router.get('/abe/reference/*', getReference)
 router.post('/abe/upload/*', postUpload)
-router.post('/abe/write-json/*', writeJson)
+router.post('/abe/reference/*', postReference)
 router.get('/abe/list-url*', function (req, res, next) {
   getListUrl(router, req, res, next) 
 })

src/server/public/scripts/modules/EditorReferences.js

@@ -1,9 +1,6 @@
 /*global document, FormData, CONFIG, XMLHttpRequest */
 
 import Nanoajax from 'nanoajax'
-import EditorUtils from '../modules/EditorUtils'
-import {IframeNode} from '../utils/iframe'
-import on from 'on'
 import qs from 'qs'
 
 export default class EditorFiles {
@@ -12,7 +9,19 @@ export default class EditorFiles {
     this.referenceLinks = document.querySelectorAll('[data-ref-json]')
     this.textArea = document.querySelector('.display-json')
     this.jsonError = document.querySelector('.json-error')
+    this.referenceTabButton = document.querySelector('[data-manager-show="references-files"]')
     if(this.referenceLinks) this.rebind()
+
+      this._ajax(
+      {
+        url: `/abe/reference/`,
+        body: '',
+        cors: true,
+        method: 'get'
+      },
+      (code, responseText) => {
+        console.log(responseText)
+      })
   }
 
   rebind() {
@@ -37,6 +46,10 @@ export default class EditorFiles {
     this.textArea.addEventListener('blur', () => {
       this.save()
     })
+
+    this.textArea.addEventListener('blur', () => {
+      this.save()
+    })
   }
 
   save(){
@@ -58,7 +71,7 @@ export default class EditorFiles {
     if(isValidJson){
       this._ajax(
       {
-        url: `/abe/write-json/`,
+        url: `/abe/reference/`,
         body: data,
         cors: true,
         method: 'post'

src/server/routes/get-main.js

@@ -85,8 +85,7 @@ var route = function(req, res, next) {
     var manager = {}
 
     manager.home = {
-      files: Manager.instance.getList(),
-      references: Manager.instance.getReferences()
+      files: Manager.instance.getList()
     }
 
     manager.list = Manager.instance.getStructureAndTemplates()

src/server/routes/get-reference.js

@@ -0,0 +1,10 @@
+import {
+  Manager
+} from '../../cli'
+
+var route = function(req, res, next){
+  res.set('Content-Type', 'application/json')
+  res.send(JSON.stringify({reference: Manager.instance.getReferences()}))
+}
+
+export default route

src/server/routes/index.js

@@ -15,7 +15,8 @@ import getUnpublish from './get-unpublish'
 import getDelete from './get-delete'
 import postUpload from './post-upload'
 import postSqlRequest from './post-sql-request'
-import writeJson from './write-json'
+import postReference from './post-reference'
+import getReference from './get-reference'
 
 export {
 	getMain
@@ -35,5 +36,6 @@ export {
 	,getDelete
 	,postUpload
 	,postSqlRequest,
-	writeJson
+	postReference,
+	getReference
 }

src/server/routes/write-json.js → src/server/routes/post-reference.js

@@ -11,7 +11,7 @@ import {
 var route = function(req, res, next){
   if(typeof res._header !== 'undefined' && res._header !== null) return
   fse.writeJson(path.join(config.root, req.body.url), JSON.parse(req.body.json), function (err) {
-    if(err) console.log("write-json reference error: ", err)
+    if(err) console.log("post-reference reference error: ", err)
     Manager.instance.updateReferences()
     res.set('Content-Type', 'application/json')
     res.send(JSON.stringify({success: 1}))

src/server/views/partials/right-references-list.html

@@ -7,9 +7,9 @@
     </div>
     <div class="references-files-wrapper">
       <ul class="list-group">
-        {{#each manager.home.references}}
-        <li class="list-group-item" data-error="0" data-href="{{@root.config.reference.url}}/{{name}}" data-ref-json='{{printJson data}}'>
-          {{name}}
+        {{#each references}}
+        <li class="list-group-item" data-error="0" data-href="{{@root.config.reference.url}}/{{@key}}" data-ref-json='{{printJson this}}'>
+          {{@key}}
         </li>
         {{/each}}
         </ul>