diff --git a/database.db b/database.db index 4ae74a654169246e7ee2dacc6a8f5d8756c172ab..7e78026e1a58eb13f2d82ea4f36d20357f85df77 100644 Binary files a/database.db and b/database.db differ diff --git a/database.db-journal b/database.db-journal index 931772b91248f9b17fa63029d518269c632bb142..3b1d80e026a672989d458c9a72677bb7377dfeb0 100644 Binary files a/database.db-journal and b/database.db-journal differ diff --git a/static/style.css b/static/style.css index 0ad81b3e800574b86711d0910f7c5ac2b17259d8..0a62aee73297000587837ac3245ac554f834a393 100644 --- a/static/style.css +++ b/static/style.css @@ -104,6 +104,18 @@ nav li a:hover:last-child { background-color: #111; } +.column { + float: left; + width: 33%; + padding: 5px; +} + +.row::after { + content: ""; + clear: both; + display: table; +} + .workspace-item { background-color: #fff; border-radius: 0.5rem; diff --git a/templates/home.html b/templates/home.html index d0e1565d3f9eb62d8cee21967f719837f8a44147..ce3951603a2a44e08143700a389cd8ea1e2d0d07 100644 --- a/templates/home.html +++ b/templates/home.html @@ -8,7 +8,7 @@ <a href="/workspace/{{ workspace.id }}"><img class="image" src="{{ workspace.main_photo }}"></a> </div> <div class="main-col"> - <div><a href="/workspace/{{ workspace.id }}" class="title">{{ workspace.name }}</a></div> + <div><a href="/workspace.{{ workspace.id }}" class="title">{{ workspace.name }}</a></div> <div> <span class="meta"><a href="mailto:{{ workspace.email }}">{{ workspace.email }}</a></li> <span class="dot">·</span> <span class="meta"><a href="tel:{{ workspace.phone_number }}">{{ workspace.phone_number }}</a></span> <span class="dot">·</span> @@ -22,4 +22,4 @@ </div> {% endfor %} </ul> -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/workingspace.1.html b/templates/workingspace.1.html new file mode 100644 index 0000000000000000000000000000000000000000..419eba9b5fd7b7e4ba9f465e552c9ab4cd8ac34c --- /dev/null +++ b/templates/workingspace.1.html @@ -0,0 +1,29 @@ +<!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> +<body> +<div class="row"> + <div class="column"> + <img src="https://creativecardiff.org.uk/sites/default/files/tramshed.jpg" alt="Working space" style="width:100%"> + </div> + <div class="column"> + <img src="https://coworker.imgix.net/photos/united-kingdom/cardiff/tramshed-tech/2.jpg?w=1200&h=0&q=90&auto=format,compress&fit=crop&mark=/template/img/wm_icon.png&markscale=5&markalign=center,middle" alt="Employee in working space" style="width:100%"> + </div> + <div class="column"> + <img src="https://miro.medium.com/max/3984/1*6y4ymVFdD-qcmN647Ljf6Q.png" alt="Mountains" style="width:100%"> + </div> +</div> +<!--{% block mainBlock %}{% endblock %}--> + </body> +</html> diff --git a/workingspace.1.html b/workingspace.1.html new file mode 100644 index 0000000000000000000000000000000000000000..ce3951603a2a44e08143700a389cd8ea1e2d0d07 --- /dev/null +++ b/workingspace.1.html @@ -0,0 +1,25 @@ +{% extends "main.html" %} +{% block title %}Home{% endblock %} +{% block mainBlock %} +<ul> + {% for workspace in workspaces %} + <div class="workspace-item"> + <div class="image-col"> + <a href="/workspace/{{ workspace.id }}"><img class="image" src="{{ workspace.main_photo }}"></a> + </div> + <div class="main-col"> + <div><a href="/workspace.{{ workspace.id }}" class="title">{{ workspace.name }}</a></div> + <div> + <span class="meta"><a href="mailto:{{ workspace.email }}">{{ workspace.email }}</a></li> <span class="dot">·</span> + <span class="meta"><a href="tel:{{ workspace.phone_number }}">{{ workspace.phone_number }}</a></span> <span class="dot">·</span> + <span class="meta"><a href="{{ workspace.website }}" target="_blank">{{ workspace.website }}</a></span> + </div> + <div> + <span class="meta">{{ workspace.address }}</span> <span class="dot">·</span> + <span class="meta">{{ workspace.opening_hours }}</span> + </div> + </div> + </div> + {% endfor %} +</ul> +{% endblock %}