Merge pull request #1 from saviorand/fix/auth

Fix/auth

CONTRIBUTING.md

@@ -1 +1 @@
-All Open Source for Good projects follow Free Code Camp's [contributor's guide](https://github.com/FreeCodeCamp/FreeCodeCamp/blob/staging/CONTRIBUTING.md).
+All Open Source for Good projects follow Free Code Camp's [contributor's guide](https://github.com/freeCodeCamp/freeCodeCamp/blob/master/CONTRIBUTING.md).

README.md

@@ -37,7 +37,7 @@ With Mail for Good you can:
 
 ### Performance
 
-We're currently sending weekly email blasts of over 800,000 emails in 4 hours on a $10 per month Digital Ocean VPS with 1gb memory and 1 core processor.
+We're currently sending weekly email blasts of over 800,000 emails in 4 hours on a $10 per month Digital Ocean VPS with 1 GB memory and 1 core processor.
 
 Mail for Good is fast and scales to the rate limit enforced by AWS.
 

client/containers/lists/ImportCSV.js

@@ -46,8 +46,8 @@ export class ImportCSVComponent extends Component {
   handleNewFile(file) {
 
     const callback = results => {
-      if (!results.meta.fields.some(field => field.toLowerCase() === 'email')) { // Check if any header field is labeled email
-        this.handleErrorWithFile('Please ensure the CSV file contains at least one column field labeled "email" (check the first row)');
+      if (!results.meta.fields.some(field => field.toLowerCase() === 'email' || 'e-mail')) { // Check if any header field is labeled email
+        this.handleErrorWithFile('Please ensure the CSV file contains at least one column field labeled "email/e-mail" (check the first row)');
       } else {
 
         const errors = results.errors;

docs/aws_deploy.md

@@ -23,7 +23,7 @@ Select Ubuntu as your operating system.
 
 ![](resources/deploy_images/5.png)
 
-Here is the preselected instance is fine. (t2.micro instances are eligible for the free tier).
+Here the preselected instance is fine. (t2.micro instances are eligible for the free tier).
 
 ![](resources/deploy_images/6.png)
 
@@ -235,8 +235,8 @@ In the left menu, select **Dashboard**. Now select **Enable API**, search for `G
 In the left menu, select **Credentials**. Then click **Create Credentials** > **OAuth client ID**.
 
 Select **Web Application**. Name it as you wish
-  - Under **Authorised Javascript Origins** put the “Public DNS (IPv4)” you received from Amazon earlier.
-  - Under **Authorised redirect URIs** put your “Public DNS (IPv4)” followed by `/auth/google/callback`.
+  - Under **Authorized Javascript Origins** put the “Public DNS (IPv4)” you received from Amazon earlier.
+  - Under **Authorized redirect URIs** put your “Public DNS (IPv4)” followed by `/auth/google/callback`.
 
 ![](resources/deploy_images/google_origins.png)
 
@@ -274,7 +274,7 @@ GOOGLE_CONSUMER_KEY=
   # E.g abcdefQVw1ghijzeaQklmnop
 GOOGLE_CONSUMER_SECRET=
   # The URL Google will send you back to after logging in.
-  # It must match what is under "Authorised redirect URIs" in the Google Dashboard exactly
+  # It must match what is under "Authorized redirect URIs" in the Google Dashboard exactly
 GOOGLE_CALLBACK=
   # A random, preferably long sequence of characters. You do not need to remember this.
 ENCRYPTION_PASSWORD=

docs/docs-hugo-templates/content/google-api-guide.md

@@ -6,5 +6,5 @@ date: 2017-09-30T16:56:37-05:00
 1. Login to [Google API Manager](https://console.developers.google.com/apis/).
 2. In the left menu, select **Dashboard**. Now select **Enable API**, search for `Google+` and select it. At the top of the screen, ensure it's enabled by clicking on **Enable**.
 3. In the left menu, select **Credentials**. Then click **Create Credentials** > **OAuth client ID**.
-4. Select **Web Application**. Name is as you wish, but under **Authorised Javascript Origins** put `http://localhost:8080`, and under **Authorised redirect URIs** put `http://localhost:8080/auth/google/callback`.
-5. Click **Create**. You will now have a Client ID and Client Secret. In your .env file, put the Client ID as your GOOGLE_CONSUMER_KEY, and the Client Secret as your GOOGLE_CONSUMER_SECRET.
+4. Select **Web Application**. Name is as you wish, but under **Authorized Javascript Origins** put `http://localhost:8080`, and under **Authorized redirect URIs** put `http://localhost:8080/auth/google/callback`.
+5. Click **Create**. You will now have a Client ID and Client Secret. In your .env file, put the Client ID as your GOOGLE_CONSUMER_KEY, and the Client Secret as your GOOGLE_CONSUMER_SECRET.

docs/docs-hugo-templates/content/index.md

@@ -33,7 +33,7 @@ With Mail for Good you can:
 - Send email campaigns of unlimited size.
 - Import emails saved in CSV format.
 - Create templates to reuse for convenience when sending email campaigns.
-- Track bounce rate and other standard metrics. You can also insert tracking pixels and unsubcribe links at the click of a button.
+- Track bounce rate and other standard metrics. You can also insert tracking pixels and unsubscribe links at the click of a button.
 - Add custom fields to imported email lists such as names or cities.
 - Grant other users (limited or otherwise) permissions to use your account on your behalf.
 - Add embedded HTML newsletter sign up forms to your site. These are snippets of code that will let your users sign up with you at the click of a button.
@@ -46,4 +46,4 @@ Mail for Good is fast and scales to the rate limit enforced by AWS.
 
 ## Why are we doing this?
 
-We want to help nonprofits manage their email campaigns as inexpensively as possible, and have full control over their data.
+We want to help nonprofits manage their email campaigns as inexpensively as possible, and have full control over their data.