From 24ab791a46acf4d87eea6b0aa22599ef743a4534 Mon Sep 17 00:00:00 2001
From: Rhiannon Austin <austinrp@cardiff.ac.uk>
Date: Mon, 13 Dec 2021 22:59:29 +0000
Subject: [PATCH] Fixing for merge
---
main.py | 1 -
templates/login.html | 30 ++++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 templates/login.html
diff --git a/main.py b/main.py
index d8f7d15..d97972a 100644
--- a/main.py
+++ b/main.py
@@ -11,7 +11,6 @@ def home():
workspaces = database.get_workspaces()
return render_template("home.html", workspaces = workspaces)
-
@app.route('/login', methods = ["GET"])
def login():
username = request.form.get('username')
diff --git a/templates/login.html b/templates/login.html
new file mode 100644
index 0000000..6bc629c
--- /dev/null
+++ b/templates/login.html
@@ -0,0 +1,30 @@
+<!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>
+
+<!-- <div class="parallax">
+<body class="body">
+ <!--<img src="static/Tramshed_Logo.jpg" alt="Logo" height="50" width="100">-->
+<!-- navigation -->
+
+<form class='myForm' method="POST" action="">
+ <p>Enter Username: </p>
+ <br>
+ <input type = "text" name = "username" placeholder="Username.." ><br>
+ <button type = "submit" id='mySubmit'> Submit </button>
+</form>
+<!--{% block mainBlock %}{% endblock %}-->
+ </body>
+</html>
--
GitLab