2 files changed, 33 insertions, 2 deletions

diff --git a/cmd/web/js/api.js b/cmd/web/js/api.js
index f892a6b..62530ba 100644
--- a/cmd/web/js/api.js
+++ b/cmd/web/js/api.js
@@ -64,6 +64,16 @@ var ApiEndpoints = {
       return '/changepassword';
     }
   },
+  'CONFIRM_EMAIL': {
+    'type': 'POST',
+    'auth': false,
+    'parameters': [
+      {'name': 'token', 'mandatory': true, 'inquery': true},
+    ],
+    'buildUrl': function() {
+      return '/confirmemail';
+    }
+  },
   'MARKET': {
     'type': 'GET',
     'auth': true,
diff --git a/cmd/web/js/main.jsx b/cmd/web/js/main.jsx
index 84b5848..5dc45eb 100644
--- a/cmd/web/js/main.jsx
+++ b/cmd/web/js/main.jsx
@@ -62,6 +62,27 @@ App.page('/change-password', false, function(context) {
     </div>);
 });
 
+App.page('/confirm', false, function(context) {
+  var token = qs.parse(context.querystring).token;
+
+  if (token === undefined) {
+    App.go('/');
+    return;
+  }
+
+  Api.Call(
+    'CONFIRM_EMAIL',
+    {'token': token},
+    function(err, status, data) {
+      if (err) {
+        console.error(err, data);
+      }
+
+      App.go('/me');
+    }
+  );
+});
+
 App.page('/signout', true, function(context) {
   cookies.removeItem('jwt');
 
@@ -84,8 +105,8 @@ App.page('/not_confirmed', true, function(context) {
   App.mount(<div>
       <div className="row">
         <div className="box offset-3 col-6 text-center">
-          <p>Please be patient, you account is being confirmed...</p>
-          <p><a href="/me"><u>Refresh</u></a></p>
+          <p>An email has now been sent to your email address.</p>
+          <p>Please click the "Confirm your account" button to validate your email.</p>
         </div>
       </div>
     </div>);