make push state work by responding to all routes not prefixed with ap…

…i with HTML
joelongstreet · Feb 22, 2014 · 1f3e158 · 1f3e158
1 parent e5fd32d
commit 1f3e158
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,6 @@ node_modules
 *.db
 bower_components
 public/*
-!public/index.html
+!public/app.html
 !public/img/
 !public/img/*
diff --git a/index.js b/index.js
@@ -5,9 +5,9 @@ var app = express();
 
 app.use(express.static(process.cwd() + '/public'));
 
-app.get('/', routes.getAuthURL);
-app.get('/user/authorize', routes.getAuthURL);
-app.get('/auth_callback', routes.authCallback);
+app.get('/*', routes.ui);
+app.get('/api/user/authorize', routes.getAuthURL);
+app.get('/api/auth_callback', routes.authCallback);
 app.get('/api/:method', routes.makeFlickrRequest);
 
 

diff --git a/lib/routes.js b/lib/routes.js
@@ -1,3 +1,4 @@
+var path = require('path');
 var dirty = require('dirty');
 var users = dirty('./db/users.db');
 
@@ -7,6 +8,12 @@ require('./flickrConnect').createClient(function(client){
 });
 
 
+exports.ui = function(req, res){
+  var htmlPath = path.join(process.cwd(), 'public/app.html')
+  res.sendfile(htmlPath);
+};
+
+
 exports.getAuthURL = function(req, res){
   res.redirect(flickrClient.getUserAuthURL());
 };

diff --git a/public/index.html → public/app.html b/public/index.html → public/app.html
@@ -1,14 +1,13 @@
 <!DOCTYPE html>
 <html>
-  <h
+  <head>
     <meta charset="utf-8">
     <title>Flickr Photo Album</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="/app.css" />
     <script src="/vendor.js"></script>
     <script src="/templates.js"></script>
-    <script src="/app.css"></script>
     <script src="/app.js"></script>
   </head>
   <body><div id="main"></div></body>