diff --git a/.flaskenv b/.flaskenv
new file mode 100644
index 0000000000000000000000000000000000000000..f84f4514fd3817c5e174aef38510848226be4e50
--- /dev/null
+++ b/.flaskenv
@@ -0,0 +1,2 @@
+FLASK_APP=main.py
+FLASK_ENV=development
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..98feee92f790f8537a788150b9b993f2db938bfe
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+__pycache__/
+.vscode/
+database.db
diff --git a/Pipfile b/Pipfile
index 9bb4d23ef7bfe98170e684aeb8353dc2f642c8ff..a5f384f27d11a8a6a67ad56429f9f173e2df34dc 100644
--- a/Pipfile
+++ b/Pipfile
@@ -5,6 +5,7 @@ name = "pypi"
[packages]
flask = "*"
+python-dotenv = "*"
[dev-packages]
diff --git a/Pipfile.lock b/Pipfile.lock
index 97fd0a459e81f479293c186a1d196bf698df3ae8..2b0e8e692d1ec743db3c57cc868af36d35a999a4 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "f7f1cea682a03d85328caf2f88382c4380283d3892a9ba31b374784fb29536c4"
+ "sha256": "e75fbf7398b2878d5624ff5f88aa44b1590e34754d2c19b0cc4512a42eb8676e"
},
"pipfile-spec": 6,
"requires": {
@@ -131,6 +131,14 @@
"markers": "python_version >= '3.6'",
"version": "==2.0.1"
},
+ "python-dotenv": {
+ "hashes": [
+ "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3",
+ "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"
+ ],
+ "index": "pypi",
+ "version": "==0.19.2"
+ },
"werkzeug": {
"hashes": [
"sha256:63d3dc1cf60e7b7e35e97fa9861f7397283b75d765afcaefd993d6046899de8f",
diff --git a/database.py b/database.py
index 156ef956bc3c1291c3afad7a97588bc118f9efb3..5e323c47c2a9f47ba8ea2089319a5ec83b06e76d 100644
--- a/database.py
+++ b/database.py
@@ -71,7 +71,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])
diff --git a/import_database.py b/import_database.py
new file mode 100644
index 0000000000000000000000000000000000000000..deceed40a826f436a7db3a2546563523db90b263
--- /dev/null
+++ b/import_database.py
@@ -0,0 +1,14 @@
+import database
+
+print(database.add_workspace(database.Workspace(
+ "CodeBase",
+ "CodeBase Edinburgh, 37a Castle Terrace, Edinburgh, EH1 2EL",
+ "https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1505921023376-PAHUDHVOOKIYF4XQPHOO/5951229048_3e3d50fcb1_o.jpg?format=750w",
+ ["https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1636387943314-W9JWMS6ZX4DEZSPUV7T0/Copy+of+Unfiltered_square+%281%29.png?format=500w"],
+ "We've been exploring the world of startups...",
+ "https://www.thisiscodebase.com",
+ "hannah@thisiscodebase.com",
+ "+44 131 560 2003",
+ "Monday - Friday, 9am - 5pm",
+ "Tramsched members should contact Hannah using the email address listed."
+)))
diff --git a/static/Tramshed_Logo.jpg b/static/Tramshed_Logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8409830e1d8de59c35908622defccbfb1cffeb91
Binary files /dev/null and b/static/Tramshed_Logo.jpg differ
diff --git a/style.css b/static/style.css
similarity index 85%
rename from style.css
rename to static/style.css
index b837fd959526379ca09b60d73cb35eaca48474db..640879bec84c1a5f8b9b2c04f308c0a357fdc125 100644
--- a/style.css
+++ b/static/style.css
@@ -1,13 +1,7 @@
h1
{ color: blue;}
-button
-{color: greenyellow;
-border-spacing: 20px;
-size: 4000000px;
-}
-
-li {
+nav li {
display: inline;
border-right: 1px solid #bbb;
float:left;
@@ -15,14 +9,14 @@ li {
border-bottom-right-radius: 1000%;
}
-li:last-child {
+nav li:last-child {
color: red;
background-color: red;
border-right: none;
border-top-left-radius: 1000%;
border-bottom-left-radius: 1000%;
}
-ul {
+nav ul {
list-style-type: none;
margin: 0;
padding: 0;
@@ -31,7 +25,7 @@ ul {
}
-li a {
+nav li a {
display: block;
color: white;
text-align: center;
@@ -40,7 +34,7 @@ li a {
}
-li a:hover {
+nav li a:hover {
border-bottom-right-radius: 1000%;
border-top-right-radius: 1000%;
border-top-left-radius: -1000%;
@@ -48,7 +42,7 @@ li a:hover {
background-color: #111;
}
-li a:hover:last-child {
+nav li a:hover:last-child {
border-bottom-right-radius: 1000%;
border-top-right-radius: 1000%;
border-top-left-radius: 1000%;
diff --git a/templates/home.html b/templates/home.html
new file mode 100644
index 0000000000000000000000000000000000000000..9a1af7ec00074ae49b10865085a71494a7d8b8d3
--- /dev/null
+++ b/templates/home.html
@@ -0,0 +1,18 @@
+{% extends "main.html" %}
+{% block title %}Home{% endblock %}
+{% block mainBlock %}
+<ul>
+ {% for workspace in workspaces %}
+ <li><a href="{{ workspace.website }}">{{ workspace.name }}</a>
+ <img src="{{ workspace.main_photo }}"></li>
+ <ul>
+ <li>{{ workspace.address }}</li>
+ <li>{{ workspace.description }}</li>
+ <li>{{ workspace.email }}</li>
+ <li>{{ workspace.phone_number }}</li>
+ <li>{{ workspace.opening_hours }}</li>
+ <li>{{ workspace.checkin_instructions }}</li>
+ </ul>
+ {% endfor %}
+</ul>
+{% endblock %}
\ No newline at end of file
diff --git a/home.html b/templates/main.html
similarity index 66%
rename from home.html
rename to templates/main.html
index 62bfd8b07a5c7dca462454fd07da1d2139f95378..34903741b4d4bcc011c8909b6474a4f16a9e6add 100644
--- a/home.html
+++ b/templates/main.html
@@ -1,9 +1,8 @@
<!DOCTYPE html>
<html lang="en">
-<link rel="stylesheet" href="styles.css">
<head>
- <link rel="stylesheet" href="style.css">
+ <link rel="stylesheet" href="static/style.css">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href=
@@ -12,14 +11,13 @@
"sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
crossorigin="anonymous">
- <title>Hello</title>
+ <title>{% block title %}{% endblock %} - Tramshed Workspaces</title>
</head>
<div class="parallax">
<body class="body">
- <h1>Welcome</h1>
-
- <!-- navigation -->
+ <img src="static/Tramshed_Logo.jpg" alt="Logo" height="50" width="100">
+<!-- navigation -->
<nav>
<ul>
<li><a href="#home">Home</a></li>
@@ -27,4 +25,7 @@
<li><a href="#contactUs">Contact Us</a></li>
<li style="float:right"><a class="active" href="#about">About</a></li>
</ul>
- </nav><br><br><br>
+ </nav>
+ {% block mainBlock %}{% endblock %}
+ </body>
+</html>