Merge pull request #6 from atlantabitdevs/devops/pre-merge

deployment

.gitignore

@@ -9,7 +9,7 @@ logs
 **/*.backup.*
 **/*.back.*
 
-**/node_modules
+node_modules
 bower_components
 
 *.sublime*
@@ -18,15 +18,12 @@ psd
 thumb
 sketch
 
-<<<<<<< HEAD
 *.lock
 
 # End of https://www.toptal.com/developers/gitignore/api/react
-=======
 # End of https://www.toptal.com/developers/gitignore/api/react
 
 **/service-account.json
->>>>>>> 18ffdb861cdf24a7ebaea8c6f91205ed97a03c98
 
 # Misc. secrets (API keys, GCP credentials, etc.)
 .env

backend/.github/workflows/deploy.yml

@@ -1,15 +1,14 @@
-name: park-ln
+name: family-btc
 
 on:
   push:
     branches:
-      - master
-      - devops/deploy/backend
+      - main
 
 env:
-  CLOUD_RUN_PROJECT_ID: park-lightning
+  CLOUD_RUN_PROJECT_ID: atl-bitdevs-hackathons
   CLOUD_RUN_REGION: us-east1
-  REPO_NAME: park-lightning
+  REPO_NAME: familybtc
 
 jobs:
   deploy-backend:

backend/package.json

@@ -1,28 +1,28 @@
 {
-  "name": "atlbitdevs-familybtc",
-  "version": "1.0.0",
-  "description": "A bitcoin solution for families",
-  "main": "server.js",
-  "repository": "[email protected]:atlantabitdevs/familybtc.git",
-  "author": "[email protected]",
-  "license": "MIT",
-  "scripts": {
-    "start": "PORT=8080 node server.js",
-    "dev": "PORT=8081 nodemon server.js"
-  },
-  "dependencies": {
-    "cors": "^2.8.5",
-    "debug": "^4.3.4",
-    "dotenv": "^16.0.0",
-    "express": "^4.17.3",
-    "firebase-admin": "^10.0.2",
-    "http-errors": "^2.0.0",
-    "mailgun-js": "^0.22.0",
-    "morgan": "^1.10.0",
-    "node-fetch": "2.6.6",
-    "nodemon": "^2.0.15",
-    "opennode": "^1.3.0",
-    "uuid": "^8.3.2",
-    "winston": "^3.6.0"
-  }
+    "name": "atlbitdevs-familybtc",
+    "version": "1.0.0",
+    "description": "A bitcoin solution for families",
+    "main": "server.js",
+    "repository": "[email protected]:atlantabitdevs/familybtc.git",
+    "author": "[email protected]",
+    "license": "MIT",
+    "scripts": {
+        "start": "PORT=8080 node server.js",
+        "dev": "PORT=8081 nodemon server.js"
+    },
+    "dependencies": {
+        "cors": "^2.8.5",
+        "debug": "^4.3.4",
+        "dotenv": "^16.0.0",
+        "express": "^4.17.3",
+        "firebase-admin": "^10.0.2",
+        "http-errors": "^2.0.0",
+        "mailgun-js": "^0.22.0",
+        "morgan": "^1.10.0",
+        "node-fetch": "2.6.6",
+        "nodemon": "^2.0.15",
+        "opennode": "^1.3.0",
+        "uuid": "^8.3.2",
+        "winston": "^3.6.0"
+    }
 }

backend/sensei/nodes.js

@@ -53,26 +53,9 @@ const payInvoice = async (invoice) => {
     return await res.json();
 }
 
-<<<<<<< HEAD
-const keysend = async (destPubkey, amtMsat) => {
+const keySend = async (destPubkey, amtMsat) => {
     const res = await apiCall('/v1/node/invoices/pay', 'POST', { dest_pubkey: destPubkey, amt_msat: amtMsat });
     return await res.json();
-=======
-const keySend = async (destPubkey, amtMsat) => {
-    const res = await fetch(`${BASE_URL}/v1/node/keysend`,
-        {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            credentials: 'include',
-            body: JSON.stringify({
-                dest_pubkey: destPubkey,
-                amt_msat: amtMsat
-            })
-        }
-    );
->>>>>>> e295aada2015b250764e2aa5e1db0e8d8a7f6d24
 }