From fba4231da70b2aec2135ab6df9e32f0877ff7f79 Mon Sep 17 00:00:00 2001
From: Rhiannon Austin <austinrp@cardiff.ac.uk>
Date: Mon, 10 Jan 2022 01:07:28 +0000
Subject: [PATCH] fixing
---
database.db | Bin 20480 -> 20480 bytes
main.py | 2 +-
templates/login.html | 34 ++++------------------------------
3 files changed, 5 insertions(+), 31 deletions(-)
diff --git a/database.db b/database.db
index 7e78026e1a58eb13f2d82ea4f36d20357f85df77..335e7b75439b6135c601c76f63916e3806bc2146 100644
GIT binary patch
delta 224
zcmZozz}T>Wae_3Xz(g5mRsjY*|Jscy3-|@tSejY+Jh|6#o?-vWX2a6Fu`!>8x7m!1
zk3qJPu}MGO(|&W9oDw5jMq*xGV#eee`4*roD{k4%U&XJ93$pMrGAlBM=NDxc7bGU9
z7PC#hqpvK=#>>FKz{aD=z#q%ElTVblkmoFq=Eg=*9_B_xw#j?!7O=22DzbtYjI5gr
tZ6`DFu<)&6;9t!j#?Q#NX0xEe96qLCmdR`VgPDSvArupcn!MUS6abRDKfM3|
delta 135
zcmV;20C@j^paFoO0gxL343Qi|1q=W#KiIKkpbrcL2lWLGNeiwC%m?+cf!7BP0p|cG
zQ-UvnH$68kL4mXN7uFXM0uBKKApuu!a%*#NVPj=;1e4q^BM}4*000044RHVuT@JYp
p6%BE-5g=g=vvEC>0tf;RRsavH4_31gAW9DcQv#E&PE?buPgI^FCd2>$
diff --git a/main.py b/main.py
index d566b83..66e080e 100644
--- a/main.py
+++ b/main.py
@@ -18,7 +18,7 @@ def login():
return redirect("/")
else:
message = "Wrong Username"
- return render_template("/login.html")
+ return render_template("login.html")
@app.route("/about", methods = ["GET"])
def about():
diff --git a/templates/login.html b/templates/login.html
index 2d1413f..3ab2671 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,35 +1,11 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-
- <link rel="stylesheet" href="static/style.css">
-
- <!-- Bootstrap CSS -->
- <link rel="stylesheet" href=
-"https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
- integrity=
-"sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
- crossorigin="anonymous">
-
- <title>{% block title %}{% endblock %} - Tramshed Workspaces</title>
-</head>
-<body>
- <header><img src="/static/Tramshed_Logo.jpg" alt="Logo" height="50" width="100" >Login</header>
-<nav>
-<ul>
- <p></p>
-</ul>
-</nav>
+{% extends "main.html" %}
+{% block title %}login{% endblock %}
+{% block mainBlock %}
<form class='myForm' method="POST" action="">
<p>Enter Username: </p>
- <br>
<input type = "text" name = "username" placeholder="Username.." ><br>
- <br>
- <br>
<button type = "submit" id='mySubmit'> Submit </button>
- <br>
- <br>
</form>
<div class="row">
<div class="column">
@@ -42,6 +18,4 @@
<img src="https://miro.medium.com/max/3984/1*6y4ymVFdD-qcmN647Ljf6Q.png" alt="Mountains" style="width:100%">
</div>
</div>
-<!--{% block mainBlock %}{% endblock %}-->
- </body>
-</html>
+{% endblock %}
--
GitLab