Fixes#883 : Deploy the New API to Heroku (#885)

Fixes #883 #### Checklist - [x] I have read the [Contribution & Best practices Guide](https://blog.fossasia.org/open-source-developer-guide-and-best-practices-at-fossasia) and my PR follows them. - [x] My branch is up-to-date with the Upstream `development` branch. - [x] I have added necessary documentation (if appropriate) ### Preview Link - **Replace XXX with your PR no** - Link to live demo: http://pr-XXX-fossasia-badgeyay.surge.sh #### Changes proposed in this pull request: - Deploy the New API to Heroku
fossasia · May 30, 2018 · f1bb622 · f1bb622
1 parent 5c8c4d5
commit f1bb622
Show file tree

Hide file tree

Showing 68 changed files with 50 additions and 12 deletions.
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: gunicorn --pythonpath backend/app/ main:app
+web: gunicorn --pythonpath api/ run:app
diff --git a/api/.gitignore b/api/.gitignore
@@ -0,0 +1,3 @@
+static/uploads
+static/temporary
+app.yaml
diff --git a/backend/Dockerfile → api/Dockerfile b/backend/Dockerfile → api/Dockerfile
diff --git a/backend/Procfile → api/Procfile b/backend/Procfile → api/Procfile
diff --git a/backend/README.md → api/README.md b/backend/README.md → api/README.md
diff --git a/backend/__init__.py → api/__init__.py b/backend/__init__.py → api/__init__.py
@@ -14,11 +14,10 @@ def create_app():
     if not config.DEBUG:
         app.config['SQLALCHEMY_DATABASE_URI'] = os.environ['SQLALCHEMY_DATABASE_URI']
     else:
-        app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql://%(user)s:%(pw)s@%(host)s:%(port)s/%(db)s' % config.POSTGRES
+        app.config['SQLALCHEMY_DATABASE_URI'] = os.environ['DATABASE_URL']
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
     app.config['SECRET_KEY'] = config.POSTGRES['secret']
     app.config['DEBUG'] = config.DEBUG
-    app.config.from_object('api.config.mailConfig.MailConfig')
     CORS(app, resources={r"*": {"origins": "*"}})
 
     return app
diff --git a/...nd/badge_backgrounds/black_futuristic.png → api/badge_backgrounds/black_futuristic.png b/...nd/badge_backgrounds/black_futuristic.png → api/badge_backgrounds/black_futuristic.png
diff --git a/...end/badge_backgrounds/blue_futuristic.png → api/badge_backgrounds/blue_futuristic.png b/...end/badge_backgrounds/blue_futuristic.png → api/badge_backgrounds/blue_futuristic.png
diff --git a/...end/badge_backgrounds/cyan_futuristic.png → api/badge_backgrounds/cyan_futuristic.png b/...end/badge_backgrounds/cyan_futuristic.png → api/badge_backgrounds/cyan_futuristic.png
diff --git a/...end/badge_backgrounds/gray_futuristic.png → api/badge_backgrounds/gray_futuristic.png b/...end/badge_backgrounds/gray_futuristic.png → api/badge_backgrounds/gray_futuristic.png
diff --git a/...nd/badge_backgrounds/green_futuristic.png → api/badge_backgrounds/green_futuristic.png b/...nd/badge_backgrounds/green_futuristic.png → api/badge_backgrounds/green_futuristic.png
diff --git a/backend/badge_backgrounds/red_futuristic.png → api/badge_backgrounds/red_futuristic.png b/backend/badge_backgrounds/red_futuristic.png → api/badge_backgrounds/red_futuristic.png
diff --git a/backend/badge_backgrounds/user_defined.png → api/badge_backgrounds/user_defined.png b/backend/badge_backgrounds/user_defined.png → api/badge_backgrounds/user_defined.png
diff --git a/...d/badge_backgrounds/yellow_futuristic.png → api/badge_backgrounds/yellow_futuristic.png b/...d/badge_backgrounds/yellow_futuristic.png → api/badge_backgrounds/yellow_futuristic.png
diff --git a/api/config/ServiceAccountkey.json b/api/config/ServiceAccountkey.json
@@ -0,0 +1,12 @@
+{
+  "type": "service_account",
+  "project_id": "badgeyay-195bf",
+  "private_key_id": "baac7d919f1f17a3419295978ebb3b5d356a4e02",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQDifXANNMQnIJyW\nLZNmoS82pe61JuYUkYngSa9KzhBmq1UINiNSOsmVR8WKY9MyUZBVQSe66JW3DIo/\njaTFbg9Ig2f6aq8rUfPHm42LyPwEbrhyco9IJgMry8yNVlXRJdukhIHM11ip7oP1\nQFj/v6E0oCKwO5aUBuPEKUERQBhQ6rmI2j+1HNVbr4qzVb09Y/5mZJvGF5m2aku1\nrSN6wLDif+CYk5FdGFiU3vxmK3bHMBY8vFrLUbtCoIfrKIipp9DqqMLHDNORd7V2\ntH7j6TXSxIK7uoSRx/HtLguCzEOYBKvjtpJTDd4rWcNnDU+NLKgbmRS602zi+iik\nzmsjyL8DAgMBAAECggEAGSS6yUSH2B4nNAbYO8b+Ek+GegbY+QSVLViQxLmumW9A\nz9oOvsS290MR+4SMgCQM5WIH0piacklKmbaUSbSnrrGj2+l3C9SbvxeWNaP40lcm\nU9JC9Mv/gx+rVC929HKC+Tcan85yUd8gOBxOJQo1j72NTEo5M7K2G2NHDW6zpFvM\n9+zaRwWaaCMjK1CZkICSDI4YOOXTzsY+vq7M6TXtX/x8VJ0+o6m1dVV/ucJDo9z/\naV4rZcJIp5rTERuy0s0FQy25C+sDxOVMJKdkm5Eus/LjSyCAlJBe8+q0NSl/rsuj\nfHYJTerNmEdS8N2FNwKt1brmhRMnlXKUumPlfPcQVQKBgQD9R8XY5kM/2oc+6aSU\nBTA3nty63pY94qa5G4pprJT+ZP8MI0iJ9x7F0GHnpcRWNyO/JdqLnOpWAy0Dyo5D\n/ATdqX/zkhe7FV7BWZjjFOQQYQ6VoeGYjDJFznttKC6IkU9jNo0M3gtAZvkse7CD\ni+iCr+GGZ7ceiXGZIIskGVtlBQKBgQDk7AW9P46IlSRPJl0xRg+e1pXogUBYIQgm\nkHCtqmRBs+OWZzK9wY2m24mNd7mtsQxiIAcZBdhP8kCqXCWFhvRRJJai62pQK7Gb\n9JbXJvnyisulNtkpNX4vSQ6OhlQFJ2ucYb0sJ7gXNfHigteT4ZocySEN2/rxjyJo\nY+MC46HSZwJ/ebECXjREG2njkVawvG3BvPeXFjHb/d/oOwgAeMVy0Me1wx8wuxkA\nsApu/92ld8cGZdDKMEo0TR85gZjQwdlUfSvzThPjUv/xhvSFgJWI/lWjrEEbIzA4\n91E9/DRSJ0up2QFcw9HrlgXjsnu7U3jlPeVDdlBeq01eRzRbpfyI7QKBgEHdRql0\np+XUQ2Yie525srTYuLj0tzakClxOIp1U8ROWVlznxEmkbsUbVTBGyj2XOyDgZipk\n7B/Ua5aYfJM2iQTvqgemBCic6bUdYmj05eVK2dznMwQQSAYC1xVawMHa3bNYy7zw\nkJ7c/oNVcgEyX8z4cXIzYLgvno66bo5eQCjxAoGBANLNEvDQFWyKgWbsju9a303b\nXzSMe7q5cJ3q388mLFQo9Vs2mKfZhUvjrzXEnCzh05DHT+PaK/CTD66YfBnAqvmX\nXrQYD5Z8WG5+zh9htDIhoAWGBxn+UTTGMdOQMhUznc2rYoglLdF4+8nuXY4uXl8Q\nXiDuMvi/BB/Ks739l28u\n-----END PRIVATE KEY-----\n",
+  "client_email": "[email protected]",
+  "client_id": "107341524668147355773",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://accounts.google.com/o/oauth2/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-96j6i%40badgeyay-195bf.iam.gserviceaccount.com"
+}
diff --git a/backend/config/__init__.py → api/config/__init__.py b/backend/config/__init__.py → api/config/__init__.py
diff --git a/backend/app.example.yaml → api/config/app.example.yaml b/backend/app.example.yaml → api/config/app.example.yaml
diff --git a/api/config/config.py b/api/config/config.py
@@ -0,0 +1,11 @@
+# DEBUG variable
+DEBUG = True
+# Sample config for PostgreSQL Database
+POSTGRES = {
+    'user': 'badgeyay',
+    'pw': 'badge',
+    'host': 'localhost',
+    'port': '5432',
+    'db': 'badgeyay',
+    'secret': 'thisisaverysupersecretkeyforfossasiabadgeyay'
+}
diff --git a/backend/config/dev_config.py → api/config/dev_config.py b/backend/config/dev_config.py → api/config/dev_config.py
diff --git a/backend/config/mailConfig.py → api/config/mailConfig.py b/backend/config/mailConfig.py → api/config/mailConfig.py
diff --git a/backend/config/urlConfig.py → api/config/urlConfig.py b/backend/config/urlConfig.py → api/config/urlConfig.py
diff --git a/backend/controllers/__init__.py → api/controllers/__init__.py b/backend/controllers/__init__.py → api/controllers/__init__.py
diff --git a/backend/controllers/assetHelper.py → api/controllers/assetHelper.py b/backend/controllers/assetHelper.py → api/controllers/assetHelper.py
diff --git a/backend/controllers/errorHandlers.py → api/controllers/errorHandlers.py b/backend/controllers/errorHandlers.py → api/controllers/errorHandlers.py
diff --git a/backend/controllers/fileUploader.py → api/controllers/fileUploader.py b/backend/controllers/fileUploader.py → api/controllers/fileUploader.py
diff --git a/backend/controllers/generateBadges.py → api/controllers/generateBadges.py b/backend/controllers/generateBadges.py → api/controllers/generateBadges.py
diff --git a/backend/controllers/homePage.py → api/controllers/homePage.py b/backend/controllers/homePage.py → api/controllers/homePage.py
diff --git a/backend/controllers/loginUser.py → api/controllers/loginUser.py b/backend/controllers/loginUser.py → api/controllers/loginUser.py
diff --git a/backend/controllers/modifyUser.py → api/controllers/modifyUser.py b/backend/controllers/modifyUser.py → api/controllers/modifyUser.py
diff --git a/backend/controllers/oauthToken.py → api/controllers/oauthToken.py b/backend/controllers/oauthToken.py → api/controllers/oauthToken.py
diff --git a/backend/controllers/registerUser.py → api/controllers/registerUser.py b/backend/controllers/registerUser.py → api/controllers/registerUser.py
diff --git a/backend/controllers/resetUser.py → api/controllers/resetUser.py b/backend/controllers/resetUser.py → api/controllers/resetUser.py
diff --git a/backend/db.py → api/db.py b/backend/db.py → api/db.py
diff --git a/backend/docs/installation/docker.md → api/docs/installation/docker.md b/backend/docs/installation/docker.md → api/docs/installation/docker.md
diff --git a/backend/docs/installation/heroku.md → api/docs/installation/heroku.md b/backend/docs/installation/heroku.md → api/docs/installation/heroku.md
diff --git a/backend/docs/installation/localvag.md → api/docs/installation/localvag.md b/backend/docs/installation/localvag.md → api/docs/installation/localvag.md
diff --git a/backend/docs/installation/localvir.md → api/docs/installation/localvir.md b/backend/docs/installation/localvir.md → api/docs/installation/localvir.md
diff --git a/backend/docs/test/testing.md → api/docs/test/testing.md b/backend/docs/test/testing.md → api/docs/test/testing.md
diff --git a/backend/helpers/__init__.py → api/helpers/__init__.py b/backend/helpers/__init__.py → api/helpers/__init__.py
diff --git a/backend/helpers/uploads.py → api/helpers/uploads.py b/backend/helpers/uploads.py → api/helpers/uploads.py
diff --git a/backend/helpers/verifyPassword.py → api/helpers/verifyPassword.py b/backend/helpers/verifyPassword.py → api/helpers/verifyPassword.py
diff --git a/backend/helpers/verifyToken.py → api/helpers/verifyToken.py b/backend/helpers/verifyToken.py → api/helpers/verifyToken.py
diff --git a/backend/migrations/README → api/migrations/README b/backend/migrations/README → api/migrations/README
diff --git a/backend/migrations/alembic.ini → api/migrations/alembic.ini b/backend/migrations/alembic.ini → api/migrations/alembic.ini
diff --git a/backend/migrations/env.py → api/migrations/env.py b/backend/migrations/env.py → api/migrations/env.py
diff --git a/backend/migrations/script.py.mako → api/migrations/script.py.mako b/backend/migrations/script.py.mako → api/migrations/script.py.mako
diff --git a/backend/migrations/versions/cec42e929259_.py → api/migrations/versions/cec42e929259_.py b/backend/migrations/versions/cec42e929259_.py → api/migrations/versions/cec42e929259_.py
diff --git a/backend/models/__init__.py → api/models/__init__.py b/backend/models/__init__.py → api/models/__init__.py
diff --git a/backend/models/badges.py → api/models/badges.py b/backend/models/badges.py → api/models/badges.py
diff --git a/backend/models/file.py → api/models/file.py b/backend/models/file.py → api/models/file.py
diff --git a/backend/models/user.py → api/models/user.py b/backend/models/user.py → api/models/user.py
diff --git a/backend/requirements.txt → api/requirements.txt b/backend/requirements.txt → api/requirements.txt
@@ -36,6 +36,7 @@ msgpack-python==0.5.6
 Pillow==5.1.0
 protobuf==3.5.2.post1
 psycopg2==2.7.4
+psycopg2-binary==2.7.4
 pyasn1==0.4.2
 pyasn1-modules==0.2.1
 pycparser==2.18
@@ -52,3 +53,4 @@ tinycss2==0.6.1
 urllib3==1.22
 webencodings==0.5.1
 Werkzeug==0.14.1
+marshmallow-jsonapi
diff --git a/backend/run.py → api/run.py b/backend/run.py → api/run.py
diff --git a/backend/schemas/badges.py → api/schemas/badges.py b/backend/schemas/badges.py → api/schemas/badges.py
diff --git a/backend/schemas/errors.py → api/schemas/errors.py b/backend/schemas/errors.py → api/schemas/errors.py
diff --git a/backend/schemas/file.py → api/schemas/file.py b/backend/schemas/file.py → api/schemas/file.py
diff --git a/backend/schemas/user.py → api/schemas/user.py b/backend/schemas/user.py → api/schemas/user.py
@@ -5,7 +5,7 @@
 class UserSchema(Schema):
     class Meta:
         type_ = 'user-signups'
-        self_view = 'loginUser.login'
+        self_view = 'registerUser.register_user'
         kwargs = {'id': '<id>'}
 
     id = fields.Str(required=True, dump_only=True)

diff --git a/backend/static/badges/8BadgesOnA3.svg → api/static/badges/8BadgesOnA3.svg b/backend/static/badges/8BadgesOnA3.svg → api/static/badges/8BadgesOnA3.svg
diff --git a/backend/utils/__init__.py → api/utils/__init__.py b/backend/utils/__init__.py → api/utils/__init__.py
diff --git a/backend/utils/errors.py → api/utils/errors.py b/backend/utils/errors.py → api/utils/errors.py
diff --git a/backend/utils/generate_badges.py → api/utils/generate_badges.py b/backend/utils/generate_badges.py → api/utils/generate_badges.py
diff --git a/backend/utils/mail.py → api/utils/mail.py b/backend/utils/mail.py → api/utils/mail.py
diff --git a/backend/utils/merge_badges.py → api/utils/merge_badges.py b/backend/utils/merge_badges.py → api/utils/merge_badges.py
diff --git a/backend/utils/response.py → api/utils/response.py b/backend/utils/response.py → api/utils/response.py
diff --git a/backend/utils/svg_to_png.py → api/utils/svg_to_png.py b/backend/utils/svg_to_png.py → api/utils/svg_to_png.py
diff --git a/app.json b/app.json
@@ -1,7 +1,7 @@
 {
     "name": "BadgeYay-API",
     "description": "A fully functional REST API for badges generator using flask",
-    "repository": "https://github.com/fossasia/badgeyay/backend/",
+    "repository": "https://github.com/fossasia/badgeyay/api/",
     "keywords": [
         "badgeyay",
         "fossasia",
@@ -11,5 +11,21 @@
         {
             "url": "heroku/python"
         }
-    ]
+    ],
+    "env" : {
+      "SERVICE_ACCOUNT_JSON" : {
+        "description": "The service-account.json from Firebase app.",
+        "required": true
+      },
+      "DATABASE_URL" : {
+        "description": "URL for Heroku Postgres",
+        "required": true
+      }
+    },
+    "addons": [
+    "heroku-postgresql",
+    {
+      "plan": "hobby-dev"
+    }
+  ]
 }
diff --git a/backend/.gitignore b/backend/.gitignore
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
--r backend/requirements/prod.txt
+-r api/requirements.txt
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		web: gunicorn --pythonpath backend/app/ main:app
		web: gunicorn --pythonpath api/ run:app
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		-r backend/requirements/prod.txt
		-r api/requirements.txt