Skip to content

Commit

Permalink
Prepare for Pusher
Browse files Browse the repository at this point in the history
  • Loading branch information
phanan committed Aug 25, 2017
1 parent 77d1e46 commit bf1885f
Show file tree
Hide file tree
Showing 7 changed files with 273 additions and 250 deletions.
11 changes: 8 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,14 @@ ALLOW_DOWNLOAD=true
# errors, try setting this to false.
CACHE_MEDIA=true


# Pusher configuration, for interesting features such as remote controlling.
PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=


# The variables below are Laravel-specific.
# You can change them if you know what you're doing. Otherwise, just leave them as-is.
APP_LOG_LEVEL=debug
Expand All @@ -111,6 +119,3 @@ MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null

PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"guzzlehttp/guzzle": "^6.1",
"tymon/jwt-auth": "^0.5.6",
"aws/aws-sdk-php-laravel": "^3.1",
"pusher/pusher-php-server": "^2.2",
"pusher/pusher-php-server": "^2.6",
"predis/predis": "~1.0",
"doctrine/dbal": "^2.5"
},
Expand Down
2 changes: 1 addition & 1 deletion config/broadcasting.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
//
'cluster' => env('PUSHER_APP_CLUSTER'),
],
],

Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"alertify.js": "^1.0.12",
"axios": "^0.15.3",
"blueimp-md5": "^2.3.0",
"dotenv-webpack": "^1.5.4",
"intersection-observer": "^0.2.0",
"ismobilejs": "^0.4.0",
"local-storage": "^1.4.2",
Expand Down Expand Up @@ -63,6 +64,7 @@
"laravel-mix": "^0.8.0",
"mocha": "^2.3.4",
"node-sass": "^3.4.2",
"pusher-js": "^4.1.0",
"sinon": "^1.17.2"
},
"scripts": {
Expand Down
Loading

0 comments on commit bf1885f

Please sign in to comment.