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

Resorted repository as a team.

parent b0899923
No related branches found
No related tags found
3 merge requests!20Draft: resolving merge conflicts,!19Development,!14Resolve "Hotfix for sorting out the repository"
Hide whitespace changes
Inline Side-by-side
Showing
with 15 additions and 363 deletions
.flaskenv deleted 100644 → 0
+ 0
− 2
View file @ b0899923
FLASK_APP=main.py
FLASK_ENV=development
.gitignore 0 → 100644
+ 3
− 0
View file @ 868a7924
Database Files
*.db
Coworking_Spaces.db
static/Coworking_Functions.py → Coworking_Functions.py
+ 0
− 0
View file @ 868a7924
File moved
OurSpaces.html deleted 100644 → 0
+ 0
− 16
View file @ b0899923
<head>
<link rel="stylesheet" href="framework.css">
</head>
<body class="body">
<header> <img src="header.png"/> </header>
<div class="box">
</div>
</body>
html deleted 100644 → 0
+ 0
− 64
View file @ b0899923
<!DOCTYPE html>
<html>
<head>
<link rel="stylesheet" href= "css/locations.css">
<title> Locations </title>
</head>
<body>
<h1>
<img src="https://www.4piproductions.com/wp-content/uploads/2017/04/tramshed_.png" class="logo">
OUR LOCATIONS </h1>
<div class="contain">
<ul class= "list">
<li>
<div class="container">
<img src="https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1646867535415-4JI39H286BUMT26H4FHN/C36A1915.jpg?format=2500w" class="image" >
<div class="middle">
<div class="text"> Codebase </div>
</div>
</div>
</li>
<li>
<div class="container">
<img src="https://wearecatalyst.org/wp-content/uploads/2022/05/Catalyst03.jpg" class="image" >
<div class="middle">
<div class="text"> Catalyst </div>
</div>
</div>
</li>
<li>
<div class="container">
<img src="https://images.squarespace-cdn.com/content/v1/5709040420c647579532dbb4/1594914119071-OWI9G22S295OCMSWL0VL/_K5L1162.jpg?format=2500w" Class="image" >
<div class="middle">
<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>
</body>
landingpage.html deleted 100644 → 0
+ 0
− 9
View file @ b0899923
<html>
<head><link rel="stylesheet" href="style.css"></head>
<header>
<img src="logo.jpg"/><br><br><br><br>
</header>
<body class="body">
<img src="title.png"/>
<button id= "ViewLocations" type="ViewLocations" href="locations.html">View Locations</button>
</html>
locations deleted 100644 → 0
+ 0
− 31
View file @ b0899923
<!DOCTYPE html>
<html>
<head>
<title> Locations </title>
<style>
body{
background-color: white;
color: black;
}
header{
background-color: white;
color: black;
display: block;
margin-left: auto;
margin-right: auto;
float: center;
}
</style>
<body>
<h1> OUR LOCATIONS </h>
<ul>
<li><img src="https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1646867535415-4JI39H286BUMT26H4FHN/C36A1915.jpg?format=2500w" wedth="200" height="200" ><p> Codebase </p></li>
<li><img src="https://wearecatalyst.org/wp-content/uploads/2022/05/Catalyst03.jpg" wedth="200" height="200" ><p> Catalyst </p></li>
<li><img src="https://images.squarespace-cdn.com/content/v1/5709040420c647579532dbb4/1594914119071-OWI9G22S295OCMSWL0VL/_K5L1162.jpg?format=2500w" wedth="200" height="200" ><p> C4DI </p></li>
<li><img src="https://dogpatchlabs.wpenginepowered.com/wp-content/uploads/2022/09/ian_browne.jpg "wedth="200" height="200" ><p> Dogpatch </p></li>
<li><img src="https://stationf.co/img/misc/create-zone.jpg" wedth="200" height="200" ><p> Stafion F </p></li>
</ul>
</body>
main.py deleted 100644 → 0
+ 0
− 40
View file @ b0899923
from flask import Flask, request, render_template, redirect
import database
import csv
import re
def import_workspace(data):
workspace = database.Workspace(
data["name"],
data["address"],
data["main_photo"],
data["additional_photos"],
data["description"],
data["website"],
data["email"],
data["phone_number"],
data["opening_hours"],
data["checkin_instructions"]
)
app = Flask(__name__)
file = open("coworking_spaces.csv")
csvreader = csv.reader(file)
header = next(csvreader)
Rows= []
for Row in csvreader:
Rows.append(Row)
print(Row)
with open('coworking_spaces.csv') as file:
content = file.readlines()
header = content[2:]
rows = content[1:]
print(header)
print(Rows)
our locations.html deleted 100644 → 0
+ 0
− 136
View file @ b0899923
<!DOCTYPE html>
<html>
<head>
<title> Locations </title>
<style>
body{
background-color: white;
color: black;
}
header{
background-color: white;
color: black;
display: block;
margin-left: auto;
margin-right: auto;
float: center;
}
.container {
position: relative;
padding: 5px;
width: 50%;
height: 70%;
background-color: white;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
margin-bottom: 25px;
}
.image {
opacity: 1;
display: block;
width: 100%;
height: 75%;
transition: .5s ease;
backface-visibility: hidden;
}
.middle {
transition: .5s ease;
opacity: 0;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
-ms-transform: translate(-50%, -50%)
}
.container:hover .image {
opacity: 0.3;
}
.container:hover .middle {
opacity: 1;
}
.text {
background-color: black;
color: white;
font-size: 16px;
padding: 16px 32px;
}
div.contain {
text-align: center;
}
ul.list {
display: inline-block;
text-align: left;
list-style-type: none;
}
</style>
<body>
<h1> OUR LOCATIONS </h1>
<div class="contain">
<ul class= "list">
<li>
<div class="container">
<img src="https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1646867535415-4JI39H286BUMT26H4FHN/C36A1915.jpg?format=2500w" class="image" >
<div class="middle">
<div class="text"> Codebase </div>
</div>
</div>
</li>
<li>
<div class="container">
<img src="https://wearecatalyst.org/wp-content/uploads/2022/05/Catalyst03.jpg" class="image" >
<div class="middle">
<div class="text"> Catalyst </div>
</div>
</div>
</li>
<li>
<div class="container">
<img src="https://images.squarespace-cdn.com/content/v1/5709040420c647579532dbb4/1594914119071-OWI9G22S295OCMSWL0VL/_K5L1162.jpg?format=2500w" Class="image" >
<div class="middle">
<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>
</body>
__init__.py → project_db.sql
+ 0
− 0
View file @ 868a7924
File moved
tempServer.py → project_server.py
+ 12
− 0
View file @ 868a7924
import os
from flask import Flask, redirect, request, render_template, jsonify
from static import Coworking_Functions
from . import Coworking_Functions
app = Flask(__name__)
ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'])
@app.route("/AddRecord", methods=['POST'])
def addRecord():
print('Processing record.')
infoMessage = ('Add record failed.')
if (request.method == 'POST'):
recordData = Coworking_Functions.getCoworkingSpaces()
Coworking_Functions.addCoworkingSpaces(recordData)
infoMessage = (f'{recordData} Record added.')
print(infoMessage)
return (infoMessage)
#PUT ROUTES HERE
if __name__ == "__main__":
app.run(debug=True)
static/.gitkeep deleted 100644 → 0
+ 0
− 0
View file @ b0899923
static/__init__.py deleted 100644 → 0
+ 0
− 0
View file @ b0899923
static/__pycache__/__init__.cpython-310.pyc deleted 100644 → 0
+ 0
− 0
View file @ b0899923
File deleted
static/__pycache__/coworking_functions.cpython-310.pyc deleted 100644 → 0
+ 0
− 0
View file @ b0899923
File deleted
static/__pycache__/coworking_spaces_functions.cpython-310.pyc deleted 100644 → 0
+ 0
− 0
View file @ b0899923
File deleted
static/test deleted 100644 → 0
+ 0
− 33
View file @ b0899923
def getFieldnames(csvFile):
fieldnames = []
with open(csvFile, 'r') as readFile:
csvReader = csv.reader(readFile)
fieldnames = next(csvReader)
readFile.close()
return fieldnames
dictKeys = getFieldnames('coworking_spaces.csv')
"""
"""
newRecord = {}
for x in range(len(keys)):
newRecord[keys[x]] = values[x]
"""
"""
name_Value = "NEWNEWNEW"
address_Value = "123CodeBase Edinburgh , 37a Castle Terrace, Edinburgh, EH1 2EL"
MP_Value = "123https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1646867535415-4JI39H286BUMT26H4FHN/C36A1915.jpg?format=2500w"
AP_Value = "123https://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"
description_Value = "123Hi. We\u2019re 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\u2019re friendly people who are geeky about building tech startups, managing disruption and innovation."
website_Value = "123https://www.thisiscodebase.com"
email_Value = "123info@thisiscodebase.com"
PN_Value = "123Hi(+44) 0131 560 2003"
OH_Value = "12308:00 - 17:00"
CI_Value = "123Use the email address or phone number to call ahead and book a desk, let them know you're a Tramshed member"
recordValues = [name_Value, address_Value, MP_Value, AP_Value, description_Value, website_Value, email_Value, PN_Value, OH_Value, CI_Value]
style.css deleted 100644 → 0
+ 0
− 32
View file @ b0899923
header{
background-color: black;
display: block;
color: black;
margin-left: auto;
margin-right: inherit;
width: 100%;
height: 75%;
}
button{
background-color: white;
color: black;
text-align: center;
position: fixed;
margin: inherit;
display: inline-block;
line-height: 20px;
float: center;
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;
}
body{
display: block;
templates/.gitkeep deleted 100644 → 0
+ 0
− 0
View file @ b0899923
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