greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/2/head
Sahat Yalkabov 2014-10-27 19:58:48 -07:00
parent 4cff300afa 5554cb3201
commit a4f6573702
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,5 +1,5 @@
![Alt](https://lh4.googleusercontent.com/-PVw-ZUM9vV8/UuWeH51os0I/AAAAAAAAD6M/0Ikg7viJftQ/w1286-h566-no/hackathon-starter-logo.jpg)
Hackathon Starter [![Dependency Status](https://david-dm.org/sahat/hackathon-starter/dev-status.svg?style=flat)](https://david-dm.org/sahat/hackathon-starter) [![Build Status](http://img.shields.io/sahat/hackathon-starter.svg?style=flat)](https://travis-ci.org/sahat/hackathon-starter) [![Analytics](https://ga-beacon.appspot.com/UA-47447818-2/hackathon-starter?pixel)](https://github.com/igrigorik/ga-beacon)
Hackathon Starter [![Dependency Status](https://david-dm.org/sahat/hackathon-starter/status.svg?style=flat)](https://david-dm.org/sahat/hackathon-starter) [![Build Status](http://img.shields.io/travis/sahat/hackathon-starter.svg?style=flat)](https://travis-ci.org/sahat/hackathon-starter) [![Analytics](https://ga-beacon.appspot.com/UA-47447818-2/hackathon-starter?pixel)](https://github.com/igrigorik/ga-beacon)
=======================
:octocat:  **Live Demo**: http://hackathonstarter.herokuapp.com

14
package.json
View File

@ -12,7 +12,7 @@
"dependencies": {
"async": "^0.9.0",
"bcrypt-nodejs": "^0.0.3",
"body-parser": "^1.9.0",
"body-parser": "^1.9.1",
"cheerio": "^0.17.0",
"clockwork": "^0.1.1",
"compression": "^1.2.0",
@ -21,9 +21,9 @@
"cookie-parser": "^1.3.3",
"csso": "^1.3.11",
"errorhandler": "^1.2.2",
"express": "^4.9.8",
"express": "^4.10.0",
"express-flash": "^0.0.2",
"express-session": "^1.9.0",
"express-session": "^1.9.1",
"express-validator": "^2.6.0",
"fbgraph": "^0.3.0",
"github-api": "^0.7.0",
@ -34,7 +34,7 @@
"lodash": "^2.4.1",
"lusca": "^1.0.2",
"method-override": "^2.3.0",
"mongoose": "^3.8.17",
"mongoose": "^3.8.18",
"morgan": "^1.4.0",
"node-foursquare": "^0.2.1",
"node-linkedin": "^0.3.3",
@ -48,19 +48,19 @@
"passport-local": "^1.0.0",
"passport-oauth": "^1.0.0",
"passport-twitter": "^1.0.2",
"request": "^2.45.0",
"request": "^2.46.0",
"stripe": "^2.8.0",
"tumblr.js": "^0.0.4",
"twilio": "^1.7.0",
"twit": "^1.1.18",
"uglify-js": "^2.4.15",
"validator": "^3.22.0",
"yui": "^3.18.0"
"yui": "^3.18.1"
},
"devDependencies": {
"blessed": "^0.0.37",
"chai": "^1.9.2",
"mocha": "^1.21.5",
"mocha": "^2.0.1",
"multiline": "^1.0.1",
"supertest": "^0.14.0"
}

4
views/account/login.jade
View File

@ -8,7 +8,7 @@ block content
.col-sm-8.col-sm-offset-2
.form-group
label.control-label(for='email') Email
input.form-control(type='text', name='email', id='email', placeholder='Email', autofocus=true)
input.form-control(type='email', name='email', id='email', placeholder='Email', autofocus=true)
.form-group
label.control-label(for='password') Password
input.form-control(type='password', name='password', id='password', placeholder='Password')
@ -35,4 +35,4 @@ block content
| Sign in with LinkedIn
a.btn.btn-block.btn-instagram.btn-social(href='/auth/instagram')
i.fa.fa-instagram
| Sign in with Instagram
| Sign in with Instagram