diff --git a/project_db.sql b/project_db.sql
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..65d9b087e57eae411834ef03779849edf0270f18 100644
--- a/project_db.sql
+++ b/project_db.sql
@@ -0,0 +1,19 @@
+BEGIN TRANSACTION;
+CREATE TABLE IF NOT EXISTS "coworking_spaces" (
+ "Name" TEXT,
+ "Address" TEXT,
+ "Main_Photo" TEXT,
+ "Additional_Photos" TEXT,
+ "Description" TEXT,
+ "Website" TEXT,
+ "Email" TEXT,
+ "Phone_Number" TEXT,
+ "Opening_Hours" TEXT,
+ "Checkin_Instructions" TEXT
+);
+INSERT INTO "coworking_spaces" VALUES ('Codebase','CodeBase Edinburgh , 37a Castle Terrace, Edinburgh, EH1 2EL','https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1646867535415-4JI39H286BUMT26H4FHN/C36A1915.jpg?format=2500w','https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1646868533510-J1OT4PEG5VM9FCBF8BJE/15.10.19_-_CREATIVE_BRIDGE_C02_-_DAY01_-_LQ-19+%281%29.jpg?format=2500w,https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1646868421127-07KQ4N1OHTDDKQME686A/15.10.19_-_CREATIVE_BRIDGE_C02_-_DAY01_-_LQ-52+%281%29.jpg?format=2500w','Hi. We’re CodeBase. We''ve been exploring the world of startups and innovation for over five years now. We''re not really sure how to best describe what we do, but we think the words "tech cluster" probably do it best. Please get in touch! We’re friendly people who are geeky about building tech startups, managing disruption and innovation.','https://www.thisiscodebase.com','info@thisiscodebase.com','(+44) 0131 560 2003','08:00 - 17:00','Use the email address or phone number to call ahead and book a desk, let them know you''re a Tramshed member');
+INSERT INTO "coworking_spaces" VALUES ('Catalyst','Titanic Quarter, Queens Road, Belfast, BT3 9DT','https://wearecatalyst.org/wp-content/uploads/2022/05/Catalyst03.jpg','https://wearecatalyst.org/wp-content/uploads/2022/03/DSC07673-scaled-2048x1570.jpg,https://wearecatalyst.org/wp-content/uploads/2021/01/2F6A1513.jpg','We are an independent, not-for-profit organisation working together for the greater good, enabling a connected community of like-minded innovators in an entrepreneurial eco-system that is the key driver of the knowledge economy in Northern Ireland.','https://wearecatalyst.org','enquiries@wearecatalyst.org','+44(0)28 9073 7800','08:00 - 18:00','Use the email address or phone number to call ahead and book a desk, let them know you''re a Tramshed member');
+INSERT INTO "coworking_spaces" VALUES ('C4DI','C4DI Campus, 31-38 Queen Street, Hull, HU1 1UU','https://images.squarespace-cdn.com/content/v1/5709040420c647579532dbb4/1594914119071-OWI9G22S295OCMSWL0VL/_K5L1162.jpg?format=2500w','https://images.squarespace-cdn.com/content/v1/5709040420c647579532dbb4/1588346951023-V0QWKQI35IDUACMOJ0WM/_MKL2718.jpg?format=750w,https://images.squarespace-cdn.com/content/v1/5709040420c647579532dbb4/1588346977833-LGY6P9473H2C5JF6I2UG/_K5M5505.jpg?format=750w','C4DI is an incubator that helps tech companies grow, and traditional businesses innovate.','http://www.c4di.co.uk','lc@c4di.net','+44 1482 304244','9am - 5pm','Use the email address or phone number to call ahead and book a desk, let them know you''re a Tramshed member');
+INSERT INTO "coworking_spaces" VALUES ('Dogpatch Labs','Custom House Quay, Dublin, D01 Y6H7','https://dogpatchlabs.wpenginepowered.com/wp-content/uploads/2022/09/ian_browne.jpg','https://dogpatchlabs.wpenginepowered.com/wp-content/uploads/2021/07/bordered.jpg,https://dogpatchlabs.com/wp-content/uploads/2020/03/UG_3-1.jpg','Dogpatch Labs is a startup hub, located in the heart of Dublin’s Digital Docklands.','https://dogpatchlabs.com','info@dogpatchlabs.com',NULL,'8:30 - 5:30','Use the email address or phone number to call ahead and book a desk, let them know you''re a Tramshed member');
+INSERT INTO "coworking_spaces" VALUES ('Stafion F','5 Parvis Alan Turing, Paris','https://stationf.co/img/misc/create-zone.jpg',',https://stationf.co/img/flatmates/coffee-restaurant.jpg','Based in central Paris, STATION F gathers a whole entrepreneurial ecosystem under one roof. We help entrepreneurs bring their ambitious ideas to life.','https://stationf.co',NULL,NULL,'0:00 - 0:00','Book through the Tramshed Tech app');
+COMMIT;
diff --git a/project_server.py b/project_server.py
index af115bce1e4207ef4c5ad703820af8d3cdc7cdc2..0b8c9b01d17918636d95ffe2bdb9f0db766db18d 100644
--- a/project_server.py
+++ b/project_server.py
@@ -1,8 +1,9 @@
import os
-import csv
+import sqlite3
from flask import Flask, redirect, request, render_template, jsonify
app = Flask(__name__)
+DATABASE = "project_db.db"
ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'])
@@ -26,10 +27,12 @@ def addRecord():
recordCheckinInstructions = request.form['recordCheckinInstructions']
recordData = [recordName, recordAddress, recordMainPhotos, recordAdditionalPhotos, recordDescription, recordWebsite, recordEmail, recordPhoneNumber, recordOpeningHours, recordCheckinInstructions]
- with open('coworking_spaces.csv', 'a') as addToFile:
- csvWriter = csv.writer(addToFile)
- csvWriter.writerow(recordData)
- addToFile.close()
+ conn = sqlite3.connect(DATABASE)
+ cur = conn.cursor()
+ cur.execute("INSERT INTO coworking_spaces ('Name', 'Address', 'Main_Photo', 'Additional_Photos', 'Description', 'Website', 'Email', 'Phone_Number', 'Opening_Hours', 'Checkin_Instructions')\
+ VALUES (?,?,?,?,?,?,?,?,?,?)", (recordName, recordAddress, recordMainPhotos, recordAdditionalPhotos, recordDescription, recordWebsite, recordEmail, recordPhoneNumber, recordOpeningHours, recordCheckinInstructions))
+ conn.commit()
+ conn.close()
infoMessage = (f'{recordData} Record added.')
diff --git a/static/Manage_Coworking_Spaces.css b/static/Manage_Coworking_Spaces.css
index 45f7b3fc7235e7db8221659b381317165b18d223..b9b1e4a439d856607d7bba1fe3a0af72c13b3a42 100644
--- a/static/Manage_Coworking_Spaces.css
+++ b/static/Manage_Coworking_Spaces.css
@@ -47,25 +47,42 @@ a {
/* [#1] Page header styling. Uses [#2].
header #pageHeader
- main #headerMain
+ div #headerDiv
nav #headerNav .navBar
ul .Right, ul .Left
li a
*/
-#headerMain {
+#headerDiv {
text-align: center;
background-color: white;
padding: 20px 0px;
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
}
-#headerMain a {
+#headerDiv a {
font-size: 30px;
font-weight: bold;
color: black;
}
+#headerText {
+ width: 100%;
+ margin-left: -220px;
+}
+
+#headerImg {
+ width: 180px;
+ height: 65px;
+ margin-top: -10px;
+ margin-right: 20px;
+ margin-bottom: -17.5px;
+ margin-left: 20px;
+}
+
#headerNav {
width: 100%;
position: absolute;
@@ -76,6 +93,11 @@ header #pageHeader
padding: 7.5px 10px;
}
+#headerNav img {
+ width: 55px;
+ height: 20px;
+}
+
/* [#2] Page navigation styling. Used in [#1] and [#4]. */
.navBar {
@@ -101,15 +123,27 @@ header #pageHeader
/* [#3] Page main styling.
main #pageMain
+ form #recordForm
+ label
+ input .formTextInput
+ button #addButton
*/
#pageMain {}
+#recordForm {
+ margin-left: 5px;
+}
+
+#recordForm .formTextInput {
+ margin-top: 5px;
+ width: 50%;
+}
+
/* [#4] Page footer styling. Uses [#2].
footer #pageFooter
- main #footerMain
nav #footerNav .navBar
ul .Center
li a
diff --git a/static/Manage_Coworking_Spaces.html b/static/Manage_Coworking_Spaces.html
index 52f9ea310c31e22ce615946a554b14cccfe092e3..b75f594479ff9ae3ef051a4da1da84380c07387b 100644
--- a/static/Manage_Coworking_Spaces.html
+++ b/static/Manage_Coworking_Spaces.html
@@ -9,12 +9,19 @@
<body onLoad="pageLoad()">
<header id="pageHeader" class="pageHeader">
- <main id="headerMain">
- <a href="Manage_Coworking_Spaces.html">Manage Coworking Spaces</a>
- </main>
+ <div id="headerDiv">
+ <a href="Manage_Coworking_Spaces.html">
+ <img id="headerImg" class="headerImg"
+ src="Tramshed-Logo-Main-Black.png"></img></a>
+ <a id="headerText" class="headerText"
+ href="Manage_Coworking_Spaces.html">
+ Manage Coworking Spaces</a>
+ </div>
<nav id="headerNav" class="navBar">
<ul class="Left">
- <li><a href="Manage_Coworking_Spaces.html">Home</a></li>
+ <li><a href="Manage_Coworking_Spaces.html">
+ <img id="navImg" class="navImg"
+ src="Tramshed-Logo-Main-White.png"></img></a></li>
<li><a href="Manage_Coworking_Spaces.html">Left</a></li>
<li><a href="Manage_Coworking_Spaces.html">Home</a></li>
<li><a href="Manage_Coworking_Spaces.html">Left</a></li>
@@ -31,29 +38,28 @@
</nav>
</header>
- <main id="recordSection">
- <br>
+ <main id="pageMain">
<form id="recordForm" title="Record Form">
- <label>Name: <input name="record_name" id="recordName"
- type="text"></label><br>
- <label>Address: <input name="record_address" id="recordAddress"
- type="text"></label><br>
- <label>Main Photograph: <input name="record_MP" id="recordMainPhotos"
- type="text"></label><br>
- <label>Additional Photographs: <input name="record_AP" id="recordAdditionalPhotos"
- type="text"></label><br>
- <label>Description: <input name="record_description" id="recordDescription"
- type="text"></label><br>
- <label>Website: <input name="record_website" id="recordWebsite"
- type="text"></label><br>
- <label>Email: <input name="record_email" id="recordEmail"
- type="text"></label><br>
- <label>Phone Number: <input name="record_PN" id="recordPhoneNumber"
- type="text"></label><br>
- <label>Opening Hours: <input name="record_OH" id="recordOpeningHours"
- type="text"></label><br>
- <label>Checkin Instructions: <input name="record_CI" id="recordCheckinInstructions"
- type="text"></label>
+ <label>Name: <input id="recordName" class="formTextInput"
+ name="record_name" type="text"></label><br>
+ <label>Address: <input id="recordAddress" class="formTextInput"
+ name="record_address" type="text"></label><br>
+ <label>Main Photograph: <input id="recordMainPhotos" class="formTextInput"
+ name="record_MP" type="text"></label><br>
+ <label>Additional Photographs: <input id="recordAdditionalPhotos" class="formTextInput"
+ name="record_AP" type="text"></label><br>
+ <label>Description: <input id="recordDescription" class="formTextInput"
+ name="record_description" type="text"></label><br>
+ <label>Website: <input id="recordWebsite" class="formTextInput"
+ name="record_website" type="text"></label><br>
+ <label>Email: <input id="recordEmail" class="formTextInput"
+ name="record_email" type="text"></label><br>
+ <label>Phone Number: <input id="recordPhoneNumber" class="formTextInput"
+ name="record_PN" type="text"></label><br>
+ <label>Opening Hours: <input id="recordOpeningHours" class="formTextInput"
+ name="record_OH" type="text"></label><br>
+ <label>Checkin Instructions: <input id="recordCheckinInstructions" class="formTextInput"
+ name="record_CI" type="text"></label>
<br><br>
<button id="addButton" type="submit">Add</button>
@@ -68,19 +74,17 @@
</main>
<footer id="pageFooter">
- <main id="footerMain">
- <nav id="footerNav" class="navBar">
- <ul class="Center">
- <li><a href="Manage_Coworking_Spaces.html">Left</a></li>
- </ul>
- <ul class="Center">
- <li><a href="Manage_Coworking_Spaces.html">Center</a></li>
- </ul>
- <ul class="Center">
- <li><a href="Manage_Coworking_Spaces.html">Right</a></li>
- </ul>
- </nav>
- </main>
+ <nav id="footerNav" class="navBar">
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces.html">Left</a></li>
+ </ul>
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces.html">Center</a></li>
+ </ul>
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces.html">Right</a></li>
+ </ul>
+ </nav>
</footer>
<script src="Manage_Coworking_Spaces.js"></script>
diff --git a/static/Manage_Coworking_Spaces.js b/static/Manage_Coworking_Spaces.js
index cd99c349a737f789d40218bbba02f7717693ef13..b0860b59f5a19e5aaaeeb579c41aa987018fc0a6 100644
--- a/static/Manage_Coworking_Spaces.js
+++ b/static/Manage_Coworking_Spaces.js
@@ -3,21 +3,20 @@ function onSubmitLoad() {
document.getElementById('addButton').addEventListener('click',addRecord);
}
-
function headerLoad() {
- let headerMain = document.querySelector('#headerMain');
- let headerMainHeight = headerMain.offsetHeight;
+ let headerDiv = document.querySelector('#headerDiv');
+ let headerDivHeight = headerDiv.offsetHeight;
let headerNav = document.querySelector('#headerNav');
let headerNavHeight = headerNav.offsetHeight;
- let pageHeaderHeight = headerMainHeight + headerNavHeight;
+ let pageHeaderHeight = headerDivHeight + headerNavHeight;
document.getElementById("pageHeader").style.height = pageHeaderHeight + "px";
}
window.onscroll = function() {parallaxNavScroll()};
function parallaxNavScroll() {
- let headerMain = document.querySelector('#headerMain');
- let headerHeight = headerMain.offsetHeight;
+ let headerDiv = document.querySelector('#headerDiv');
+ let headerHeight = headerDiv.offsetHeight;
if (document.body.scrollTop > headerHeight || document.documentElement.scrollTop > headerHeight) {
document.getElementById("headerNav").style.top = "0";
document.getElementById("headerNav").style.position = "fixed";
diff --git a/static/Tramshed-Logo-Main-Black.png b/static/Tramshed-Logo-Main-Black.png
new file mode 100644
index 0000000000000000000000000000000000000000..455f7390c61fde648e50fd2a762d15feba6337dd
Binary files /dev/null and b/static/Tramshed-Logo-Main-Black.png differ
diff --git a/static/Tramshed-Logo-Main-White.png b/static/Tramshed-Logo-Main-White.png
new file mode 100644
index 0000000000000000000000000000000000000000..b446f08b72112aef326461887d89437c3eeb901d
Binary files /dev/null and b/static/Tramshed-Logo-Main-White.png differ
diff --git a/static/landingpage.html b/static/landingpage.html
index c91743899013c95405a401465c373d13e5e3233f..e2c6ac3745e3154b3024a336c659317a45670ff3 100644
--- a/static/landingpage.html
+++ b/static/landingpage.html
@@ -1,11 +1,56 @@
-<html>
-<head><link rel="stylesheet" href="landingstyle.css"></head>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
<header>
- <title>Tramshed Tech</title>
- <img src="logo.jpg"/><br><br><br><br>
+ <nav class="navbar navbar-expand-sm bg-dark navbar-dark">
+ <div class="container-fluid">
+ <ul class="navbar-nav">
+ <li class="nav-item">
+ <a class="nav-link" href="locations.html">Coworking locations</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="Manage_Coworking_Spaces.html">Manage locations</a>
+ </li>
+ </ul>
+ </div>
+ </nav>
+</header>
+<header class="masthead bg-dark text-white text-left">
+ <div class="container-fluid">
+ <img id="logo" src="logo.png"/>
+ <h1 id="header">Tramshed Tech</h1>
+ </div>
</header>
<body>
- <img src="title.png"/>
- <button id= "ViewLocations" type="ViewLocations" href="locations.html">View Locations</button>
+ <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet">
+ <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.2/dist/umd/popper.min.js" ></script>
+ <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.min.js" integrity="sha384-Atwg2Pkwv9vp0ygtn1JAojH0nYbwNJLPhwyoVbhoPwBhjQPR5VtM2+xf0Uwh9KtT" crossorigin="anonymous"></script>
+ <link rel="preconnect" href="https://fonts.googleapis.com">
+ <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+ <link href="https://fonts.googleapis.com/css2?family=Sora:wght@800&display=swap" rel="stylesheet">
+ <link rel="stylesheet" href="landingstyle.css">
+ <title>Tramshed Tech</title>
+ <img id="tramshed" src="tramshed.jpg">
+ <div class="bg-dark p-3">
+ <div id="buttons" class="flex-container">
+ <button onclick="window.location.href='locations.html';" type="button" class="btn btn-light">
+ <span class="spinner-grow spinner-grow-sm"></span>
+ View Locations
+ </button>
+ <br>
+ <div class="dropdown">
+ <button class="btn btn-light dropdown-toggle" type="button" id="dropdownMenubutton" data-bs-toggle="dropdown">Socials</button>
+ <ul class="dropdown-menu" id="dropdownmenu" aria-labelledby="dropdownMenubutton">
+ <li><button class="dropdown-item" type="button" onclick="window.location.href='https://www.linkedin.com/company/tramshed-tech';" target="_blank" rel="noopener" class="footer-social-media-icon"> <img class="no-border-radius" src="https://cdn.tramshedtech.co.uk/static/img/home/Linkedin%20Logo.svg" alt="LinkedIn"> LinkedIn</button></li>
+ <li><button class="dropdown-item" type="button" onclick="window.location.href='https://www.facebook.com/tramshedtech';" target="_blank" rel="noopener" class="footer-social-media-icon"> <img class="no-border-radius" src="https://cdn.tramshedtech.co.uk/static/img/home/Facebook%20Logo.svg" alt="Facebook"> Facebook</button></li>
+ <li><button class="dropdown-item" type="button" onclick="window.location.href='https://twitter.com/TramshedTech';" target="_blank" rel="noopener" class="footer-social-media-icon"> <img class="no-border-radius" src="https://cdn.tramshedtech.co.uk/static/img/home/Twitter%20Logo.svg" alt="Twitter"> Twitter</button></li>
+ <li><button class="dropdown-item" type="button" onclick="window.location.href='https://www.instagram.com/tramshedtech/?hl=en';" target="_blank" rel="noopener" class="footer-social-media-icon"> <img class="no-border-radius" src="https://cdn.tramshedtech.co.uk/static/img/home/Instagram%20Logo.svg" alt="Instagram"> Instagram</button></li>
+ </ul>
+ </div>
+ </div>
+ </div>
</body>
</html>
diff --git a/static/landingstyle.css b/static/landingstyle.css
index 496bb079cca6cccfe95dfac79cc0822052fca366..a63b29d5a4cab5686387807774ac244875f7baa7 100644
--- a/static/landingstyle.css
+++ b/static/landingstyle.css
@@ -8,26 +8,52 @@ header{
height: 75%;
}
-button{
- background-color: white;
- color: black;
- text-align: center;
- position: absolute;
- margin: inherit;
- display: inline-block;
- line-height: 20px;
+
+#logo{
width: 10%;
- height: 15%;
- font-size: 16px;
- border-radius: 12px;
- padding: 1px 10px;
- transform: translate(350%, 50%);
- font-family: monospace;
- font-style: oblique;
- font-weight: bolder;
+}
+
+
+button{
+ font-family: 'Sora', sans-serif;
cursor: pointer;
}
body{
- display: block;
+ background-color: #212529;
+ font-family: 'Sora', sans-serif;
+}
+
+.container-fluid{
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: center;
+}
+#tramshed{
+ width: 45%;
+ height: 45%;
+ display: inline-block;
+ transform: translate(60%, 0%);
+ border: 1px solid #ddd;
+ border-radius: 4px;
+ padding: 5px;
+}
+
+#buttons{
+ width: 25%;
+ height: 25%;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ margin-left: auto;
+ margin-right: auto;
+ transform: translate(-10%, 0%);
+}
+
+#dropdownmenu{
+ background-color: grey;
+ color: #212529;
+ text-align: end;
}
diff --git a/static/title.png b/static/title.png
deleted file mode 100644
index ecd6448502b63a65b44067ae8bb7b05b64cacc43..0000000000000000000000000000000000000000
Binary files a/static/title.png and /dev/null differ
diff --git a/static/tramshed.jpg b/static/tramshed.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1924701c2bbdc9e71753db086605e4b2149a918b
Binary files /dev/null and b/static/tramshed.jpg differ