Skip to content

Commit

Permalink
yeet
Browse files Browse the repository at this point in the history
  • Loading branch information
@Li-Evelyn
Li-Evelyn committed Mar 29, 2020
1 parent 08fd3a9 commit 3361207
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 141 deletions.
3 changes: 3 additions & 0 deletions .idea/.gitignore
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ def update():
plot_any(data['intersection'], data['direction'], data['traffic'])
return "it worked"

@app.route('/analysis.html')
def analysis():
return render_template("analysis.html")


@app.route('/home.html')
@app.route('/home')
@app.route('/dashboard.html')
def hello_world():
return render_template("site.html")

Expand Down
168 changes: 32 additions & 136 deletions static/styles/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,37 @@ header {
border-radius: 20px;
}

.nav {
display: inline-block;
}

.nav ul {
background-color: transparent;
outline: solid black 2px;
list-style-type: none;
padding-inline-start: 0px;
display: flex;
flex-direction: row;
text-align: center;
justify-content: space-around;
background-color: #5d739a;
width: 500px;
}
.nav li {
display: block;
}

.nav a {
display: inline-block;
padding: 8px 20px;
color: white;
text-decoration: none;
}

.nav a:hover {
background-color: gray;
}

.body {
padding: 10px;
display: flex;
Expand Down Expand Up @@ -114,142 +145,7 @@ iframe {
align-items: center;
}

.street-1-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.street-2-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.street-3-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.north-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.east-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.south-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.west-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.general-traffic-button-selected {
.street-1-button, .south-button, .general-traffic-button {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.single-unit-trucks-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.articulated-trucks-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.buses-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.work-vans-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.bicycles-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}

.pedestrians-button-selected {
background-color: #5d739a;
color: #272659;
border: solid 3px #5d739a;
overflow: hidden;
position: relative;
border-radius: 10px;
padding: 5px;
}
26 changes: 26 additions & 0 deletions templates/analysis.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!doctype html>
<html>
<head>
<meta charset='utf8'>
<link rel="shortcut icon" href="static/images/car.png">
<link rel="stylesheet" type="text/css" href="/static/styles/main.css">
<title>INSERT TITLE HERE</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="/static/scripts/site.js"></script>
</head>
<body>
<header>
<h1>Traffic Analysis</h1>
<div class = "nav">
<ul>
<li>
<a href=/analysis.html>Analysis</a>
</li>
<li>
<a href=/dashboard.html>Dashboard</a>
</li>
</ul>
</div>
</header>
</body>
</html>
15 changes: 12 additions & 3 deletions templates/site.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,24 @@
<meta charset='utf8'>
<link rel="shortcut icon" href="static/images/car.png">
<link rel="stylesheet" type="text/css" href="/static/styles/main.css">
<title>Dream team :)</title>
<title>INSERT TITLE HERE</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="/static/scripts/site.js"></script>
</head>

<body>
<header>
<h1>Super Nice Graph</h1>
<p>* The Dream Team *</p>
<h1>Intersections Dashboard</h1>
<div class = "nav">
<ul>
<li>
<a href=/analysis.html>Analysis</a>
</li>
<li>
<a href=/dashboard.html>Dashboard</a>
</li>
</ul>
</div>
</header>
<section class="body">
<div class="graph-container">
Expand Down

0 comments on commit 3361207

Please sign in to comment.