Merge branch 'master' of github.com:sahat/hackathon-starter

This commit is contained in:
Sahat Yalkabov
2014-07-15 17:17:59 -04:00
3 changed files with 21 additions and 15 deletions

View File

@ -22,15 +22,19 @@ if for example you are only interested in **Sign in with Google** authentication
Chances are you do not need all authentication methods or API examples. As of **Hackathon Starter 2.1**
it is possible to selectively check which authentication methods you need by running `node setup.js`.
<h4 align="center">Flatly Bootstrap Theme</h3>
<h4 align="center">Modern Theme</h4>
![](https://lh6.googleusercontent.com/-KQTmCFNK6MM/U7OZpznjDuI/AAAAAAAAERc/h3jR27Uy1lE/w1366-h1006-no/Screenshot+2014-07-02+01.32.22.png)
<h4 align="center">Flatly Bootstrap Theme</h4>
![](https://lh5.googleusercontent.com/-oJ-7bSYisRY/U1a-WhK_LoI/AAAAAAAAECM/a04fVYgefzw/w1474-h1098-no/Screen+Shot+2014-04-22+at+3.08.33+PM.png)
<h4 align="center">Default Theme</h3>
<h4 align="center">Default Theme</h4>
![](https://lh6.googleusercontent.com/-J4_ttNHnWZo/U5IivU_0-XI/AAAAAAAAEIg/XikKjaSdReU/w1320-h986-no/Screenshot+2014-06-06+16.20.41.png)
<h4 align="center">Hackathon Starter Generator</h3>
<h4 align="center">Hackathon Starter Generator</h4>
![](https://lh4.googleusercontent.com/-ncBLUzq6czE/U3KkYE0UXsI/AAAAAAAAEEM/YsZeIqOlZg8/w1288-h874-no/Screenshot+2014-05-13+19.01.15.png)
@ -1167,7 +1171,7 @@ Add this to `package.json`, after *name* and *version*. This is necessary becaus
<img src="http://www.comparethecloud.net/wp-content/uploads/2014/06/ibm-bluemix_pr-030514.jpg" width="200">
- Go to [Codename: Bluemix](http://bluemix.net) to signup for the free beta, or login with your *IBM id*
- Go to [Codename: Bluemix](http://bluemix.net) to signup for the free trial, or login with your *IBM id*
- Install [Cloud Foundry CLI](https://github.com/cloudfoundry/cli)
- Navigate to your **hackathon-starter** directory and then run `cf push [your-app-name] -m 512m` command to deploy the application
- **Note:** You must specify a unique application name in place of `[your-app-name]`

2
app.js
View File

@ -81,6 +81,8 @@ app.use(expressValidator());
app.use(methodOverride());
app.use(cookieParser());
app.use(session({
resave: true,
saveUninitialized: true,
secret: secrets.sessionSecret,
store: new MongoStore({
url: secrets.db,

View File

@ -16,24 +16,24 @@
"cheerio": "^0.17.0",
"clockwork": "^0.1.1",
"compression": "^1.0.8",
"connect-assets": "^3.0.1",
"connect-assets": "^3.0.2",
"connect-mongo": "^0.4.1",
"cookie-parser": "^1.3.1",
"cookie-parser": "^1.3.2",
"csso": "^1.3.11",
"errorhandler": "^1.1.1",
"express": "^4.4.4",
"express": "^4.5.1",
"express-flash": "^0.0.2",
"express-session": "^1.5.1",
"express-session": "^1.6.1",
"express-validator": "^2.3.0",
"fbgraph": "^0.2.10",
"github-api": "^0.7.0",
"instagram-node": "^0.4.0",
"jade": "^1.3.1",
"lastfm": "^0.9.0",
"less": "^1.7.2",
"lastfm": "^0.9.2",
"less": "^1.7.3",
"lodash": "^2.4.1",
"lusca": "^1.0.0",
"method-override": "^2.0.2",
"method-override": "^2.1.0",
"mongoose": "^3.8.12",
"morgan": "^1.1.1",
"node-foursquare": "^0.2.1",
@ -48,14 +48,14 @@
"passport-local": "^1.0.0",
"passport-oauth": "^1.0.0",
"passport-twitter": "^1.0.2",
"request": "^2.36.0",
"stripe": "^2.6.3",
"request": "^2.37.0",
"stripe": "^2.7.3",
"tumblr.js": "^0.0.4",
"twilio": "^1.6.0",
"twit": "^1.1.15",
"uglify-js": "^2.4.14",
"validator": "^3.13.0",
"yui": "^3.17.1"
"validator": "^3.16.1",
"yui": "^3.17.2"
},
"devDependencies": {
"blessed": "^0.0.37",