From 947dbf4024dd2c4ad5b6efe3387c22c9b197754a Mon Sep 17 00:00:00 2001 From: Santiago Siri Date: Fri, 27 Oct 2017 15:18:51 -0400 Subject: [PATCH] navigation card for all screens --- .meteor/packages | 2 +- .meteor/versions | 2 -- imports/ui/templates/components/identity/avatar/avatar.js | 1 + imports/ui/templates/components/identity/login/login.js | 4 ++++ .../components/identity/login/profile/profileEditor.html | 1 - .../components/identity/login/profile/profileEditor.js | 1 + 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 1871ac55d..9ac03279c 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -20,7 +20,7 @@ mrt:jquery-ui rajit:bootstrap3-datepicker mystor:device-detection standard-minifier-css@1.3.5 -standard-minifier-js@2.1.2 +# standard-minifier-js@2.1.2 velocityjs:velocityjs # react diff --git a/.meteor/versions b/.meteor/versions index 0866a5d31..a6c3141a1 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -82,7 +82,6 @@ meteorhacks:search-source@1.4.2 meteorhacks:ssr@2.2.0 meteorspark:util@0.2.0 minifier-css@1.2.16 -minifier-js@2.1.4 minimongo@1.3.2 mobile-experience@1.0.5 mobile-status-bar@1.0.14 @@ -125,7 +124,6 @@ spacebars@1.0.15 spacebars-compiler@1.1.3 srp@1.0.10 standard-minifier-css@1.3.5 -standard-minifier-js@2.1.2 tap:i18n@1.8.2 templating@1.3.2 templating-compiler@1.3.3 diff --git a/imports/ui/templates/components/identity/avatar/avatar.js b/imports/ui/templates/components/identity/avatar/avatar.js index ec8e796e2..cba0268d7 100644 --- a/imports/ui/templates/components/identity/avatar/avatar.js +++ b/imports/ui/templates/components/identity/avatar/avatar.js @@ -232,6 +232,7 @@ Template.avatar.events({ const data = Meteor.user().profile; data.configured = false; Meteor.users.update(Meteor.userId(), { $set: { profile: data } }); + Session.set('cardNavigation', true); }, 'click #removeSignature'() { if (Meteor.Device.isPhone()) { diff --git a/imports/ui/templates/components/identity/login/login.js b/imports/ui/templates/components/identity/login/login.js index b5fc23d8d..a45c4556b 100644 --- a/imports/ui/templates/components/identity/login/login.js +++ b/imports/ui/templates/components/identity/login/login.js @@ -27,6 +27,10 @@ Template.login.events({ Template.cardNavigation.events({ 'click #card-back'() { + const data = Meteor.user().profile; + Session.set('newCountry', undefined); + data.configured = true; + Meteor.users.update(Meteor.userId(), { $set: { profile: data } }); Session.set('cardNavigation', false); }, }); diff --git a/imports/ui/templates/components/identity/login/profile/profileEditor.html b/imports/ui/templates/components/identity/login/profile/profileEditor.html index 9eb5a1910..4bd3cf97e 100644 --- a/imports/ui/templates/components/identity/login/profile/profileEditor.html +++ b/imports/ui/templates/components/identity/login/profile/profileEditor.html @@ -43,6 +43,5 @@ - diff --git a/imports/ui/templates/components/identity/login/profile/profileEditor.js b/imports/ui/templates/components/identity/login/profile/profileEditor.js index ac20b09a6..c50b012cf 100644 --- a/imports/ui/templates/components/identity/login/profile/profileEditor.js +++ b/imports/ui/templates/components/identity/login/profile/profileEditor.js @@ -66,6 +66,7 @@ Template.profileEditor.events({ Session.set('newCountry', undefined); data.configured = true; Meteor.users.update(Meteor.userId(), { $set: { profile: data } }); + Session.set('cardNavigation', false); }, 'click #save-profile'() { if (document.getElementById('editFirstName').value === '') {