From 60ed5cce14f7285a24b5a41b921cad1a1a4968c3 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Thu, 9 Mar 2017 12:31:07 -0500 Subject: [PATCH] switch from `lbry-web-ui` to `ui` --- README.md | 2 +- appveyor.yml | 2 +- build.sh | 2 +- fix_submodule_urls.sh | 1 - release.py | 6 ++---- reset.sh | 5 ----- ui/js/page/help.js | 6 +++--- ui/package.json | 8 ++------ 8 files changed, 10 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 1e9626b52..1c2bfb44d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # LBRY App -This is a graphical browser for the decentralized content marketplace provided by the [LBRY](https://lbry.io) protocol. It is essentially the [lbry daemon](https://github.com/lbryio/lbry) bundled with the [lbry web ui](https://github.com/lbryio/lbry-web-ui) in an [Electron](http://electron.atom.io/) application. +This is a graphical browser for the decentralized content marketplace provided by the [LBRY](https://lbry.io) protocol. It is essentially the [lbry daemon](https://github.com/lbryio/lbry) bundled with a UI using [Electron](http://electron.atom.io/). ## Installing diff --git a/appveyor.yml b/appveyor.yml index b89ec2395..db278b465 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ install: - ps: .\build.ps1 - cd .. # build ui - - cd lbry-web-ui + - cd ui - npm install - node_modules\.bin\node-sass --output dist\css --sourcemap=none scss\ - node_modules\.bin\webpack diff --git a/build.sh b/build.sh index d6c818672..a8f3b3e6f 100755 --- a/build.sh +++ b/build.sh @@ -48,7 +48,7 @@ npm install ############ ( - cd "$ROOT/lbry-web-ui" + cd "$ROOT/ui" npm install node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/ node_modules/.bin/webpack diff --git a/fix_submodule_urls.sh b/fix_submodule_urls.sh index 98c9b2854..67e024b55 100644 --- a/fix_submodule_urls.sh +++ b/fix_submodule_urls.sh @@ -11,4 +11,3 @@ cd "DIR" git config submodule.lbry.url git@github.com:lbryio/lbry.git git config submodule.lbryum.url git@github.com:lbryio/lbryum.git -git config submodule.lbry-web-ui.url git@github.com:lbryio/lbry-web-ui.git \ No newline at end of file diff --git a/release.py b/release.py index 8db78b869..81827097e 100644 --- a/release.py +++ b/release.py @@ -28,7 +28,6 @@ in the future""" DEFAULT_BRANCHES = { 'lbry': 'master', 'lbry-app': 'master', - 'lbry-web-ui': 'development', 'lbryum': 'master' } # TODO: ask bumpversion for these @@ -89,7 +88,7 @@ def main(): auth = github.Github(gh_token) github_repo = auth.get_repo('lbryio/lbry-app') - names = ['lbry', 'lbry-web-ui', 'lbryum'] + names = ['lbry', 'lbryum'] repos = {name: Repo(name, get_part(args, name)) for name in names} # in order to see if we've had any change in the submodule, we need to checkout @@ -232,8 +231,7 @@ def check_bumpversion(): def get_part(args, name): - value = args.ui_part if name == 'lbry-web-ui' else getattr(args, name + '_part') - return value or args.lbry_part + return getattr(args, name + '_part') or args.lbry_part class Repo(object): diff --git a/reset.sh b/reset.sh index cc3de3172..2a0a8163a 100755 --- a/reset.sh +++ b/reset.sh @@ -7,11 +7,6 @@ git tag -d $(git describe) git reset --hard origin/master popd -pushd lbry-web-ui -git tag -d $(git describe) -git reset --hard origin/development -popd - pushd lbryum git tag -d $(git describe) git reset --hard origin/master diff --git a/ui/js/page/help.js b/ui/js/page/help.js index 93a550be5..6bf964205 100644 --- a/ui/js/page/help.js +++ b/ui/js/page/help.js @@ -80,15 +80,15 @@ var HelpPage = React.createClass({ - + - + - + diff --git a/ui/package.json b/ui/package.json index 7b2678006..7b90a49fe 100644 --- a/ui/package.json +++ b/ui/package.json @@ -5,19 +5,15 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, - "repository": { - "type": "git", - "url": "git+https://github.com/lbryio/lbry-web-ui.git" - }, "keywords": [ "lbry" ], "author": "Alex Liebowitz ", "license": "SEE LICENSE IN LICENSE.md", "bugs": { - "url": "https://github.com/lbryio/lbry-web-ui/issues" + "url": "https://github.com/lbryio/lbry-app/issues" }, - "homepage": "https://github.com/lbryio/lbry-web-ui#readme", + "homepage": "https://github.com/lbryio/lbry-app#readme", "dependencies": { "babel-cli": "^6.11.4", "babel-preset-es2015": "^6.13.2",
lbrynet (data)daemon (lbrynet) {ver.lbrynet_version}
lbryum (wallet)wallet (lbryum) {ver.lbryum_version}
lbry-web-ui (interface)interface {uiVersion}