Skip to content

Commit

Permalink
Cambia la página de inicio
Browse files Browse the repository at this point in the history
  • Loading branch information
germaaan committed Dec 1, 2015
1 parent 33eb6de commit 3356c99
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 20 deletions.
14 changes: 9 additions & 5 deletions doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@ <h1>index.js</h1>
</div>

<div class="content"><div class='highlight'><pre><span class="hljs-keyword">var</span> express = <span class="hljs-built_in">require</span>(<span class="hljs-string">'express'</span>);
<span class="hljs-keyword">var</span> jsonfile = <span class="hljs-built_in">require</span>(<span class="hljs-string">'jsonfile'</span>);
<span class="hljs-keyword">var</span> router = express.Router();

<span class="hljs-keyword">var</span> client = <span class="hljs-built_in">require</span>(appRoot + <span class="hljs-string">'/database/client'</span>);</pre></div></div>
<span class="hljs-keyword">var</span> client = <span class="hljs-built_in">require</span>(appRoot + <span class="hljs-string">'/database/client'</span>);
<span class="hljs-keyword">var</span> file = appRoot + <span class="hljs-string">"/public/data/data.json"</span>;</pre></div></div>

</li>

Expand Down Expand Up @@ -128,10 +130,12 @@ <h1>index.js</h1>

<div class="content"><div class='highlight'><pre> client.close();

res.render(<span class="hljs-string">'index'</span>, {
title: <span class="hljs-string">'Gesco-DatabaseManagement: Inicio'</span>,
data: datos.rows
});
jsonfile.writeFileSync(file, datos.rows);
});

res.render(<span class="hljs-string">'index'</span>, {
title: <span class="hljs-string">'Gesco-DatabaseManagement: Inicio'</span>,
data: jsonfile.readFileSync(file)
});
});
});
Expand Down
23 changes: 12 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,6 @@
"cookie-parser": "^1.4.0",
"debug": "^2.2.0",
"express": "^4.13.3",
"istanbul": "^0.4.0",
"jade": "^1.11.0",
"jshint": "^2.8.0",
"lx-pdf": "^0.1.2",
"mocha": "^2.3.3",
"moment": "^2.10.6",
"morgan": "^1.6.1",
"request": "^2.65.0",
"serve-favicon": "2.3.0",
"underscore": "^1.8.3",
"gulp": "^3.9.0",
"gulp-docco": "^0.0.4",
"gulp-env": "^0.2.0",
Expand All @@ -63,8 +53,19 @@
"gulp-sass": "^2.1.0",
"gulp-shell": "^0.5.1",
"gulp-uglify": "^1.5.1",
"istanbul": "^0.4.0",
"jade": "^1.11.0",
"jshint": "^2.8.0",
"jsonfile": "^2.2.3",
"lx-pdf": "^0.1.2",
"mocha": "^2.3.3",
"moment": "^2.10.6",
"morgan": "^1.6.1",
"request": "^2.65.0",
"serve-favicon": "2.3.0",
"should": "^7.1.1",
"supertest": "^1.1.0"
"supertest": "^1.1.0",
"underscore": "^1.8.3"
},
"devDependencies": {
"coveralls": "^2.11.4"
Expand Down
1 change: 1 addition & 0 deletions public/data/data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"frecuencia":0.01267,"id":1,"nombre":"Atención cliente"},{"frecuencia":0.31413,"id":2,"nombre":"Finanzas"},{"frecuencia":0.16955,"id":3,"nombre":"Legal"},{"frecuencia":0.33579,"id":4,"nombre":"Planificación"},{"frecuencia":0.07251,"id":5,"nombre":"Publicidad"},{"frecuencia":0.09535,"id":6,"nombre":"Recursos humanos"}]
12 changes: 8 additions & 4 deletions routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

// Dependencias
var express = require('express');
var jsonfile = require('jsonfile');
var router = express.Router();

var client = require(appRoot + '/database/client');
var file = appRoot + "/public/data/data.json";

// GET de la página principal
router.get('/', function(req, res) {
Expand All @@ -34,10 +36,12 @@ router.get('/', function(req, res) {
// Cierra conexión
client.close();

res.render('index', {
title: 'Gesco-DatabaseManagement: Inicio',
data: datos.rows
});
jsonfile.writeFileSync(file, datos.rows);
});

res.render('index', {
title: 'Gesco-DatabaseManagement: Inicio',
data: jsonfile.readFileSync(file)
});
});
});
Expand Down

0 comments on commit 3356c99

Please sign in to comment.