Get meteor developer accounts working a bit better.

Differential · May 27, 2014 · be97ac8 · be97ac8
1 parent 2c547b9
commit be97ac8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/client/helpers.coffee b/client/helpers.coffee
@@ -19,6 +19,9 @@ Handlebars.registerHelper 'signupClass', ->
   if Accounts.oauth && Accounts.oauth.serviceNames().length > 0
     "collapse"
 
+Handlebars.registerHelper 'signedIn', ->
+  return true if Meteor.user()
+
 Handlebars.registerHelper 'otherLoginServices', ->
   Accounts.oauth &&
   Accounts.oauth.serviceNames().length > 0

diff --git a/client/views/social/social.coffee b/client/views/social/social.coffee
@@ -5,12 +5,18 @@ Template.entrySocial.helpers
     Session.get('buttonText')
 
   unconfigured: ->
-    Accounts.loginServiceConfiguration.find({service: @toString()}).fetch().length is 0
+    ServiceConfiguration.configurations.find({service: @toString()}).fetch().length is 0
 
   google: ->
     if @[0] == 'g' && @[1] == 'o'
       true
 
+  icon: ->
+    switch @.toString()
+      when 'google' then 'google-plus'
+      when 'meteor-developer' then 'rocket'
+      else @
+
 Template.entrySocial.events
 
   'click .btn': (event)->
@@ -29,7 +35,10 @@ Template.entrySocial.events
         Accounts._loginButtonsSession.configureService(serviceName)
       else
         Accounts._loginButtonsSession.errorMessage(err.reason || t9n("error.unknown"))
-    loginWithService = Meteor["loginWith" + capitalize(serviceName)]
+    if serviceName is 'meteor'
+      loginWithService = Meteor["loginWithMeteorDeveloperAccount"]
+    else
+      loginWithService = Meteor["loginWith" + capitalize(serviceName)]
     options = {}
 
     if (Accounts.ui._options.requestPermissions[serviceName])

diff --git a/client/views/social/social.html b/client/views/social/social.html
@@ -1,17 +1,9 @@
 <template name='entrySocial'>
   <button class="btn" id="entry-{{this}}" name="{{this}}">
     {{#if unconfigured}}
-      {{#if google}}
-        <i class="fa fa-{{this}}-plus"></i> {{t9n "configure"}} {{capitalize this}}
-      {{else}}
-        <i class="fa fa-{{this}}"></i> {{t9n "configure"}} {{capitalize this}}
-      {{/if}}
+      <i class="fa fa-{{icon}}"></i> {{t9n "configure"}} {{capitalize this}}
     {{else}}
-      {{#if google}}
-        <i class="fa fa-{{this}}-plus"></i> {{t9n "sign"}} {{buttonText}} {{t9n "with"}} {{capitalize this}}
-      {{else}}
-        <i class="fa fa-{{this}}"></i> {{t9n "sign"}} {{buttonText}} {{t9n "with"}} {{capitalize this}}
-      {{/if}}
+      <i class="fa fa-{{icon}}"></i> {{t9n "sign"}} {{buttonText}} {{t9n "with"}} {{capitalize this}}
     {{/if}}
   </button>
 </template>