Compare commits
No commits in common. "dev" and "sj-game-logic" have entirely different histories.
dev
...
sj-game-lo
4 changed files with 10 additions and 28 deletions
3
Procfile
3
Procfile
|
@ -1,2 +1 @@
|
||||||
web: gunicorn server:app
|
web: gunicorn app:app
|
||||||
release: python manage.py db upgrade
|
|
|
@ -8,13 +8,10 @@ def jwt_required():
|
||||||
auth_header = request.headers.get('Authorization') or None
|
auth_header = request.headers.get('Authorization') or None
|
||||||
if auth_header:
|
if auth_header:
|
||||||
auth_token = auth_header.split(" ")[1]
|
auth_token = auth_header.split(" ")[1]
|
||||||
try:
|
|
||||||
if jwt.decode(auth_token, os.environ.get('SECRET_KEY')):
|
if jwt.decode(auth_token, os.environ.get('SECRET_KEY')):
|
||||||
return func(*args, **kwargs)
|
return func(*args, **kwargs)
|
||||||
else:
|
else:
|
||||||
abort(401)
|
abort(401)
|
||||||
except:
|
|
||||||
abort(401)
|
|
||||||
else:
|
else:
|
||||||
abort(401)
|
abort(401)
|
||||||
return authorized
|
return authorized
|
||||||
|
|
|
@ -26,6 +26,7 @@ def get_room(game_id):
|
||||||
game.player_black = user['id']
|
game.player_black = user['id']
|
||||||
db.session.add(game)
|
db.session.add(game)
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
print(game.player_black)
|
||||||
join_game_notice(game)
|
join_game_notice(game)
|
||||||
response = {'game': game_schema.dumps(game)}
|
response = {'game': game_schema.dumps(game)}
|
||||||
if game.player_black:
|
if game.player_black:
|
||||||
|
|
21
server.py
21
server.py
|
@ -1,5 +1,4 @@
|
||||||
from app import create_app, db
|
from app import create_app, db
|
||||||
import os
|
|
||||||
|
|
||||||
# Blueprints
|
# Blueprints
|
||||||
from api.api import register_api_endpoints
|
from api.api import register_api_endpoints
|
||||||
|
@ -11,22 +10,8 @@ from websockets.socket import socketio
|
||||||
import configuration.models_mount
|
import configuration.models_mount
|
||||||
from flask_migrate import Migrate
|
from flask_migrate import Migrate
|
||||||
|
|
||||||
from flask import Blueprint, jsonify
|
|
||||||
import psycopg2
|
|
||||||
server = Blueprint('server', __name__, url_prefix='/')
|
|
||||||
|
|
||||||
@server.route('/', methods=['GET'])
|
|
||||||
def api_home():
|
|
||||||
response = {"message": "hello world"}
|
|
||||||
return jsonify(response)
|
|
||||||
|
|
||||||
app = create_app()
|
|
||||||
register_api_endpoints(app)
|
|
||||||
app.register_blueprint(server)
|
|
||||||
migrate = Migrate(app, db)
|
|
||||||
# added 10/14
|
|
||||||
DATABASE_URL = os.environ['DATABASE_URL']
|
|
||||||
# conn = psycopg2.connect(DATABASE_URL, sslmode='require')
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
app = create_app()
|
||||||
|
register_api_endpoints(app)
|
||||||
|
migrate = Migrate(app, db)
|
||||||
socketio.run(app, debug=True)
|
socketio.run(app, debug=True)
|
Loading…
Reference in a new issue