diff --git a/__pycache__/footballHelper.cpython-39.pyc b/__pycache__/footballHelper.cpython-39.pyc index a33fe9c77c4e969abfd04d25d439d4e8342499c7..d6d7b871d829f3bccbe469fa98ce68747e163b38 100644 Binary files a/__pycache__/footballHelper.cpython-39.pyc and b/__pycache__/footballHelper.cpython-39.pyc differ diff --git a/main.py b/main.py index 26ff2ceda689691003939c705b6276674ffd8914..087c1f66fa1ca640a7cbe70e43f769e905c252ad 100644 --- a/main.py +++ b/main.py @@ -84,6 +84,7 @@ def index(): x = x + 1 # Setting all session data to the new allPlayers Dict session['allPlayerData'] = allPlayers + session['allTeamData'] = allTeamData # Take all players from session data to put into the two players drop downs on comparison page. players = [] @@ -456,6 +457,10 @@ def admin(): for player in session['allPlayerData']: players.append(Player(player)) + teamsList = [] + + for teams in session['allTeamData']: + teamsList.append(teams) if request.method == 'POST': player = request.form['playerName'] @@ -487,7 +492,7 @@ def admin(): cursor.close() conn.close() - return render_template('adminFunction.html', player=player, operation=operation,loggedIn=loggedIn, isAdmin=isAdmin) + return render_template('adminFunction.html', player=player, operation=operation,loggedIn=loggedIn, isAdmin=isAdmin, teamNames=teamsList) return render_template('admin.html', players=players) diff --git a/static/.DS_Store b/static/.DS_Store deleted file mode 100644 index 83825d78780c90df30d9faa2937c6f46b6b87bdd..0000000000000000000000000000000000000000 Binary files a/static/.DS_Store and /dev/null differ diff --git a/static/images/.DS_Store b/static/images/.DS_Store deleted file mode 100644 index 354336d885bb8f4af1f0726d39bc1cebda0f289b..0000000000000000000000000000000000000000 Binary files a/static/images/.DS_Store and /dev/null differ diff --git a/static/styles/homepage.css b/static/styles/homepage.css index 70c58606ff6004be0700e761397c17087810324a..a6fe8bbd7dcd57077d2addd150296e5937466ed1 100644 --- a/static/styles/homepage.css +++ b/static/styles/homepage.css @@ -67,4 +67,7 @@ body { margin-left: 35%; margin-top: 10%; +} +.textCentre{ + text-align:center; } \ No newline at end of file diff --git a/templates/adminFunction.html b/templates/adminFunction.html index 3a25803e1c4959863e8247e3f3ac9903fc1420c0..b2bcad0fb9ed0ea10862ca35fb7c582fd298fa90 100644 --- a/templates/adminFunction.html +++ b/templates/adminFunction.html @@ -36,7 +36,10 @@ </select> </td> <td> - <input type="text" name="club" id="club" placeholder={{player.club}}> + <select name="club" id="club"> + {% for team in teamNames %} + <option value="{{team.TeamName}}">{{team.TeamName}}</option> + {% endfor %} </td> <td> <input type="date" name="dateSigned" id="dateSigned" placeholder={{player.dateSigned}}> diff --git a/templates/login.html b/templates/login.html index 1dd67aad922bde5158c5d1a0b38f19cdcec8c42d..cfb9c8623ed700f5c9f2fb98d29db555829d9df2 100644 --- a/templates/login.html +++ b/templates/login.html @@ -1,31 +1,39 @@ {% include "base.html" %} {% block content %} - <div class="centreContent"> - <div class="container pt-5 "> - <div class="card text-white bg-dark mb-3" style="max-width: 26rem;"> - <div class="card-header"><h1>Login</h1></div> - <div class="card-body"> - <form action="{{ url_for('login')}}" method="post"> - <div class="row g-3"> - <div class="col"> - <label for="username" class="form-label">Username</label> - <input type="text" class="form-control" placeholder="Username" aria-label="Username" id="username" - name="username" required> - </div> - <div class="col"> - <label for="password" class="form-label">Password</label> - <input type="password" class="form-control" placeholder="Password" aria-label="Password" id="password" - name="password" required> - </div> - <div class="col-12"> - <button type="submit" class="btn btn-light">Login</button> - </div> - {{msg}} - </div> +<div class="centreContent"> + <div class="container pt-5 "> + <div class="card text-white bg-dark mb-3" style="max-width: 26rem;"> + <div class="card-header"> + <h1>Login</h1> + </div> + <div class="card-body"> + <form action="{{ url_for('login')}}" method="post"> + <div class="row g-3"> + <div class="col"> + <label for="username" class="form-label">Username</label> + <input type="text" class="form-control" placeholder="Username" aria-label="Username" id="username" + name="username" required> </div> - </div> + <div class="col"> + <label for="password" class="form-label">Password</label> + <input type="password" class="form-control" placeholder="Password" aria-label="Password" id="password" + name="password" required> + </div> + <button type="submit" class="btn btn-info">Login</button> + <div class="col-12"> + <a href="/register" role="button" class="btn btn-secondary">Register</a> + </div> + <div class="errorMessage"> + <div class="textCentre"> + {{msg}} + </div> + </div> + + </div> + </div> + </div> -{% endblock %} -<p><br></p> -{% include "footer.html" %} \ No newline at end of file + {% endblock %} + <p><br></p> + {% include "footer.html" %} \ No newline at end of file