diff --git a/app.py b/app.py index e06dfdd..b0dae5d 100644 --- a/app.py +++ b/app.py @@ -1,20 +1,16 @@ import os from flask import Flask, render_template, redirect, request, url_for -from flasgger import Swagger, swag_from - -from db import DataBase from decorators import validate_person, validate_topset, validate_workout +from db import DataBase from utils import get_people_and_exercise_rep_maxes app = Flask(__name__) app.config.from_pyfile('config.py') -swagger = Swagger(app, template_file='swagger/base.json') db = DataBase(app) @ app.route("/") -@ swag_from('swagger/dashboard.yml') def dashboard(): all_topsets = db.get_all_topsets() people_and_exercise_rep_maxes = get_people_and_exercise_rep_maxes( @@ -23,7 +19,6 @@ def dashboard(): @ app.route("/person/") -@ swag_from('swagger/get_person.yml') @ validate_person def get_person(person_id): person = db.get_person_final(person_id) @@ -31,7 +26,6 @@ def get_person(person_id): @ app.route("/person//workout", methods=['POST']) -@ swag_from('swagger/create_workout.yml') @ validate_person def create_workout(person_id): new_workout_id = db.create_workout(person_id) @@ -39,7 +33,6 @@ def create_workout(person_id): @ app.route("/person//workout/") -@ swag_from('swagger/get_workout.yml') @ validate_workout def get_workout(person_id, workout_id): workout = db.get_workout_final(person_id, workout_id) @@ -47,7 +40,6 @@ def get_workout(person_id, workout_id): @ app.route("/person//workout//delete", methods=['GET', 'DELETE']) -@ swag_from('swagger/delete_workout.yml') @ validate_workout def delete_workout(person_id, workout_id): db.delete_workout(workout_id) @@ -55,7 +47,6 @@ def delete_workout(person_id, workout_id): @ app.route("/person//workout//topset/", methods=['GET', 'POST']) -@ swag_from('swagger/get_topset.yml') @ validate_topset def get_topset(person_id, workout_id, topset_id): if request.method == 'POST': @@ -72,7 +63,6 @@ def get_topset(person_id, workout_id, topset_id): @ app.route("/person//workout//topset", methods=['POST']) -@ swag_from('swagger/create_topset.yml') @ validate_workout def create_topset(person_id, workout_id): exercise_id = request.form.get("exercise_id") @@ -84,7 +74,6 @@ def create_topset(person_id, workout_id): @ app.route("/person//workout//topset//delete", methods=['GET', 'DELETE']) -@ swag_from('swagger/delete_topset.yml') @ validate_topset def delete_topset(person_id, workout_id, topset_id): db.delete_topset(topset_id) @@ -118,7 +107,6 @@ def delete_exercise(exercise_id): @ app.route("/settings") -@ swag_from('swagger/dashboard.yml') def settings(): people = db.get_people() exercises = db.get_exercises() diff --git a/config.py b/config.py index 38a2e9e..784ca99 100644 --- a/config.py +++ b/config.py @@ -2,4 +2,3 @@ TESTING = True DEBUG = True FLASK_ENV = 'development' SECRET_KEY = '' -DATABASE_URI = 'workout.db' diff --git a/db.py b/db.py index 81eeaed..e5119cf 100644 --- a/db.py +++ b/db.py @@ -9,21 +9,14 @@ from utils import get_all_exercises_from_topsets, get_people_and_exercise_rep_ma class DataBase(): def __init__(self, app): - self.DATABASE_URI = app.config['DATABASE_URI'] - db_url = urlparse(os.environ['DATABASE_URL']) - username = db_url.username - password = db_url.password - database = db_url.path[1:] - hostname = db_url.hostname - port = db_url.port self.conn = psycopg2.connect( - database=database, - user=username, - password=password, - host=hostname, - port=port + database=db_url.path[1:], + user=db_url.username, + password=db_url.password, + host=db_url.hostname, + port=db_url.port ) def execute(self, query, args=(), one=False, commit=False): diff --git a/requirements.txt b/requirements.txt index 4324054..c789d7a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ Flask==2.0.1 gunicorn==19.7.1 Jinja2==3.0.1 -flasgger==0.9.5 psycopg2-binary==2.9.3 \ No newline at end of file diff --git a/swagger/base.json b/swagger/base.json deleted file mode 100644 index 2ff9b20..0000000 --- a/swagger/base.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "WorkoutTracker API", - "description": "API for tracking topsets of workouts", - "contact": { - "responsibleOrganization": "ME", - "responsibleDeveloper": "Me", - "email": "me@me.com", - "url": "www.me.com" - }, - "version": "0.0.1" - }, - "schemes": ["http", "https"], - "operationId": "getmyData" -} diff --git a/swagger/create_topset.yml b/swagger/create_topset.yml deleted file mode 100644 index 7d98a42..0000000 --- a/swagger/create_topset.yml +++ /dev/null @@ -1,17 +0,0 @@ -Add top set to workout -Add a topset to a workout completed by a person ---- -tags: - - Topset -parameters: - - name: person_id - in: path - type: number - required: true - - name: workout_id - in: path - type: number - required: true -responses: - 200: - description: A list of topsets in a selected workout diff --git a/swagger/create_workout.yml b/swagger/create_workout.yml deleted file mode 100644 index a074109..0000000 --- a/swagger/create_workout.yml +++ /dev/null @@ -1,13 +0,0 @@ -Create new workout -Creates a workout with current date and then redirects to newly created workout ---- -tags: - - Workout -parameters: - - name: person_id - in: path - type: number - required: true -responses: - 200: - description: View of newly created workout diff --git a/swagger/dashboard.yml b/swagger/dashboard.yml deleted file mode 100644 index 6d00cd4..0000000 --- a/swagger/dashboard.yml +++ /dev/null @@ -1,8 +0,0 @@ -Dashboard page -Displays stats and a list of all people and there rep maxes for each exercise ---- -tags: - - Dashboard -responses: - 200: - description: A list of all people and there rep maxes for each exercise diff --git a/swagger/delete_topset.yml b/swagger/delete_topset.yml deleted file mode 100644 index 9b4edf5..0000000 --- a/swagger/delete_topset.yml +++ /dev/null @@ -1,21 +0,0 @@ -Delete top set -Add a topset to a workout completed by a person ---- -tags: - - Topset -parameters: - - name: person_id - in: path - type: number - required: true - - name: workout_id - in: path - type: number - required: true - - name: topset_id - in: path - type: number - required: true -responses: - 200: - description: A list of topsets in a selected workout diff --git a/swagger/delete_workout.yml b/swagger/delete_workout.yml deleted file mode 100644 index 6d39a2c..0000000 --- a/swagger/delete_workout.yml +++ /dev/null @@ -1,17 +0,0 @@ -Delete workout -Deletes selected workout completed by a person ---- -tags: - - Workout -parameters: - - name: person_id - in: path - type: number - required: true - - name: workout_id - in: path - type: number - required: true -responses: - 200: - description: Redirect to workouts list page for person diff --git a/swagger/get_person.yml b/swagger/get_person.yml deleted file mode 100644 index 8ebe731..0000000 --- a/swagger/get_person.yml +++ /dev/null @@ -1,13 +0,0 @@ -Display all workouts for a person -Displays stats and a list of all people and there rep maxes for each exercise ---- -tags: - - Person -parameters: - - name: person_id - in: path - type: number - equired: true -responses: - 200: - description: A list of all people and there rep maxes for each exercise diff --git a/swagger/get_topset.yml b/swagger/get_topset.yml deleted file mode 100644 index c8a94da..0000000 --- a/swagger/get_topset.yml +++ /dev/null @@ -1,21 +0,0 @@ -Display/Create new top set -Displays stats and a list of all people and there rep maxes for each exercise ---- -tags: - - Topset -parameters: - - name: person_id - in: path - type: number - required: true - - name: workout_id - in: path - type: number - required: true - - name: topset_id - in: path - type: number - required: true -responses: - 200: - description: A list of topsets in a selected workout diff --git a/swagger/get_workout.yml b/swagger/get_workout.yml deleted file mode 100644 index bf9876b..0000000 --- a/swagger/get_workout.yml +++ /dev/null @@ -1,17 +0,0 @@ -Display a workout -Displays a selected workout with options to edit/delete existing and add new topsets ---- -tags: - - Workout -parameters: - - name: person_id - in: path - type: number - required: true - - name: workout_id - in: path - type: number - required: true -responses: - 200: - description: A list of topsets in a selected workout diff --git a/templates/base.html b/templates/base.html index a80f738..c6a39d1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -42,21 +42,6 @@
- - - Workout Tracker on GitHub - - + +