Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os

from flask import Flask
from flask_cors import CORS
from flask_sqlalchemy import SQLAlchemy
from flask_marshmallow import Marshmallow
from config import CONFIG
Expand All @@ -13,6 +14,7 @@

def create_app(config_name):
app = Flask(__name__)
CORS(app, support_credentials=True)
app.config.from_object(CONFIG[config_name])
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False # disabling sqlalchemy event system

Expand Down
4 changes: 4 additions & 0 deletions app/routes/v1/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"""

import uuid
from flask_cors import cross_origin
from flask import Blueprint, jsonify, request
from app.models import Application, ApplicationType, ApplicationSchema, Genre
from app import db
Expand All @@ -27,6 +28,7 @@


@application.route('/', methods=['GET'])
@cross_origin(supports_credentials=True)
def get_applications():
"""Get a list of all the Applications"""
applications = Application.query.all()
Expand All @@ -35,6 +37,7 @@ def get_applications():


@application.route('/<int:id>', methods=['GET'])
@cross_origin(supports_credentials=True)
def get_application(id):
"""Get info on an Applications when an id is passed in"""
application = Application.query.get(id)
Expand All @@ -43,6 +46,7 @@ def get_application(id):


@application.route('/', methods=['POST'])
@cross_origin(supports_credentials=True)
def create_application():
"""Create a new Application"""

Expand Down
2 changes: 2 additions & 0 deletions app/routes/v1/main.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from flask import Blueprint, jsonify
from flask_cors import cross_origin

main = Blueprint('main', __name__)


@main.route('/')
@cross_origin(supports_credentials=True)
def index():
return jsonify({"message": "Welcome to CSSI REST API"})
5 changes: 4 additions & 1 deletion app/routes/v1/questionnaire.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

"""

import uuid
from flask import Blueprint, jsonify, request
from flask_cors import cross_origin
from app.models import Questionnaire, ApplicationType, QuestionnaireSchema, Genre
from app import db

Expand All @@ -27,6 +27,7 @@


@questionnaire.route('/', methods=['GET'])
@cross_origin(supports_credentials=True)
def get_questionnaire_list():
"""Get a list of all the Questionnaire"""
questionnaires = Questionnaire.query.all()
Expand All @@ -35,6 +36,7 @@ def get_questionnaire_list():


@questionnaire.route('/<int:id>', methods=['GET'])
@cross_origin(supports_credentials=True)
def get_questionnaire(id):
"""Get questionnaire when an id is passed in"""
questionnaire = Questionnaire.query.get(id)
Expand All @@ -43,6 +45,7 @@ def get_questionnaire(id):


@questionnaire.route('/', methods=['POST'])
@cross_origin(supports_credentials=True)
def create_questionnaire():
"""Create a new Questionnaire"""
pre = request.json['pre']
Expand Down
4 changes: 4 additions & 0 deletions app/routes/v1/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"""

from flask import Blueprint, jsonify, request
from flask_cors import cross_origin
from app.models import Session, SessionSchema, Application, Questionnaire
from app import db

Expand All @@ -26,6 +27,7 @@


@session.route('/', methods=['GET'])
@cross_origin(supports_credentials=True)
def get_sessions_list():
"""Get a list of all the sessions"""
sessions = Session.query.all()
Expand All @@ -34,6 +36,7 @@ def get_sessions_list():


@session.route('/<int:id>', methods=['GET'])
@cross_origin(supports_credentials=True)
def get_session(id):
"""Get info on a session when an id is passed in"""
session = Session.query.get(id)
Expand All @@ -42,6 +45,7 @@ def get_session(id):


@session.route('/', methods=['POST'])
@cross_origin(supports_credentials=True)
def create_session():
"""Create a new Session"""

Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ marshmallow==2.14.0
flask_sqlalchemy==2.3.2
flask_marshmallow==0.8.0
marshmallow-sqlalchemy==0.13.2
PyMySQL==0.9.3
PyMySQL==0.9.3
flask-cors