Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

travis #174

Open
wants to merge 8 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ deploy:
api_key:
secure: jj6SDxhprIwq8cjC4rPLVciNcfvqS3dZWG27Aa4Eg58GTN8eVdNO+n3mDgZ2KRpZJ93/mVIOmgEnq9vDwPlfob8lT/BpLVkbS07zcagZxweoEN8RdOcRxWFG3qDR301RZwHSTqSw81pZsligE+lWWY69OxFzFVvAR0jDN7dxn/s=
app: still-scrubland-1948
env:
global:
- secure: shUwCgAOkc46fEi+Y8B4e0UQYhyGbkq/VFimj4HG+bYYPrti653dsrJ9xgbeX8lDnvCeeIXXlkBmYrgP2fUSk26mmT4MkrICGLO2MSXn1pWwuwRGuHKZnpM5jgTew/UNOT4VCfwxNQNkptM5UmHXusw/O/SDEFIiC9pnUtYHAxo=
- secure: pCDvwQZVN9cam73/Emh3RIPaz8I18HtyeED17378dtEaFvej+kzqmQcBCoRVPkFSSx+m0PioIxMPZwQFD74hV1QdEr6SxcG5O27dCGCnjSKezHhNzyZclhrJ+kPFfNTGfkL4qvba/PqZzyElhoa0HfGSOpKkYqcipQJ/XH204x4=
- secure: mcp4PIqGhNqPtV6hqxqidzBJZ+Zl0OtDOD2Bl3RHCF+/b9dh4x/Aq1XX58+E8WK1/fSD+hzjgHZRYXQJRWQpNuD2kt3S7T1FFxnggnMElEiHn4BE6QvWb21iaUxrGzePUmO36PcMj1L5Oo2t/TvoP31iJf4NqIXZFP+HNKpqNNQ=
- secure: D27tin0Nng3+2vpPdOG8MPJKEfF4iYmgOwarmxGgCC3plsvuV/J/e4MHLo80OOIPiX4CJcpMfnm2Znz4jYWm1C/4pSok0kWKej+aLQkTKcOtvIs8MGT7/q5Gw5DGOh1DThnnsw2pYQtHXVTJAZamE1bGmwKj91oeyChJeISpkis=
3 changes: 2 additions & 1 deletion app/coffee/app.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ app = require './server'

app.listen port

console.log "Listening on port #{port}"
console.log "Listening on port #{port}"

6 changes: 4 additions & 2 deletions app/coffee/config/auth.coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# auth tokens here, will replace with env variables
# will git ignore this once we all have a local copyreq


{port} = require './serverConfig'
url =
if process.env.HEROKU_URL
Expand All @@ -9,6 +11,6 @@ url =

module.exports =
fitbit:
consumerKey: '6b8b28e0569a422e97a70b5ca671df32'
consumerSecret: 'b351c1fea45d48ed9955a518f4e30e72'
consumerKey: process.env.CONSUMER_KEY
consumerSecret: process.env.CONSUMER_SECRET
callbackURL: url
5 changes: 2 additions & 3 deletions app/coffee/config/mail.coffee
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
nodemailer = require 'nodemailer'


module.exports = {
smtpTransport: (service) ->
return nodemailer.createTransport(
'SMTP', {service: service, auth: {
user: '[email protected]'
pass: 'ballin35'
user: process.env.EMAIL
pass: process.env.PASS
}
}
)
Expand Down
3 changes: 3 additions & 0 deletions app/coffee/routes/userRoutes.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@ module.exports = (app, passport) ->

app.delete '/user/delete', isLoggedIn, user.deleteUser

# this route is expecting an email
app.post '/user/forgot/password', user.forgotPassword

# this is the route the is sent in the email, use clicks this
app.get '/user/reset/:token', user.resetPassword

# this is the route the the new passowrd will post to
app.post '/user/reset/:token', user.updatePassword

app.get '/connect/fitbit', isLoggedIn, passport.authorize 'fitbit'
Expand Down
4 changes: 4 additions & 0 deletions app/coffee/server.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,9 @@ require('./routes/groupRoutes')(app, passport)
require('./routes/mainFeedRoutes')(app)


console.log 'here!!!!!!', process.env.CONSUMER_KEY,
process.env.CONSUMER_SECRET


module.exports = app

3 changes: 3 additions & 0 deletions app/coffee/test/users_spec.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ dbUrl = 'mongodb://localhost/teses'
User = require '../models/user'
clearDB = require('mocha-mongoose')(dbUrl)

console.log 'here!!!!!', process.env.CONSUMER_KEY,
process.env.CONSUMER_SECRET

describe "Saving a new user", ->
beforeEach (done) ->
return done() if mongoose.connection.db
Expand Down