diff --git a/emission/net/api/cfc_webapp.py b/emission/net/api/cfc_webapp.py index 48dff5dc0..2773b180b 100644 --- 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("/") +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 b/front/server/about.html similarity index 93% rename from front/server/About Us.html rename to front/server/about.html index 0297a2953..59e9c1b15 100644 --- a/front/server/About Us.html +++ b/front/server/about.html @@ -1,3 +1,4 @@ + diff --git a/front/server/assets/css/images/overlay1.png b/front/server/assets/css/images/overlay1.png new file mode 100755 index 000000000..7aa803196 Binary files /dev/null and b/front/server/assets/css/images/overlay1.png differ diff --git a/front/server/home.html b/front/server/home.html index 76219d5d6..a3da3504a 100644 --- a/front/server/home.html +++ b/front/server/home.html @@ -27,8 +27,8 @@

bPedal

diff --git a/front/server/images/header.jpg b/front/server/images/header.jpg new file mode 100644 index 000000000..e84417a68 Binary files /dev/null and b/front/server/images/header.jpg differ diff --git a/webapp/www/img/aggregate/bike_apr_2016.png b/webapp/www/img/aggregate/bike_apr_2016.png new file mode 100644 index 000000000..e094e789e Binary files /dev/null and b/webapp/www/img/aggregate/bike_apr_2016.png differ diff --git a/webapp/www/img/aggregate/bike_march_2016.png b/webapp/www/img/aggregate/bike_march_2016.png new file mode 100644 index 000000000..09cc541de Binary files /dev/null and b/webapp/www/img/aggregate/bike_march_2016.png differ diff --git a/webapp/www/img/personal/common_trips.png b/webapp/www/img/personal/common_trips.png new file mode 100644 index 000000000..b390c426f Binary files /dev/null and b/webapp/www/img/personal/common_trips.png differ diff --git a/webapp/www/img/personal/compare_with_common.png b/webapp/www/img/personal/compare_with_common.png new file mode 100644 index 000000000..0229a8cc6 Binary files /dev/null and b/webapp/www/img/personal/compare_with_common.png differ diff --git a/webapp/www/img/personal/detail_view.png b/webapp/www/img/personal/detail_view.png new file mode 100644 index 000000000..25e741b96 Binary files /dev/null and b/webapp/www/img/personal/detail_view.png differ diff --git a/webapp/www/img/personal/list_view.png b/webapp/www/img/personal/list_view.png new file mode 100644 index 000000000..dcb5c8909 Binary files /dev/null and b/webapp/www/img/personal/list_view.png differ diff --git a/webapp/www/templates/home.html b/webapp/www/templates/home.html new file mode 100644 index 000000000..fd1833955 --- /dev/null +++ b/webapp/www/templates/home.html @@ -0,0 +1,173 @@ + + +Fork me on GitHub +
+
+
+ + emission +
+ +
+
+ +
+
+

E-Mission

+
+
+ +
+
+

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.

+

Our goal is to enable personal and structural shifts to sustainable transportation.

+

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.

+
+
+ +
+
+
+
+
+
+

Personal

+
+
+ + + +
+

{{slide.text}}

+
+ + +
+
+

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: +

    +
  • are your trips taking longer? +
  • are you leaving for work later? +
  • are you using different transportation modes? +
+

+ Get it now! +
+
+
+
+
+
+

Aggregate

+
+
+

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 bicycling trips in the + Berkeley Area on Thursday commute hours (7am to 10am) in the + months of March and April. It looks like somebody used to bike around the South + side in March and then stopped!! + Explore now! +

+
+
+
+
+ + + +
+

{{slide.text}}

+
+ + +
+
+
+
+
+
+

Code

+

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.

+

View on GitHub +

+

You can even join our list of contributors.

+

Server code

+

Phone code

+

Cordova plugins for: +

+
+
+
+
+

Join us!

+

Aggregate analysis

+

Aggregate heatmap analysis based 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. +

+

Personalized analysis

+

The personal data collection + apps for android and iOS are currently in private alpha. If you + would like an invitation, please email shankari@eecs.berkeley.edu + indicating: +

    +
  • whether you are using android or iOS, and
  • +
  • the address to send the invitation to - gmail account on android, apple ID on iOS +
+

Since TestFlight limits the number of users in + private alpha, we have only ~ 15 slots currently available for iOS testers. + So reply soon if you want to participate!

+

+
+
+ + +