Merge branch 'master' of github.com:tiphub-io/tiphub

wbobeirne · wbobeirne · commit bfeb07876d86 · 2019-05-01T11:32:19.000-04:00
diff --git a/.env.example b/.env.example
@@ -10,10 +10,13 @@ DATABASE_URL="postgresql://username:password@localhost:5432/db-name"
 BACKEND_URL="http://localhost:5000"
 FRONTEND_URL="http://localhost:8080"
 
+# Fixed URL public path, required for correct Blockstack links. Only used in
+# production builds of the frontend.
+PUBLIC_PATH="http://localhost:5000"
+
 # OAuth Credentials
 GITHUB_CLIENT_ID="123..."
 GITHUB_CLIENT_SECRET="abc..."
 
-
 GITLAB_CLIENT_ID="123..."
 GITLAB_CLIENT_SECRET="abc..."
diff --git a/backend/boltathon/views/templates.py b/backend/boltathon/views/templates.py
@@ -217,6 +217,9 @@ def top_donors_svg(receiver_id):
 
     return send_file(io.BytesIO(bytes(svg, 'utf-8')), mimetype='image/svg+xml')
 
+@blueprint.route('/manifest.json')
+def manifest():
+    return current_app.send_static_file('manifest.json')
 
 @blueprint.route('/', defaults={'path': ''})
 @blueprint.route('/<path:path>')
diff --git a/frontend/package.json b/frontend/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "blockstack.js": "git://github.com/wbobeirne/blockstack.js#efdbc848f8bd73905e0ed6b98b48ca7e1645900f",
     "css-loader": "2.1.1",
+    "dotenv": "7.0.0",
     "dotenv-webpack": "1.7.0",
     "favicons-webpack-plugin": "0.0.9",
     "file-loader": "3.0.1",
diff --git a/frontend/src/images/favicon.png b/frontend/src/images/favicon.png
diff --git a/frontend/src/index.html b/frontend/src/index.html
@@ -5,9 +5,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <title>TipHub</title>
-    <meta name="description" content="Send sats to your favorite open source contributors!"/>
+    <meta name="description" content="Send sats to your favorite open source contributors"/>
     <meta property="og:title" content="TipHub" />
-    <meta property="og:description" content="Our cool boltathon app" />
+    <meta property="og:description" content="Send sats to your favorite open source contributors" />
     <meta property="og:type" content="website" />
   </head>
   <body>
diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js
@@ -1,3 +1,4 @@
+require('dotenv').config();
 const path = require('path');
 const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
@@ -10,7 +11,7 @@ const src = path.join(__dirname, 'src');
 const dist = path.join(__dirname, 'dist');
 
 const isDev = process.env.NODE_ENV !== 'production';
-const publicPath = isDev ? '/' : '/static';
+const publicPath =  isDev ? '/' : `${process.env.PUBLIC_PATH || ''}/static`;
 
 const typescriptLoader = {
   test: /\.tsx?$/,
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -1666,6 +1666,11 @@ dotenv-webpack@1.7.0:
   dependencies:
     dotenv-defaults "^1.0.2"
 
+dotenv@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c"
+  integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
+
 dotenv@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
