Skip to content
Snippets Groups Projects
Commit c06e11ba authored by Liam Driscoll's avatar Liam Driscoll
Browse files

Merge branch 'development' of... 

Merge branch 'development' of https://git.cardiff.ac.uk/c22064609/tramshed-tech-client-project-team-15 into development
parents 361e8efe fffdce15
No related branches found
No related tags found
1 merge request!31Resolve "Reorganising static folder"
Hide whitespace changes
Inline Side-by-side
Coworking_Functions.py deleted 100644 → 0
+ 0
− 25
View file @ 361e8efe
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.")
project_server.py
+ 30
− 2
View file @ c06e11ba
import os import os
import csv
from flask import Flask, redirect, request, render_template, jsonify from flask import Flask, redirect, request, render_template, jsonify
app = Flask(__name__) app = Flask(__name__)
ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif']) ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'])
#PUT ROUTES HERE # Adds a record to the CSV file.
@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__": if __name__ == "__main__":
app.run(debug=True) app.run(debug=True)
static/Manage_Coworking_Spaces.css 0 → 100644
+ 122
− 0
View file @ c06e11ba
/* #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;
}
static/Manage_Coworking_Spaces.html
+ 43
− 10
View file @ c06e11ba
...@@ -2,19 +2,37 @@ ...@@ -2,19 +2,37 @@
<html lang="EN" dir="ltr"> <html lang="EN" dir="ltr">
<head> <head>
<meta charSet="UTF-8"> <meta charSet="UTF-8">
<title> Page Template </title> <title> Manage Coworking Spaces </title>
<link rel="stylesheet" href="StylingSheet.css"> <link rel="stylesheet" href="Manage_Coworking_Spaces.css">
</head> </head>
<body onLoad="pageLoad()"> <body onLoad="pageLoad()">
<header id="header"> <header id="pageHeader" class="pageHeader">
<a href=""><h1>Page Header</h1></a> <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> </header>
<hr>
<main id="recordSection"> <main id="recordSection">
<br>
<form id="recordForm" title="Record Form"> <form id="recordForm" title="Record Form">
<label>Name: <input name="record_name" id="recordName" <label>Name: <input name="record_name" id="recordName"
type="text"></label><br> type="text"></label><br>
...@@ -42,12 +60,27 @@ ...@@ -42,12 +60,27 @@
</form> </form>
<br> <br>
<span id="DEBUGserverMessage"> </span> <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"> <footer id="pageFooter">
<a href="#header">Top</a> <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> </footer>
<script src="Manage_Coworking_Spaces.js"></script> <script src="Manage_Coworking_Spaces.js"></script>
......
static/Manage_Coworking_Spaces.js
+ 30
− 1
View file @ c06e11ba
// Replaces the onSubmit attribute for the addRecord form. // Replaces the onSubmit attribute for the addRecord form.
function pageLoad() { function onSubmitLoad() {
document.getElementById('addButton').addEventListener('click',addRecord); 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. // Adds a record to the CSV file.
function addRecord(e) { function addRecord(e) {
// Removes the standard form processing. // Removes the standard form processing.
......
static/locations.html
+ 45
− 20
View file @ c06e11ba
...@@ -6,24 +6,23 @@ ...@@ -6,24 +6,23 @@
</head> </head>
<body> <body>
<section> <section>
<h1><img src="https://www.4piproductions.com/wp-content/uploads/2017/04/tramshed_.png" class="logo"> Our Locations </h1>
<button>
<span></span>
<span></span>
<span></span>
</button>
<nav>
<ul>
<li><a href="#"> Home </a></li>
<li><a href="#"> ### </a></li>
<li><a href="#"> ### </a></li>
</ul>
</nav>
<h1><img src="https://www.4piproductions.com/wp-content/uploads/2017/04/tramshed_.png" class="logo"> Our Locations </h1> <div class="contain">
<button> <ul class= "list">
<span></span> <li>
<span></span>
<span></span>
</button>
<nav>
<ul>
<li><a href="#"> Home </a></il>
<li><a href="#"> ### </a></il>
<li><a href="#"> ### </a></il>
</ul>
</nav>
<div class="contain">
<ul class= "list">
<li>
<div class="container"> <div class="container">
<img src="https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1646867535415-4JI39H286BUMT26H4FHN/C36A1915.jpg?format=2500w" class="image" > <img src="https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1646867535415-4JI39H286BUMT26H4FHN/C36A1915.jpg?format=2500w" class="image" >
...@@ -45,9 +44,35 @@ ...@@ -45,9 +44,35 @@
<li> <li>
<div class="container"> <div class="container">
<img src="https://images.squarespace-cdn.com/content/v1/5709040420c647579532dbb4/1594914119071-OWI9G22S295OCMSWL0VL/_K5L1162.jpg?format=2500w" Class="image" > <img src="https://images.squarespace-cdn.com/content/v1/5709040420c647579532dbb4/1594914119071-OWI9G22S295OCMSWL0VL/_K5L1162.jpg?format=2500w" Class="image" >
</li>
</ul> <div class="middle">
</div> <div class="text"> C4DI </div>
</div>
</div>
</li>
<li>
<div class="container">
<img src="https://dogpatchlabs.wpenginepowered.com/wp-content/uploads/2022/09/ian_browne.jpg" class="image" >
<div class="middle">
<div class="text"> Dogpatch </div>
</div>
</div>
</li>
<li>
<div class="container">
<img src="https://stationf.co/img/misc/create-zone.jpg" class="image" >
<div class="middle">
<div class="text"> Station F </div>
</div>
</div>
</li>
</ul>
</div>
</section> </section>
<script src="C:\Users\c22086220\OneDrive - Cardiff University\Desktop\our locations\JScript\locations.js"> </script> <script src="C:\Users\c22086220\OneDrive - Cardiff University\Desktop\our locations\JScript\locations.js"> </script>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment