diff --git a/build/install_deps.sh b/build/install_deps.sh index 34a212dfe..2103d27e3 100755 --- a/build/install_deps.sh +++ b/build/install_deps.sh @@ -84,7 +84,7 @@ fi if ! cmd_exists node; then if $LINUX; then - curl -sL https://deb.nodesource.com/setup_7.x | $SUDO -E bash - + curl -sL https://deb.nodesource.com/setup_8.x | $SUDO -E bash - $INSTALL nodejs elif $OSX; then brew install node diff --git a/package.json b/package.json index 05c715893..6f0104ca7 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,18 @@ "name": "LBRY", "version": "0.19.0", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.", + "homepage": "https://lbry.io/", + "bugs": { + "url": "https://github.com/lbryio/lbry-app/issues" + }, + "repository": { + "type": "git", + "url": "https://github.com/lbryio/lbry-app" + }, "author": { "name": "LBRY Inc.", "email": "hello@lbry.io" }, - "homepage": "https://lbry.io/", - "license": "MIT", "scripts": { "extract-langs": "node src/renderer/extractLocals.js", "dev": "electron-webpack dev", @@ -17,14 +23,7 @@ "postinstall": "electron-builder install-app-deps", "precommit": "lint-staged" }, - "main": "src/main/main.js", - "repository": { - "type": "git", - "url": "https://github.com/lbryio/lbry-app" - }, - "bugs": { - "url": "https://github.com/lbryio/lbry-app/issues" - }, + "main": "src/main/index.js", "keywords": [ "lbry" ], @@ -94,6 +93,11 @@ "resolutions": { "webpack/webpack-sources": "1.0.1" }, + "engines": { + "node": ">=6", + "yarn": "^1.3" + }, + "license": "MIT", "lint-staged": { "src/**/*.{js,jsx}": [ "prettier --trailing-comma es5 --write", diff --git a/src/main/main.js b/src/main/index.js similarity index 100% rename from src/main/main.js rename to src/main/index.js diff --git a/src/main/menu/main-menu.js b/src/main/menu/main-menu.js index 147ab60b4..7b5854d75 100644 --- a/src/main/menu/main-menu.js +++ b/src/main/menu/main-menu.js @@ -1,5 +1,5 @@ const { app, shell, Menu } = require('electron'); -const { safeQuit } = require('../main.js'); +const { safeQuit } = require('../index.js'); const baseTemplate = [ { diff --git a/src/renderer/component/rewardSummary/view.jsx b/src/renderer/component/rewardSummary/view.jsx index 4da98ea35..e214d67a1 100644 --- a/src/renderer/component/rewardSummary/view.jsx +++ b/src/renderer/component/rewardSummary/view.jsx @@ -5,7 +5,7 @@ import { CreditAmount } from "component/common"; type Props = { unclaimedRewardAmount: number, -} +}; const RewardSummary = (props: Props) => { const { unclaimedRewardAmount } = props; @@ -19,11 +19,15 @@ const RewardSummary = (props: Props) => { {unclaimedRewardAmount > 0 ? (

{__("You have")}{" "} - - {" "}{__("in unclaimed rewards")}. + {" "} + {__("in unclaimed rewards")}.

) : ( -

{__("There are no rewards available at this time, please check back later")}.

+

+ {__( + "There are no rewards available at this time, please check back later" + )}. +

)}
diff --git a/src/renderer/main.js b/src/renderer/index.js similarity index 100% rename from src/renderer/main.js rename to src/renderer/index.js diff --git a/src/renderer/redux/actions/settings.js b/src/renderer/redux/actions/settings.js index 01185085e..06b82e9ee 100644 --- a/src/renderer/redux/actions/settings.js +++ b/src/renderer/redux/actions/settings.js @@ -7,10 +7,6 @@ import lbry from "lbry"; import fs from "fs"; import http from "http"; -const { remote } = require("electron"); -const { extname } = require("path"); -const { readdir } = remote.require("fs"); - export function doFetchDaemonSettings() { return function(dispatch, getState) { lbry.settings_get().then(settings => { @@ -52,22 +48,14 @@ export function doSetClientSetting(key, value) { export function doGetThemes() { return function(dispatch, getState) { - const dir = `${staticResourcesPath}/themes`; + const themes = ["light", "dark"]; + dispatch( + doSetClientSetting( + settings.THEMES, + themes + ) + ); - readdir(dir, (error, files) => { - if (!error) { - dispatch( - doSetClientSetting( - settings.THEMES, - files - .filter(file => extname(file) === ".css") - .map(file => file.replace(".css", "")) - ) - ); - } else { - dispatch(doAlertError(error)); - } - }); }; }