From 49d0c561ca32c603119e7205f08470c892979a3d Mon Sep 17 00:00:00 2001 From: mrschnei <mrschnei@umich.edu> Date: Mon, 27 Jul 2020 21:57:55 -0400 Subject: [PATCH] Removed html pages and code that is no longer used --- servicePoints/templates/accountNotFound.html | 19 ---------- servicePoints/templates/duplicateOrgName.html | 16 --------- .../templates/duplicateUsername.html | 16 --------- servicePoints/templates/orgNotFound.html | 19 ---------- servicePoints/views/accounts.py | 35 ------------------- 5 files changed, 105 deletions(-) delete mode 100644 servicePoints/templates/accountNotFound.html delete mode 100644 servicePoints/templates/duplicateOrgName.html delete mode 100644 servicePoints/templates/duplicateUsername.html delete mode 100644 servicePoints/templates/orgNotFound.html diff --git a/servicePoints/templates/accountNotFound.html b/servicePoints/templates/accountNotFound.html deleted file mode 100644 index af51f66..0000000 --- a/servicePoints/templates/accountNotFound.html +++ /dev/null @@ -1,19 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <link rel="stylesheet" type="text/css" href="/css/style.css"> - <title>ServicePoints</title> - </head> - - <body> - <p> - The Username or Password You've Entered is Incorrect - </p> - <form action="/accounts/accountNotFound/" method="post" enctype="multipart/form-data"> - <input type="submit" name="login" value="Return to Login"/> - </form> - <form action="/accounts/accountNotFound/" method="post" enctype="multipart/form-data"> - <input type="submit" name="createAccount" value="Create Account"/> - </form> - </body> -</html> diff --git a/servicePoints/templates/duplicateOrgName.html b/servicePoints/templates/duplicateOrgName.html deleted file mode 100644 index 0ba6975..0000000 --- a/servicePoints/templates/duplicateOrgName.html +++ /dev/null @@ -1,16 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <link rel="stylesheet" type="text/css" href="/css/style.css"> - <title>ServicePoints</title> - </head> - - <body> - <p> - This organization already exists - </p> - <form action="/accounts/duplicateOrgName/{{prev}}" method="post" enctype="multipart/form-data"> - <input type="submit" name="return" value="Return to Create Organization"/> - </form> - </body> -</html> diff --git a/servicePoints/templates/duplicateUsername.html b/servicePoints/templates/duplicateUsername.html deleted file mode 100644 index b94f158..0000000 --- a/servicePoints/templates/duplicateUsername.html +++ /dev/null @@ -1,16 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <link rel="stylesheet" type="text/css" href="/css/style.css"> - <title>ServicePoints</title> - </head> - - <body> - <p> - This username is taken - </p> - <form action="/accounts/duplicateUsername/{{prev}}" method="post" enctype="multipart/form-data"> - <input type="submit" name="return" value="Return to Create Account"/> - </form> - </body> -</html> diff --git a/servicePoints/templates/orgNotFound.html b/servicePoints/templates/orgNotFound.html deleted file mode 100644 index bb037ed..0000000 --- a/servicePoints/templates/orgNotFound.html +++ /dev/null @@ -1,19 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <link rel="stylesheet" type="text/css" href="/css/style.css"> - <title>ServicePoints</title> - </head> - - <body> - <p> - The Student Organization You've Entered Does Not Exist - </p> - <form action="/accounts/orgNotFound/" method="post" enctype="multipart/form-data"> - <input type="submit" name="registerOrg" value="Register Your Organization"/> - </form> - <form action="/accounts/orgNotFound/" method="post" enctype="multipart/form-data"> - <input type="submit" name="login" value="Return To Login"/> - </form> - </body> -</html> diff --git a/servicePoints/views/accounts.py b/servicePoints/views/accounts.py index 91cbbeb..602c00f 100644 --- a/servicePoints/views/accounts.py +++ b/servicePoints/views/accounts.py @@ -253,41 +253,6 @@ def delete(): context = {'username': flask.session['username']} return render_template('delete.html', **context) -@servicePoints.app.route('/accounts/orgNotFound/', methods=['GET', 'POST']) -def orgNotFound(): - """Render delete page.""" - if flask.request.method == 'POST': - if 'login' in flask.request.form: - return flask.redirect(flask.url_for('login')) - if 'registerOrg' in flask.request.form: - return flask.redirect(flask.url_for('createOrg')) - context = {} - return render_template('orgNotFound.html', **context) - -@servicePoints.app.route('/accounts/accountNotFound/', methods=['GET', 'POST']) -def accountNotFound(): - if flask.request.method == 'POST': - if 'login' in flask.request.form: - return flask.redirect(flask.url_for('login')) - if 'createAccount' in flask.request.form: - return flask.redirect(flask.url_for('create')) - context = {} - return render_template('accountNotFound.html', **context) - -@servicePoints.app.route('/accounts/duplicateUsername/<prev>', methods=['GET', 'POST']) -def duplicateUsername(prev): - if flask.request.method == 'POST': - return flask.redirect(flask.url_for(prev)) - context = {"prev": prev} - return render_template('duplicateUsername.html', **context) - -@servicePoints.app.route('/accounts/duplicateOrgName/', methods=['GET', 'POST']) -def duplicateOrgName(): - if flask.request.method == 'POST': - return flask.redirect(flask.url_for('createOrg')) - context = {} - return render_template('duplicateOrgName.html', **context) - @servicePoints.app.route('/accounts/hourError/', methods=['GET', 'POST']) def hourError(): if flask.request.method == 'POST': -- GitLab