website

e-mission · Apr 3, 2016 · 7feb92d · 7feb92d
1 parent d7584a0
commit 7feb92d
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 7 deletions.
diff --git a/emission/net/api/cfc_webapp.py b/emission/net/api/cfc_webapp.py
@@ -80,17 +80,41 @@ def index():
 # If this gets to be too much, we should definitely consider that
 @route("/<filename>")
 def doc(filename):
-  if filename != "privacy" and filename != "support" and filename != "about" and filename != "consent":
+  if filename != "privacy" and filename != "home" and filename != "about" and filename != "index":
     return HTTPError(404, "Don't try to hack me, you evil spammer")
   else:
-    return static_file("%s.html" % filename, "%s/docs/" % static_path)
+    return static_file("%s.html" % filename, "%s/server/" % static_path)
 
 # Serve up javascript and css files properly
 @route('/front/<filename:path>')
 def server_static(filename):
   logging.debug("static filename = %s" % filename)
   return static_file(filename, static_path)
 
+@route('/assets/css/<filename>')
+def css_static(filename):
+  return static_file(filename, static_path + '/server/assets/css/')
+
+@route('/assets/css/images/<filename>')
+def css_images_static(filename):
+  return static_file(filename, static_path + '/server/assets/css/images')
+
+@route('/assets/js/<filename>')
+def js_static(filename):
+  return static_file(filename, static_path + '/server/assets/js/')
+
+@route('/assets/fonts/<filename>')
+def fonts_static(filename):
+  return static_file(filename, static_path + '/server/assets/fonts/')
+
+@route('/assets/css/images/<filename>')
+def assets_images_static(filename):
+  return static_file(filename, static_path + '/server/assets/css/images/')
+
+@route('/images/<filename>')
+def images_static(filename):
+  return static_file(filename, static_path + '/server/images/')
+
 @route('/clients/<clientname>/front/<filename>')
 def server_static(clientname, filename):
   logging.debug("returning file %s from client %s " % (filename, clientname))

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="index.html">Home</a></li>
-							<li><a href="About Us.html">About Us</a></li>
-							<li><a href="data.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="data.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