navigation card for all screens

DemocracyEarth · Oct 27, 2017 · 947dbf4 · 947dbf4
1 parent ecb10e6
commit 947dbf4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -20,7 +20,7 @@ mrt:jquery-ui
 rajit:bootstrap3-datepicker
 mystor:device-detection
 [email protected]
-[email protected]
+# [email protected]
 velocityjs:velocityjs
 
 # react

diff --git a/.meteor/versions b/.meteor/versions
@@ -82,7 +82,6 @@ meteorhacks:[email protected]
 meteorhacks:[email protected]
 meteorspark:[email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -125,7 +124,6 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
 tap:[email protected]
 [email protected]
 [email protected]

diff --git 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
@@ -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
@@ -43,6 +43,5 @@
         </div>
       </form>
     </div>
-    <!--<div>{{_ "edit-later"}} <a id='skip-step'>{{_ "skip-step"}}</a>.</div>-->
   </div>
 </template>
diff --git 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 === '') {
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,5 @@ @@
             </div>
           </form>
         </div>
-        <!--<div>{{_ "edit-later"}} <a id='skip-step'>{{_ "skip-step"}}</a>.</div>-->
       </div>
     </template>