Merge pull request #386 from UUDigitalHumanitieslab/feature/reliable-routes

Reliable redirect, shorter login duration

Author: BeritJanssen

frontend/src/aspects/navigation.ts

@@ -24,7 +24,10 @@ history.once('route', () => {
     uploadSourceForm.setHeight(availableHeight);
 });
 
-mainRouter.on('route:home', () => mainRouter.navigate('search'));
+mainRouter.on('route:home', () => mainRouter.navigate('search', {
+    trigger: true,
+    replace: true,
+}));
 mainRouter.on('route:search', () => userFsm.handle('search'));
 mainRouter.on('route:upload', () => userFsm.handle('upload'));
 mainRouter.on('route:explore', () => userFsm.handle('explore'));

frontend/src/main.ts

@@ -15,8 +15,8 @@ import './aspects/authentication';
 import './aspects/registration';
 import './aspects/exploration';
 
+user.fetch();
 when(ready, i18nPromise).done(function () {
-    user.fetch();
     let success = history.start({
         root: baseUrl,
         pushState: true,

frontend/src/user/registration/confirm-registration-template.hbs

@@ -3,7 +3,7 @@
     <form class="box is-narrow-modal-form">
     {{#if isConfirmed}}
     <h3 class="title is-3">Confirmation complete</h3>
-    <p>Thank you for signing up. You can now <a href='arrive'>login</a></p>
+    <p>Thank you for signing up. You can now <a href='search'>login</a></p>
     {{/if}}
 
     {{#if wasNotFound}}