switch from lbry-web-ui to ui

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
 

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

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

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

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 getattr(args, name + '_part') or args.lbry_part
-    return value or args.lbry_part
 
 
 class Repo(object):

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

ui/js/page/help.js

@@ -80,15 +80,15 @@ var HelpPage = React.createClass({
             <table className="table-standard">
               <tbody>
                 <tr>
-                  <th>lbrynet (data)</th>
+                  <th>daemon (lbrynet)</th>
                   <td>{ver.lbrynet_version}</td>
                 </tr>
                 <tr>
-                  <th>lbryum (wallet)</th>
+                  <th>wallet (lbryum)</th>
                   <td>{ver.lbryum_version}</td>
                 </tr>
                 <tr>
-                  <th>lbry-web-ui (interface)</th>
+                  <th>interface</th>
                   <td>{uiVersion}</td>
                 </tr>
                 <tr>

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 <aliebowitz@lbry.io>",
   "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",