From 3044ac0c886dbc6cfc31279c3439eb193574d152 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 22 Mar 2017 15:12:48 +0200 Subject: [PATCH] feature(server) cloudfunc: common -> server --- server/cloudcmd.js | 4 +--- server/config.js | 3 +-- server/rest.js | 3 +-- server/route.js | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/server/cloudcmd.js b/server/cloudcmd.js index 1515cc49..a7ebca66 100644 --- a/server/cloudcmd.js +++ b/server/cloudcmd.js @@ -2,10 +2,8 @@ const DIR = __dirname + '/'; const DIR_ROOT = DIR + '../'; -const DIR_COMMON = DIR + '../common/'; - -const cloudfunc = require(DIR_COMMON + 'cloudfunc'); +const cloudfunc = require(DIR + 'cloudfunc'); const auth = require(DIR + 'auth'); const config = require(DIR + 'config'); const rest = require(DIR + 'rest'); diff --git a/server/config.js b/server/config.js index cc3d3a57..773f41cc 100644 --- a/server/config.js +++ b/server/config.js @@ -1,14 +1,13 @@ 'use strict'; const DIR_SERVER = __dirname + '/'; -const DIR_COMMON = DIR_SERVER + '../common/'; const DIR = DIR_SERVER + '../'; const path = require('path'); const fs = require('fs'); const exit = require(DIR_SERVER + 'exit'); -const CloudFunc = require(DIR_COMMON + 'cloudfunc'); +const CloudFunc = require(DIR_SERVER + 'cloudfunc'); const pullout = require('pullout/legacy'); const ponse = require('ponse'); diff --git a/server/rest.js b/server/rest.js index 37d81340..fe8370e5 100644 --- a/server/rest.js +++ b/server/rest.js @@ -1,12 +1,11 @@ 'use strict'; const DIR = './'; -const DIR_COMMON = DIR + '../common/'; const path = require('path'); const root = require(DIR + 'root'); const config = require(DIR + 'config'); -const CloudFunc = require(DIR_COMMON + 'cloudfunc'); +const CloudFunc = require(DIR + 'cloudfunc'); const markdown = require(DIR + 'markdown'); const jaguar = require('jaguar/legacy'); diff --git a/server/route.js b/server/route.js index d40813a4..0492092f 100644 --- a/server/route.js +++ b/server/route.js @@ -3,7 +3,6 @@ const DIR = __dirname + '/../'; const DIR_TMPL = DIR + 'tmpl/'; const DIR_HTML = DIR + 'html/'; -const DIR_COMMON = DIR + 'common/'; const DIR_JSON = DIR + 'json/'; const DIR_SERVER = './'; const DIR_FS = DIR_TMPL + 'fs/'; @@ -23,8 +22,8 @@ const apart = require('apart'); const config = require(DIR_SERVER + 'config'); const root = require(DIR_SERVER + 'root'); const prefixer = require(DIR_SERVER + 'prefixer'); +const CloudFunc = require(DIR_SERVER + 'cloudfunc'); const prefix = squad(prefixer, apart(config, 'prefix')); -const CloudFunc = require(DIR_COMMON + 'cloudfunc'); const PATH_INDEX = DIR_HTML + 'index.html';