diff --git a/api.js b/api.js index 240e74f..7650683 100755 --- a/api.js +++ b/api.js @@ -64,14 +64,6 @@ var getFeedData = function (site) { } }; -var initSampleSites = function(site) { - db.sites.insert(site, function (err, site) { - if (err) { - console.log('Error occured during site save'); - } - }); -}; - var getFeeds = function () { db.sites.find({}, function (err, sites) { if (err) { @@ -122,7 +114,7 @@ app.post('/api/sites', function (req, res) { if (err) { res.send({ error: err }); } else { - res.send({ data: req.body }); + res.send({ data: site }); } }); }); diff --git a/electron.js b/electron.js index 9cd8638..4f3dd88 100644 --- a/electron.js +++ b/electron.js @@ -1,9 +1,9 @@ var backRssApi = require('./api'); -var electron = require('app'); -var BrowserWindow = require('browser-window'); -var shell = require('shell'); -var Menu = require('menu'); -var MenuItem = require('menu-item'); +var electron = require('electron').app; +var BrowserWindow = require('electron').BrowserWindow; +var shell = require('electron').Shell; +var Menu = require('electron').Menu; +var MenuItem = require('electron').MenuItem; backRssApi.start(); @@ -73,7 +73,7 @@ if (process.platform !== 'darwin') { if (!aboutWindow) { aboutWindow = new BrowserWindow({ width: 400, height: 120, "node-integration": false, frame: true, resizable: false, "always-on-top": true }); - aboutWindow.loadUrl('http://localhost:8080/about.html'); + aboutWindow.loadURL('http://localhost:8080/about.html'); aboutWindow.on('closed', function () { aboutWindow = null; @@ -159,7 +159,7 @@ if (process.platform !== 'darwin') { } function createMainWindow() { - mainWindow = new BrowserWindow({ width: 1200, height: 768, "node-integration": false, icon: __dirname + '/public/images/icon.png'}); + mainWindow = new BrowserWindow({ width: 1200, height: 768, webPreferences: { nodeIntegration: false }, icon: __dirname + '/public/images/icon.png'}); mainWindow.loadURL('http://localhost:8080'); mainWindow.on('closed', function() { diff --git a/package.json b/package.json index 61542ab..4ece7a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "BackRSS", - "version": "1.0.0", + "version": "1.0.2", "description": "Simple RSS reader", "main": "electron.js", "scripts": {