From 1ad2827df5b4acc3b1ee5a33157c07b35c4fac7d Mon Sep 17 00:00:00 2001 From: William Peebles Date: Sat, 19 Nov 2022 09:09:03 -0500 Subject: [PATCH] reorg orders of routes, add comments --- app.py | 53 +++++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/app.py b/app.py index 619dffe..57fcd22 100644 --- a/app.py +++ b/app.py @@ -21,18 +21,26 @@ app.register_blueprint(auth_blueprint) def index(): return redirect('/events') -@app.route('/events') -def events(): - events = Event.query.all() - periods = Period.query.all() - - return render_template('events.html', events=events, periods=periods, datetime=datetime, date=date) - +# Periods routes @app.route('/periods') def periods(): periods = Period.query.all() return render_template('periods.html', periods=periods, datetime=datetime) +@app.route('/period/new', methods=('GET', 'POST')) +def newPeriod(): + form = PeriodForm() + if form.validate_on_submit(): + period = Period(periodTime=form.periodTime.data, + weekendSchedule=form.weekendSchedule.data + ) + db.session.add(period) + db.session.commit() + createEvents(db, currDay, Period, Event) + return redirect(f'/period/edit/{period.period}') + return render_template('newPeriod.html', form=form) + + @app.route('/period/edit/', methods=('GET', 'POST')) def editPeriod(periodNum): period = Period.query.get_or_404(periodNum) @@ -51,18 +59,14 @@ def delete_period(periodNum): db.session.commit() return redirect('/periods') -@app.route('/period/new', methods=('GET', 'POST')) -def newPeriod(): - form = PeriodForm() - if form.validate_on_submit(): - period = Period(periodTime=form.periodTime.data, - weekendSchedule=form.weekendSchedule.data - ) - db.session.add(period) - db.session.commit() - createEvents(db, currDay, Period, Event) - return redirect(f'/period/edit/{period.period}') - return render_template('newPeriod.html', form=form) + +# Events routes +@app.route('/events') +def events(): + events = Event.query.all() + periods = Period.query.all() + + return render_template('events.html', events=events, periods=periods, datetime=datetime, date=date) @app.route('/event/edit//', methods=('GET', 'POST')) def editEvent(event_id): @@ -77,11 +81,17 @@ def editEvent(event_id): return redirect('/events') return render_template('editEvent.html', event=event, form=form, datetime=datetime) +# Tasks routes @app.route('/tasks') def tasks(): tasks = Task.query.all() return render_template('tasks.html', str=str, tasks=tasks, datetime=datetime, date=date) +@app.route('/task//') +def task(task_id): + task = Task.query.get_or_404(task_id) + return render_template('task.html', str=str, task=task, datetime=datetime, date=date) + @app.route('/task/new', methods=('GET', 'POST')) def newTask(): form = TaskForm() @@ -94,11 +104,6 @@ def newTask(): return redirect(f'/task/{task.id}') return render_template('newtask.html', form=form) -@app.route('/task//') -def task(task_id): - task = Task.query.get_or_404(task_id) - return render_template('task.html', str=str, task=task, datetime=datetime, date=date) - @app.route('/task//edit', methods=('GET', 'POST')) def editTask(task_id): task = Task.query.get_or_404(task_id)