From 1f1e36f9b4482753d271a15aca4ee495837373af Mon Sep 17 00:00:00 2001 From: Bogdan Ghervan Date: Sat, 8 Oct 2016 18:14:35 +0300 Subject: [PATCH 1/2] Fix minor small typos --- src/activity-streams/activities.md | 2 +- src/activity-streams/learned.md | 2 +- src/getting-started/setting-env-vars.md | 2 +- src/notifications/ui.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/activity-streams/activities.md b/src/activity-streams/activities.md index c0a8886..2ff951d 100644 --- a/src/activity-streams/activities.md +++ b/src/activity-streams/activities.md @@ -67,7 +67,7 @@ The view, defined in `resources/views/activities.blade.php`, already has some fu ### User Visited -Whenever the `/activities` endpoint (`getIndex()` action) is access a `user-visit` event is triggered on the `activities` channel. +Whenever the `/activities` endpoint (`getIndex()` action) is accessed, a `user-visit` event is triggered on the `activities` channel. If you haven't already done so, navigate to http://localhost:8000/activities endpoint in the browser and make sure the event is triggered by checking the Pusher Debug Console. diff --git a/src/activity-streams/learned.md b/src/activity-streams/learned.md index ce684fb..a1b299c 100644 --- a/src/activity-streams/learned.md +++ b/src/activity-streams/learned.md @@ -2,7 +2,7 @@ In this chapter we've: -* Created a super-simple authentication mechanism tso we can give our events some user context +* Created a super-simple authentication mechanism so we can give our events some user context * How we can trigger events with different names on the same channel in order to provide more context to events * How events simplify our client-side application logic by separating out event handlers diff --git a/src/getting-started/setting-env-vars.md b/src/getting-started/setting-env-vars.md index 73e1f7c..7edf3d8 100644 --- a/src/getting-started/setting-env-vars.md +++ b/src/getting-started/setting-env-vars.md @@ -2,7 +2,7 @@ When the Laravel application was created a `.env` file will also have been created in the root of the app. - Take the Pusher credentials we noted down earlier (`app_id`, `key` and `secret`) - or you may even have a browser tap still open on the *App Keys* section of your app in the Pusher dashboard - and add them to the `.env` file: + Take the Pusher credentials we noted down earlier (`app_id`, `key` and `secret`) - or you may even have a browser tab still open on the *App Keys* section of your app in the Pusher dashboard - and add them to the `.env` file: ```php PUSHER_APP_ID=YOUR_APP_ID diff --git a/src/notifications/ui.md b/src/notifications/ui.md index bd3acf2..fdac7a9 100644 --- a/src/notifications/ui.md +++ b/src/notifications/ui.md @@ -20,7 +20,7 @@ channel.bind('event-name', function(data) { ## Showing the Notifications -The Pusher JavaScript library and the toastr notification library has already been included in the [template](../assets/laravel_app/notifiation.blade.php) we copied earlier. So, all we need to do is subscribe to the `notifications` channel, bind to the `new-notification` event and use the toastr library to show the notification. +The Pusher JavaScript library and the toastr notification library have already been included in the [template](../assets/laravel_app/notifiation.blade.php) we copied earlier. So, all we need to do is subscribe to the `notifications` channel, bind to the `new-notification` event and use the toastr library to show the notification. Use the following code outline to implement the notification functionality: From 0dfd3fd9b1e54ac46681a296e3d349c212137d2d Mon Sep 17 00:00:00 2001 From: Bogdan Ghervan Date: Sat, 8 Oct 2016 18:19:54 +0300 Subject: [PATCH 2/2] Update steps on creating a GitHub app to reflect a GitHub menu change --- src/activity-streams/simple-auth.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/activity-streams/simple-auth.md b/src/activity-streams/simple-auth.md index 864771b..dc005b3 100644 --- a/src/activity-streams/simple-auth.md +++ b/src/activity-streams/simple-auth.md @@ -53,7 +53,7 @@ In order to use GitHub social login your application needs to be registered with 1. Login to [GitHub](https://github.com) 2. Go to your settings (top-right drop-down -> Settings) 3. Select **Applications** from the menu -4. Select the **Developer applications** tab +4. Select the **OAuth applications** tab 5. Click **Register new application** 6. Enter a name, If using `localhost:8000`: * Use `http://localhost:8000` as the home page