Improve setup instructions and README

- README cleanups and link to documentation
- Improve dev setup instructions
- Fix js linting errors
- Move local setup instructions to installation docs
- Project link fix, closes #42
- Notes about frontend
- Clarify different LND backends

.env.example

@@ -9,7 +9,7 @@ LNBITS_DISABLED_EXTENSIONS="amilk,events"
 LNBITS_FORCE_HTTPS=1
 LNBITS_SERVICE_FEE="0.0"
 
-# Choose from LNPayWallet, OpenNodeWallet, LntxbotWallet, LndWallet, CLightningWallet, LnbitsWallet
+# Choose from LNPayWallet, OpenNodeWallet, LntxbotWallet, LndWallet (gRPC), LndRestWallet, CLightningWallet, LnbitsWallet
 LNBITS_BACKEND_WALLET_CLASS=LntxbotWallet
 
 CLIGHTNING_RPC="/home/bob/.lightning/bitcoin/lightning-rpc"

README.md

@@ -8,9 +8,11 @@ LNbits
 ![Lightning network wallet](https://i.imgur.com/EHvK6Lq.png)
 
 # LNbits v0.1 BETA, free and open-source lightning-network wallet/accounts system
-https://lnbits.com, or run your own LNbits server!
+
+Use [lnbits.com](https://lnbits.com), or run your own LNbits server!
 
 LNbits is a very simple Python server that sits on top of any funding source, and can be used as:
+
 * Accounts system to mitigate the risk of exposing applications to your full balance, via unique API keys for each wallet
 * Extendable platform for exploring lightning-network functionality via LNbits extension framework
 * Part of a development stack via LNbits API
@@ -19,9 +21,11 @@ LNbits is a very simple Python server that sits on top of any funding source, an
 
 The wallet can run on top of any lightning-network funding source, currently there is support for LND, CLightning, Lntxbot, LNpay, OpenNode, with more being added regularily.
 
-## LNbits as an account system
+See [lnbits.org](https://lnbits.org) for more detailed documentation.
-LNbits is packaged with tools to help manage funds, such as a table of transactions, line chart of spending, export to csv + more to come..
 
+## LNbits as an account system
+
+LNbits is packaged with tools to help manage funds, such as a table of transactions, line chart of spending, export to csv + more to come..
 
 ![Lightning network wallet](https://i.imgur.com/w8jdGpF.png)
 
@@ -32,10 +36,10 @@ Each wallet also comes with its own API keys, to help partition the exposure of
 ![lnurl ATM](https://i.imgur.com/WfCg8wY.png)
 
 ## LNbits as an LNURL-withdraw fallback
-LNURL has a fallback scheme, so if scanned by a regular QR code reader it can default to a URL. LNbits exploits this to generate an instant wallet using the LNURL-withdraw.
+
+LNURL has a fallback scheme, so if scanned by a regular QR code reader it can default to a URL. LNbits exploits this to generate an instant wallet using the [LNURL-withdraw](https://github.com/btcontract/lnurl-rfc/blob/master/lnurl-withdraw.md).
 
 ![lnurl fallback](https://i.imgur.com/CPBKHIv.png)
-https://github.com/btcontract/lnurl-rfc/blob/master/spec.md
 
 Using **lnbits.com/?lightning="LNURL-withdraw"** will trigger a withdraw that builds an LNbits wallet.
 Example use would be an ATM, which utilises LNURL, if the user scans the QR with a regular QR code scanner app, they will stilll be able to access the funds.
@@ -43,44 +47,19 @@ Example use would be an ATM, which utilises LNURL, if the user scans the QR with
 ![lnurl ATM](https://i.imgur.com/Gi6bn3L.jpg)
 
 ## LNbits as an insta-wallet
+
 Wallets can be easily generated and given out to people at events (one click multi-wallet generation to be added soon).
 "Go to this  website", has a lot less friction than "Download this app".
 
 ![lnurl ATM](https://i.imgur.com/xFWDnwy.png)
 
-# Running LNbits locally
+## Running LNbits locally
-Download this repo
 
-LNbits uses [Flask](http://flask.pocoo.org/).  
+See the [development docs](docs/devs/installation.md) for details on installation and setup.
-Feel free to contribute to the project.
 
-Application dependencies
+## Tip me
-------------------------
-The application uses [Pipenv][pipenv] to manage Python packages.
-While in development, you will need to install all dependencies:
-
-    $ pipenv shell
-    $ pipenv install --dev
-
-You will need to set the variables in .env.example, and rename the file to .env
-
-![lnurl ATM](https://i.imgur.com/ri2zOe8.png)
-
-Running the server
-------------------
-
-    $ flask migrate
-    $ flask run
-
-There is an environment variable called `FLASK_ENV` that has to be set to `development`
-if you want to run Flask in debug mode with autoreload
-
-[pipenv]: https://docs.pipenv.org/#install-pipenv-today
-
-# Tip me
-If you like this project and might even use or extend it, why not send some tip love!
-https://lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK
 
+If you like this project and might even use or extend it, why not [send some tip love](https://lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK)!
 
 [github-actions]: https://github.com/lnbits/lnbits/actions
 [github-actions-badge]: https://github.com/lnbits/lnbits/workflows/test%20suite/badge.svg

docs/devs/installation.md

@@ -5,30 +5,47 @@ title: Installation
 nav_order: 1
 ---
 
-
 Installation
 ============
 
-LNbits uses [Flask](http://flask.pocoo.org/).
+Download this repo and install the dependencies.
-
 
 Application dependencies
 ------------------------
 
 The application uses [Pipenv][pipenv] to manage Python packages.
-While in development, you will need to install all dependencies (includes packages like `black` and `flake8`):
+While in development, you will need to install all dependencies:
 
+```sh
 $ pipenv shell
 $ pipenv install --dev
+```
 
+You will need to set the variables in `.env.example`, and rename the file to `.env`.
+
+![Files](https://i.imgur.com/ri2zOe8.png)
+
+You might also need to install additional packages, depending on the [backend wallets](../guide/wallets.md) you configured.
+E.g. when you want to use LND you have to `pipenv install lnd-grpc`.
+
+Take a look at [Polar](https://lightningpolar.com/) for an excellent way of spinning up a Lightning Network dev environment.
 
 Running the server
 ------------------
 
-    $ flask run
+LNbits uses [Flask](http://flask.pocoo.org/) as an application server.
+
+```sh
+$ pipenv run flask migrate
+$ pipenv run flask run
+```
 
 There is an environment variable called `FLASK_ENV` that has to be set to `development`
 if you want to run Flask in debug mode with autoreload
 
+[pipenv]: https://pipenv.pypa.io/
 
-[pipenv]: https://docs.pipenv.org/#install-pipenv-today
+Frontend
+--------
+
+The views are build using [Vue.js and Quasar](https://quasar.dev/start/how-to-use-vue).

lnbits/core/templates/core/index.html

@@ -47,7 +47,7 @@
           <div class="row q-mt-md q-gutter-sm">
             <q-btn outline
               color="grey"
-              type="a" href="https://github.com/arcbtc/lnbits" target="_blank" rel="noopener">View project in GitHub</q-btn>
+              type="a" href="https://github.com/lnbits/lnbits" target="_blank" rel="noopener">View project in GitHub</q-btn>
             <q-btn outline
               color="grey"
               type="a" href="https://lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK" target="_blank" rel="noopener">Donate</q-btn>

lnbits/extensions/events/templates/events/_api_docs.html

@@ -1,4 +1,3 @@
-     
 <q-expansion-item
   group="extras"
   icon="swap_vertical_circle"
@@ -7,11 +6,18 @@
 >
   <q-card>
     <q-card-section>
-       <h5 class="text-subtitle1 q-my-none">Events: Sell and register ticket waves for an event</h5>
+      <h5 class="text-subtitle1 q-my-none">
-                <p>Events alows you to make a wave of tickets for an event, each ticket is in the form of a unqiue QRcode, which the user presents at registration. Events comes with a shareable ticket scanner, which can be used to register attendees.<br/>
+        Events: Sell and register ticket waves for an event
-                  <small> Created by,  <a href="https://github.com/benarc">Ben Arc</a></small></p> 
+      </h5>
+      <p>
+        Events alows you to make a wave of tickets for an event, each ticket is
+        in the form of a unqiue QRcode, which the user presents at registration.
+        Events comes with a shareable ticket scanner, which can be used to
+        register attendees.<br />
+        <small>
+          Created by, <a href="https://github.com/benarc">Ben Arc</a>
+        </small>
+      </p>
+    </q-card-section>
   </q-card>
-      </q-card-section>
-
-      </q-card-section>
 </q-expansion-item>

lnbits/extensions/events/templates/events/index.html

@@ -55,8 +55,6 @@
                   :href="props.row.displayUrl"
                   target="_blank"
                 ></q-btn>
-
-
                 <q-btn
                   unelevated
                   dense
@@ -68,7 +66,6 @@
                   target="_blank"
                 ></q-btn>
               </q-td>
-              </q-td>
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 {{ col.value }}
               </q-td>

lnbits/extensions/lnticket/templates/lnticket/_api_docs.html

@@ -1,4 +1,3 @@
-     
 <q-expansion-item
   group="extras"
   icon="swap_vertical_circle"
@@ -7,11 +6,17 @@
 >
   <q-card>
     <q-card-section>
-       <h5 class="text-subtitle1 q-my-none">Support Tickets: Get paid sats to answer questions</h5>
+      <h5 class="text-subtitle1 q-my-none">
-                <p>Charge people per word for contacting you. Possible applications incude, paid support ticketing, PAYG language services, contact spam protection.<br/>
+        Support Tickets: Get paid sats to answer questions
-                  <small> Created by,  <a href="https://github.com/benarc">Ben Arc</a></small></p> 
+      </h5>
+      <p>
+        Charge people per word for contacting you. Possible applications incude,
+        paid support ticketing, PAYG language services, contact spam
+        protection.<br />
+        <small>
+          Created by, <a href="https://github.com/benarc">Ben Arc</a></small
+        >
+      </p>
+    </q-card-section>
   </q-card>
-      </q-card-section>
-
-      </q-card-section>
 </q-expansion-item>

lnbits/extensions/paywall/templates/paywall/_api_docs.html

@@ -7,9 +7,7 @@
   <q-expansion-item group="api" dense expand-separator label="List paywalls">
     <q-card>
       <q-card-section>
-        <code
+        <code><span class="text-blue">GET</span> /paywall/api/v1/paywalls</code>
-          ><span class="text-blue">GET</span> /paywall/api/v1/paywalls</code
-        >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
@@ -29,37 +27,42 @@
     <q-card>
       <q-card-section>
         <code
-          ><span class="text-green">POST</span>
+          ><span class="text-green">POST</span> /paywall/api/v1/paywalls</code
-          /paywall/api/v1/paywalls</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
         <code
-          >{"amount": &lt;integer&gt;, "description": &lt;string&gt;,
+          >{"amount": &lt;integer&gt;, "description": &lt;string&gt;, "memo":
-          "memo": &lt;string&gt;, "remembers": &lt;boolean&gt;,
+          &lt;string&gt;, "remembers": &lt;boolean&gt;, "url":
-          "url": &lt;string&gt;}</code
+          &lt;string&gt;}</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">
           Returns 201 CREATED (application/json)
         </h5>
-        <code>{"amount": &lt;integer&gt;, "description": &lt;string&gt;,
+        <code
-          "id": &lt;string&gt;, "memo": &lt;string&gt;,
+          >{"amount": &lt;integer&gt;, "description": &lt;string&gt;, "id":
-          "remembers": &lt;boolean&gt;, "time": &lt;int&gt;,
+          &lt;string&gt;, "memo": &lt;string&gt;, "remembers": &lt;boolean&gt;,
-          "url": &lt;string&gt;, "wallet": &lt;string&gt;}</code>
+          "time": &lt;int&gt;, "url": &lt;string&gt;, "wallet":
+          &lt;string&gt;}</code
+        >
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
         <code
           >curl -X POST {{ request.url_root }}paywall/api/v1/paywalls -d
-          '{"url": &lt;string&gt;, "memo": &lt;string&gt;,
+          '{"url": &lt;string&gt;, "memo": &lt;string&gt;, "description":
-          "description": &lt;string&gt;, "amount": &lt;integer&gt;,
+          &lt;string&gt;, "amount": &lt;integer&gt;, "remembers":
-          "remembers": &lt;boolean&gt;}' -H
+          &lt;boolean&gt;}' -H "Content-type: application/json" -H "X-Api-Key:
-          "Content-type: application/json" -H "X-Api-Key: {{
+          {{ g.user.wallets[0].adminkey }}"
-          g.user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
     </q-card>
   </q-expansion-item>
-  <q-expansion-item group="api" dense expand-separator label="Create an invoice (public)">
+  <q-expansion-item
+    group="api"
+    dense
+    expand-separator
+    label="Create an invoice (public)"
+  >
     <q-card>
       <q-card-section>
         <code
@@ -67,23 +70,29 @@
           /paywall/api/v1/paywalls/&lt;paywall_id&gt;/invoice</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
-        <code
+        <code>{"amount": &lt;integer&gt;}</code>
-          >{"amount": &lt;integer&gt;}</code
-        >
         <h5 class="text-caption q-mt-sm q-mb-none">
           Returns 201 CREATED (application/json)
         </h5>
-        <code>{"checking_id": &lt;string&gt;, "payment_request": &lt;string&gt;}</code>
+        <code
+          >{"checking_id": &lt;string&gt;, "payment_request":
+          &lt;string&gt;}</code
+        >
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
         <code
-          >curl -X POST {{ request.url_root }}paywall/api/v1/paywalls/&lt;paywall_id&gt;/invoice -d
+          >curl -X POST {{ request.url_root
-          '{"amount": &lt;integer&gt;}' -H
+          }}paywall/api/v1/paywalls/&lt;paywall_id&gt;/invoice -d '{"amount":
-          "Content-type: application/json"
+          &lt;integer&gt;}' -H "Content-type: application/json"
         </code>
       </q-card-section>
     </q-card>
   </q-expansion-item>
-  <q-expansion-item group="api" dense expand-separator label="Check invoice status (public)">
+  <q-expansion-item
+    group="api"
+    dense
+    expand-separator
+    label="Check invoice status (public)"
+  >
     <q-card>
       <q-card-section>
         <code
@@ -91,19 +100,20 @@
           /paywall/api/v1/paywalls/&lt;paywall_id&gt;/check_invoice</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
-        <code
+        <code>{"checking_id": &lt;string&gt;}</code>
-          >{"checking_id": &lt;string&gt;}</code
-        >
         <h5 class="text-caption q-mt-sm q-mb-none">
           Returns 200 OK (application/json)
         </h5>
-        <code>{"paid": false}</code><br>
+        <code>{"paid": false}</code><br />
-        <code>{"paid": true, "url": &lt;string&gt;, "remembers": &lt;boolean&gt;}</code>
+        <code
+          >{"paid": true, "url": &lt;string&gt;, "remembers":
+          &lt;boolean&gt;}</code
+        >
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
         <code
-          >curl -X POST {{ request.url_root }}paywall/api/v1/paywalls/&lt;paywall_id&gt;/check_invoice -d
+          >curl -X POST {{ request.url_root
-          '{"checking_id": &lt;string&gt;}' -H
+          }}paywall/api/v1/paywalls/&lt;paywall_id&gt;/check_invoice -d
-          "Content-type: application/json"
+          '{"checking_id": &lt;string&gt;}' -H "Content-type: application/json"
         </code>
       </q-card-section>
     </q-card>

lnbits/extensions/paywall/templates/paywall/display.html

@@ -19,7 +19,16 @@
               :hint="'Minimum ' + paywallAmount + ' sat'"
             >
               <template v-slot:after>
-                <q-btn round dense flat icon="check" color="deep-purple" type="submit" @click="createInvoice" :disabled="userAmount < paywallAmount || paymentReq"></q-btn>
+                <q-btn
+                  round
+                  dense
+                  flat
+                  icon="check"
+                  color="deep-purple"
+                  type="submit"
+                  @click="createInvoice"
+                  :disabled="userAmount < paywallAmount || paymentReq"
+                ></q-btn>
               </template>
             </q-input>
           </q-form>
@@ -37,7 +46,9 @@
               <q-btn outline color="grey" @click="copyText(paymentReq)"
                 >Copy invoice</q-btn
               >
-              <q-btn @click="cancelPayment" flat color="grey" class="q-ml-auto">Cancel</q-btn>
+              <q-btn @click="cancelPayment" flat color="grey" class="q-ml-auto"
+                >Cancel</q-btn
+              >
             </div>
           </div>
         </div>

lnbits/extensions/paywall/templates/paywall/index.html

@@ -147,11 +147,11 @@
               ></q-checkbox>
             </q-item-section>
             <q-item-section>
-              <q-item-label
+              <q-item-label>Remember payments</q-item-label>
-                >Remember payments</q-item-label
-              >
               <q-item-label caption
-                >A succesful payment will be registered in the browser's storage, so the user doesn't need to pay again to access the URL.</q-item-label
+                >A succesful payment will be registered in the browser's
+                storage, so the user doesn't need to pay again to access the
+                URL.</q-item-label
               >
             </q-item-section>
           </q-item>
@@ -204,7 +204,12 @@
                 return rowA.amount - rowB.amount
               }
             },
-            {name: 'remembers', align: 'left', label: 'Remember', field: 'remembers'},
+            {
+              name: 'remembers',
+              align: 'left',
+              label: 'Remember',
+              field: 'remembers'
+            },
             {
               name: 'date',
               align: 'left',

lnbits/extensions/tpos/templates/tpos/_api_docs.html

@@ -4,12 +4,7 @@
   label="API info"
   :content-inset-level="0.5"
 >
-  <q-expansion-item
+  <q-expansion-item group="api" dense expand-separator label="List TPoS">
-    group="api"
-    dense
-    expand-separator
-    label="List TPoS"
-  >
     <q-card>
       <q-card-section>
         <code><span class="text-blue">GET</span> /tpos/api/v1/tposs</code>
@@ -31,9 +26,7 @@
   <q-expansion-item group="api" dense expand-separator label="Create a TPoS">
     <q-card>
       <q-card-section>
-        <code
+        <code><span class="text-green">POST</span> /tpos/api/v1/tposs</code>
-          ><span class="text-green">POST</span> /tpos/api/v1/tposs</code
-        >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>

lnbits/extensions/withdraw/templates/withdraw/_api_docs.html

@@ -12,9 +12,7 @@
   >
     <q-card>
       <q-card-section>
-        <code
+        <code><span class="text-blue">GET</span> /withdraw/api/v1/links</code>
-          ><span class="text-blue">GET</span> /withdraw/api/v1/links</code
-        >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
@@ -66,10 +64,7 @@
   >
     <q-card>
       <q-card-section>
-        <code
+        <code><span class="text-green">POST</span> /withdraw/api/v1/links</code>
-          ><span class="text-green">POST</span>
-          /withdraw/api/v1/links</code
-        >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>

lnbits/templates/base.html

@@ -67,7 +67,7 @@
               <strong>LN</strong>bits, free and open-source lightning wallet/accounts system
             </q-toolbar-title>
             <q-space></q-space>
-            <q-btn flat dense :color="($q.dark.isActive) ? 'white' : 'deep-purple'" icon="code" type="a" href="https://github.com/arcbtc/lnbits" target="_blank" rel="noopener">
+            <q-btn flat dense :color="($q.dark.isActive) ? 'white' : 'deep-purple'" icon="code" type="a" href="https://github.com/lnbits/lnbits" target="_blank" rel="noopener">
               <q-tooltip>View project in GitHub</q-tooltip>
             </q-btn>
           </q-toolbar>

package-lock.json

@@ -0,0 +1,12 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "prettier": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
+      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
+      "dev": true
+    }
+  }
+}

package.json

@@ -1,5 +1,8 @@
 {
   "devDependencies": {
     "prettier": "^2.0.5"
+  },
+  "scripts": {
+    "lint": "prettier --write lnbits/static/js/** lnbits/core/static/js/** lnbits/extensions/*/templates/**"
   }
 }