Merge branch 'master' into flowtype
|
@ -16,11 +16,11 @@ values =
|
||||||
rc
|
rc
|
||||||
production
|
production
|
||||||
|
|
||||||
[bumpversion:file:app/package.json]
|
[bumpversion:file:src/main/package.json]
|
||||||
search = "version": "{current_version}"
|
search = "version": "{current_version}"
|
||||||
replace = "version": "{new_version}"
|
replace = "version": "{new_version}"
|
||||||
|
|
||||||
[bumpversion:file:ui/package.json]
|
[bumpversion:file:src/renderer/package.json]
|
||||||
search = "version": "{current_version}"
|
search = "version": "{current_version}"
|
||||||
replace = "version": "{new_version}"
|
replace = "version": "{new_version}"
|
||||||
|
|
||||||
|
|
16
.gitignore
vendored
|
@ -2,16 +2,16 @@
|
||||||
/LBRY-darwin-x64
|
/LBRY-darwin-x64
|
||||||
/dist
|
/dist
|
||||||
|
|
||||||
/ui/dist/css/*
|
/src/renderer/dist/css/*
|
||||||
/ui/dist/js/*
|
/src/renderer/dist/js/*
|
||||||
!/ui/dist/js/mediaelement
|
!/src/renderer/dist/js/mediaelement
|
||||||
/ui/node_modules
|
/src/renderer/node_modules
|
||||||
/ui/.sass-cache
|
/src/renderer/.sass-cache
|
||||||
|
|
||||||
|
|
||||||
/app/dist
|
/src/main/dist
|
||||||
/app/locales
|
/src/main/locales
|
||||||
/app/node_modules
|
/src/main/node_modules
|
||||||
/build/venv
|
/build/venv
|
||||||
/build/daemon.ver
|
/build/daemon.ver
|
||||||
/lbry-app-venv
|
/lbry-app-venv
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
host = https://www.transifex.com
|
host = https://www.transifex.com
|
||||||
|
|
||||||
[lbry-app.app-strings]
|
[lbry-app.app-strings]
|
||||||
file_filter = app/dist/locales/<lang>.json
|
file_filter = src/main/dist/locales/<lang>.json
|
||||||
source_file = app/dist/locales/en.json
|
source_file = src/main/dist/locales/en.json
|
||||||
source_lang = en
|
source_lang = en
|
||||||
type = KEYVALUEJSON
|
type = KEYVALUEJSON
|
|
@ -12,14 +12,16 @@ Web UI version numbers should always match the corresponding version of LBRY App
|
||||||
*
|
*
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
* The credit balance displayed in the main app navigation displays two decimal places instead of one.
|
||||||
* Moved all redux code into /redux folder
|
* Moved all redux code into /redux folder
|
||||||
*
|
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
* Long channel names causing inconsistent thumbnail sizes (#721)
|
* Long channel names causing inconsistent thumbnail sizes (#721)
|
||||||
* Fixed regression in #697 causing transaction screen to not load for new users (#755)
|
* Fixed regression in #697 causing transaction screen to not load for new users (#755)
|
||||||
* Fixed scriolling restore/reset/set (#729)
|
* Fixed scriolling restore/reset/set (#729)
|
||||||
* Fixed sorting by title for published files (#614)
|
* Fixed sorting by title for published files (#614)
|
||||||
|
* App now uses the new balance_delta field in the txn list.
|
||||||
|
*
|
||||||
|
|
||||||
### Deprecated
|
### Deprecated
|
||||||
*
|
*
|
||||||
|
|
28
README.md
|
@ -29,13 +29,13 @@ This will download and install the LBRY app and its dependencies, including [the
|
||||||
|
|
||||||
### Running
|
### Running
|
||||||
|
|
||||||
Run `./node_modules/.bin/electron app`
|
Run `./node_modules/.bin/electron src/main`
|
||||||
|
|
||||||
### Ongoing Development
|
### Ongoing Development
|
||||||
1. `cd ui`
|
1. `cd src/renderer`
|
||||||
2. `./watch.sh`
|
2. `./watch.sh`
|
||||||
|
|
||||||
This will set up a monitor that will automatically compile any changes to JS or CSS folders inside of the `ui` folder. This allows you to make changes and see them immediately by reloading the app.
|
This will set up a monitor that will automatically compile any changes to JS or CSS folders inside of the `src/renderer` folder. This allows you to make changes and see them immediately by reloading the app.
|
||||||
|
|
||||||
### Packaging
|
### Packaging
|
||||||
|
|
||||||
|
@ -63,40 +63,40 @@ exit
|
||||||
2. Open command prompt in the root of the project and run the following:
|
2. Open command prompt in the root of the project and run the following:
|
||||||
```
|
```
|
||||||
python -m pip install -r build\requirements.txt
|
python -m pip install -r build\requirements.txt
|
||||||
python build\set_version.py
|
|
||||||
npm install -g yarn
|
npm install -g yarn
|
||||||
yarn install
|
yarn install
|
||||||
```
|
```
|
||||||
3. Change directory to `app` and run the following;
|
|
||||||
|
3. Change directory to `src\main` and run the following:
|
||||||
```
|
```
|
||||||
yarn install
|
yarn install
|
||||||
node_modules\.bin\electron-rebuild
|
node_modules\.bin\electron-rebuild
|
||||||
node_modules\.bin\electron-rebuild
|
node_modules\.bin\electron-rebuild
|
||||||
cd ..
|
cd ..\..
|
||||||
```
|
```
|
||||||
4. Change directory to `ui` and run the following:
|
4. Change directory to `src\renderer` and run the following:
|
||||||
```
|
```
|
||||||
yarn install
|
yarn install
|
||||||
npm rebuild node-sass
|
npm rebuild node-sass
|
||||||
node node_modules\node-sass\bin\node-sass --output dist\css --sourcemap=none scss\
|
node node_modules\node-sass\bin\node-sass --output dist\css --sourcemap=none scss\
|
||||||
node_modules\.bin\webpack --config webpack.dev.config.js
|
node_modules\.bin\webpack --config webpack.dev.config.js
|
||||||
xcopy /E dist ..\app\dist
|
xcopy /E dist ..\main\dist
|
||||||
cd ..
|
cd ..\..
|
||||||
```
|
```
|
||||||
4. Download the lbry daemon and cli [binaries](https://github.com/lbryio/lbry/releases) and place them in `app\dist\`
|
4. Download the lbry daemon and cli [binaries](https://github.com/lbryio/lbry/releases) and place them in `src\main\dist\`
|
||||||
|
|
||||||
### Building lbry-app
|
### Building lbry-app
|
||||||
1. run `node_modules\.bin\build -p never` from the root of the project.
|
1. run `node_modules\.bin\build -p never` from the root of the project.
|
||||||
|
|
||||||
### Running the electron app
|
### Running the electron app
|
||||||
1. Run `node_modules\.bin\electron app`
|
1. Run `node_modules\.bin\electron src\main`
|
||||||
|
|
||||||
### Ongoing Development
|
### Ongoing Development
|
||||||
1. `cd ui`
|
1. `cd src\renderer`
|
||||||
2. `watch.bat`
|
2. `watch.bat`
|
||||||
|
|
||||||
This will set up a monitor that will automatically compile any changes to JS or CSS folders inside of the `ui` folder. This allows you to make changes and see them immediately by reloading the app.
|
This will set up a monitor that will automatically compile any changes to JS or CSS folders inside of the `src\renderer` folder. This allows you to make changes and see them immediately by reloading the app.
|
||||||
|
|
||||||
## Internationalization
|
## Internationalization
|
||||||
|
|
||||||
If you want to help translating the lbry-app, you can copy the en.json file in /app/locales and modify the values while leaving the keys as their original English strings. An example for this would be: `"Skip": "Überspringen",` Translations should automatically show up in options.
|
If you want to help translating the lbry-app, you can copy the en.json file in /src/main/locales and modify the values while leaving the keys as their original English strings. An example for this would be: `"Skip": "Überspringen",` Translations should automatically show up in options.
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
pip install -r build\requirements.txt
|
pip install -r build\requirements.txt
|
||||||
python build\set_version.py
|
|
||||||
|
|
||||||
|
|
||||||
# Get the latest stable version of Node.js or io.js
|
# Get the latest stable version of Node.js or io.js
|
||||||
Install-Product node $env:nodejs_version
|
Install-Product node $env:nodejs_version
|
||||||
|
@ -9,33 +7,33 @@ yarn install
|
||||||
|
|
||||||
|
|
||||||
# do app
|
# do app
|
||||||
cd app
|
cd src\main
|
||||||
yarn install
|
yarn install
|
||||||
# necessary to ensure native Node modules (e.g. keytar) are built against the correct version of Node)
|
# necessary to ensure native Node modules (e.g. keytar) are built against the correct version of Node)
|
||||||
# yes, it needs to be run twice. it fails the first time, not sure why
|
# yes, it needs to be run twice. it fails the first time, not sure why
|
||||||
node_modules\.bin\electron-rebuild
|
node_modules\.bin\electron-rebuild
|
||||||
node_modules\.bin\electron-rebuild
|
node_modules\.bin\electron-rebuild
|
||||||
cd ..
|
cd ..\..
|
||||||
|
|
||||||
|
|
||||||
# build ui
|
# build ui
|
||||||
cd ui
|
cd src\renderer
|
||||||
yarn install
|
yarn install
|
||||||
npm rebuild node-sass
|
npm rebuild node-sass
|
||||||
node_modules\.bin\node-sass --output dist\css --sourcemap=none scss\
|
node_modules\.bin\node-sass --output dist\css --sourcemap=none scss\
|
||||||
node_modules\.bin\webpack --config webpack.prod.js
|
node_modules\.bin\webpack --config webpack.prod.js
|
||||||
Copy-Item dist ..\app\ -recurse
|
Copy-Item dist ..\main\ -recurse
|
||||||
cd ..
|
cd ..\..
|
||||||
|
|
||||||
|
|
||||||
# get daemon and cli executable
|
# get daemon and cli executable
|
||||||
$package_settings = (Get-Content app\package.json -Raw | ConvertFrom-Json).lbrySettings
|
$package_settings = (Get-Content src\main\package.json -Raw | ConvertFrom-Json).lbrySettings
|
||||||
$daemon_ver = $package_settings.lbrynetDaemonVersion
|
$daemon_ver = $package_settings.lbrynetDaemonVersion
|
||||||
$daemon_url_template = $package_settings.lbrynetDaemonUrlTemplate
|
$daemon_url_template = $package_settings.lbrynetDaemonUrlTemplate
|
||||||
$daemon_url = $daemon_url_template.Replace('OSNAME', 'windows').Replace('DAEMONVER', $daemon_ver)
|
$daemon_url = $daemon_url_template.Replace('OSNAME', 'windows').Replace('DAEMONVER', $daemon_ver)
|
||||||
Invoke-WebRequest -Uri $daemon_url -OutFile daemon.zip
|
Invoke-WebRequest -Uri $daemon_url -OutFile daemon.zip
|
||||||
Expand-Archive daemon.zip -DestinationPath app\dist\
|
Expand-Archive daemon.zip -DestinationPath src\main\dist\
|
||||||
dir app\dist\ # verify that daemon binary is there
|
dir src\main\dist\ # verify that daemon binary is there
|
||||||
rm daemon.zip
|
rm daemon.zip
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -41,8 +41,8 @@ fi
|
||||||
|
|
||||||
[ -d "$ROOT/dist" ] && rm -rf "$ROOT/dist"
|
[ -d "$ROOT/dist" ] && rm -rf "$ROOT/dist"
|
||||||
mkdir -p "$ROOT/dist"
|
mkdir -p "$ROOT/dist"
|
||||||
[ -d "$ROOT/app/dist" ] && rm -rf "$ROOT/app/dist"
|
[ -d "$ROOT/src/main/dist" ] && rm -rf "$ROOT/src/main/dist"
|
||||||
mkdir -p "$ROOT/app/dist"
|
mkdir -p "$ROOT/src/main/dist"
|
||||||
|
|
||||||
yarn install
|
yarn install
|
||||||
|
|
||||||
|
@ -53,13 +53,13 @@ yarn install
|
||||||
############
|
############
|
||||||
echo -e "\033[0;32mCompiling UI\x1b[m"
|
echo -e "\033[0;32mCompiling UI\x1b[m"
|
||||||
(
|
(
|
||||||
cd "$ROOT/ui"
|
cd "$ROOT/src/renderer"
|
||||||
yarn install
|
yarn install
|
||||||
npm rebuild node-sass
|
npm rebuild node-sass
|
||||||
node extractLocals.js
|
node extractLocals.js
|
||||||
node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/
|
node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/
|
||||||
node_modules/.bin/webpack --config webpack.prod.js
|
node_modules/.bin/webpack --config webpack.prod.js
|
||||||
cp -r dist/* "$ROOT/app/dist/"
|
cp -r dist/* "$ROOT/src/main/dist/"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -73,14 +73,14 @@ if $OSX; then
|
||||||
else
|
else
|
||||||
OSNAME="linux"
|
OSNAME="linux"
|
||||||
fi
|
fi
|
||||||
DAEMON_VER=$(node -e "console.log(require(\"$ROOT/app/package.json\").lbrySettings.lbrynetDaemonVersion)")
|
DAEMON_VER=$(node -e "console.log(require(\"$ROOT/src/main/package.json\").lbrySettings.lbrynetDaemonVersion)")
|
||||||
DAEMON_URL_TEMPLATE=$(node -e "console.log(require(\"$ROOT/app/package.json\").lbrySettings.lbrynetDaemonUrlTemplate)")
|
DAEMON_URL_TEMPLATE=$(node -e "console.log(require(\"$ROOT/src/main/package.json\").lbrySettings.lbrynetDaemonUrlTemplate)")
|
||||||
DAEMON_URL=$(echo ${DAEMON_URL_TEMPLATE//DAEMONVER/$DAEMON_VER} | sed "s/OSNAME/$OSNAME/g")
|
DAEMON_URL=$(echo ${DAEMON_URL_TEMPLATE//DAEMONVER/$DAEMON_VER} | sed "s/OSNAME/$OSNAME/g")
|
||||||
DAEMON_VER_PATH="$BUILD_DIR/daemon.ver"
|
DAEMON_VER_PATH="$BUILD_DIR/daemon.ver"
|
||||||
echo "$DAEMON_VER_PATH"
|
echo "$DAEMON_VER_PATH"
|
||||||
if [[ ! -f $DAEMON_VER_PATH || ! -f $ROOT/app/dist/lbrynet-daemon || "$(< "$DAEMON_VER_PATH")" != "$DAEMON_VER" ]]; then
|
if [[ ! -f $DAEMON_VER_PATH || ! -f $ROOT/src/main/dist/lbrynet-daemon || "$(< "$DAEMON_VER_PATH")" != "$DAEMON_VER" ]]; then
|
||||||
curl -sL -o "$BUILD_DIR/daemon.zip" "$DAEMON_URL"
|
curl -sL -o "$BUILD_DIR/daemon.zip" "$DAEMON_URL"
|
||||||
unzip "$BUILD_DIR/daemon.zip" -d "$ROOT/app/dist/"
|
unzip "$BUILD_DIR/daemon.zip" -d "$ROOT/src/main/dist/"
|
||||||
rm "$BUILD_DIR/daemon.zip"
|
rm "$BUILD_DIR/daemon.zip"
|
||||||
echo "$DAEMON_VER" > "$DAEMON_VER_PATH"
|
echo "$DAEMON_VER" > "$DAEMON_VER_PATH"
|
||||||
else
|
else
|
||||||
|
@ -95,16 +95,16 @@ fi
|
||||||
###################
|
###################
|
||||||
echo -e '\033[0;32mBuilding Lbry-app\x1b[m'
|
echo -e '\033[0;32mBuilding Lbry-app\x1b[m'
|
||||||
(
|
(
|
||||||
cd "$ROOT/app"
|
cd "$ROOT/src/main"
|
||||||
yarn install
|
yarn install
|
||||||
|
|
||||||
# necessary to ensure native Node modules (e.g. keytar) are built against the correct version of Node)
|
# necessary to ensure native Node modules (e.g. keytar) are built against the correct version of Node)
|
||||||
# yes, it needs to be run twice. it fails the first time, not sure why
|
# yes, it needs to be run twice. it fails the first time, not sure why
|
||||||
set +e
|
set +e
|
||||||
# DEBUG=electron-rebuild node_modules/.bin/electron-rebuild .
|
# DEBUG=electron-rebuild node_modules/.bin/electron-rebuild .
|
||||||
node_modules/.bin/electron-rebuild "$ROOT/app"
|
node_modules/.bin/electron-rebuild "$ROOT/src/main"
|
||||||
set -e
|
set -e
|
||||||
node_modules/.bin/electron-rebuild "$ROOT/app"
|
node_modules/.bin/electron-rebuild "$ROOT/src/main"
|
||||||
)
|
)
|
||||||
|
|
||||||
if [ "$FULL_BUILD" == "true" ]; then
|
if [ "$FULL_BUILD" == "true" ]; then
|
||||||
|
@ -133,5 +133,5 @@ if [ "$FULL_BUILD" == "true" ]; then
|
||||||
|
|
||||||
echo -e '\033[0;32mBuild and packaging complete.\x1b[m'
|
echo -e '\033[0;32mBuild and packaging complete.\x1b[m'
|
||||||
else
|
else
|
||||||
echo -e 'Build complete. Run \033[1;31m./node_modules/.bin/electron app\x1b[m to launch the app'
|
echo -e 'Build complete. Run \033[1;31m./node_modules/.bin/electron src/main\x1b[m to launch the app'
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -17,7 +17,7 @@ import github
|
||||||
import changelog
|
import changelog
|
||||||
|
|
||||||
ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
||||||
APP_PACKAGE_JSON_FILE = os.path.join(ROOT, 'app', 'package.json')
|
APP_PACKAGE_JSON_FILE = os.path.join(ROOT, 'src', 'main', 'package.json')
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
"build": {
|
"build": {
|
||||||
"asar": false,
|
"asar": false,
|
||||||
"directories": {
|
"directories": {
|
||||||
"app": "app"
|
"app": "src/main"
|
||||||
},
|
},
|
||||||
"appId": "io.lbry.LBRY",
|
"appId": "io.lbry.LBRY",
|
||||||
"mac": {
|
"mac": {
|
||||||
|
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 434 KiB After Width: | Height: | Size: 434 KiB |
Before Width: | Height: | Size: 507 B After Width: | Height: | Size: 507 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 507 B After Width: | Height: | Size: 507 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 2 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.4 KiB |
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 9 KiB After Width: | Height: | Size: 9 KiB |
Before Width: | Height: | Size: 9 KiB After Width: | Height: | Size: 9 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 4 KiB After Width: | Height: | Size: 4 KiB |
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 9.6 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 4 KiB After Width: | Height: | Size: 4 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 9.3 KiB After Width: | Height: | Size: 9.3 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 992 KiB After Width: | Height: | Size: 992 KiB |
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 9.5 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
@ -1,7 +1,7 @@
|
||||||
var extract = require("i18n-extract");
|
var extract = require("i18n-extract");
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
|
|
||||||
var dir = __dirname + "/../app/dist/locales";
|
var dir = __dirname + "/../main/dist/locales";
|
||||||
var path = dir + "/en.json";
|
var path = dir + "/en.json";
|
||||||
|
|
||||||
if (!fs.existsSync(dir)) {
|
if (!fs.existsSync(dir)) {
|
|
@ -40,16 +40,19 @@ class ChannelTile extends React.PureComponent {
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
<div className="card__content card__subtext">
|
<div className="card__content card__subtext">
|
||||||
{isResolvingUri &&
|
{isResolvingUri && (
|
||||||
<BusyMessage message={__("Resolving channel")} />}
|
<BusyMessage message={__("Resolving channel")} />
|
||||||
{totalItems > 0 &&
|
)}
|
||||||
|
{totalItems > 0 && (
|
||||||
<span>
|
<span>
|
||||||
This is a channel with {totalItems}{" "}
|
This is a channel with {totalItems}{" "}
|
||||||
{totalItems === 1 ? " item" : " items"} inside of it.
|
{totalItems === 1 ? " item" : " items"} inside of it.
|
||||||
</span>}
|
</span>
|
||||||
|
)}
|
||||||
{!isResolvingUri &&
|
{!isResolvingUri &&
|
||||||
!totalItems &&
|
!totalItems && (
|
||||||
<span className="empty">This is an empty channel.</span>}
|
<span className="empty">This is an empty channel.</span>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
|
@ -1,13 +1,14 @@
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
import { formatCredits, formatFullPrice } from "util/formatCredits";
|
import { formatCredits, formatFullPrice } from "util/formatCredits";
|
||||||
import lbry from "../lbry.js";
|
import lbry from "../lbry.js";
|
||||||
|
|
||||||
//component/icon.js
|
//component/icon.js
|
||||||
export class Icon extends React.PureComponent {
|
export class Icon extends React.PureComponent {
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
icon: React.PropTypes.string.isRequired,
|
icon: PropTypes.string.isRequired,
|
||||||
className: React.PropTypes.string,
|
className: PropTypes.string,
|
||||||
fixed: React.PropTypes.bool,
|
fixed: PropTypes.bool,
|
||||||
};
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
@ -24,7 +25,7 @@ export class Icon extends React.PureComponent {
|
||||||
|
|
||||||
export class TruncatedText extends React.PureComponent {
|
export class TruncatedText extends React.PureComponent {
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
lines: React.PropTypes.number,
|
lines: PropTypes.number,
|
||||||
};
|
};
|
||||||
|
|
||||||
static defaultProps = {
|
static defaultProps = {
|
||||||
|
@ -45,12 +46,14 @@ export class TruncatedText extends React.PureComponent {
|
||||||
|
|
||||||
export class BusyMessage extends React.PureComponent {
|
export class BusyMessage extends React.PureComponent {
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
message: React.PropTypes.string,
|
message: PropTypes.string,
|
||||||
};
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<span>{this.props.message} <span className="busy-indicator" /></span>
|
<span>
|
||||||
|
{this.props.message} <span className="busy-indicator" />
|
||||||
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -63,14 +66,14 @@ export class CurrencySymbol extends React.PureComponent {
|
||||||
|
|
||||||
export class CreditAmount extends React.PureComponent {
|
export class CreditAmount extends React.PureComponent {
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
amount: React.PropTypes.number.isRequired,
|
amount: PropTypes.number.isRequired,
|
||||||
precision: React.PropTypes.number,
|
precision: PropTypes.number,
|
||||||
isEstimate: React.PropTypes.bool,
|
isEstimate: PropTypes.bool,
|
||||||
label: React.PropTypes.bool,
|
label: PropTypes.bool,
|
||||||
showFree: React.PropTypes.bool,
|
showFree: PropTypes.bool,
|
||||||
showFullPrice: React.PropTypes.bool,
|
showFullPrice: PropTypes.bool,
|
||||||
showPlus: React.PropTypes.bool,
|
showPlus: PropTypes.bool,
|
||||||
look: React.PropTypes.oneOf(["indicator", "plain", "fee"]),
|
look: PropTypes.oneOf(["indicator", "plain", "fee"]),
|
||||||
};
|
};
|
||||||
|
|
||||||
static defaultProps = {
|
static defaultProps = {
|
||||||
|
@ -92,9 +95,10 @@ export class CreditAmount extends React.PureComponent {
|
||||||
if (showFullPrice) {
|
if (showFullPrice) {
|
||||||
formattedAmount = fullPrice;
|
formattedAmount = fullPrice;
|
||||||
} else {
|
} else {
|
||||||
formattedAmount = amount > 0 && amount < minimumRenderableAmount
|
formattedAmount =
|
||||||
? "<" + minimumRenderableAmount
|
amount > 0 && amount < minimumRenderableAmount
|
||||||
: formatCredits(amount, precision);
|
? "<" + minimumRenderableAmount
|
||||||
|
: formatCredits(amount, precision);
|
||||||
}
|
}
|
||||||
|
|
||||||
let amountText;
|
let amountText;
|
||||||
|
@ -119,17 +123,15 @@ export class CreditAmount extends React.PureComponent {
|
||||||
className={`credit-amount credit-amount--${this.props.look}`}
|
className={`credit-amount credit-amount--${this.props.look}`}
|
||||||
title={fullPrice}
|
title={fullPrice}
|
||||||
>
|
>
|
||||||
<span>
|
<span>{amountText}</span>
|
||||||
{amountText}
|
{this.props.isEstimate ? (
|
||||||
</span>
|
<span
|
||||||
{this.props.isEstimate
|
className="credit-amount__estimate"
|
||||||
? <span
|
title={__("This is an estimate and does not include data fees")}
|
||||||
className="credit-amount__estimate"
|
>
|
||||||
title={__("This is an estimate and does not include data fees")}
|
*
|
||||||
>
|
</span>
|
||||||
*
|
) : null}
|
||||||
</span>
|
|
||||||
: null}
|
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -141,7 +143,7 @@ let addressStyle = {
|
||||||
};
|
};
|
||||||
export class Address extends React.PureComponent {
|
export class Address extends React.PureComponent {
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
address: React.PropTypes.string,
|
address: PropTypes.string,
|
||||||
};
|
};
|
||||||
|
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
|
@ -173,7 +175,7 @@ export class Address extends React.PureComponent {
|
||||||
|
|
||||||
export class Thumbnail extends React.PureComponent {
|
export class Thumbnail extends React.PureComponent {
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
src: React.PropTypes.string,
|
src: PropTypes.string,
|
||||||
};
|
};
|
||||||
|
|
||||||
handleError() {
|
handleError() {
|
|
@ -1,11 +1,12 @@
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
const { remote } = require("electron");
|
const { remote } = require("electron");
|
||||||
class FileSelector extends React.PureComponent {
|
class FileSelector extends React.PureComponent {
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
type: React.PropTypes.oneOf(["file", "directory"]),
|
type: PropTypes.oneOf(["file", "directory"]),
|
||||||
initPath: React.PropTypes.string,
|
initPath: PropTypes.string,
|
||||||
onFileChosen: React.PropTypes.func,
|
onFileChosen: PropTypes.func,
|
||||||
};
|
};
|
||||||
|
|
||||||
static defaultProps = {
|
static defaultProps = {
|
||||||
|
@ -26,9 +27,10 @@ class FileSelector extends React.PureComponent {
|
||||||
handleButtonClick() {
|
handleButtonClick() {
|
||||||
remote.dialog.showOpenDialog(
|
remote.dialog.showOpenDialog(
|
||||||
{
|
{
|
||||||
properties: this.props.type == "file"
|
properties:
|
||||||
? ["openFile"]
|
this.props.type == "file"
|
||||||
: ["openDirectory", "createDirectory"],
|
? ["openFile"]
|
||||||
|
: ["openDirectory", "createDirectory"],
|
||||||
},
|
},
|
||||||
paths => {
|
paths => {
|
||||||
if (!paths) {
|
if (!paths) {
|
||||||
|
@ -62,8 +64,7 @@ class FileSelector extends React.PureComponent {
|
||||||
: __("Choose Directory")}
|
: __("Choose Directory")}
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>{" "}
|
||||||
{" "}
|
|
||||||
<span className="file-selector__path">
|
<span className="file-selector__path">
|
||||||
<input
|
<input
|
||||||
className="input-copyable"
|
className="input-copyable"
|
|
@ -13,22 +13,24 @@ class FileActions extends React.PureComponent {
|
||||||
return (
|
return (
|
||||||
<section className="card__actions">
|
<section className="card__actions">
|
||||||
<FileDownloadLink uri={uri} />
|
<FileDownloadLink uri={uri} />
|
||||||
{showDelete &&
|
{showDelete && (
|
||||||
<Link
|
<Link
|
||||||
button="text"
|
button="text"
|
||||||
icon="icon-trash"
|
icon="icon-trash"
|
||||||
label={__("Remove")}
|
label={__("Remove")}
|
||||||
className="no-underline"
|
className="no-underline"
|
||||||
onClick={() => openModal(modals.CONFIRM_FILE_REMOVE, { uri })}
|
onClick={() => openModal(modals.CONFIRM_FILE_REMOVE, { uri })}
|
||||||
/>}
|
/>
|
||||||
{!claimIsMine &&
|
)}
|
||||||
|
{!claimIsMine && (
|
||||||
<Link
|
<Link
|
||||||
button="text"
|
button="text"
|
||||||
icon="icon-flag"
|
icon="icon-flag"
|
||||||
href={`https://lbry.io/dmca?claim_id=${claimId}`}
|
href={`https://lbry.io/dmca?claim_id=${claimId}`}
|
||||||
className="no-underline"
|
className="no-underline"
|
||||||
label={__("report")}
|
label={__("report")}
|
||||||
/>}
|
/>
|
||||||
|
)}
|
||||||
<Link
|
<Link
|
||||||
button="primary"
|
button="primary"
|
||||||
icon="icon-gift"
|
icon="icon-gift"
|
||||||
|
@ -37,7 +39,7 @@ class FileActions extends React.PureComponent {
|
||||||
className="card__action--right"
|
className="card__action--right"
|
||||||
navigateParams={{ uri, tab: "tip" }}
|
navigateParams={{ uri, tab: "tip" }}
|
||||||
/>
|
/>
|
||||||
{claimIsMine &&
|
{claimIsMine && (
|
||||||
<Link
|
<Link
|
||||||
button="alt"
|
button="alt"
|
||||||
icon="icon-edit"
|
icon="icon-edit"
|
||||||
|
@ -45,7 +47,8 @@ class FileActions extends React.PureComponent {
|
||||||
navigate="/publish"
|
navigate="/publish"
|
||||||
className="card__action--right"
|
className="card__action--right"
|
||||||
navigateParams={{ id: claimId }}
|
navigateParams={{ id: claimId }}
|
||||||
/>}
|
/>
|
||||||
|
)}
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
}
|
}
|
|
@ -59,9 +59,8 @@ class FileCard extends React.PureComponent {
|
||||||
|
|
||||||
const uri = lbryuri.normalize(this.props.uri);
|
const uri = lbryuri.normalize(this.props.uri);
|
||||||
const title = metadata && metadata.title ? metadata.title : uri;
|
const title = metadata && metadata.title ? metadata.title : uri;
|
||||||
const thumbnail = metadata && metadata.thumbnail
|
const thumbnail =
|
||||||
? metadata.thumbnail
|
metadata && metadata.thumbnail ? metadata.thumbnail : null;
|
||||||
: null;
|
|
||||||
const obscureNsfw = this.props.obscureNsfw && metadata && metadata.nsfw;
|
const obscureNsfw = this.props.obscureNsfw && metadata && metadata.nsfw;
|
||||||
const isRewardContent =
|
const isRewardContent =
|
||||||
claim && rewardedContentClaimIds.includes(claim.claim_id);
|
claim && rewardedContentClaimIds.includes(claim.claim_id);
|
||||||
|
@ -96,13 +95,11 @@ class FileCard extends React.PureComponent {
|
||||||
</div>
|
</div>
|
||||||
<div className="card__subtitle">
|
<div className="card__subtitle">
|
||||||
<span className="card__indicators">
|
<span className="card__indicators">
|
||||||
<FilePrice uri={uri} />
|
<FilePrice uri={uri} />{" "}
|
||||||
{" "}
|
{isRewardContent && <Icon icon={icons.FEATURED} />}{" "}
|
||||||
{isRewardContent && <Icon icon={icons.FEATURED} />}
|
|
||||||
{" "}
|
|
||||||
{fileInfo && <Icon icon={icons.LOCAL} />}
|
{fileInfo && <Icon icon={icons.LOCAL} />}
|
||||||
</span>
|
</span>
|
||||||
<UriIndicator uri={uri} />
|
<UriIndicator uri={uri} smallCard />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{/* Test for nizuka's design: should we remove description?
|
{/* Test for nizuka's design: should we remove description?
|
|
@ -49,15 +49,18 @@ class FileDetails extends React.PureComponent {
|
||||||
<table className="table-standard table-stretch">
|
<table className="table-standard table-stretch">
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td>{__("Content-Type")}</td><td>{mediaType}</td>
|
<td>{__("Content-Type")}</td>
|
||||||
|
<td>{mediaType}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>{__("Language")}</td><td>{language}</td>
|
<td>{__("Language")}</td>
|
||||||
|
<td>{language}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>{__("License")}</td><td>{license}</td>
|
<td>{__("License")}</td>
|
||||||
|
<td>{license}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{downloadPath &&
|
{downloadPath && (
|
||||||
<tr>
|
<tr>
|
||||||
<td>{__("Downloaded to")}</td>
|
<td>{__("Downloaded to")}</td>
|
||||||
<td>
|
<td>
|
||||||
|
@ -65,7 +68,8 @@ class FileDetails extends React.PureComponent {
|
||||||
{downloadPath}
|
{downloadPath}
|
||||||
</Link>
|
</Link>
|
||||||
</td>
|
</td>
|
||||||
</tr>}
|
</tr>
|
||||||
|
)}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
|
@ -45,18 +45,17 @@ class FileDownloadLink extends React.PureComponent {
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
if (loading || downloading) {
|
if (loading || downloading) {
|
||||||
const progress = fileInfo && fileInfo.written_bytes
|
const progress =
|
||||||
? fileInfo.written_bytes / fileInfo.total_bytes * 100
|
fileInfo && fileInfo.written_bytes
|
||||||
: 0,
|
? fileInfo.written_bytes / fileInfo.total_bytes * 100
|
||||||
|
: 0,
|
||||||
label = fileInfo
|
label = fileInfo
|
||||||
? progress.toFixed(0) + __("% complete")
|
? progress.toFixed(0) + __("% complete")
|
||||||
: __("Connecting..."),
|
: __("Connecting..."),
|
||||||
labelWithIcon = (
|
labelWithIcon = (
|
||||||
<span className="button__content">
|
<span className="button__content">
|
||||||
<Icon icon="icon-download" />
|
<Icon icon="icon-download" />
|
||||||
<span>
|
<span>{label}</span>
|
||||||
{label}
|
|
||||||
</span>
|
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
|
|
|
@ -98,7 +98,7 @@ class FileList extends React.PureComponent {
|
||||||
<section className="file-list__header">
|
<section className="file-list__header">
|
||||||
{fetching && <BusyMessage />}
|
{fetching && <BusyMessage />}
|
||||||
<span className="sort-section">
|
<span className="sort-section">
|
||||||
{__("Sort by")} {" "}
|
{__("Sort by")}{" "}
|
||||||
<FormField type="select" onChange={this.handleSortChanged.bind(this)}>
|
<FormField type="select" onChange={this.handleSortChanged.bind(this)}>
|
||||||
<option value="date">{__("Date")}</option>
|
<option value="date">{__("Date")}</option>
|
||||||
<option value="title">{__("Title")}</option>
|
<option value="title">{__("Title")}</option>
|
|
@ -11,7 +11,7 @@ const SearchNoResults = props => {
|
||||||
return (
|
return (
|
||||||
<section>
|
<section>
|
||||||
<span className="empty">
|
<span className="empty">
|
||||||
{(__("No one has checked anything in for %s yet."), query)} {" "}
|
{(__("No one has checked anything in for %s yet."), query)}{" "}
|
||||||
<Link label={__("Be the first")} navigate="/publish" />
|
<Link label={__("Be the first")} navigate="/publish" />
|
||||||
</span>
|
</span>
|
||||||
</section>
|
</section>
|
||||||
|
@ -39,19 +39,21 @@ class FileListSearch extends React.PureComponent {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
{isSearching &&
|
{isSearching &&
|
||||||
!uris &&
|
!uris && (
|
||||||
<BusyMessage message={__("Looking up the Dewey Decimals")} />}
|
<BusyMessage message={__("Looking up the Dewey Decimals")} />
|
||||||
|
)}
|
||||||
|
|
||||||
{isSearching &&
|
{isSearching &&
|
||||||
uris &&
|
uris && <BusyMessage message={__("Refreshing the Dewey Decimals")} />}
|
||||||
<BusyMessage message={__("Refreshing the Dewey Decimals")} />}
|
|
||||||
|
|
||||||
{uris && uris.length
|
{uris && uris.length
|
||||||
? uris.map(
|
? uris.map(
|
||||||
uri =>
|
uri =>
|
||||||
lbryuri.parse(uri).name[0] === "@"
|
lbryuri.parse(uri).name[0] === "@" ? (
|
||||||
? <ChannelTile key={uri} uri={uri} />
|
<ChannelTile key={uri} uri={uri} />
|
||||||
: <FileTile key={uri} uri={uri} />
|
) : (
|
||||||
|
<FileTile key={uri} uri={uri} />
|
||||||
|
)
|
||||||
)
|
)
|
||||||
: !isSearching && <SearchNoResults query={query} />}
|
: !isSearching && <SearchNoResults query={query} />}
|
||||||
</div>
|
</div>
|