Skip to content

Commit

Permalink
Initial commit
Browse files Browse the repository at this point in the history
  • Loading branch information
msalom28 committed Apr 27, 2015
1 parent d87f6aa commit 77705dd
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/Realtime/Realtime.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ abstract class Realtime
*/
public function __construct()
{
$this->socketClient = new Client(new Version1X('http://45.55.233.57:1337'));
$this->socketClient = new Client(new Version1X('http://localhost:3000'));
}
/**
* Send a websocket broadcast to all connected users.
Expand Down
2 changes: 1 addition & 1 deletion config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
|
*/

'default' => 'mysql',
'default' => 'sqlite',

/*
|--------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
$('.welcome-alert').fadeIn(300).delay(3500).fadeOut(300);

//Register and Connect to websocket
var socket = io.connect('http://45.55.233.57:1337');
var socket = io.connect('http://localhost:3000');

socket.emit('register', {'userId': userId});

Expand Down Expand Up @@ -871,7 +871,7 @@

// Loading feeds when scrolling

if($(location).attr('href') == "http://larasocial.info/feeds")
if($(location).attr('href') == "http://localhost:8000/feeds")
{

$(window).scroll(function(){
Expand Down
2 changes: 1 addition & 1 deletion public/js/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions resources/views/layouts/default.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</div>
</footer>
<script src="{{ asset('js/libs.js') }}"></script>
<script src="http://45.55.233.57:1337/socket.io/socket.io.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.3.5/socket.io.min.js"></script>
<script src="{{ asset('js/main.js') }}"></script>
</body>
</htm
</htm>
10 changes: 5 additions & 5 deletions server.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var app = require('express')(),
server = require('http').Server(app),
io = require('socket.io')(server),
logger = require('winston'),
port = 1337;
var server = require('http').createServer(),
io = require('socket.io')(server),
logger = require('winston'),
port = 3000;


// Logger config
logger.remove(logger.transports.Console);
Expand Down
Binary file modified storage/database.sqlite
Binary file not shown.

0 comments on commit 77705dd

Please sign in to comment.