From ab2f79bac2a290f69e885e2d7270864b4d9e874f Mon Sep 17 00:00:00 2001
From: Liam Driscoll <driscolll4@cardiff.ac.uk>
Date: Tue, 29 Nov 2022 10:52:12 +0000
Subject: [PATCH 1/3] Adding AddRecord route to the project_server.py
---
Coworking_Functions.py | 25 -------------------------
project_server.py | 31 +++++++++++++++++++++++++++++--
2 files changed, 29 insertions(+), 27 deletions(-)
delete mode 100644 Coworking_Functions.py
diff --git a/Coworking_Functions.py b/Coworking_Functions.py
deleted file mode 100644
index 0d170f2..0000000
--- a/Coworking_Functions.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from flask import request
-from csv import writer
-
-def getCoworkingSpaces():
-
- recordName = request.form['recordName']
- recordAddress = request.form['recordAddress']
- recordMainPhotos = request.form['recordMainPhotos']
- recordAdditionalPhotos = request.form['recordAdditionalPhotos']
- recordDescription = request.form['recordDescription']
- recordWebsite = request.form['recordWebsite']
- recordEmail = request.form['recordEmail']
- recordPhoneNumber = request.form['recordPhoneNumber']
- recordOpeningHours = request.form['recordOpeningHours']
- recordCheckinInstructions = request.form['recordCheckinInstructions']
- recordData = [recordName, recordAddress, recordMainPhotos, recordAdditionalPhotos, recordDescription, recordWebsite, recordEmail, recordPhoneNumber, recordOpeningHours, recordCheckinInstructions]
- return recordData
-
-def addCoworkingSpaces(data):
-
- with open('coworking_spaces.csv', 'a') as addToFile:
- csvWriter = writer(addToFile)
- csvWriter.writerow(data)
- addToFile.close()
- return (f"{data} added.")
diff --git a/project_server.py b/project_server.py
index edb3daf..17b53cf 100644
--- a/project_server.py
+++ b/project_server.py
@@ -1,12 +1,39 @@
import os
+import csv
from flask import Flask, redirect, request, render_template, jsonify
-
app = Flask(__name__)
ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'])
-#PUT ROUTES HERE
+@app.route("/AddRecord", methods=['POST'])
+def addRecord():
+
+ print('Processing record.')
+ infoMessage = ('Add record failed.')
+
+ if (request.method == 'POST'):
+ recordName = request.form['recordName']
+ recordAddress = request.form['recordAddress']
+ recordMainPhotos = request.form['recordMainPhotos']
+ recordAdditionalPhotos = request.form['recordAdditionalPhotos']
+ recordDescription = request.form['recordDescription']
+ recordWebsite = request.form['recordWebsite']
+ recordEmail = request.form['recordEmail']
+ recordPhoneNumber = request.form['recordPhoneNumber']
+ recordOpeningHours = request.form['recordOpeningHours']
+ 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()
+
+ infoMessage = (f'{recordData} Record added.')
+
+ print(infoMessage)
+ return (infoMessage)
if __name__ == "__main__":
app.run(debug=True)
--
GitLab
From ad05090ca6a25ba5989ce6c0ec8026c8843a8da7 Mon Sep 17 00:00:00 2001
From: Liam Driscoll <driscolll4@cardiff.ac.uk>
Date: Tue, 29 Nov 2022 11:26:25 +0000
Subject: [PATCH 2/3] Changes to project_server.py
---
project_server.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/project_server.py b/project_server.py
index 17b53cf..af115bc 100644
--- a/project_server.py
+++ b/project_server.py
@@ -6,6 +6,7 @@ app = Flask(__name__)
ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'])
+# Adds a record to the CSV file.
@app.route("/AddRecord", methods=['POST'])
def addRecord():
--
GitLab
From ea8043695a852dea17bd51a6e0d9e5803f5959ed Mon Sep 17 00:00:00 2001
From: Liam Driscoll <driscolll4@cardiff.ac.uk>
Date: Tue, 29 Nov 2022 12:18:57 +0000
Subject: [PATCH 3/3] Adding some styling.
---
static/Manage_Coworking_Spaces.css | 122 ++++++++++++++++++++++++++++
static/Manage_Coworking_Spaces.html | 53 +++++++++---
static/Manage_Coworking_Spaces.js | 31 ++++++-
3 files changed, 195 insertions(+), 11 deletions(-)
create mode 100644 static/Manage_Coworking_Spaces.css
diff --git a/static/Manage_Coworking_Spaces.css b/static/Manage_Coworking_Spaces.css
new file mode 100644
index 0000000..45f7b3f
--- /dev/null
+++ b/static/Manage_Coworking_Spaces.css
@@ -0,0 +1,122 @@
+/* #iD and .Class
+
+font, color, text
+padding, background, border, margin
+width, height,
+position, top/right/bottom/left
+overflow, float, display
+
+
+.my-class {
+ width: calc(100% - 20px);
+ height: calc(50% + 10px);
+} */
+
+* {
+ font-family: Helvetica, Verdana, Arial, sans-serif;
+}
+
+body {
+ margin: 0;
+ padding: 0;
+}
+
+ul, li {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+}
+
+a {
+ text-decoration: none;
+}
+
+.Left {
+ margin-right: auto;
+}
+
+.Center {
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.Right {
+ margin-left: auto;
+}
+
+/* [#1] Page header styling. Uses [#2].
+
+header #pageHeader
+ main #headerMain
+ nav #headerNav .navBar
+ ul .Right, ul .Left
+ li a
+
+*/
+
+#headerMain {
+ text-align: center;
+ background-color: white;
+ padding: 20px 0px;
+}
+
+#headerMain a {
+ font-size: 30px;
+ font-weight: bold;
+ color: black;
+}
+
+#headerNav {
+ width: 100%;
+ position: absolute;
+}
+
+#headerNav a {
+ font-size: 20px;
+ padding: 7.5px 10px;
+}
+
+/* [#2] Page navigation styling. Used in [#1] and [#4]. */
+
+.navBar {
+ background-color: #282A35;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.navBar ul, .navBar li {
+ display: flex;
+ align-items: center;
+}
+
+.navBar a {
+ color: white;
+}
+
+.navBar a:hover {
+ background-color: #0B0C0F;
+}
+
+/* [#3] Page main styling.
+
+main #pageMain
+
+ */
+
+#pageMain {}
+
+/* [#4] Page footer styling. Uses [#2].
+
+footer #pageFooter
+ main #footerMain
+ nav #footerNav .navBar
+ ul .Center
+ li a
+
+*/
+
+#footerNav a {
+ font-size: 15px;
+ padding: 5px 10px;
+}
diff --git a/static/Manage_Coworking_Spaces.html b/static/Manage_Coworking_Spaces.html
index 7f11000..52f9ea3 100644
--- a/static/Manage_Coworking_Spaces.html
+++ b/static/Manage_Coworking_Spaces.html
@@ -2,19 +2,37 @@
<html lang="EN" dir="ltr">
<head>
<meta charSet="UTF-8">
- <title> Page Template </title>
- <link rel="stylesheet" href="StylingSheet.css">
+ <title> Manage Coworking Spaces </title>
+ <link rel="stylesheet" href="Manage_Coworking_Spaces.css">
</head>
<body onLoad="pageLoad()">
- <header id="header">
- <a href=""><h1>Page Header</h1></a>
+ <header id="pageHeader" class="pageHeader">
+ <main id="headerMain">
+ <a href="Manage_Coworking_Spaces.html">Manage Coworking Spaces</a>
+ </main>
+ <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">Left</a></li>
+ <li><a href="Manage_Coworking_Spaces.html">Home</a></li>
+ <li><a href="Manage_Coworking_Spaces.html">Left</a></li>
+ </ul>
+ <ul class="Right">
+ <li><a href="Manage_Coworking_Spaces.html">Home</a></li>
+ <li><a href="Manage_Coworking_Spaces.html">Right</a></li>
+ <li><div class="navHamburger">
+ <span></span>
+ <span></span>
+ <span></span>
+ </div></li>
+ </ul>
+ </nav>
</header>
- <hr>
-
<main id="recordSection">
+ <br>
<form id="recordForm" title="Record Form">
<label>Name: <input name="record_name" id="recordName"
type="text"></label><br>
@@ -42,12 +60,27 @@
</form>
<br>
<span id="DEBUGserverMessage"> </span>
- </main>
- <hr>
+ <br><br><br><br><br><br><br><br><br><br><br><br>
+ <br><br><br><br><br><br><br><br><br><br><br><br>
+ <br><br><br><br><br><br><br><br><br><br><br><br>
+ <br><br><br><br><br><br><br><br><br><br><br><br>
+ </main>
- <footer id="footer">
- <a href="#header">Top</a>
+ <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>
</footer>
<script src="Manage_Coworking_Spaces.js"></script>
diff --git a/static/Manage_Coworking_Spaces.js b/static/Manage_Coworking_Spaces.js
index 2cd7b3f..cd99c34 100644
--- a/static/Manage_Coworking_Spaces.js
+++ b/static/Manage_Coworking_Spaces.js
@@ -1,8 +1,37 @@
// Replaces the onSubmit attribute for the addRecord form.
-function pageLoad() {
+function onSubmitLoad() {
document.getElementById('addButton').addEventListener('click',addRecord);
}
+
+function headerLoad() {
+ let headerMain = document.querySelector('#headerMain');
+ let headerMainHeight = headerMain.offsetHeight;
+ let headerNav = document.querySelector('#headerNav');
+ let headerNavHeight = headerNav.offsetHeight;
+ let pageHeaderHeight = headerMainHeight + headerNavHeight;
+ document.getElementById("pageHeader").style.height = pageHeaderHeight + "px";
+}
+
+window.onscroll = function() {parallaxNavScroll()};
+
+function parallaxNavScroll() {
+ let headerMain = document.querySelector('#headerMain');
+ let headerHeight = headerMain.offsetHeight;
+ if (document.body.scrollTop > headerHeight || document.documentElement.scrollTop > headerHeight) {
+ document.getElementById("headerNav").style.top = "0";
+ document.getElementById("headerNav").style.position = "fixed";
+ } else {
+ document.getElementById("headerNav").style.top = headerHeight + "px";
+ document.getElementById("headerNav").style.position = "absolute";
+ }
+}
+
+function pageLoad() {
+ onSubmitLoad();
+ headerLoad();
+}
+
// Adds a record to the CSV file.
function addRecord(e) {
// Removes the standard form processing.
--
GitLab