Merge branch 'master' into enroll

Author: benmgreene

.gitignore

@@ -7,4 +7,7 @@ vendor/
 packages
 *.lock
 *.sublime-workspace
-*.sublime-project
+*.sublime-project
+Makefile
+start_test.js
+phantom_runner.js

.travis.yml

@@ -3,5 +3,5 @@ node_js:
   - "0.10"
 before_install:
   - "curl -L http://git.io/ejPSng | /bin/sh"
-notifications:
-  slack: differential:L6ydnf9YbCImkL3LHFfNRpf6
+env:
+  - TEST_COMMAND=meteor

README.md

@@ -1,27 +1,24 @@
----
-layout: default
-username: Differential
-repo: accounts-entry
-desc: Meteor sign up and sign in pages.
-version: 1.0.2
+[![Stories in Ready](https://badge.waffle.io/Differential/accounts-entry.png?label=ready&title=Ready)](https://waffle.io/Differential/accounts-entry)
+# Meteor accounts-entry [![Build Status](https://travis-ci.org/Differential/accounts-entry.png)](https://travis-ci.org/Differential/accounts-entry)
 
----
+accounts-entry is a meteor package that relies on Iron Router and provides an alternative interface to accounts-ui, with whole pages for sign up and sign in.
 
-**NOTE:** Version 0.8.0 and higher or accounts-entry requires that you use Meteor 0.8.2 or higher. You also need to pass the pause param to AccountsEntry.signedInRequired if you are using it. If you were using master and extraSignUpFields, please review the docs for changes in the 0.8.0 release.
+## Getting started
+
+Run:
 
-# accounts-entry
+```
+meteor add joshowens:accounts-entry
+```
 
-[![Build Status](https://travis-ci.org/Differential/accounts-entry.png)](https://travis-ci.org/Differential/accounts-entry)
+You can install the `accounts-ui` package, as it is still used for OAuth setup.
 
-accounts-entry is a meteorite package that relies on Iron Router and provides an
-alternative interface to accounts-ui, with whole pages for sign up
-and sign in.
 
 We wanted something to work with that used [Iron Router](https://github.com/EventedMind/iron-router),
 [Bootstrap 3](https://github.com/mangasocial/meteor-bootstrap-3), and didn't require the forcing of
 the dropdown box that didn't seem to be easily styled. But we love the ease of adding more packages like `accounts-facebook` or `accounts-twitter`, so we fully support the OAuth packages by adding buttons to let people sign-up/sign-in with those services if you add them.  By default, accounts-entry doesn't offer email/password login functionality.  If you `mrt add accounts-password`, accounts-entry will offer your users the option to sign-up/sign-in with a username and password.
 
-![Example](http://github.differential.io/accounts-entry/images/Example.png)
+![Example](http://github.differential.com/accounts-entry/images/Example.png)
 
 Examples of the package in action (check out the sign up or sign in
 links):
@@ -30,23 +27,13 @@ links):
 * [https://carp.io/](https://carp.io/)
 * [https://getliquid.io/](https://getliquid.io/)
 * [http://support.unpolishedcr.com/](http://support.unpolishedcr.com/)
-* Email [email protected] to add your project to the list.
+* Submit PR with a description to add your project to the list.
 
 [Changelog](https://github.com/BeDifferential/accounts-entry/blob/master/CHANGELOG.md)
 
 ## Compatibility
 
-accounts-entry is presently compatible with Iron Router 0.6.0 and above. Since meteorite doesn't support semantic version locking, we are currently pegged to 0.6.4 of Iron-router.
-
-## Getting started
-
-Run:
-
-```
-mrt add accounts-entry
-```
-
-You can install the `accounts-ui` package, as it is still used for OAuth setup.
+accounts-entry is presently compatible with Iron Router 1.0.3 and above.
 
 ## Provided routes
 
@@ -57,9 +44,9 @@ You will get routes and the necessary templates for:
 /sign-out
 /sign-up
 /forgot-password
+/verification-pending
 ```
 
-{% assign special = '{{> accountButtons}}' %}
 You can then either add links to those directly, or use the `{{ special }}` helper we provide to give you the apppropriate links for signed-in/signed-out users.  The `{{ special }}` helper will display a sign-out link and the user's email address when they are signed-in.
 
 ## Ensuring signed in users for routes
@@ -84,7 +71,6 @@ Use `mrt add accounts-password` if you want to have email/username login authent
 
 ## Setting up OAuth/social integrations
 
-{% assign loginButtons = '{{> loginButtons}}' %}
 Use `accounts-ui` to configure your social/OAuth integrations (or manually create records in your database, if you have those skills). We don't have the nice instructions on how to configure the services built into this package, but if you choose to use <code>{{ loginButtons }}</code> elsewhere in your application (even temporarily), you can configure OAuth logins there.
 
 ## Configuration
@@ -119,6 +105,13 @@ Since this is a young package, we are maintaining compatibility with accounts-ui
         type: "text",                            // The type of field you want
         required: true                           // Adds html 5 required property if true
        }]
+       fluidLayout: false               // Set to true to use bootstrap3 container-fluid and row-fluid classes.
+       useContainer: true               // Set to false to use an unstyled "accounts-entry-container" class instead of a bootstrap3 "container" or "container-fluid" class. 
+       signInAfterRegistration: true    // Set to false to avoid prevent users being automatically signed up upon sign-up e.g. to wait until their email has been verified. 
+       emailVerificationPendingRoute: '/verification-pending' // The route to which users should be directed after sign-up. Only relevant if signInAfterRegistration is false.
+       showSpinner: true                // Show the spinner when the client is talking to the server (spin.js)
+       spinnerOptions: { color: "#000", top: "80%" } // options as per [spin.js](http://fgnass.github.io/spin.js/)
+
     });
   });
 ```
@@ -152,4 +145,4 @@ dashboard (used after signing in).
 
 ## Interested in building a quick meteor app that starts with Accounts-Entry?
 
-We've created a [meteor-boilerplate repo](http://github.differential.io/meteor-boilerplate/) that you can clone as a starting point for an app.  It follows all our standards that we use for building apps for our clients.
+We've created a [meteor-boilerplate repo](http://github.differential.com/meteor-boilerplate/) that you can clone as a starting point for an app.  It follows all our standards that we use for building apps for our clients.

client/entry.coffee

@@ -1,14 +1,20 @@
 AccountsEntry =
   settings:
     wrapLinks: true
-    homeRoute: '/home'
+    homeRoute: '/'
     dashboardRoute: '/dashboard'
     passwordSignupFields: 'EMAIL_ONLY'
     emailToLower: true
     usernameToLower: false
     entrySignUp: '/sign-up'
     extraSignUpFields: []
     showOtherLoginServices: true
+    fluidLayout: false
+    useContainer: true
+    signInAfterRegistration: true
+    emailVerificationPendingRoute: '/verification-pending'
+    showSpinner: true
+    spinnerOptions: { color: "#000", top: "80%" }
 
   isStringEmail: (email) ->
     emailPattern = /^([\w.-]+)@([\w.-]+)\.([a-zA-Z.]{2,6})$/i

client/helpers.coffee

@@ -38,3 +38,28 @@ UI.registerHelper 'passwordLoginService', ->
 
 UI.registerHelper 'showCreateAccountLink', ->
   return !Accounts._options.forbidClientAccountCreation
+
+UI.registerHelper 'fluidLayout', ->
+  AccountsEntry.settings.fluidLayout is true
+  
+UI.registerHelper 'talkingToServer', ->
+  if AccountsEntry.settings.showSpinner is true
+    Meteor.Spinner.options = AccountsEntry.settings.spinnerOptions
+    return (Session.get('talkingToServer') is true)
+  else
+    return false
+
+UI.registerHelper 'containerCSSClass', ->
+  if AccountsEntry.settings.useContainer is false
+    "accounts-entry-container"
+  else
+    if AccountsEntry.settings.fluidLayout is true
+      "container-fluid"
+    else
+      "container"
+    
+UI.registerHelper 'rowCSSClass', ->
+  if AccountsEntry.settings.fluidLayout is true
+    "row-fluid"
+  else
+    "row"    

client/t9n/arabic.coffee

@@ -25,6 +25,8 @@ ar =
   configure: "تعديل"
   with: "مع"
   createAccount: "افتح حساب جديد"
+  verificationPending: "Confirm your email address"
+  verificationPendingDetails: "A confirmation email has been sent to the email address you provided. Click on the confirmation link in the email to activate your account."
   and: "و"
   "Match failed":  "المطابقة فشلت"
   "User not found":  "اسم المستخدم غير موجود"

client/t9n/english.coffee

@@ -25,6 +25,8 @@ en =
   configure: "Configure"
   with: "with"
   createAccount: "Create an Account"
+  verificationPending: "Confirm your email address"
+  verificationPendingDetails: "A confirmation email has been sent to the email address you provided. Click on the confirmation link in the email to activate your account."
   and: "and"
   "Match failed":  "Match failed"
   "User not found":  "User not found"

client/t9n/french.coffee

@@ -25,6 +25,8 @@ fr =
   configure: "Configurer"
   with: "avec"
   createAccount: "Créer un compte"
+  verificationPending: "Confirm your email address"
+  verificationPendingDetails: "A confirmation email has been sent to the email address you provided. Click on the confirmation link in the email to activate your account."
   and: "et"
 
   error:

client/t9n/german.coffee

@@ -25,6 +25,8 @@ de =
   configure: "Konfigurieren"
   with: "mit"
   createAccount: "Konto erzeugen"
+  verificationPending: "Confirm your email address"
+  verificationPendingDetails: "A confirmation email has been sent to the email address you provided. Click on the confirmation link in the email to activate your account."
   and: "und"
 
   error:

client/t9n/hebrew.coffee

@@ -0,0 +1,43 @@
+he =
+  signIn: "כניסה לחשבון"
+  signin: "כניסה לחשבון"
+  signOut: "יציאה"
+  signUp: "חשבון חדש"
+  OR: "או"
+  forgotPassword: "שחכת סיסמא?"
+  emailAddress: "כתובת Email"
+  emailResetLink: "קישור לאיפוס Email"
+  dontHaveAnAccount: "אין לך חשבון?"
+  resetYourPassword: "איפוס סיסמא"
+  updateYourPassword: "עדכון סיסמא"
+  password: "סיסמא"
+  usernameOrEmail: "שם משתמש או Email"
+  email: "Email"
+  ifYouAlreadyHaveAnAccount: "אם יש לך חשבון"
+  signUpWithYourEmailAddress: "הירשם עם כתובת ה-Email"
+  username: "שם משתמש"
+  optional: "שדה רשות"
+  signupCode: "קוד הרשמה"
+  clickAgree: "על ידי סיום תהליך ההרשמה, הינך מסכים"
+  privacyPolicy: "לתנאי הפרטיות"
+  terms: "לתנאי השימוש"
+  sign: "הירשם"
+  configure: "הגדרות"
+  with: "עם"
+  createAccount: "חשבון חדש"
+  and: "ו"
+  "Match failed":  "התאמה נכשלה (Match Failed)"
+  "User not found":  "המשתמש לא נמצא"
+
+  error:
+    minChar: "הסיסמה חייבת לכלול 7 תווים."
+    pwOneLetter: "הסיסמה חייבת לכלות אות אחת."
+    pwOneDigit: "הסיסמה חייבת לכלות מספר אחד."
+    usernameRequired: "חובה להזין שם משתמש."
+    emailRequired: "חובה להזין Email."
+    signupCodeRequired: "חובה להזין קוד הרשמה."
+    signupCodeIncorrect: "קוד ההרשמה שגוי."
+    signInRequired: "אין לך רשות לבצע פעולה זאת."
+    usernameIsEmail: "שם המשתמש לא יכול להיות כתובת Email."
+
+T9n.map "he", he

client/t9n/italian.coffee

@@ -25,6 +25,8 @@ it =
   configure: "Configura"
   with: "con"
   createAccount: "Crea un Account"
+  verificationPending: "Confirm your email address"
+  verificationPendingDetails: "A confirmation email has been sent to the email address you provided. Click on the confirmation link in the email to activate your account."
   and: "e"
   "Match failed":  "Riscontro fallito"
   "User not found":  "Utente non trovato"

client/t9n/polish.coffee

@@ -25,6 +25,8 @@ pl =
   configure: "Konfiguruj"
   with: "z"
   createAccount: "Utwórz konto"
+  verificationPending: "Confirm your email address"
+  verificationPendingDetails: "A confirmation email has been sent to the email address you provided. Click on the confirmation link in the email to activate your account."
   and: "i"
 
   error:

client/t9n/portuguese.coffee

@@ -25,6 +25,8 @@ pt =
   configure: "Configurar"
   with: "com"
   createAccount: "Criar Conta"
+  verificationPending: "Confirm your email address"
+  verificationPendingDetails: "A confirmation email has been sent to the email address you provided. Click on the confirmation link in the email to activate your account."
   and: "e"
   "Match failed":  "Usuário ou senha não encontrado"
   "User not found":  "Usuário não encontrado"

client/t9n/russian.coffee

@@ -25,6 +25,8 @@ ru =
   configure: "Конфигурировать"
   with: "с"
   createAccount: "Создать аккаунт"
+  verificationPending: "Confirm your email address"
+  verificationPendingDetails: "A confirmation email has been sent to the email address you provided. Click on the confirmation link in the email to activate your account."
   and: "и"
   "Match failed":  "Не совпадают"
   "User not found":  "Пользователь не найден"

client/t9n/slovene.coffee

@@ -25,6 +25,8 @@ sl =
   configure: "Nastavi"
   with: "z"
   createAccount: "Nova registracija"
+  verificationPending: "Confirm your email address"
+  verificationPendingDetails: "A confirmation email has been sent to the email address you provided. Click on the confirmation link in the email to activate your account."
   and: "in"
   "Match failed":  "Prijava neuspešna"
   "User not found":  "Uporabnik ne obstaja"

client/t9n/spanish.coffee

@@ -24,6 +24,8 @@ es =
   configure: "Disposición"
   with: "con"
   createAccount: "Crear cuenta"
+  verificationPending: "Confirm your email address"
+  verificationPendingDetails: "A confirmation email has been sent to the email address you provided. Click on the confirmation link in the email to activate your account."
   and: "y"
 
   error:

client/t9n/swedish.coffee

@@ -25,6 +25,8 @@ sv =
   configure: "Konfigurera"
   with: "med"
   createAccount: "Skapa ett konto"
+  verificationPending: "Confirm your email address"
+  verificationPendingDetails: "A confirmation email has been sent to the email address you provided. Click on the confirmation link in the email to activate your account."
   and: "och"
   "Match failed":  "Matchning misslyckades"
   "User not found":  "Användaren hittades inte"

client/views/forgotPassword/forgotPassword.coffee

@@ -13,9 +13,11 @@ Template.entryForgotPassword.events
       Session.set('entryError', 'Email is required')
       return
 
+    Session.set 'talkingToServer', true
     Accounts.forgotPassword({
       email: Session.get('email')
       }, (error)->
+        Session.set 'talkingToServer', false
         if error
           Session.set('entryError', error.reason)
         else

client/views/forgotPassword/forgotPassword.html

@@ -1,6 +1,6 @@
 <template name='entryForgotPassword'>
-  <div class="container">
-    <div class="row">
+  <div class="{{containerCSSClass}}">
+    <div class="{{rowCSSClass}}">
       {{#if logo}}
         <div class="entry-logo">
             <a href="/"><img src="{{logo}}" alt="logo"></a>
@@ -20,6 +20,9 @@ <h3>{{t9n 'forgotPassword'}}</h3>
         {{#if showSignupCode}}
           <p class="entry-signup-cta">{{t9n 'dontHaveAnAccount'}} <a href="{{pathFor 'entrySignUp'}}">{{t9n 'signUp'}}</a></p>
         {{/if}}
+        {{#if talkingToServer}}
+          {{> spinner}}
+        {{/if}}
       </div>
     </div>
   </div>

client/views/resetPassword/resetPassword.coffee

@@ -32,7 +32,9 @@ Template.entryResetPassword.events
 
     if passwordErrors then return
 
+    Session.set 'talkingToServer', true
     Accounts.resetPassword Session.get('resetToken'), password, (error) ->
+      Session.set 'talkingToServer', false
       if error
         Session.set('entryError', (error.reason || "Unknown error"))
       else

client/views/resetPassword/resetPassword.html

@@ -1,6 +1,6 @@
 <template name='entryResetPassword'>
-  <div class="container">
-    <div class="row">
+  <div class="{{containerCSSClass}}">
+    <div class="{{rowCSSClass}}">
       {{#if logo}}
         <div class="entry-logo">
             <a href="/"><img src="{{logo}}" alt="logo"></a>
@@ -20,6 +20,9 @@ <h3>{{t9n "resetYourPassword"}}</h3>
         {{#if showSignupCode}}
           <p class="entry-signup-cta">{{t9n 'dontHaveAnAccount'}} <a href="{{pathFor 'entrySignUp'}}">{{t9n 'signUp'}}</a></p>
         {{/if}}
+        {{#if talkingToServer}}
+          {{> spinner}}
+        {{/if}}
       </div>
     </div>
   </div>

client/views/signIn/signIn.coffee

@@ -37,9 +37,11 @@ AccountsEntry.entrySignInEvents = {
 
     Session.set('email', email)
     Session.set('password', $('input[name="password"]').val())
+    Session.set 'talkingToServer', true
 
     Meteor.loginWithPassword(Session.get('email'), Session.get('password'), (error)->
       Session.set('password', undefined)
+      Session.set 'talkingToServer', false
       if error
         T9NHelper.accountsError error
       else if Session.get('fromWhere')