Skip to content
Snippets Groups Projects
Commit 616dd5a5 authored by Rhiannon Austin's avatar Rhiannon Austin
Browse files

Merge branch 'login' into 'main'

Login

See merge request !18
parents a1bac372 e8f7f9a0
Branches
No related tags found
1 merge request!18Login
......@@ -4,4 +4,4 @@
],
"SelectedNode": "\\README.md",
"PreviewInSolutionExplorer": false
}
\ No newline at end of file
}
File added
File added
......@@ -113,7 +113,7 @@ class Workspace:
def from_query(conn, tuple):
(id, name, address, main_photo, description, website, email, phone_number, opening_hours, checkin_instructions) = tuple
additional_photos = []
conn.execute("SELECT url FROM AdditionalPhotos WHERE workspace_id = ?", (str(id)))
for x in conn.cursor.fetchall():
additional_photos.append(x[0])
......@@ -138,3 +138,6 @@ def get_workspaces():
with Connection() as conn:
conn.execute("SELECT * FROM Workspaces")
return [Workspace.from_query(conn, x) for x in conn.cursor.fetchall()]
print(get_workspaces())
from flask import Flask, request, render_template
from flask import Flask, request, render_template, redirect
import database
import json
import re
......@@ -11,6 +11,15 @@ def home():
workspaces = database.get_workspaces()
return render_template("home.html", workspaces = workspaces)
@app.route('/login', methods = ["GET", "POST"])
def login():
username = request.form.get('username')
if username == "admin":
return redirect("/")
else:
message = "Wrong Username"
return render_template("/login.html")
@app.route("/about", methods = ["GET"])
def about():
return render_template("about.html")
......
......@@ -67,6 +67,9 @@ nav ul {
background-color: black;
}
form{
text-align: center;
}
nav li a {
display: block;
......@@ -75,6 +78,13 @@ nav li a {
padding: 14px 16px;
text-decoration: none;
}
nav ul p {
display: block;
color: white;
float: left;
padding: 18px 20px;
text-decoration: none;
}
nav li a:hover {
......
<!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 class="body">
<header><img src="/static/Tramshed_Logo.jpg" alt="Logo" height="50" width="100" >Login</header>
<nav>
<ul>
<p></p>
</ul>
</nav>
<!-- <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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment