From 62899daa17e4ffccec3fc114e12b16052b63e1a1 Mon Sep 17 00:00:00 2001
From: coderaiser <coderaiser@cloudcmd.io>
Date: Mon, 27 Feb 2017 11:43:00 +0200
Subject: [PATCH] refactor(modules) add dom

---
 client/cloudcmd.js              | 3 +--
 client/{ => dom}/buffer.js      | 2 +-
 client/{ => dom}/dialog.js      | 0
 client/{ => dom}/directory.js   | 2 +-
 client/{ => dom}/events.js      | 0
 client/{ => dom}/files.js       | 0
 client/{dom.js => dom/index.js} | 4 ++--
 client/{ => dom}/load.js        | 4 ++--
 client/{ => dom}/rest.js        | 2 +-
 client/{ => dom}/storage.js     | 0
 client/key.js                   | 4 ++--
 client/modules/cloud.js         | 4 ++--
 client/modules/config.js        | 5 +++--
 client/modules/edit.js          | 2 +-
 client/modules/markdown.js      | 4 ++--
 client/modules/menu.js          | 4 ++--
 client/modules/operation.js     | 2 +-
 client/modules/upload.js        | 6 +++---
 client/modules/view.js          | 6 +++---
 webpack.config.js               | 7 +++++++
 20 files changed, 34 insertions(+), 27 deletions(-)
 rename client/{ => dom}/buffer.js (99%)
 rename client/{ => dom}/dialog.js (100%)
 rename client/{ => dom}/directory.js (98%)
 rename client/{ => dom}/events.js (100%)
 rename client/{ => dom}/files.js (100%)
 rename client/{dom.js => dom/index.js} (99%)
 rename client/{ => dom}/load.js (98%)
 rename client/{ => dom}/rest.js (99%)
 rename client/{ => dom}/storage.js (100%)

diff --git a/client/cloudcmd.js b/client/cloudcmd.js
index 31b7a696..0e8a603e 100644
--- a/client/cloudcmd.js
+++ b/client/cloudcmd.js
@@ -16,7 +16,7 @@ window.CloudCmd = (config) => {
     window.DOM = DOM;
     window.CloudCmd = require('./client');
     
-    const Dialog = require('./dialog');
+    const Dialog = require('./dom/dialog');
     
     const prefix = getPrefix(config.prefix);
     const {htmlDialogs} = config;
@@ -27,7 +27,6 @@ window.CloudCmd = (config) => {
     
     require('./listeners');
     require('./key');
-    require('./directory');
     require('./sort');
     
     window.CloudCmd.init(prefix, config);
diff --git a/client/buffer.js b/client/dom/buffer.js
similarity index 99%
rename from client/buffer.js
rename to client/dom/buffer.js
index d8844b1f..9badc537 100644
--- a/client/buffer.js
+++ b/client/dom/buffer.js
@@ -6,7 +6,7 @@ const jonny = require('jonny');
 const exec = require('execon');
 
 const Storage = require('./storage');
-const DOM = require('./dom');
+const DOM = require('./');
 
 module.exports = new BufferProto();
 
diff --git a/client/dialog.js b/client/dom/dialog.js
similarity index 100%
rename from client/dialog.js
rename to client/dom/dialog.js
diff --git a/client/directory.js b/client/dom/directory.js
similarity index 98%
rename from client/directory.js
rename to client/dom/directory.js
index b68dbe6a..f591f94a 100644
--- a/client/directory.js
+++ b/client/dom/directory.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-const Images = require('./dom/images');
+const Images = require('./images');
 
 module.exports = (items) => {
     const Info = DOM.CurrentInfo;
diff --git a/client/events.js b/client/dom/events.js
similarity index 100%
rename from client/events.js
rename to client/dom/events.js
diff --git a/client/files.js b/client/dom/files.js
similarity index 100%
rename from client/files.js
rename to client/dom/files.js
diff --git a/client/dom.js b/client/dom/index.js
similarity index 99%
rename from client/dom.js
rename to client/dom/index.js
index f561ab98..4254e4c4 100644
--- a/client/dom.js
+++ b/client/dom/index.js
@@ -7,7 +7,7 @@ const itype = require('itype/legacy');
 const rendy = require('rendy');
 const exec = require('execon');
 const jonny = require('jonny');
-const Util = require('../common/util');
+const Util = require('../../common/util');
 
 const DOMFunc = function() {};
 
@@ -20,7 +20,7 @@ const DOM = new DOMFunc();
 
 module.exports = DOM;
 
-const Images = require('./dom/images');
+const Images = require('./images');
 const load = require('./load');
 
 DOM.Images = Images;
diff --git a/client/load.js b/client/dom/load.js
similarity index 98%
rename from client/load.js
rename to client/dom/load.js
index 4bf7fe64..bbac476c 100644
--- a/client/load.js
+++ b/client/dom/load.js
@@ -4,10 +4,10 @@ const itype = require('itype/legacy');
 const jonny = require('jonny');
 const Emitify = require('emitify');
 const exec = require('execon');
-const Images = require('./dom/images');
+const Images = require('./images');
 const Events = require('./events');
 
-const {getExt} = require('../common/util');
+const {getExt} = require('../../common/util');
 
 module.exports = load;
 module.exports.getIdBySrc = getIdBySrc;
diff --git a/client/rest.js b/client/dom/rest.js
similarity index 99%
rename from client/rest.js
rename to client/dom/rest.js
index 8f87b82c..7cca7a6b 100644
--- a/client/rest.js
+++ b/client/dom/rest.js
@@ -6,7 +6,7 @@ const itype = require('itype/legacy');
 
 module.exports = new RESTful();
 
-const {Images} = require('./dom');
+const Images = require('./images');
 const load = require('./load');
 
 function RESTful() {
diff --git a/client/storage.js b/client/dom/storage.js
similarity index 100%
rename from client/storage.js
rename to client/dom/storage.js
diff --git a/client/key.js b/client/key.js
index 73244d34..64e65d2c 100644
--- a/client/key.js
+++ b/client/key.js
@@ -6,8 +6,8 @@ const Info = DOM.CurrentInfo;
 
 const exec = require('execon');
 
-const Events = require('./events');
-const Buffer = require('./buffer');
+const Events = require('./dom/events');
+const Buffer = require('./dom/buffer');
 const {escapeRegExp} = require('../common/util');
 
 let Chars = [];
diff --git a/client/modules/cloud.js b/client/modules/cloud.js
index bc87a964..5f3fb95a 100644
--- a/client/modules/cloud.js
+++ b/client/modules/cloud.js
@@ -6,8 +6,8 @@ CloudCmd.Cloud = CloudProto;
 
 const exec = require('execon');
 
-const load = require('../load');
-const Files = require('../files');
+const load = require('../dom/load');
+const Files = require('../dom/files');
 const Images = require('../dom/images');
 const Util = require('../../common/util');
 
diff --git a/client/modules/config.js b/client/modules/config.js
index 1cb5f6cd..47214f5d 100644
--- a/client/modules/config.js
+++ b/client/modules/config.js
@@ -8,8 +8,9 @@ const currify = require('currify/legacy');
 const input = require('../input');
 
 const Images = require('../dom/images');
-const Events = require('../events');
-const Files = require('../files');
+const Events = require('../dom/events');
+const Files = require('../dom/files');
+
 const {Dialog} = DOM;
 
 const TITLE = 'Config';
diff --git a/client/modules/edit.js b/client/modules/edit.js
index 23dc42d9..b48f7eed 100644
--- a/client/modules/edit.js
+++ b/client/modules/edit.js
@@ -5,7 +5,7 @@
 const exec = require('execon');
 const currify = require('currify/legacy');
 
-const load = require('../load');
+const load = require('../dom/load');
 const {time, timeEnd} = require('../../common/util');
 
 CloudCmd.Edit = EditProto;
diff --git a/client/modules/markdown.js b/client/modules/markdown.js
index b3dc12c6..7d23af50 100644
--- a/client/modules/markdown.js
+++ b/client/modules/markdown.js
@@ -7,8 +7,8 @@ CloudCmd.Markdown = MarkdownProto;
 const exec = require('execon');
 
 const Images = require('../dom/images');
-const load = require('../load');
-const {Markdown} = require('../rest');
+const load = require('../dom/load');
+const {Markdown} = require('../dom/rest');
 
 function MarkdownProto(name, options) {
     Images.show.load('top');
diff --git a/client/modules/menu.js b/client/modules/menu.js
index 3e52363f..01b4928b 100644
--- a/client/modules/menu.js
+++ b/client/modules/menu.js
@@ -7,8 +7,8 @@ CloudCmd.Menu = MenuProto;
 const exec = require('execon');
 const currify = require('currify/legacy');
 
-const load = require('../load');
-const RESTful = require('../rest');
+const load = require('../dom/load');
+const RESTful = require('../dom/rest');
 const bind = (f, ...a) => (...b) => f(...a, ...b);
 
 function MenuProto(position) {
diff --git a/client/modules/operation.js b/client/modules/operation.js
index fab9e908..0c68fe5c 100644
--- a/client/modules/operation.js
+++ b/client/modules/operation.js
@@ -14,7 +14,7 @@ CloudCmd.Operation = OperationProto;
 const currify = require('currify/legacy');
 const exec = require('execon');
 
-const RESTful = require('../rest');
+const RESTful = require('../dom/rest');
 
 function OperationProto(operation, data) {
     const Name = 'Operation';
diff --git a/client/modules/upload.js b/client/modules/upload.js
index 97ad35de..80b9c9aa 100644
--- a/client/modules/upload.js
+++ b/client/modules/upload.js
@@ -4,9 +4,9 @@
 
 const exec = require('execon');
 
-const load = require('../load');
-const Files = require('../files');
-const {Images} = DOM;
+const load = require('../dom/load');
+const Files = require('../dom/files');
+const Images = require('../dom/images');
 
 CloudCmd.Upload = UploadProto;
 
diff --git a/client/modules/view.js b/client/modules/view.js
index 811854e5..ec8cbf64 100644
--- a/client/modules/view.js
+++ b/client/modules/view.js
@@ -7,9 +7,9 @@ const rendy = require('rendy');
 const exec = require('execon');
 
 const {time} = require('../../common/util');
-const Files = require('../files');
-const Events = require('../events');
-const load = require('../load');
+const Files = require('../dom/files');
+const Events = require('../dom/events');
+const load = require('../dom/load');
 const Images = require('../dom/images');
 
 CloudCmd.View = ViewProto;
diff --git a/webpack.config.js b/webpack.config.js
index c9de9a5e..c738b83f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -66,7 +66,14 @@ module.exports = {
                 presets: ['es2015']
             }
         }]
+    },
+    /*
+    resolve: {
+        alias: {
+            dom: `${dir}/dom`
+        }
     }
+    */
 };
 
 function externals(context, request, fn) {