From 797a73c88f275a360c6c952966ff3552e7fbb5ab Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Wed, 21 Sep 2016 18:26:40 -0700 Subject: [PATCH] Stuff --- app/backend/database/index.js | 16 ++++++++-------- app/backend/database/{ => models}/cookieJar.js | 2 +- app/backend/database/{ => models}/environment.js | 2 +- app/backend/database/{ => models}/request.js | 6 +++--- .../database/{ => models}/requestGroup.js | 2 +- app/backend/database/{ => models}/response.js | 2 +- app/backend/database/{ => models}/settings.js | 2 +- app/backend/database/{ => models}/stats.js | 2 +- app/backend/database/{ => models}/workspace.js | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) rename app/backend/database/{ => models}/cookieJar.js (96%) rename app/backend/database/{ => models}/environment.js (97%) rename app/backend/database/{ => models}/request.js (95%) rename app/backend/database/{ => models}/requestGroup.js (97%) rename app/backend/database/{ => models}/response.js (95%) rename app/backend/database/{ => models}/settings.js (96%) rename app/backend/database/{ => models}/stats.js (95%) rename app/backend/database/{ => models}/workspace.js (91%) diff --git a/app/backend/database/index.js b/app/backend/database/index.js index bb2846bcf..9b25b624d 100644 --- a/app/backend/database/index.js +++ b/app/backend/database/index.js @@ -16,14 +16,14 @@ module.exports.CHANGE_REMOVE = 'remove'; // MODELS // // ~~~~~~ // -module.exports.stats = require('./stats'); -module.exports.settings = require('./settings'); -module.exports.workspace = require('./workspace'); -module.exports.environment = require('./environment'); -module.exports.cookieJar = require('./cookieJar'); -module.exports.requestGroup = require('./requestGroup'); -module.exports.request = require('./request'); -module.exports.response = require('./response'); +module.exports.stats = require('./models/stats'); +module.exports.settings = require('./models/settings'); +module.exports.workspace = require('./models/workspace'); +module.exports.environment = require('./models/environment'); +module.exports.cookieJar = require('./models/cookieJar'); +module.exports.requestGroup = require('./models/requestGroup'); +module.exports.request = require('./models/request'); +module.exports.response = require('./models/response'); const MODELS = [ module.exports.stats, diff --git a/app/backend/database/cookieJar.js b/app/backend/database/models/cookieJar.js similarity index 96% rename from app/backend/database/cookieJar.js rename to app/backend/database/models/cookieJar.js index 9dd31a381..aab133167 100644 --- a/app/backend/database/cookieJar.js +++ b/app/backend/database/models/cookieJar.js @@ -1,6 +1,6 @@ 'use strict'; -const db = require('./'); +const db = require('../index'); module.exports.type = 'CookieJar'; module.exports.prefix = 'jar'; diff --git a/app/backend/database/environment.js b/app/backend/database/models/environment.js similarity index 97% rename from app/backend/database/environment.js rename to app/backend/database/models/environment.js index 6e056d88d..f52dfb056 100644 --- a/app/backend/database/environment.js +++ b/app/backend/database/models/environment.js @@ -1,6 +1,6 @@ 'use strict'; -const db = require('./'); +const db = require('../index'); module.exports.type = 'Environment'; module.exports.prefix = 'env'; diff --git a/app/backend/database/request.js b/app/backend/database/models/request.js similarity index 95% rename from app/backend/database/request.js rename to app/backend/database/models/request.js index 165f6bfae..20269395e 100644 --- a/app/backend/database/request.js +++ b/app/backend/database/models/request.js @@ -1,8 +1,8 @@ 'use strict'; -const {PREVIEW_MODE_SOURCE} = require('../previewModes'); -const {METHOD_GET} = require('../constants'); -const db = require('./'); +const {PREVIEW_MODE_SOURCE} = require('../../previewModes'); +const {METHOD_GET} = require('../../constants'); +const db = require('../index'); module.exports.type = 'Request'; module.exports.prefix = 'req'; diff --git a/app/backend/database/requestGroup.js b/app/backend/database/models/requestGroup.js similarity index 97% rename from app/backend/database/requestGroup.js rename to app/backend/database/models/requestGroup.js index b5b1408aa..a8e08f130 100644 --- a/app/backend/database/requestGroup.js +++ b/app/backend/database/models/requestGroup.js @@ -1,6 +1,6 @@ 'use strict'; -const db = require('./'); +const db = require('../index'); module.exports.type = 'RequestGroup'; module.exports.prefix = 'fld'; diff --git a/app/backend/database/response.js b/app/backend/database/models/response.js similarity index 95% rename from app/backend/database/response.js rename to app/backend/database/models/response.js index 7bc542445..8efcaf52d 100644 --- a/app/backend/database/response.js +++ b/app/backend/database/models/response.js @@ -1,6 +1,6 @@ 'use strict'; -const db = require('./'); +const db = require('../index'); module.exports.type = 'Response'; module.exports.prefix = 'res'; diff --git a/app/backend/database/settings.js b/app/backend/database/models/settings.js similarity index 96% rename from app/backend/database/settings.js rename to app/backend/database/models/settings.js index f3dbffc45..fab02e2c0 100644 --- a/app/backend/database/settings.js +++ b/app/backend/database/models/settings.js @@ -1,6 +1,6 @@ 'use strict'; -const db = require('./'); +const db = require('../index'); module.exports.type = 'Settings'; module.exports.prefix = 'set'; diff --git a/app/backend/database/stats.js b/app/backend/database/models/stats.js similarity index 95% rename from app/backend/database/stats.js rename to app/backend/database/models/stats.js index 69074eefe..8344ab092 100644 --- a/app/backend/database/stats.js +++ b/app/backend/database/models/stats.js @@ -1,6 +1,6 @@ 'use strict'; -const db = require('./'); +const db = require('../index'); module.exports.type = 'Stats'; module.exports.prefix = 'sta'; diff --git a/app/backend/database/workspace.js b/app/backend/database/models/workspace.js similarity index 91% rename from app/backend/database/workspace.js rename to app/backend/database/models/workspace.js index 7c05acdcc..2673ff797 100644 --- a/app/backend/database/workspace.js +++ b/app/backend/database/models/workspace.js @@ -1,7 +1,7 @@ 'use strict'; -const db = require('./'); -const {DEFAULT_SIDEBAR_WIDTH} = require('../constants'); +const db = require('../index'); +const {DEFAULT_SIDEBAR_WIDTH} = require('../../constants'); module.exports.type = 'Workspace'; module.exports.prefix = 'wrk';