Compare commits
No commits in common. "master" and "dev" have entirely different histories.
5 changed files with 7 additions and 8 deletions
3
app.py
3
app.py
|
@ -18,7 +18,7 @@ app.config.from_object(os.getenv('CONFIGURATION_OBJECT'))
|
|||
# ! Environment Variable
|
||||
# TODO export ALLOWED_ORIGIN= whatever the react server is
|
||||
# TODO cors_allowed_origins=os.getenv('ALLOWED_ORIGIN')
|
||||
socketio = SocketIO(app, cors_allowed_origins=os.getenv('ALLOWED_ORIGIN'))
|
||||
socketio = SocketIO(app, cors_allowed_origins=['http://localhost:3000', 'http://localhost:3001'])
|
||||
|
||||
def create_app():
|
||||
CORS(app, resources={
|
||||
|
@ -28,4 +28,3 @@ def create_app():
|
|||
db.init_app(app)
|
||||
ma.init_app(app)
|
||||
return app
|
||||
|
|
@ -29,6 +29,6 @@ class TestingConfig(BaseConfig):
|
|||
|
||||
class ProductionConfig(BaseConfig):
|
||||
"""Production configuration."""
|
||||
SECRET_KEY = os.getenv('SECRET_KEY')
|
||||
SECRET_KEY = ''
|
||||
DEBUG = False
|
||||
SQLALCHEMY_DATABASE_URI = 'postgres://mzwaocmnwvesac:d86d256a9e73639d0ac1eba3651f3f5268540e6417b110265fd58398358d1c1b@ec2-174-129-227-51.compute-1.amazonaws.com:5432/d1jbr1uiojpma'
|
||||
SQLALCHEMY_DATABASE_URI = 'postgresql:///'
|
||||
|
|
|
@ -22,7 +22,7 @@ from models.Move import Move
|
|||
from models.User import User
|
||||
|
||||
|
||||
app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv('DATABASE_URL')
|
||||
app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql://localhost/browser-go'
|
||||
@manager.command
|
||||
def test():
|
||||
"""Runs the unit tests without test coverage."""
|
||||
|
|
|
@ -84,6 +84,6 @@ class GameSchema(ma.Schema):
|
|||
player_black = fields.Int()
|
||||
player_white = fields.Int()
|
||||
|
||||
|
||||
|
||||
game_schema = GameSchema()
|
||||
games_schema = GameSchema(many=True)
|
|
@ -26,7 +26,7 @@ app.register_blueprint(server)
|
|||
migrate = Migrate(app, db)
|
||||
# added 10/14
|
||||
DATABASE_URL = os.environ['DATABASE_URL']
|
||||
conn = psycopg2.connect(DATABASE_URL, sslmode='require')
|
||||
# conn = psycopg2.connect(DATABASE_URL, sslmode='require')
|
||||
|
||||
if __name__ == '__main__':
|
||||
socketio.run(app, debug=False)
|
||||
socketio.run(app, debug=True)
|
||||
|
|
Loading…
Reference in a new issue