Commit a050023a authored by yPhil's avatar yPhil

KiRSS

parent e0cfe6ca
......@@ -5,12 +5,17 @@ var logger = require('morgan');
var cookieParser = require('cookie-parser');
var bodyParser = require('body-parser');
var cors = require('cors');
// app.use('Access-Control-Allow-Origin':'*');
//
var index = require('./routes/index');
var feed = require('./routes/feed');
var app = express();
var $ = require('jquery');
app.use(cors());
// view engine setup
app.set('views', path.join(__dirname, 'views'));
......@@ -18,7 +23,6 @@ app.set('views', path.join(__dirname, 'views'));
app.engine('html', require('ejs').renderFile);
app.set('view engine', 'html');
// uncomment after placing your favicon in /public
app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
app.use(logger('dev'));
......@@ -30,6 +34,7 @@ app.use(express.static(path.join(__dirname, 'public')));
app.use('/', index);
app.use('/feed', feed);
//
// catch 404 and forward to error handler
app.use(function(req, res, next) {
var err = new Error('Not Found');
......
......@@ -5,7 +5,7 @@
*/
var app = require('../app');
var debug = require('debug')('fwomaj:server');
var debug = require('debug')('mobylette:server');
var http = require('http');
/**
......
{
"name": "fwomaj",
"version": "0.0.0",
"name": "mobylette",
"version": "0.4.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......@@ -132,6 +132,15 @@
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
},
"cors": {
"version": "2.8.4",
"resolved": "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz",
"integrity": "sha1-K9OB8usgECAQXNUOpZ2mMJBpRoY=",
"requires": {
"object-assign": "4.1.1",
"vary": "1.1.2"
}
},
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
......@@ -171,6 +180,11 @@
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
"integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA="
},
"entities": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
},
"escape-html": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
......@@ -392,6 +406,11 @@
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
},
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
},
"on-finished": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
......@@ -468,11 +487,25 @@
"align-text": "0.1.4"
}
},
"rss-parser": {
"version": "2.10.6",
"resolved": "https://registry.npmjs.org/rss-parser/-/rss-parser-2.10.6.tgz",
"integrity": "sha1-S8UkF6k+UvyKcBolJW1gbyor3Kk=",
"requires": {
"entities": "1.1.1",
"xml2js": "0.4.19"
}
},
"safe-buffer": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
},
"sax": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
},
"send": {
"version": "0.15.6",
"resolved": "https://registry.npmjs.org/send/-/send-0.15.6.tgz",
......@@ -602,6 +635,20 @@
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
"integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
},
"xml2js": {
"version": "0.4.19",
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
"integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
"requires": {
"sax": "1.2.4",
"xmlbuilder": "9.0.4"
}
},
"xmlbuilder": {
"version": "9.0.4",
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
"integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8="
},
"yargs": {
"version": "3.10.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
......
......@@ -8,6 +8,7 @@
"dependencies": {
"body-parser": "~1.18.2",
"cookie-parser": "~1.4.3",
"cors": "2.8.4",
"debug": "~2.6.9",
"ejs": "^2.5.7",
"express": "~4.15.5",
......@@ -15,6 +16,7 @@
"jquery": "^3.2.1",
"jquery-ui": "^1.12.1",
"morgan": "~1.9.0",
"rss-parser": "2.10.6",
"serve-favicon": "~2.4.5"
}
}
......@@ -3,7 +3,6 @@ var router = express.Router();
/* GET home page. */
router.get('/feed', function(req, res, next) {
// res.send('im the feed!');
console.log('im the feed!');
});
......
......@@ -83,6 +83,10 @@
$(document).ready(function() {
$.get("https://mobylette-feedr.herokuapp.com?q=http://www.ebaytechblog.com/feed/", function(data, status){
alert("Data: " + data + "\nStatus: " + status);
});
var $tabs = $("#tabs").tabs({
heightStyle: "fill"
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment