diff options
| -rw-r--r-- | app.js | 8 | ||||
| -rw-r--r-- | public/javascripts/hover.js | 10 | ||||
| -rw-r--r-- | views/hover.ejs | 3 | ||||
| -rw-r--r-- | views/index.ejs | 2 |
4 files changed, 18 insertions, 5 deletions
@@ -16,11 +16,13 @@ var app = express(); var server = http.createServer(app); var io = require('socket.io').listen(server); -server.listen(3000); +var PORT = 6060 + +server.listen(PORT); app.configure(function(){ // app.set('port', process.env.PORT || 3000); - app.set('port', 3000); + app.set('port', PORT); app.set('views', __dirname + '/views'); app.set('view engine', 'ejs'); app.use(express.favicon()); @@ -81,7 +83,7 @@ passport.use(new FacebookStrategy({ */ clientID: "303580399744488", clientSecret: "2de03fb633e9529b511b33faebc659c8", - callbackURL: "http://ec2-107-20-35-143.compute-1.amazonaws.com/auth/facebook/callback" + callbackURL: "/auth/facebook/callback" }, function(accessToken, refreshToken, profile, done) { User.findOne({ facebookId: profile.id }, function (err, user) { diff --git a/public/javascripts/hover.js b/public/javascripts/hover.js index dfee104..6eeaf7d 100644 --- a/public/javascripts/hover.js +++ b/public/javascripts/hover.js @@ -23,6 +23,8 @@ var game = { own_cursor.own = true; own_cursor.el.addClass("own"); game.bindEvents(); + socket.emit('focus', { id: _id }); + own_cursor.focus(); } game.loop(); }, @@ -73,6 +75,8 @@ var game = { // $("#really_waiting").html("FOCUS"); // socket.emit('focus', { id: _id }); // own_cursor.focus(); + socket.emit('focus', { id: _id }); + own_cursor.focus(); }, mousemove: function(e){ emit_mouse_movement(e); @@ -81,8 +85,10 @@ var game = { }); var hovering = false; - own_cursor.blur(); +// own_cursor.blur(); + +/* $("#racecar").hoverpng({ mouseover: function(e){ socket.emit('focus', { id: _id }); @@ -96,7 +102,7 @@ var game = { }, threshold: 0.8 }); - +*/ $(".okfocus").bind({ mouseover: function(){ own_cursor.el.hide(); diff --git a/views/hover.ejs b/views/hover.ejs index c57e37a..c3be5a4 100644 --- a/views/hover.ejs +++ b/views/hover.ejs @@ -43,6 +43,7 @@ height: 302px; margin-left: -250px; margin-top: -151px; + display: none; } .cursor { background-image: url(/images/cursor-red.png) !important; @@ -79,7 +80,9 @@ </header> <img src="/images/foamposite.png" id="racecar"> +<!-- <a href="mailto:frontdesk@okfoc.us?subject=hello OKFocus" class="okfocus"><img src="/images/okfocus_logo.png" alt="OKFocus"><br>hire us!</a> +--> <div id="cursors"></div> </body> diff --git a/views/index.ejs b/views/index.ejs index d423392..76233a8 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -55,7 +55,9 @@ <a href="/auth/facebook"class="fbutton"></a><br> <% } %> </header> +<!-- <a href="mailto:frontdesk@okfoc.us?subject=hello OKFocus" class="okfocus"><img src="/images/okfocus_logo.png" alt="OKFocus"><br>hire us!</a> +--> <div id="cursors"></div> </body> |