diff --git a/scripts/app.js b/scripts/app.js index 97cf79b..6132a4d 100644 --- a/scripts/app.js +++ b/scripts/app.js @@ -20,14 +20,8 @@ app.controller("blog", { $scope.posts = []; - // $http.get("/getnews") - // .then( - // (r) => - // { - // if (r.status != 200) console.log("Failed to get posts (" + r.statusText + ")"); - // else $scope.posts = angular.fromJson(r.data).arr.reverse(); - // } - // ); + $http.get("/posts") + .then((r) => { $scope.posts = angular.fromJson(r.data); }); } ] ); diff --git a/server.js b/server.js index 3f167df..3f64a61 100644 --- a/server.js +++ b/server.js @@ -1,3 +1,4 @@ +var fs = require('fs'); // Filesystem var express = require('express'); // Express var bodyParser = require('body-parser'); // Data conversion, JSON parsing @@ -16,9 +17,9 @@ app.get("/", function(req, res) { res.sendFile("./index.html"); }); -// News route, return defaultNews.json -app.get("/getnews", function(req, res) { - handleGetPosts(req, res); +// Posts route, return posts.json +app.get("/posts", function(req, res) { + res.json(JSON.parse(fs.readFileSync('./data/posts.json'))); }); // News route, digest received post JSON