Merge pull request #717 from lbryio/master

Cut staging from master

README.md

@@ -5,45 +5,18 @@ You can create your own custom version of spee.ch by installing this code base a
 
 ## Quickstart
 
-_note: this is the quickstart guide, for an in-depth step-by-step overview visit the [fullstart guide](https://github.com/lbryio/spee.ch/blob/readme-update/fullstart.md)._
+### Ubuntu
+[Ubuntu VPS Setup](./docs/ubuntu16vpspersonal.md)
 
-#### Install System Dependencies:
+_Note: This is our new setup. For our old setup see the [fullstart guide](./fullstart.md)._
+
+#### System Dependencies:
   * [node](https://nodejs.org)
   * [MySQL](https://dev.mysql.com/doc/refman/8.0/en/installing.html)
   * [`lbry`](https://github.com/lbryio/lbry) daemon
     * note: retrieve an address from the daemon and send your wallet a few credits (or join us in the [#speech discord channel](https://discord.gg/YjYbwhS) and we will send you a few)
   * [FFmpeg](https://www.ffmpeg.org/download.html)
 
-#### Clone this repo
-```
-$ git clone https://github.com/lbryio/spee.ch.git
-```
-
-####  Change directory into your project
-```
-$ cd spee.ch
-```
-
-#### Install node dependencies
-```
-$ npm install
-```
-
-#### Create the config files using the built-in CLI
-```
-$ npm run configure
-```
-
-#### Build & start the app
-
-_note: make sure lbry is running in the background before proceeding_
-```
-$ npm run start
-```
-
-#### View in browser
- *  Visit [http://localhost:3000](http://localhost:3000) in your browser
-
 #### Customize your app
 
 Check out the [customization guide](https://github.com/lbryio/spee.ch/blob/readme-update/customize.md) to change your app's appearance and components

client/src/containers/ChannelLoginForm/view.jsx

@@ -31,7 +31,7 @@ class ChannelLoginForm extends React.Component {
       }),
       credentials: 'include',
     };
-    request('login', params)
+    request('auth', params)
       .then(({success, channelName, shortChannelId, channelClaimId, message}) => {
         if (success) {
           this.props.onChannelLogin(channelName, shortChannelId, channelClaimId);

docs/ubuntu16vpspersonal.md

@@ -8,7 +8,7 @@
   * Domain name with @ and www pointed at your VPS IP
   * Email Address
   * Ability to send 5+ LBRY credits to an address
-  * Noncommercial use
+  * Noncommercial use (highly suggested, but you still _could_)
   * We recommend that you fork Spee.ch so that you can customize the site.
 
 ## You'll be installing:

server/routes/auth/index.js

@@ -6,7 +6,7 @@ const handleUserRequest = require('../../controllers/auth/user');
 
 module.exports = {
   '/signup': { method: 'post', controller: [ speechPassport.authenticate('local-signup'), handleSignupRequest ] },
-  '/login': { method: 'post', controller: handleLoginRequest },
+  '/auth': { method: 'post', controller: handleLoginRequest },
   '/logout': { controller: handleLogoutRequest },
   '/user': { controller: handleUserRequest },
 };

server/routes/index.js

@@ -1,7 +1,7 @@
 module.exports = {
-  ...require('./auth'),
   ...require('./pages'),
   ...require('./api'),
+  ...require('./auth'),
   ...require('./assets'),
   ...require('./fallback'),
 };