From 2974397b1f92c791d449e01e25f06af5427c0612 Mon Sep 17 00:00:00 2001 From: Sahil Khokhar Date: Thu, 3 Aug 2017 01:24:25 +0530 Subject: [PATCH 1/4] changed a few names --- app/controller/sidebar.js | 6 +++--- app/models/sidebar.js | 8 ++++---- app/routes.js | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controller/sidebar.js b/app/controller/sidebar.js index fb004db..316ec66 100644 --- a/app/controller/sidebar.js +++ b/app/controller/sidebar.js @@ -1,9 +1,9 @@ 'use strict'; -var model = require('../models/sidebar'); +var layer = require('../models/sidebar'); var sidebar = module.exports = {}; -sidebar.getData = function () { - return model.get(); +sidebar.get = function () { + return layer.set(); }; diff --git a/app/models/sidebar.js b/app/models/sidebar.js index c7c3257..7f7c89c 100644 --- a/app/models/sidebar.js +++ b/app/models/sidebar.js @@ -1,15 +1,15 @@ 'use strict'; -var model = module.exports = {}; +var layer = module.exports = {}; var fs = require('fs'); -model.newData = []; +layer.layers = []; // Logic to read an array of files inside a directory -model.get = function () { +layer.set = function () { var allData = fs.readdirSync('tests/all/scss'); var prosilverData = fs.readdirSync('tests/prosilver/scss'); - var localData = model.newData; + var localData = layer.layers; for (var i = 0; i < allData.length; i++) { if (allData[i] === 'base' || allData[i] === 'settings' || allData[i] === 'objects' || allData[i] === 'components') { localData.push(allData[i]); diff --git a/app/routes.js b/app/routes.js index c71d652..1c91d1c 100644 --- a/app/routes.js +++ b/app/routes.js @@ -30,7 +30,7 @@ router.get('/editor', function (req, res) { // Route to READ the file router.get('/editor/sidebar', function (req, res) { - req.params.fetch = sidebar.getData(); + req.params.fetch = sidebar.get(); res.send(req.params.fetch); }); From 5baa524966027e45c4eaa754cf25762f738545f8 Mon Sep 17 00:00:00 2001 From: Sahil Khokhar Date: Thu, 3 Aug 2017 01:39:38 +0530 Subject: [PATCH 2/4] modified --- app/controller/sidebar.js | 4 ++-- app/models/sidebar.js | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controller/sidebar.js b/app/controller/sidebar.js index 316ec66..b98530f 100644 --- a/app/controller/sidebar.js +++ b/app/controller/sidebar.js @@ -1,9 +1,9 @@ 'use strict'; -var layer = require('../models/sidebar'); +var model = require('../models/sidebar'); var sidebar = module.exports = {}; sidebar.get = function () { - return layer.set(); + return model.getLayers(); }; diff --git a/app/models/sidebar.js b/app/models/sidebar.js index 7f7c89c..b1be539 100644 --- a/app/models/sidebar.js +++ b/app/models/sidebar.js @@ -1,15 +1,15 @@ 'use strict'; -var layer = module.exports = {}; +var model = module.exports = {}; var fs = require('fs'); -layer.layers = []; +model.layers = []; -// Logic to read an array of files inside a directory -layer.set = function () { +// Logic to read files inside a directory +model.getLayers = function () { var allData = fs.readdirSync('tests/all/scss'); var prosilverData = fs.readdirSync('tests/prosilver/scss'); - var localData = layer.layers; + var localData = model.layers; for (var i = 0; i < allData.length; i++) { if (allData[i] === 'base' || allData[i] === 'settings' || allData[i] === 'objects' || allData[i] === 'components') { localData.push(allData[i]); From df65aad04721189a79e382f652fc427cdb5a2c6d Mon Sep 17 00:00:00 2001 From: Sahil Khokhar Date: Thu, 3 Aug 2017 02:04:45 +0530 Subject: [PATCH 3/4] added method to get layer --- app/controller/sidebar.js | 7 +++++-- app/models/sidebar.js | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/controller/sidebar.js b/app/controller/sidebar.js index b98530f..3120cb0 100644 --- a/app/controller/sidebar.js +++ b/app/controller/sidebar.js @@ -1,9 +1,12 @@ 'use strict'; -var model = require('../models/sidebar'); +var layer = require('../models/sidebar'); var sidebar = module.exports = {}; sidebar.get = function () { - return model.getLayers(); + var layers = layer.getLayers(); + layer.get(layers[0]); + + return layers; }; diff --git a/app/models/sidebar.js b/app/models/sidebar.js index b1be539..3ee7e1d 100644 --- a/app/models/sidebar.js +++ b/app/models/sidebar.js @@ -1,15 +1,15 @@ 'use strict'; -var model = module.exports = {}; +var layer = module.exports = {}; var fs = require('fs'); -model.layers = []; +layer.layers = []; -// Logic to read files inside a directory -model.getLayers = function () { +// Logic to read folders inside a directory +layer.getLayers = function () { var allData = fs.readdirSync('tests/all/scss'); var prosilverData = fs.readdirSync('tests/prosilver/scss'); - var localData = model.layers; + var localData = layer.layers; for (var i = 0; i < allData.length; i++) { if (allData[i] === 'base' || allData[i] === 'settings' || allData[i] === 'objects' || allData[i] === 'components') { localData.push(allData[i]); @@ -28,6 +28,12 @@ model.getLayers = function () { var temp = localData[0]; localData[0] = localData[1]; localData[1] = temp; - + return localData; }; + +// Logic to read files inside the folders +layer.get = function (layer) { + var data = fs.readdirSync('tests/all/scss/' + layer); + console.log(data); +} \ No newline at end of file From fbe32520b16fc1b669d418ebf72b610784f2d0f2 Mon Sep 17 00:00:00 2001 From: Sahil Khokhar Date: Fri, 4 Aug 2017 17:41:15 +0530 Subject: [PATCH 4/4] testing new --- app/routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.js b/app/routes.js index 1c91d1c..9dfcf71 100644 --- a/app/routes.js +++ b/app/routes.js @@ -4,7 +4,7 @@ var express = require('express'); var config = require('./controller/config'); var sidebar = require('./controller/sidebar'); -var router = express.Router(); +var router = new express.Router(); // Route to UPDATE the config router.post('/settings/config', function (req, res) {