Merge branch 'website' of https://github.com/samuel-halim95/e-mission…

…-server into website
e-mission · May 3, 2016 · 14e0667 · 14e0667
2 parents 4db1fda + 7feb92d
commit 14e0667
Show file tree

Hide file tree

Showing 12 changed files with 187 additions and 6 deletions.
diff --git a/emission/net/api/cfc_webapp.py b/emission/net/api/cfc_webapp.py
@@ -85,7 +85,14 @@ def docs(filename):
   if filename != "privacy" and filename != "support" and filename != "about" and filename != "consent":
     return HTTPError(404, "Don't try to hack me, you evil spammer")
   else:
-    return static_file("%s.html" % filename, static_path)
+    return static_file("%s.html" % filename, "%s/%s" % (static_path, "docs"))
+
+@route("/<filename>")
+def docs(filename):
+  if filename != "privacy" and filename != "support" and filename != "about" and filename != "consent":
+    return HTTPError(404, "Don't try to hack me, you evil spammer")
+  else:
+    return static_file("%s.html" % filename, "%s/%s" % (static_path, "docs"))
 
 # Serve up the components of the webapp - library files, our javascript and css
 # files, and HTML templates, properly

diff --git a/front/server/About Us.html → front/server/about.html b/front/server/About Us.html → front/server/about.html
@@ -1,3 +1,4 @@
+
 <!DOCTYPE HTML>
 <!--
 	Big Picture by HTML5 UP
@@ -24,9 +25,9 @@ <h1 id="logo">bPedal</h1>
 				<!-- Nav -->
 					<nav id="nav">
 						<ul>
-							<li><a href="home.html">Home</a></li>
-							<li><a href="About Us.html">About Us</a></li>
-							<li><a href="index.html">Explore Data</a></li>
+							<li><a href="home">Home</a></li>
+							<li><a href="about">About Us</a></li>
+							<li><a href="index">Explore Data</a></li>
 						</ul>
 					</nav>
 

diff --git a/front/server/assets/css/images/overlay1.png b/front/server/assets/css/images/overlay1.png
diff --git a/front/server/home.html b/front/server/home.html
@@ -27,8 +27,8 @@ <h1 id="logo">bPedal</h1>
 					<nav id="nav">
 						<ul>
 							<li><a href="#intro">Home</a></li>
-							<li><a href="About Us.html">About Us</a></li>
-							<li><a href="index.html">Explore Data</a></li>
+							<li><a href="about">About Us</a></li>
+							<li><a href="index">Explore Data</a></li>
 						</ul>
 					</nav>
 

diff --git a/front/server/images/header.jpg b/front/server/images/header.jpg
diff --git a/webapp/www/img/aggregate/bike_apr_2016.png b/webapp/www/img/aggregate/bike_apr_2016.png
diff --git a/webapp/www/img/aggregate/bike_march_2016.png b/webapp/www/img/aggregate/bike_march_2016.png
diff --git a/webapp/www/img/personal/common_trips.png b/webapp/www/img/personal/common_trips.png
diff --git a/webapp/www/img/personal/compare_with_common.png b/webapp/www/img/personal/compare_with_common.png
diff --git a/webapp/www/img/personal/detail_view.png b/webapp/www/img/personal/detail_view.png
diff --git a/webapp/www/img/personal/list_view.png b/webapp/www/img/personal/list_view.png
diff --git a/webapp/www/templates/home.html b/webapp/www/templates/home.html
@@ -0,0 +1,173 @@
+<ion-view view-title="Home">
+<ion-content>
+<a href="https://github.com/you"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/e7bbb0521b397edbd5fe43e7f760759336b5e05f/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png"></a>
+<section class="nav navbar navbar-default navbar-fixed-top" ng-cloak>
+    <section class="container">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="#">emission</a>
+        </div>
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+            <ul class="nav navbar-nav">
+                <li>
+                    <a fullpage-href="summary">
+                        Summary
+                    </a>
+                </li>
+                <li>
+                    <a fullpage-href="personal">
+                        Personal
+                    </a>
+                </li>
+                <li>
+                    <a fullpage-href="aggregate">
+                        Aggregate
+                    </a>
+                </li>
+                <li>
+                    <a fullpage-href="code">
+                        Code
+                    </a>
+                </li>
+                <li>
+                    <a fullpage-href="join">
+                        Join us!
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </section>
+</section>
+<fullpage class="instant-size" page-class="page">
+    <section class="page" id="summary">
+        <section class="container">
+            <h1>E-Mission</h1>
+            <div class="row">
+            <div class="col-md-2">
+               <img ng-src="img/personal/compare_with_common.png" style="opacity: 0.5" height="480em">
+            </div>
+            <div class="col-md-8" id="main-back">
+            <p class="intro" style="color:brown;">E-Mission is a research project at UC Berkeley that allows users to share their travel patterns and experiences with their community and with urban planners.</p>
+            <p class="intro" style="color:brown;">Our goal is to enable personal and structural shifts to sustainable transportation.</p>
+            <p class="intro" style="color:brown;">The project consists of a smartphone application that functions as a personal travel diary, and an aggregate data analysis platform that enables interactive exploration of the collected data.</p>
+            </div>
+            <div class="col-md-2">
+               <img ng-src="img/personal/compare_with_common.png" style="opacity: 0.5" height="480em">
+            </div>
+            </div>
+        </section>
+    </section>
+    <section class="page" id="personal">
+        <section class="container">
+          <h1>Personal</h1>
+          <div class="row" style="height: 480em">
+            <div class="col-md-4">
+                <uib-carousel id="personalCarousel" active="active" interval="myInterval" no-wrap="noWrapSlides">
+                <uib-slide ng-repeat="slide in personalSlides track by slide.id" index="slide.id">
+                <img ng-src="{{slide.image}}" style="margin:auto;">
+                <div class="carousel-caption" style="color:brown">
+                  <p style="color:brown">{{slide.text}}</p>
+                </div>
+                </uib-slide>
+                </uib-carousel>
+            </div>
+            <div class="col-md-6">
+              <p class="intro" style="color:brown;">The phone app provides a
+                personalized travel diary, with information about times,
+distances, trajectories and travel modes. Since we track travel patterns over
+time, we are able to build data-driven tour models that we can use to track
+personalized trends over time:
+                <ul class='intro' style='color:brown'>
+                <li> are your trips taking longer?
+                <li> are you leaving for work later?
+                <li> are you using different transportation modes?
+                </ul>
+              </p>
+              <a class="button button-assertive button-block" fullpage-href="join">Get it now!</a>
+            </div>
+          </div>
+        </section>
+    </section>
+    <section class="page" id="aggregate">
+        <section class="container">
+            <h1>Aggregate</h1>
+            <div class="row">
+              <div class="col-md-12">
+                <p class="intro" style="font-size:1.5em;color:brown;">The webapp provides an aggregate
+                 view of travel patterns and supports filters by mode, month, day,
+                 weekday and time of day. This enables fine-grained visibility into changes over
+                 time. The maps here show the heatmap for <b>bicycling</b> trips in the
+                 Berkeley Area on <b>Thursday</b> commute hours <b>(7am to 10am)</b> in the
+                 months of <b>March and April</b>. It looks like somebody used to bike around the South
+                 side in March and then stopped!!
+                 <a class="button button-assertive" href="/tab/heatmap">Explore now!</a>
+                </p>
+              </div>
+            </div>
+            <div class="row">
+                  <div class="col-md-12">
+                    <uib-carousel active="active" interval="myInterval" no-wrap="noWrapSlides">
+                    <uib-slide ng-repeat="slide in aggregateSlides track by slide.id" index="slide.id">
+                      <img ng-src="{{slide.image}}" style="align:center;margin:auto;">
+                         <div class="carousel-caption" style="color:brown">
+                           <p style="color:brown">{{slide.text}}</p>
+                         </div>
+                     </uib-slide>
+                    </uib-carousel>
+                 </div>
+            </div>
+        </section>
+    </section>
+    <section class="page" id="code">
+        <section class="container">
+            <h1>Code</h1>
+            <p class="intro" style="color:brown;">The code is available on github under an open source BSD license. So you have complete visibility into the data that we collect, the analysis that we perform on it, and the results that we display.</p>
+            <p><a class="button button-assertive" href="https://github.com/e-mission/e-mission-server">View on GitHub</a>
+            </p>
+            <p class="intro" style="color:brown">You can even join our list of contributors. </p>
+            <p class="intro" style="color:brown"><a href="https://github.com/e-mission/e-mission-server/graphs/contributors">Server code</a> </p>
+            <p class="intro" style="color:brown"><a href="https://github.com/e-mission/e-mission-phone/graphs/contributors">Phone code</a></p>
+            <p class="intro" style="color:brown">Cordova plugins for:
+            <ul class="intro" style="color:brown">
+                <li> <a href="https://github.com/e-mission/e-mission-data-collection/graphs/contributors">energy-efficient data collection</a> </li>
+                <li> <a href="https://github.com/e-mission/cordova-usercache/graphs/contributors">bi-directional offline storage and processing</a></li>
+                <li> and more: <a href="https://github.com/e-mission/">https://github.com/e-mission/</a></li>
+            </ul>
+        </section>
+    </section>
+    <section class="page" id="join">
+        <section class="container">
+            <h1>Join us!</h1>
+            <h2>Aggregate analysis</h2>
+            <p class="intro" style="color:brown"><a
+                href="tab/heatmap">Aggregate heatmap analysis based</a> on our current
+                installed user base is publicly available.
+                Enjoy. As we add more analyses, we will evaluate if/how we want
+                to provide access to them. The decision will largely be driven
+                by privacy implications. 
+            </p>
+            <h2>Personalized analysis</h2>
+            <p class="intro" style="color:brown">The personal data collection
+            apps for android and iOS are currently in private alpha. If you
+            would like an invitation, please email <a
+            href="mailto:[email protected]">[email protected]</a>
+            indicating:
+            <ul class="intro"> 
+                <li> whether you are using android or iOS, and <li>
+                <li> the address to send the invitation to - gmail account on android, apple ID on iOS
+            </ul>
+            <p class="intro" style="color:brown">Since TestFlight <a
+                href="https://developer.apple.com/testflight/">limits the number of users in
+                private alpha</a>, we have only ~ 15 slots currently available for iOS testers.
+                So reply soon if you want to participate!</p>
+            </p>
+        </section>
+    </section>
+</fullpage>
+</ion-content>
+</ion-view>