update route on pedigree/person switch

fs-webcomponents · Dec 19, 2016 · 4624a05 · 4624a05
1 parent 13fc648
commit 4624a05
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/components/sample-app.html b/components/sample-app.html
@@ -257,9 +257,9 @@ <h1>FamilySearch Web Components Sample App</h1>
      */
     _togglePage: function(){
       if(this.page === 'person'){
-        this.page = 'pedigree';
+        page('/pedigree/' + this.personId);
       } else {
-        this.page = 'person';
+        page('/person/' + this.personId);
       }
     },
 
@@ -279,12 +279,17 @@ <h1>FamilySearch Web Components Sample App</h1>
       var app = this,
           loadUser = this._routeMiddleware.loadUser.bind(this),
           ensureAuth = this._routeMiddleware.ensureAuth.bind(this);
-
+
+      page('/person', ensureAuth, loadUser, function(){
+        page.redirect('/person/' + app.user.personId);
+      });
       page('/person/:personId', ensureAuth, function(context){
         app.personId = context.params.personId;
+        app.page = 'person';
       });
-      page('/person', ensureAuth, loadUser, function(){
-        page.redirect('/person/' + app.user.personId);
+      page('/pedigree/:personId', function(context){
+        app.personId = context.params.personId;
+        app.page = 'pedigree';
       });
 
       // When signed in, forward to /person by default to load the current user

diff --git a/index.js b/index.js
@@ -4,7 +4,7 @@
  */
 
 var serverFactory = require('spa-server');
-var matcher = /\/person/; 
+var matcher = /^\/(person|pedigree)/; 
 var server = serverFactory.create({
   port: process.env.PORT || 8080,