Skip to content

Commit

Permalink
Merge resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
Zachary Hanif committed Nov 16, 2019
2 parents 4829e31 + dca2945 commit a49e92d
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
def allowed_file(filename):
return '.' in filename and filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS


@app.route('/upload', methods=['GET', 'POST'])
def upload():
if request.method == 'POST':
Expand Down Expand Up @@ -51,18 +50,22 @@ def upload():
</form>
'''


@app.route('/compare/<path:experiment_one>/<path:experiment_two>')
def compare():
return 'This is the compare function for two experiments.'


@app.route('/experiment')
def experiment():
return 'This is the view of an experiment'


@app.route('/hello')
def hello():
return 'Hello!'



if __name__ == '__main__':

app.run(debug=True, host='0.0.0.0')

0 comments on commit a49e92d

Please sign in to comment.