From 2b49b8a8477043a3686f32488990a07b469c19ee Mon Sep 17 00:00:00 2001 From: brunosimon Date: Tue, 18 Jul 2017 03:47:13 +0200 Subject: [PATCH] :art: Update files structure --- bin/index.js | 4 ++-- {bin => lib/app}/config.default.json | 0 bin/keppler.class.js => lib/app/index.js | 10 +++++----- {site => lib/app/site}/controllers/index.js | 0 site/site.class.js => lib/app/site/index.js | 5 +---- .../app/site/models/event_emitter.js | 0 .../file.class.js => lib/app/site/models/file.js | 2 +- .../files.class.js => lib/app/site/models/files.js | 4 ++-- .../project.class.js => lib/app/site/models/project.js | 2 +- .../app/site/models/projects.js | 2 +- site/utils/ids.class.js => lib/app/site/utils/ids.js | 0 .../paths.class.js => lib/app/site/utils/paths.js | 0 {site => lib/app/site}/views/pages/index/project.pug | 0 {site => lib/app/site}/views/pages/index/projects.pug | 0 watcher/watcher.class.js => lib/app/watcher/index.js | 0 site/index.js | 4 ---- {test-folder => test/demo-folder}/empty.txt | 0 {test-folder => test/demo-folder}/folder-1/test-4.css | 0 .../demo-folder}/folder-2/test-3-diff-1.js | 0 .../demo-folder}/folder-2/test-3-diff-2.js | 0 .../demo-folder}/folder-2/test-3-diff-3.js | 0 .../demo-folder}/folder-2/test-3-diff-4.js | 0 {test-folder => test/demo-folder}/folder-2/test-3.js | 0 {test-folder => test/demo-folder}/test-1.html | 0 {test-folder => test/demo-folder}/test-2.php | 0 .../demo-folder}/vendor/.test/excluded-file.txt | 0 {test-folder => test/demo-folder}/vendor/.test2 | 0 .../demo-folder}/vendor/excluded-file.txt | 0 watcher/index.js | 4 ---- 29 files changed, 13 insertions(+), 24 deletions(-) rename {bin => lib/app}/config.default.json (100%) rename bin/keppler.class.js => lib/app/index.js (93%) rename {site => lib/app/site}/controllers/index.js (100%) rename site/site.class.js => lib/app/site/index.js (98%) rename site/models/event_emitter.class.js => lib/app/site/models/event_emitter.js (100%) rename site/models/file.class.js => lib/app/site/models/file.js (98%) rename site/models/files.class.js => lib/app/site/models/files.js (97%) rename site/models/project.class.js => lib/app/site/models/project.js (97%) rename site/models/projects.class.js => lib/app/site/models/projects.js (98%) rename site/utils/ids.class.js => lib/app/site/utils/ids.js (100%) rename site/utils/paths.class.js => lib/app/site/utils/paths.js (100%) rename {site => lib/app/site}/views/pages/index/project.pug (100%) rename {site => lib/app/site}/views/pages/index/projects.pug (100%) rename watcher/watcher.class.js => lib/app/watcher/index.js (100%) delete mode 100644 site/index.js rename {test-folder => test/demo-folder}/empty.txt (100%) rename {test-folder => test/demo-folder}/folder-1/test-4.css (100%) rename {test-folder => test/demo-folder}/folder-2/test-3-diff-1.js (100%) rename {test-folder => test/demo-folder}/folder-2/test-3-diff-2.js (100%) rename {test-folder => test/demo-folder}/folder-2/test-3-diff-3.js (100%) rename {test-folder => test/demo-folder}/folder-2/test-3-diff-4.js (100%) rename {test-folder => test/demo-folder}/folder-2/test-3.js (100%) rename {test-folder => test/demo-folder}/test-1.html (100%) rename {test-folder => test/demo-folder}/test-2.php (100%) rename {test-folder => test/demo-folder}/vendor/.test/excluded-file.txt (100%) rename {test-folder => test/demo-folder}/vendor/.test2 (100%) rename {test-folder => test/demo-folder}/vendor/excluded-file.txt (100%) delete mode 100644 watcher/index.js diff --git a/bin/index.js b/bin/index.js index d3491a4..8de7616 100644 --- a/bin/index.js +++ b/bin/index.js @@ -2,5 +2,5 @@ 'use strict' -const Keppler = require('./keppler.class.js') -const keppler = new Keppler() +const App = require('../lib/app') +const app = new App() diff --git a/bin/config.default.json b/lib/app/config.default.json similarity index 100% rename from bin/config.default.json rename to lib/app/config.default.json diff --git a/bin/keppler.class.js b/lib/app/index.js similarity index 93% rename from bin/keppler.class.js rename to lib/app/index.js index 35982ab..d49ee24 100644 --- a/bin/keppler.class.js +++ b/lib/app/index.js @@ -2,14 +2,14 @@ // Depedencies const ip = require('ip') -const Site = require('../site/site.class.js') -const Watcher = require('../watcher/watcher.class.js') +const Site = require('./site') +const Watcher = require('./watcher') const defaultConfig = require('./config.default.json') /** - * Keppler class + * App class */ -class Keppler +class App { /** * Constructor @@ -113,4 +113,4 @@ class Keppler } } -module.exports = Keppler +module.exports = App diff --git a/site/controllers/index.js b/lib/app/site/controllers/index.js similarity index 100% rename from site/controllers/index.js rename to lib/app/site/controllers/index.js diff --git a/site/site.class.js b/lib/app/site/index.js similarity index 98% rename from site/site.class.js rename to lib/app/site/index.js index 652201e..392e590 100644 --- a/site/site.class.js +++ b/lib/app/site/index.js @@ -9,7 +9,7 @@ const colors = require('colors') const ip = require('ip') const util = require('util') const path = require('path') -const Projects = require('./models/projects.class.js') +const Projects = require('./models/projects.js') const fs = require('fs') const opener = require('opener') @@ -195,9 +195,6 @@ class Site this.express.set('views', path.join(__dirname, 'views')) this.express.use(express.static(path.join(__dirname, 'public'))) - const config = require('../package.json') - - this.express.locals.kepplerVersion = config.version this.express.locals.domain = this.options.domain // Controllers diff --git a/site/models/event_emitter.class.js b/lib/app/site/models/event_emitter.js similarity index 100% rename from site/models/event_emitter.class.js rename to lib/app/site/models/event_emitter.js diff --git a/site/models/file.class.js b/lib/app/site/models/file.js similarity index 98% rename from site/models/file.class.js rename to lib/app/site/models/file.js index 9323ce2..cade3bb 100644 --- a/site/models/file.class.js +++ b/lib/app/site/models/file.js @@ -2,7 +2,7 @@ // Depedencies const diff = require('diff') -const ids = require('../utils/ids.class.js') +const ids = require('../utils/ids.js') class File { diff --git a/site/models/files.class.js b/lib/app/site/models/files.js similarity index 97% rename from site/models/files.class.js rename to lib/app/site/models/files.js index aedd10d..99c76f0 100644 --- a/site/models/files.class.js +++ b/lib/app/site/models/files.js @@ -1,8 +1,8 @@ 'use strict' // Dependencies -const paths = require('../utils/paths.class.js') -const File = require('./file.class.js') +const paths = require('../utils/paths.js') +const File = require('./file.js') class Files { diff --git a/site/models/project.class.js b/lib/app/site/models/project.js similarity index 97% rename from site/models/project.class.js rename to lib/app/site/models/project.js index 7e16e38..e711bad 100644 --- a/site/models/project.class.js +++ b/lib/app/site/models/project.js @@ -2,7 +2,7 @@ // Dependencies const slug = require('slug') -const Files = require('./files.class.js') +const Files = require('./files.js') class Project { diff --git a/site/models/projects.class.js b/lib/app/site/models/projects.js similarity index 98% rename from site/models/projects.class.js rename to lib/app/site/models/projects.js index bf2fce1..9856467 100644 --- a/site/models/projects.class.js +++ b/lib/app/site/models/projects.js @@ -1,6 +1,6 @@ 'use strict' -const Project = require('./project.class.js') +const Project = require('./project.js') class Projects { diff --git a/site/utils/ids.class.js b/lib/app/site/utils/ids.js similarity index 100% rename from site/utils/ids.class.js rename to lib/app/site/utils/ids.js diff --git a/site/utils/paths.class.js b/lib/app/site/utils/paths.js similarity index 100% rename from site/utils/paths.class.js rename to lib/app/site/utils/paths.js diff --git a/site/views/pages/index/project.pug b/lib/app/site/views/pages/index/project.pug similarity index 100% rename from site/views/pages/index/project.pug rename to lib/app/site/views/pages/index/project.pug diff --git a/site/views/pages/index/projects.pug b/lib/app/site/views/pages/index/projects.pug similarity index 100% rename from site/views/pages/index/projects.pug rename to lib/app/site/views/pages/index/projects.pug diff --git a/watcher/watcher.class.js b/lib/app/watcher/index.js similarity index 100% rename from watcher/watcher.class.js rename to lib/app/watcher/index.js diff --git a/site/index.js b/site/index.js deleted file mode 100644 index 0a07ea2..0000000 --- a/site/index.js +++ /dev/null @@ -1,4 +0,0 @@ -'use strict' - -const Site = require('./site.class.js') -const site = new Site() diff --git a/test-folder/empty.txt b/test/demo-folder/empty.txt similarity index 100% rename from test-folder/empty.txt rename to test/demo-folder/empty.txt diff --git a/test-folder/folder-1/test-4.css b/test/demo-folder/folder-1/test-4.css similarity index 100% rename from test-folder/folder-1/test-4.css rename to test/demo-folder/folder-1/test-4.css diff --git a/test-folder/folder-2/test-3-diff-1.js b/test/demo-folder/folder-2/test-3-diff-1.js similarity index 100% rename from test-folder/folder-2/test-3-diff-1.js rename to test/demo-folder/folder-2/test-3-diff-1.js diff --git a/test-folder/folder-2/test-3-diff-2.js b/test/demo-folder/folder-2/test-3-diff-2.js similarity index 100% rename from test-folder/folder-2/test-3-diff-2.js rename to test/demo-folder/folder-2/test-3-diff-2.js diff --git a/test-folder/folder-2/test-3-diff-3.js b/test/demo-folder/folder-2/test-3-diff-3.js similarity index 100% rename from test-folder/folder-2/test-3-diff-3.js rename to test/demo-folder/folder-2/test-3-diff-3.js diff --git a/test-folder/folder-2/test-3-diff-4.js b/test/demo-folder/folder-2/test-3-diff-4.js similarity index 100% rename from test-folder/folder-2/test-3-diff-4.js rename to test/demo-folder/folder-2/test-3-diff-4.js diff --git a/test-folder/folder-2/test-3.js b/test/demo-folder/folder-2/test-3.js similarity index 100% rename from test-folder/folder-2/test-3.js rename to test/demo-folder/folder-2/test-3.js diff --git a/test-folder/test-1.html b/test/demo-folder/test-1.html similarity index 100% rename from test-folder/test-1.html rename to test/demo-folder/test-1.html diff --git a/test-folder/test-2.php b/test/demo-folder/test-2.php similarity index 100% rename from test-folder/test-2.php rename to test/demo-folder/test-2.php diff --git a/test-folder/vendor/.test/excluded-file.txt b/test/demo-folder/vendor/.test/excluded-file.txt similarity index 100% rename from test-folder/vendor/.test/excluded-file.txt rename to test/demo-folder/vendor/.test/excluded-file.txt diff --git a/test-folder/vendor/.test2 b/test/demo-folder/vendor/.test2 similarity index 100% rename from test-folder/vendor/.test2 rename to test/demo-folder/vendor/.test2 diff --git a/test-folder/vendor/excluded-file.txt b/test/demo-folder/vendor/excluded-file.txt similarity index 100% rename from test-folder/vendor/excluded-file.txt rename to test/demo-folder/vendor/excluded-file.txt diff --git a/watcher/index.js b/watcher/index.js deleted file mode 100644 index 5a9542d..0000000 --- a/watcher/index.js +++ /dev/null @@ -1,4 +0,0 @@ -'use strict' - -const Watcher = require('./watcher.class.js') -const watcher = new Watcher()