Commit f8739794 authored by yPhil's avatar yPhil

Sys: HACK: PM2 force install

parent b5e77b89
...@@ -6,8 +6,6 @@ var express = require('express'), ...@@ -6,8 +6,6 @@ var express = require('express'),
var bodyParser = require('body-parser'); var bodyParser = require('body-parser');
if (!fs.existsSync(path.join(__dirname, process.env.FAVICONS_CACHE_DIR))){ if (!fs.existsSync(path.join(__dirname, process.env.FAVICONS_CACHE_DIR))){
fs.mkdirSync(path.join(__dirname, process.env.FAVICONS_CACHE_DIR)); fs.mkdirSync(path.join(__dirname, process.env.FAVICONS_CACHE_DIR));
} }
......
...@@ -4,6 +4,7 @@ var app = require('../app'); ...@@ -4,6 +4,7 @@ var app = require('../app');
var debug = require('debug')('petrolette:server'); var debug = require('debug')('petrolette:server');
var http = require('http'); var http = require('http');
var port = normalizePort(process.env.PORT || '8666'); var port = normalizePort(process.env.PORT || '8666');
app.set('port', port); app.set('port', port);
......
This diff is collapsed.
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"stop": "pm2 stop petrolette", "stop": "pm2 stop petrolette",
"show": "pm2 show petrolette", "show": "pm2 show petrolette",
"logs": "pm2 logs petrolette", "logs": "pm2 logs petrolette",
"postinstall": "bower install" "postinstall": "npm i -f pm2 && bower install"
}, },
"dependencies": { "dependencies": {
"bower": "1.8.2", "bower": "1.8.2",
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
"express": "4.16.2", "express": "4.16.2",
"favrat": "latest", "favrat": "latest",
"feedparser": "2.2.9", "feedparser": "2.2.9",
"feedrat": "latest" "feedrat": "latest",
"pm2": "2.10.1"
}, },
"optionalDependencies": { "optionalDependencies": {
"fsevents": "*" "fsevents": "*"
......
...@@ -278,6 +278,10 @@ a:active { ...@@ -278,6 +278,10 @@ a:active {
border-right: 1px solid var(--color-sep) !important; border-right: 1px solid var(--color-sep) !important;
} }
.ui-tab.ui-state-active {
border-right: none !important;
}
.ui-tab#new-group:hover, .ui-tab#new-group:hover,
.ui-tab.ui-state-hover { .ui-tab.ui-state-hover {
background: var(--color-sep); background: var(--color-sep);
...@@ -614,17 +618,9 @@ fieldset { ...@@ -614,17 +618,9 @@ fieldset {
/* } */ /* } */
#console, #console,
.ui-state-hover,
.ui-widget-content .ui-state-hover,
.ui-widget-header .ui-state-hover,
.ui-state-focus,
.ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus,
.ui-button:hover, .ui-button:hover,
.ui-slider-handle.ui-state-default,
.ui-button:focus, .ui-button:focus,
.ui-state-default,
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default,
.ui-button.ui-state-disabled:hover, .ui-button.ui-state-disabled:hover,
.ui-button.ui-state-disabled:active, .ui-button.ui-state-disabled:active,
.ui-button { .ui-button {
...@@ -662,7 +658,9 @@ fieldset { ...@@ -662,7 +658,9 @@ fieldset {
background-color: var(--color-ui-sec); background-color: var(--color-ui-sec);
} }
a.ui-button:active, .ui-button:active, .ui-button.ui-state-active:hover, a.ui-button:active,
.ui-button:active,
.ui-button.ui-state-active:hover,
.ui-button:active, .ui-button:active,
.ui-button.ui-state-active:hover, .ui-button.ui-state-active:hover,
.null { .null {
......
...@@ -39,7 +39,7 @@ PTL.dialog = { ...@@ -39,7 +39,7 @@ PTL.dialog = {
$(this).find('.help-button').button(); $(this).find('.help-button').button();
$(this).find('.help-bookmarklet').attr('href', 'javascript:void(window.open("' + document.domain + '?feed=" + window.location.href))'); $(this).find('.help-bookmarklet').attr('href', 'javascript:void(window.open("' + document.domain + '?add=" + window.location.href))');
$('.help-tour').on('click', function() { $('.help-tour').on('click', function() {
PTL.sideMenu('close'); PTL.sideMenu('close');
......
...@@ -174,7 +174,7 @@ PTL.i18n.translations = { ...@@ -174,7 +174,7 @@ PTL.i18n.translations = {
"This is a feed. More info: %1" : { fr: "Ceci est un flux. Plus d'infos: %1" , ja: "これはソースです 詳細情報:%1", es: "Esta es una fuente. Más info: %1" }, "This is a feed. More info: %1" : { fr: "Ceci est un flux. Plus d'infos: %1" , ja: "これはソースです 詳細情報:%1", es: "Esta es una fuente. Más info: %1" },
"Click this button to add a group." : { fr: "Cliquez sur ce bouton pour ajouter un groupe." , ja: "グループを追加するには、このボタンをクリックします。", es: "Haga clic en este botón para agregar un grupo." }, "Click this button to add a group." : { fr: "Cliquez sur ce bouton pour ajouter un groupe." , ja: "グループを追加するには、このボタンをクリックします。", es: "Haga clic en este botón para agregar un grupo." },
"Feed code" : { fr: "Code source" , ja: "ソースコード", es: "Código fuente" }, "Source code" : { fr: "Code source" , ja: "ソースコード", es: "Código fuente" },
"Click to add a feed." : { fr: "Cliquer pour ajouter un flux" , ja: "ソースを追加するにはクリックしてください", es: "Haga clic para agregar una fuente" }, "Click to add a feed." : { fr: "Cliquer pour ajouter un flux" , ja: "ソースを追加するにはクリックしてください", es: "Haga clic para agregar una fuente" },
......
...@@ -221,6 +221,7 @@ PTL.tab = { ...@@ -221,6 +221,7 @@ PTL.tab = {
$column.appendTo($tabPanel); $column.appendTo($tabPanel);
if (PTL.queryString) { if (PTL.queryString) {
PTL.feed.add($column, encodeURI(PTL.queryString), 'mixed', 8, true, true); PTL.feed.add($column, encodeURI(PTL.queryString), 'mixed', 8, true, true);
PTL.queryString = null; PTL.queryString = null;
......
...@@ -26,7 +26,7 @@ function escape(s) { ...@@ -26,7 +26,7 @@ function escape(s) {
router.get('/', function(req, res) { router.get('/', function(req, res) {
res.render('index', { res.render('index', {
queryString:escape(req.query.feed), queryString:escape(req.query.add),
version: pjson.version version: pjson.version
}); });
}); });
......
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