From 1257a2862be582ae670977b1a3fbc3cd4334777c Mon Sep 17 00:00:00 2001
From: Rhiannon Austin <austinrp@cardiff.ac.uk>
Date: Tue, 14 Dec 2021 09:41:35 +0000
Subject: [PATCH] Adding all working spaces to database
---
database.db | Bin 20480 -> 20480 bytes
database.db-journal | Bin 4616 -> 8720 bytes
static/style.css | 12 ++++++++++++
templates/home.html | 4 ++--
templates/workingspace.1.html | 29 +++++++++++++++++++++++++++++
workingspace.1.html | 25 +++++++++++++++++++++++++
6 files changed, 68 insertions(+), 2 deletions(-)
create mode 100644 templates/workingspace.1.html
create mode 100644 workingspace.1.html
diff --git a/database.db b/database.db
index 4ae74a654169246e7ee2dacc6a8f5d8756c172ab..7e78026e1a58eb13f2d82ea4f36d20357f85df77 100644
GIT binary patch
delta 539
zcmY+9L1+^}6ozMZS5q~++kzEs44IIFLYkzlixH)1LUKqn5G1uCC_35QCS$g{NoJNH
zC}tbHcv9x%$q3R*Q7C~@!Gqp&){A)XB6#oJsRW^?_ul{h_wm2M2o6T@RRo4#Uo67#
z-lO+=SP31T&?;v>o|=RX_k!=C8vG3|)weT2b~T$S1jBVj`#-CN;9<#Yb}%zrsEQl3
z=u_rxp|a;w8{PKtlSNeW8xC<rU0O!>u9ma>Yp%>!7b?$>9U?*zMwH<m^E;^JHx`lO
znV8uYA}(Sr8?|h)L*C{T_-pWnq7rEmh8<M$%(jDFi>6zQb?Eg>#+s&bM5wgsZ4r0V
z%O4YEq4Kw}1^zSoSiLW6V4jF4*RqM^_{)U^ObST9-%p!{MFb%2w;eP8Z*XmvGz_$C
zTw6g`mW&m{m}1B*0Md(dk_MszHGH;K93Mm`ke`gqp0?etPkO|rdHycCBaA}>3SR)X
zGtJ746xYsw<H^`9<tQhA8hbgj5A=!tN8caMp&k7)0B2=61q+tdvngHos+d(hw<&2*
zj>EfNuT4AHw5h^>WD;|V3II^lF3=xnpR{?kD;QXngSf&!=SGSW#O0%Ae2}Zc8A;y&
V`mVkqJU4ZzF7XewI^V6``3t#)s<!|D
delta 288
zcmZozz}T>Wae_1>$3z)tMvjdMOZd5%IX5xzxpS}P+_bUrGdnNy8V1=$#wPtndry1A
z$>DO>CNGeRog61GHMve!a`Glw9fc4E1|}{bW@8YADr_!e=3@}eglgJ+OH!E;Nyk*)
zR!Js423eqdbFHWS=H1d~7$+yoi$V>Y%G+$l2$Tkyl@62+lT%`3%Sg=2OU#&DBj3fb
zoq_)h|119On*|k?@=pw4Q59xp*5!0eNhwM#E)L1}Ni6Zn&r9cHWL9Jh&o9a@E=WvH
zEoPp4M_-wrnU{fqftgQ~fj^dSC!Z+L1a>~=Mn&eyd+Zi$-eKp%$i~ROnt^{cP+}qf
I<kkM60Fn7q=Kufz
diff --git a/database.db-journal b/database.db-journal
index 931772b91248f9b17fa63029d518269c632bb142..3b1d80e026a672989d458c9a72677bb7377dfeb0 100644
GIT binary patch
delta 514
zcmeBBncyP8fCM_<f0EcJ@Pm<uh5ailpC|V^&NJ*^H!Ct-XZL4(&Y&LLq~B<6Yp(0q
z*c`&b2j}xTHpaW;rxzraBxfl2BqkL*mll`g=PG#Qmlmfg1ePXN>L|FBCgo)20cit6
zg-A0G^U3oBCf1{9QphY;NK_~;Nh~TUEl|iPP0~@w$xlu!Nlj76%u^`INL9#41<EPp
zr$G&S)G)JH!6h?2vm`M`!6iRAJ0~$OrC2Ycq@<wON?$((>Y^N=gY=T~b2IbO@*PkF
znSr8{b$FZknq!#x7(_FHzOy%1*4})CTbWTCXhL~;xn8nKN+wXZUTJntvICftms+B2
zVxnMZVqv6UY+zz!VgfP)7>rD<VoZDtvOr^+Ywevk@8LbeIGKxAfGahxur#wMGqu=Z
zGAHjceg=kS6GouAM#d)nbWiKe5dun#EFi~CZV+q{>wN$9Ffc-xdHL@!F!OI?;6KCv
zihmn03ZAfUHefo!?kB>`tjp+_l2VjfTpW_`lUU-DpO?<W$H=V67@l90U0jfuoLbBR
gG=h&4s4BB0Ge0j;gbAVt!pjNB$S=t+W&uSu051@tDgXcg
delta 206
zcmbQ>(xD>2fCNNhIA&}V_`%4<%(;ny&z*ZU=cdhyLZ8`rnb$DLHZnHpH`;sJ8%~ZE
zxHfqSPweC*K`D-ml9GaAD}DXROZjaTLKqmBxPX|AK@_UGxr~{QK{OMpbMrlJWkz&u
z%XnKQnfMrFfr^@IJ?%H|=RLzXIbBc`+301w&1Q^1H6T;dfoh@zlo;7E67%vBGbT3(
Lwy=oAaNh?2YYsTr
diff --git a/static/style.css b/static/style.css
index 0ad81b3..0a62aee 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 d0e1565..ce39516 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 0000000..419eba9
--- /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 0000000..ce39516
--- /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 %}
--
GitLab