Skip to content

Commit c0c1f27

Browse files
committed
loopback doc fix and fix for redis sample.
Style and licenses for appengine/express. Style and licenses for appengine/geddy. Style and licenses for appengine/grunt. License for appengine/hapi and a couple other readme tweaks. Fixed a bunch more jshint error
1 parent c72329e commit c0c1f27

87 files changed

Lines changed: 1141 additions & 9440 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.jshintignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
appengine/kraken/public/components/**
2+
appengine/sails/config/**
3+
appengine/sails/tasks/**
4+
appengine/sails/assets/**
5+
node_modules

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ install:
4040
#Use '-q' to disable interactive prompts
4141

4242
script:
43-
- jshint --exclude-path=.gitignore .
43+
- jshint --exclude-path=.jshintignore .

appengine/express/README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
# Express -> Google App Engine
22

3-
This is a simple guide to running [expressjs](http://expressjs.com/) on Google App Engine.
3+
This is a simple guide to running [expressjs](http://expressjs.com/) on Google App Engine.
44

55
1. [Create a new Express app](http://expressjs.com/starter/generator.html)
66

77
2. Create an `app.yaml` in the root of your application with the following contents:
88

9-
```yaml
10-
runtime: nodejs
11-
vm: true
12-
env_variables:
13-
PORT: 8080
14-
```
9+
```yaml
10+
runtime: nodejs
11+
vm: true
12+
env_variables:
13+
PORT: 8080
14+
```
1515
1616
3. Deploy your app. For convenience, you can use an npm script to run the command. Modify your `package.json` to include:
1717

18-
```js
19-
"scripts": {
20-
"start": "node ./bin/www",
21-
"deploy": "gcloud preview app deploy app.yaml --set-default --project [project id]"
22-
}
23-
```
18+
```js
19+
"scripts": {
20+
"start": "node ./bin/www",
21+
"deploy": "gcloud preview app deploy app.yaml --set-default --project [project id]"
22+
}
23+
```
2424

25-
At the terminal you can now run `npm run deploy` to deploy your application.
25+
At the terminal you can now run `npm run deploy` to deploy your application.

appengine/express/app.js

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
1+
// Copyright 2015, Google, Inc.
2+
// Licensed under the Apache License, Version 2.0 (the "License");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
//
6+
// http://www.apache.org/licenses/LICENSE-2.0
7+
//
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
14+
'use strict';
15+
116
var express = require('express');
217
var path = require('path');
3-
var favicon = require('serve-favicon');
418
var logger = require('morgan');
519
var cookieParser = require('cookie-parser');
620
var bodyParser = require('body-parser');
@@ -14,8 +28,6 @@ var app = express();
1428
app.set('views', path.join(__dirname, 'views'));
1529
app.set('view engine', 'jade');
1630

17-
// uncomment after placing your favicon in /public
18-
//app.use(favicon(__dirname + '/public/favicon.ico'));
1931
app.use(logger('dev'));
2032
app.use(bodyParser.json());
2133
app.use(bodyParser.urlencoded({ extended: false }));
@@ -37,7 +49,7 @@ app.use(function(req, res, next) {
3749
// development error handler
3850
// will print stacktrace
3951
if (app.get('env') === 'development') {
40-
app.use(function(err, req, res, next) {
52+
app.use(function(err, req, res) {
4153
res.status(err.status || 500);
4254
res.render('error', {
4355
message: err.message,
@@ -48,7 +60,7 @@ if (app.get('env') === 'development') {
4860

4961
// production error handler
5062
// no stacktraces leaked to user
51-
app.use(function(err, req, res, next) {
63+
app.use(function(err, req, res) {
5264
res.status(err.status || 500);
5365
res.render('error', {
5466
message: err.message,

appengine/express/app.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# Copyright 2015, Google, Inc.
2+
# Licensed under the Apache License, Version 2.0 (the "License");
3+
# you may not use this file except in compliance with the License.
4+
# You may obtain a copy of the License at
5+
#
6+
# http://www.apache.org/licenses/LICENSE-2.0
7+
#
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
114
runtime: nodejs
215
api_version: 1
316
vm: true

appengine/express/bin/www

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env node
22

3+
'use strict';
4+
35
/**
46
* Module dependencies.
57
*/

appengine/express/public/stylesheets/style.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
/** Copyright 2015, Google, Inc.
2+
* Licensed under the Apache License, Version 2.0 (the "License");
3+
* you may not use this file except in compliance with the License.
4+
* You may obtain a copy of the License at
5+
*
6+
* http://www.apache.org/licenses/LICENSE-2.0
7+
*
8+
* Unless required by applicable law or agreed to in writing, software
9+
* distributed under the License is distributed on an "AS IS" BASIS,
10+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
* See the License for the specific language governing permissions and
12+
* limitations under the License.
13+
*/
114
body {
215
padding: 50px;
316
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;

appengine/express/routes/index.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
1+
// Copyright 2015, Google, Inc.
2+
// Licensed under the Apache License, Version 2.0 (the "License");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
//
6+
// http://www.apache.org/licenses/LICENSE-2.0
7+
//
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
14+
'use strict';
15+
116
var express = require('express');
217
var router = express.Router();
318

419
/* GET home page. */
5-
router.get('/', function(req, res, next) {
20+
router.get('/', function(req, res) {
621
res.render('index', { title: 'Express |2|' });
722
});
823

appengine/express/routes/users.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
1+
// Copyright 2015, Google, Inc.
2+
// Licensed under the Apache License, Version 2.0 (the "License");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
//
6+
// http://www.apache.org/licenses/LICENSE-2.0
7+
//
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
14+
'use strict';
15+
116
var express = require('express');
217
var router = express.Router();
318

419
/* GET users listing. */
5-
router.get('/', function(req, res, next) {
20+
router.get('/', function(req, res) {
621
res.send('respond with a resource');
722
});
823

appengine/express/views/error.jade

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
// Copyright 2015, Google, Inc.
2+
// Licensed under the Apache License, Version 2.0 (the "License");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
//
6+
// http://www.apache.org/licenses/LICENSE-2.0
7+
//
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
114
extends layout
215

316
block content

0 commit comments

Comments
 (0)