Moved config files from public folder to new config folder + the nece…

…ssary changes.
sharmalab · Jul 20, 2016 · 166d4c3 · 166d4c3
1 parent 21c32f8
commit 166d4c3
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,6 @@ node_modules/
 *.log
 *.bak
 *.back
-public/config/*
+config/*
 data/*
 bundle.js
diff --git a/main.js b/main.js
@@ -109,6 +109,9 @@ app.post('/uploadDataSource', routes.postDataSource);
 app.get("/", routes.index);
 app.get("/rest/json", rest.index);
 app.get("/users", user.list);
-
+
+app.get("/config/interactiveFilters", rest.getInteractiveFiltersConfig);
+app.get("/config/visualization", rest.getVisualizationConfig);
+app.get("/config/dashboard", rest.getDashboardConfig);
 
 exports.init = init;
diff --git a/modules/dataDescription.js b/modules/dataDescription.js
@@ -15,7 +15,7 @@ var dataDescription = (function(){
         visualAttributes = [],
         dataDescriptionConfig = {},
         attributes = {},
-        dataDescriptionConfigPath="public/config/dataDescription.json",
+        dataDescriptionConfigPath="config/dataDescription.json",
         _init,
         _loadConfig;
 

diff --git a/modules/dataSource.js b/modules/dataSource.js
@@ -21,7 +21,7 @@ var dataSource = (function(){
     var dataSourceConfig = {},
         dataSources = [],
         source = {},
-        dataSourceConfigPath = "public/config/dataSource.json",
+        dataSourceConfigPath = "config/dataSource.json",
         _init,
         _loadDataSourceConfig,
         attributes = {},

diff --git a/modules/interactiveFilters.js b/modules/interactiveFilters.js
@@ -23,7 +23,7 @@ var interactiveFilters = (function(){
 
 
     var interactiveFiltersConfig = {},
-        interactiveFiltersConfigPath = "public/config/interactiveFilters.json";
+        interactiveFiltersConfigPath = "config/interactiveFilters.json";
 
     var _loadConfig = function(path) {
         interactiveFiltersConfigPath = path || interactiveFiltersConfigPath;

diff --git a/modules/visualization.js b/modules/visualization.js
@@ -12,7 +12,7 @@ var visualization = (function(){
     var visualizationConfig = {},
         ndx = {},
         visualizations = [], //array containing information about all the visualizations
-        visualizationConfigPath = "public/config/visualization.json";
+        visualizationConfigPath = "config/visualization.json";
 
     var splomFilters = function(ndx, visualization){
         var attributes=visualization.attributes;

diff --git a/public/javascripts/src/App.jsx b/public/javascripts/src/App.jsx
@@ -30,14 +30,14 @@ var Dashboard = React.createClass({
 //        console.log("Waxzaaswoot!"); adsff
         self.unsubscribe = AppStore.listen(self.onFilter);
 
-        d3.json("config/interactiveFilters.json", function(err, data) {
+        d3.json("config/interactiveFilters", function(err, data) {
 
             if(err) {
                 console.log(err);
                 return;
             }
             interactiveFilters = data;
-            d3.json("config/visualization.json", function(err, data) {
+            d3.json("config/visualization", function(err, data) {
 
                 if(err) {
                     console.log(err);

diff --git a/public/javascripts/src/components/Navbar.jsx b/public/javascripts/src/components/Navbar.jsx
@@ -9,7 +9,7 @@ var NavBar = React.createClass({
     },  
     componentDidMount: function() {
         var self = this;
-        d3.json("config/dashboard.json", function(config){
+        d3.json("config/dashboard", function(config){
             var dashBoardConfig =  config || {};
             console.log(dashBoardConfig.projectTitle);
             var title = dashBoardConfig.projectTitle || "DataScope";

diff --git a/routes/rest.js b/routes/rest.js
@@ -7,7 +7,28 @@ var fs = require('fs');
 
 exports.index = function(req, res){ 
 	var dataraw = fs.readFileSync("data/small-data.json");
-    data = JSON.parse(dataraw);
-  	res.writeHead(200, { 'content-type': 'application/json' });
-  	res.end((JSON.stringify(data)))
-};
+	data = JSON.parse(dataraw);
+	res.writeHead(200, { 'content-type': 'application/json' });
+	res.end((JSON.stringify(data)));
+};
+
+exports.getInteractiveFiltersConfig = function (req, res) {
+	var file = fs.readFileSync("config/interactiveFilters.json");
+	data = JSON.parse(file);
+	res.writeHead(200, { 'content-type': 'application/json' });
+	res.end((JSON.stringify(data)));
+}
+
+exports.getVisualizationConfig = function (req, res) {
+	var file = fs.readFileSync("config/visualization.json");
+	data = JSON.parse(file);
+	res.writeHead(200, { 'content-type': 'application/json' });
+	res.end((JSON.stringify(data)));
+}
+
+exports.getDashboardConfig = function (req, res) {
+	var file = fs.readFileSync("config/dashboard.json");
+	data = JSON.parse(file);
+	res.writeHead(200, { 'content-type': 'application/json' });
+	res.end((JSON.stringify(data)));
+}