EbookFoundation
/
river-of-ebooks
mirror of https://github.com/EbookFoundation/river-of-ebooks.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'miacona96-master' into staging

pull/19/head
unknown 2018-11-07 15:07:06 -05:00
parent e548021672 f3d3d8a5a8
commit 969b50b7e6
52 changed files with 207 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintrc
View File

@ -28,6 +28,7 @@
"parserOptions": { "parserOptions": {
"ecmaVersion": 8, "ecmaVersion": 8,
"sourceType": "module",
"ecmaFeatures": { "ecmaFeatures": {
"experimentalObjectRestSpread": true "experimentalObjectRestSpread": true
} }
@ -42,6 +43,7 @@
"_": true, "_": true,
"async": true "async": true
// …and any others (e.g. `"Organization": true`) // …and any others (e.g. `"Organization": true`)
//["error", "unix"]
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}, },
@ -63,7 +65,7 @@
"ObjectExpression": 1, "ObjectExpression": 1,
"ignoredNodes": ["ConditionalExpression"] "ignoredNodes": ["ConditionalExpression"]
}], }],
"linebreak-style": ["error", "unix"], "linebreak-style": 0,
"no-dupe-keys": ["error"], "no-dupe-keys": ["error"],
"no-duplicate-case": ["error"], "no-duplicate-case": ["error"],
"no-extra-semi": ["warn"], "no-extra-semi": ["warn"],

6
.travis.yml
View File

@ -1,4 +1,5 @@
language: node_js language: node_js
warnings_are_errors: false
node_js: node_js:
- "node" - "node"
deploy: deploy:
@ -11,4 +12,7 @@ deploy:
env: "example-app-environment" env: "example-app-environment"
bucket_name: "the-target-S3-bucket" bucket_name: "the-target-S3-bucket"
#script: node testfile before_script:
- npm install
script: npm run lint && npm run custom-tests && echo 'Done.'

10
Gruntfile.js
View File

@ -12,12 +12,10 @@
* For more information see: * For more information see:
* https://sailsjs.com/anatomy/Gruntfile.js * https://sailsjs.com/anatomy/Gruntfile.js
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
var loadGruntTasks = require('sails-hook-grunt/accessible/load-grunt-tasks')
var loadGruntTasks = require('sails-hook-grunt/accessible/load-grunt-tasks');
// Load Grunt task configurations (from `tasks/config/`) and Grunt // Load Grunt task configurations (from `tasks/config/`) and Grunt
// task registrations (from `tasks/register/`). // task registrations (from `tasks/register/`).
loadGruntTasks(__dirname, grunt); loadGruntTasks(__dirname, grunt)
}
};

1
README.md
View File

@ -26,4 +26,3 @@ Note: Generators are usually run using the globally-installed `sails` CLI (comm
--> -->
[![Build Status](https://travis-ci.org/miacona96/RoE-pipe.svg?branch=master)](https://travis-ci.org/miacona96/RoE-pipe) [![Build Status](https://travis-ci.org/miacona96/RoE-pipe.svg?branch=master)](https://travis-ci.org/miacona96/RoE-pipe)

4
api/controllers/AuthController.js
View File

@ -114,7 +114,7 @@ module.exports = {
} }
} }
passportHelper.callback(req, res, function (err, user, info, status) { passportHelper.callback(req, res, (err, user, info, status) => {
if (err || !user) { if (err || !user) {
sails.log.warn(user, err, info, status) sails.log.warn(user, err, info, status)
if (!err && info) { if (!err && info) {
@ -123,7 +123,7 @@ module.exports = {
return negotiateError(err) return negotiateError(err)
} }
req.login(user, function (err) { req.login(user, (err) => {
if (err) { if (err) {
sails.log.warn(err) sails.log.warn(err)
return negotiateError(err) return negotiateError(err)

6
api/controllers/BooksController.js
View File

@ -12,8 +12,8 @@ module.exports = {
const host = req.hostname const host = req.hostname
let result let result
if (!host) throw new Error('Missing hostname') if (!host) { throw new Error('Missing hostname') }
if (!body) throw new Error('Missing body') if (!body) { throw new Error('Missing body') }
const bookExists = await Book.findOne(body) const bookExists = await Book.findOne(body)
@ -36,7 +36,7 @@ module.exports = {
list: async function (req, res) { list: async function (req, res) {
try { try {
const body = req.allParams() const body = req.allParams()
if (!body) throw new Error('Missing parameters') if (!body) { throw new Error('Missing parameters') }
const books = await Book.find(body) const books = await Book.find(body)

1
api/controllers/TargetController.js
View File

@ -2,6 +2,7 @@ module.exports = {
show: function (req, res) { show: function (req, res) {
res.view('pages/temp', { res.view('pages/temp', {
email: req.user.email email: req.user.email
}) })
} }
} }

19
api/controllers/UserController.js
View File

@ -11,10 +11,11 @@ module.exports = {
*/ */
create: async function (req, res, next) { create: async function (req, res, next) {
const passportHelper = await sails.helpers.passport() const passportHelper = await sails.helpers.passport()
passportHelper.protocols.local.register(req.body, function (err, user) { passportHelper.protocols.local.register(req.body, (err, user) => {
if (err) return res.status(500).json({ if (err) {
error: err.toString() return res.status(500).json({
}) error: err.toString() })
}
res.json(user) res.json(user)
}) })
@ -22,10 +23,12 @@ module.exports = {
update: async function (req, res, next) { update: async function (req, res, next) {
const passportHelper = await sails.helpers.passport() const passportHelper = await sails.helpers.passport()
passportHelper.protocols.local.update(req.body, function (err, user) { passportHelper.protocols.local.update(req.body, (err, user) => {
if (err) return res.status(500).json({ if (err) {
error: err.toString() return res.status(500).json({
}) error: err.toString()
})
}
res.json(user) res.json(user)
}) })

24
api/helpers/passport.js
View File

@ -19,12 +19,12 @@ module.exports = {
} }
const passport = require('passport') const passport = require('passport')
passport.serializeUser(function (user, next) { passport.serializeUser((user, next) => {
next(null, user.id) next(null, user.id)
}) })
passport.deserializeUser(function (id, next) { passport.deserializeUser((id, next) => {
return User.findOne({id: id}) return User.findOne({id: id})
.then(function (user) { .then((user) => {
next(null, user) next(null, user)
return user return user
}).catch(next) }).catch(next)
@ -72,7 +72,7 @@ function PassportHelper () {
const strategies = sails.config.passport const strategies = sails.config.passport
const provider = req.param('provider') const provider = req.param('provider')
if (!_.has(strategies, provider)) return res.redirect('/login') if (!_.has(strategies, provider)) { return res.redirect('/login') }
passport.authenticate(provider, {})(req, res, req.next) passport.authenticate(provider, {})(req, res, req.next)
} }
@ -89,7 +89,7 @@ function PassportHelper () {
} else if (action === 'disconnect' && req.user) { } else if (action === 'disconnect' && req.user) {
this.protocols.local.disconnect(req, res, next) this.protocols.local.disconnect(req, res, next)
} else { } else {
next(new Error('Invalid action')) return next(new Error('Invalid action'))
} }
} else { } else {
if (action === 'disconnect' && req.user) { if (action === 'disconnect' && req.user) {
@ -111,8 +111,8 @@ function PassportHelper () {
} }
// if the profile object from passport has an email, use it // if the profile object from passport has an email, use it
if (profile.emails && profile.emails[0]) userAttrs.email = profile.emails[0].value if (profile.emails && profile.emails[0]) { userAttrs.email = profile.emails[0].value }
if (!userAttrs.email) return next(new Error('No email available')) if (!userAttrs.email) { return next(new Error('No email available')) }
const pass = await Passport.findOne({ const pass = await Passport.findOne({
provider, provider,
@ -128,14 +128,14 @@ function PassportHelper () {
...q, ...q,
user: user.id user: user.id
}) })
next(null, user) return next(null, user)
} else { // existing user logging in } else { // existing user logging in
if (_.has(q, 'tokens') && q.tokens !== passport.tokens) { if (_.has(q, 'tokens') && q.tokens !== passport.tokens) {
passport.tokens = q.tokens passport.tokens = q.tokens
} }
await passport.save() await passport.save()
user = User.findOne(passport.user) user = User.findOne(passport.user)
next(null, user) return next(null, user)
} }
} else { // user logged in and trying to add new Passport } else { // user logged in and trying to add new Passport
if (!passport) { if (!passport) {
@ -143,9 +143,9 @@ function PassportHelper () {
...q, ...q,
user: req.user.id user: req.user.id
}) })
next(null, req.user) return next(null, req.user)
} else { // no action, user already logged in and passport exists } else { // no action, user already logged in and passport exists
next(null, user) return next(null, user)
} }
} }
} }
@ -162,7 +162,7 @@ function PassportHelper () {
next(null, user) next(null, user)
return user return user
} catch (e) { } catch (e) {
next(e) return next(e)
} }
} }
this.getPassport = function () { this.getPassport = function () {

5
api/models/Book.js
View File

@ -20,17 +20,16 @@ module.exports = {
title: {type: 'string', required: true}, title: {type: 'string', required: true},
author: {type: 'string'}, author: {type: 'string'},
isbn: {type: 'string'}, isbn: {type: 'string'},
version: {type: 'string'}, version: {type: 'string'}
// ╔═╗╔╦╗╔╗ ╔═╗╔╦╗╔═╗ // ╔═╗╔╦╗╔╗ ╔═╗╔╦╗╔═╗
// ║╣ ║║║╠╩╗║╣ ║║╚═╗ // ║╣ ║║║╠╩╗║╣ ║║╚═╗
// ╚═╝╩ ╩╚═╝╚═╝═╩╝╚═╝ // ╚═╝╩ ╩╚═╝╚═╝═╩╝╚═╝
// ╔═╗╔═╗╔═╗╔═╗╔═╗╦╔═╗╔╦╗╦╔═╗╔╗╔╔═╗ // ╔═╗╔═╗╔═╗╔═╗╔═╗╦╔═╗╔╦╗╦╔═╗╔╗╔╔═╗
// ╠═╣╚═╗╚═╗║ ║║ ║╠═╣ ║ ║║ ║║║║╚═╗ // ╠═╣╚═╗╚═╗║ ║║ ║╠═╣ ║ ║║ ║║║║╚═╗
// ╩ ╩╚═╝╚═╝╚═╝╚═╝╩╩ ╩ ╩ ╩╚═╝╝╚╝╚═╝ // ╩ ╩╚═╝╚═╝╚═╝╚═╝╩╩ ╩ ╩ ╩╚═╝╝╚╝╚═╝
}, }
} }

38
assets/js/lib/Ajax.js
View File

@ -13,45 +13,45 @@ class AjaxError extends Error {
export default class Ajax { export default class Ajax {
static async get (opts) { static async get (opts) {
if (!opts) opts = {} if (!opts) { opts = {} }
opts.method = 'get' opts.method = 'get'
return Ajax.ajax(opts) return Ajax.ajax(opts)
} }
static async post (opts) { static async post (opts) {
if (!opts) opts = {} if (!opts) { opts = {} }
opts.method = 'post' opts.method = 'post'
return Ajax.ajax(opts) return Ajax.ajax(opts)
} }
static async put (opts) { static async put (opts) {
if (!opts) opts = {} if (!opts) { opts = {} }
opts.method = 'put' opts.method = 'put'
return Ajax.ajax(opts) return Ajax.ajax(opts)
} }
static async patch (opts) { static async patch (opts) {
if (!opts) opts = {} if (!opts) { opts = {} }
opts.method = 'patch' opts.method = 'patch'
return Ajax.ajax(opts) return Ajax.ajax(opts)
} }
static async delete (opts) { static async delete (opts) {
if (!opts) opts = {} if (!opts) { opts = {} }
opts.method = 'delete' opts.method = 'delete'
return Ajax.ajax(opts) return Ajax.ajax(opts)
} }
static async head (opts) { static async head (opts) {
if (!opts) opts = {} if (!opts) { opts = {} }
opts.method = 'head' opts.method = 'head'
return Ajax.ajax(opts) return Ajax.ajax(opts)
} }
static async options (opts) { static async options (opts) {
if (!opts) opts = {} if (!opts) { opts = {} }
opts.method = 'options' opts.method = 'options'
return Ajax.ajax(opts) return Ajax.ajax(opts)
} }
static ajax (opts) { static ajax (opts) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!opts) reject(new Error('Missing required options parameter.')) if (!opts) { reject(new Error('Missing required options parameter.')) }
if (opts.method) { if (opts.method) {
if (!['get', 'post', 'put', 'patch', 'delete', 'head', 'options'].includes(opts.method.toLowerCase())) reject(new Error('opts.method must be one of: GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS.')) if (!['get', 'post', 'put', 'patch', 'delete', 'head', 'options'].includes(opts.method.toLowerCase())) { reject(new Error('opts.method must be one of: GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS.')) }
opts.method = opts.method.toUpperCase() opts.method = opts.method.toUpperCase()
} }
@ -74,7 +74,7 @@ export default class Ajax {
} }
xhr.onload = () => { xhr.onload = () => {
if (xhr.status !== 200) return xhr.onerror() if (xhr.status !== 200) { return xhr.onerror() }
var data = xhr.response var data = xhr.response
resolve({ resolve({
data, data,
@ -110,9 +110,9 @@ export default class Ajax {
xhr.open(opts.method || 'GET', opts.url + qs || window.location.href) xhr.open(opts.method || 'GET', opts.url + qs || window.location.href)
if (opts.headers) { if (opts.headers) {
for (let key in opts.headers) xhr.setRequestHeader(key, opts.headers[key]) for (let key in opts.headers) { xhr.setRequestHeader(key, opts.headers[key]) }
} }
if (ajaxcfg.access_token && !(opts.headers || {}).Authorization) xhr.setRequestHeader('Authorization', 'Bearer ' + ajaxcfg.access_token) if (ajaxcfg.access_token && !(opts.headers || {}).Authorization) { xhr.setRequestHeader('Authorization', 'Bearer ' + ajaxcfg.access_token) }
xhr.send(fd) xhr.send(fd)
}) })
} }
@ -132,8 +132,8 @@ export default class Ajax {
} }
// try original request // try original request
xhr.onload = () => { xhr.onload = () => {
if (xhr.status !== 200) return xhr.onerror() if (xhr.status !== 200) { return xhr.onerror() }
if (ajaxcfg.refresh) ajaxcfg.refresh(xhr.response) if (ajaxcfg.refresh) { ajaxcfg.refresh(xhr.response) }
var json = JSON.parse(xhr.response) var json = JSON.parse(xhr.response)
ajaxcfg.access_token = json.access_token ajaxcfg.access_token = json.access_token
ajaxcfg.refresh_token = json.refresh_token ajaxcfg.refresh_token = json.refresh_token
@ -149,11 +149,11 @@ export default class Ajax {
}) })
} }
static setTokenData (tokens) { static setTokenData (tokens) {
if (!tokens) throw new Error('Missing tokens.') if (!tokens) { throw new Error('Missing tokens.') }
if (!tokens.access_token && !tokens.refresh_token && !tokens.refresh_url) throw new Error('Missing at least one of: access_token, refresh_token, refresh_url.') if (!tokens.access_token && !tokens.refresh_token && !tokens.refresh_url) { throw new Error('Missing at least one of: access_token, refresh_token, refresh_url.') }
if (tokens.access_token) ajaxcfg.access_token = tokens.access_token if (tokens.access_token) { ajaxcfg.access_token = tokens.access_token }
if (tokens.refresh_token) ajaxcfg.refresh_token = tokens.refresh_token if (tokens.refresh_token) { ajaxcfg.refresh_token = tokens.refresh_token }
if (tokens.refresh_url) ajaxcfg.refresh_url = tokens.refresh_url if (tokens.refresh_url) { ajaxcfg.refresh_url = tokens.refresh_url }
return true return true
} }
static onRefresh (func) { static onRefresh (func) {

4
config/blueprints.js
View File

@ -19,7 +19,6 @@ module.exports.blueprints = {
// actions: false, // actions: false,
/*************************************************************************** /***************************************************************************
* * * *
* Automatically expose RESTful routes for your models? * * Automatically expose RESTful routes for your models? *
@ -28,7 +27,6 @@ module.exports.blueprints = {
// rest: true, // rest: true,
/*************************************************************************** /***************************************************************************
* * * *
* Automatically expose CRUD "shortcut" routes to GET requests? * * Automatically expose CRUD "shortcut" routes to GET requests? *
@ -38,4 +36,4 @@ module.exports.blueprints = {
// shortcuts: true, // shortcuts: true,
}; }

8
config/bootstrap.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/config/bootstrap * https://sailsjs.com/config/bootstrap
*/ */
module.exports.bootstrap = async function(done) { module.exports.bootstrap = async function (done) {
// By convention, this is a good place to set up fake data during development. // By convention, this is a good place to set up fake data during development.
// //
// For example: // For example:
@ -29,6 +28,5 @@ module.exports.bootstrap = async function(done) {
// Don't forget to trigger `done()` when this bootstrap function's logic is finished. // Don't forget to trigger `done()` when this bootstrap function's logic is finished.
// (otherwise your server will never lift, since it's waiting on the bootstrap) // (otherwise your server will never lift, since it's waiting on the bootstrap)
return done(); return done()
}
};

2
config/custom.js
View File

@ -20,4 +20,4 @@ module.exports.custom = {
// stripeSecret: 'sk_test_Zzd814nldl91104qor5911gjald', // stripeSecret: 'sk_test_Zzd814nldl91104qor5911gjald',
// … // …
}; }

6
config/datastores.js
View File

@ -15,7 +15,6 @@
module.exports.datastores = { module.exports.datastores = {
/*************************************************************************** /***************************************************************************
* * * *
* Your app's default datastore. * * Your app's default datastore. *
@ -51,7 +50,6 @@ module.exports.datastores = {
// adapter: 'sails-mysql', // adapter: 'sails-mysql',
// url: 'mysql://user:password@host:port/database', // url: 'mysql://user:password@host:port/database',
}, }
}
};

4
config/env/production.js vendored
View File

@ -238,8 +238,8 @@ module.exports = {
* * * *
***************************************************************************/ ***************************************************************************/
onlyAllowOrigins: [ onlyAllowOrigins: [
'https://ec2-18-219-76-43.us-east-2.compute.amazonaws.com', 'https://ec2-18-219-76-43.us-east-2.compute.amazonaws.com'
], ]
/*************************************************************************** /***************************************************************************
* * * *

4
config/globals.js
View File

@ -47,6 +47,6 @@ module.exports.globals = {
* * * *
****************************************************************************/ ****************************************************************************/
sails: true, sails: true
}; }

2
config/http.js
View File

@ -53,7 +53,7 @@ module.exports.http = {
], ],
rateLimit: rateLimiter, rateLimit: rateLimiter,
passportInit: require('passport').initialize(), passportInit: require('passport').initialize(),
passportSession: require('passport').session(), passportSession: require('passport').session()
/*************************************************************************** /***************************************************************************
* * * *

4
config/i18n.js
View File

@ -20,7 +20,7 @@ module.exports.i18n = {
* * * *
***************************************************************************/ ***************************************************************************/
locales: ['en', 'es', 'fr', 'de'], locales: ['en', 'es', 'fr', 'de']
/**************************************************************************** /****************************************************************************
* * * *
@ -42,4 +42,4 @@ module.exports.i18n = {
// localesDirectory: 'config/locales' // localesDirectory: 'config/locales'
}; }

2
config/log.js
View File

@ -26,4 +26,4 @@ module.exports.log = {
// level: 'info' // level: 'info'
}; }

18
config/models.js
View File

@ -15,7 +15,6 @@
module.exports.models = { module.exports.models = {
/*************************************************************************** /***************************************************************************
* * * *
* Whether the `.create()` and `.update()` model methods should ignore * * Whether the `.create()` and `.update()` model methods should ignore *
@ -37,7 +36,6 @@ module.exports.models = {
// schema: true, // schema: true,
/*************************************************************************** /***************************************************************************
* * * *
* How and whether Sails will attempt to automatically rebuild the * * How and whether Sails will attempt to automatically rebuild the *
@ -55,7 +53,6 @@ module.exports.models = {
// migrate: 'alter', // migrate: 'alter',
/*************************************************************************** /***************************************************************************
* * * *
* Base attributes that are included in all of your models by default. * * Base attributes that are included in all of your models by default. *
@ -69,10 +66,10 @@ module.exports.models = {
***************************************************************************/ ***************************************************************************/
attributes: { attributes: {
createdAt: { type: 'number', autoCreatedAt: true, }, createdAt: { type: 'number', autoCreatedAt: true },
updatedAt: { type: 'number', autoUpdatedAt: true, }, updatedAt: { type: 'number', autoUpdatedAt: true },
id: { type: 'number', autoIncrement: true, }, id: { type: 'number', autoIncrement: true }
//-------------------------------------------------------------------------- // --------------------------------------------------------------------------
// /\ Using MongoDB? // /\ Using MongoDB?
// || Replace `id` above with this instead: // || Replace `id` above with this instead:
// //
@ -82,10 +79,9 @@ module.exports.models = {
// //
// Plus, don't forget to configure MongoDB as your default datastore: // Plus, don't forget to configure MongoDB as your default datastore:
// https://sailsjs.com/docs/tutorials/using-mongo-db // https://sailsjs.com/docs/tutorials/using-mongo-db
//-------------------------------------------------------------------------- // --------------------------------------------------------------------------
}, },
/****************************************************************************** /******************************************************************************
* * * *
* The set of DEKs (data encryption keys) for at-rest encryption. * * The set of DEKs (data encryption keys) for at-rest encryption. *
@ -104,7 +100,6 @@ module.exports.models = {
default: 'nuF29j3StsGhRTut9dIrCxCNyYegcwH30FxnZ3kkdiA=' default: 'nuF29j3StsGhRTut9dIrCxCNyYegcwH30FxnZ3kkdiA='
}, },
/*************************************************************************** /***************************************************************************
* * * *
* Whether or not implicit records for associations should be cleaned up * * Whether or not implicit records for associations should be cleaned up *
@ -120,5 +115,4 @@ module.exports.models = {
cascadeOnDestroy: true cascadeOnDestroy: true
}
};

6
config/protocols.js
View File

@ -24,7 +24,7 @@ module.exports.protocols = {
const user = await User.findOne({ const user = await User.findOne({
email: identifier email: identifier
}) })
if (!user) throw new Error('an account with that email was not found') if (!user) { throw new Error('an account with that email was not found') }
const passport = await Passport.findOne({ const passport = await Passport.findOne({
protocol: 'local', protocol: 'local',
@ -32,7 +32,7 @@ module.exports.protocols = {
}) })
if (passport) { if (passport) {
const res = await Passport.validatePassword(password, passport) const res = await Passport.validatePassword(password, passport)
if (!res) throw new Error('incorrect password') if (!res) { throw new Error('incorrect password') }
return next(null, user) return next(null, user)
} else { } else {
throw new Error('that account does not have password login enabled') throw new Error('that account does not have password login enabled')
@ -45,7 +45,7 @@ module.exports.protocols = {
try { try {
const token = generateToken() const token = generateToken()
const password = user.password const password = user.password
if (!password.length) throw new Error('password cannot be blank') if (!password.length) { throw new Error('password cannot be blank') }
delete user.password delete user.password
const newUser = await User.create(user).fetch() const newUser = await User.create(user).fetch()

5
config/routes.js
View File

@ -66,17 +66,14 @@ module.exports.routes = {
'POST /api/publish': 'BooksController.publish', 'POST /api/publish': 'BooksController.publish',
'GET /api/books': 'BooksController.list', 'GET /api/books': 'BooksController.list',
'GET /api/me': 'UserController.me', 'GET /api/me': 'UserController.me'
// ╦ ╦╔═╗╔╗ ╦ ╦╔═╗╔═╗╦╔═╔═╗ // ╦ ╦╔═╗╔╗ ╦ ╦╔═╗╔═╗╦╔═╔═╗
// ║║║║╣ ╠╩╗╠═╣║ ║║ ║╠╩╗╚═╗ // ║║║║╣ ╠╩╗╠═╣║ ║║ ║╠╩╗╚═╗
// ╚╩╝╚═╝╚═╝╩ ╩╚═╝╚═╝╩ ╩╚═╝ // ╚╩╝╚═╝╚═╝╩ ╩╚═╝╚═╝╩ ╩╚═╝
// ╔╦╗╦╔═╗╔═╗ // ╔╦╗╦╔═╗╔═╗
// ║║║║╚═╗║ // ║║║║╚═╗║
// ╩ ╩╩╚═╝╚═╝ // ╩ ╩╩╚═╝╚═╝
} }

3
config/security.js
View File

@ -34,7 +34,6 @@ module.exports.security = {
// allowCredentials: false, // allowCredentials: false,
// }, // },
/**************************************************************************** /****************************************************************************
* * * *
* By default, Sails' built-in CSRF protection is disabled to facilitate * * By default, Sails' built-in CSRF protection is disabled to facilitate *
@ -51,4 +50,4 @@ module.exports.security = {
// csrf: false // csrf: false
}; }

5
config/session.js
View File

@ -18,8 +18,7 @@ module.exports.session = {
* of your users, forcing them to log in again. * * of your users, forcing them to log in again. *
* * * *
***************************************************************************/ ***************************************************************************/
secret: 'b7f0374251c4d79227067c286fe97ea5', secret: 'b7f0374251c4d79227067c286fe97ea5'
/*************************************************************************** /***************************************************************************
* * * *
@ -36,4 +35,4 @@ module.exports.session = {
// return !!req.path.match(req._sails.LOOKS_LIKE_ASSET_RX); // return !!req.path.match(req._sails.LOOKS_LIKE_ASSET_RX);
// }, // },
}; }

6
config/sockets.js
View File

@ -29,7 +29,6 @@ module.exports.sockets = {
// transports: [ 'websocket' ], // transports: [ 'websocket' ],
/*************************************************************************** /***************************************************************************
* * * *
* `beforeConnect` * * `beforeConnect` *
@ -50,7 +49,6 @@ module.exports.sockets = {
// //
// }, // },
/*************************************************************************** /***************************************************************************
* * * *
* `afterDisconnect` * * `afterDisconnect` *
@ -68,7 +66,6 @@ module.exports.sockets = {
// //
// }, // },
/*************************************************************************** /***************************************************************************
* * * *
* Whether to expose a 'GET /__getcookie' route that sets an HTTP-only * * Whether to expose a 'GET /__getcookie' route that sets an HTTP-only *
@ -78,5 +75,4 @@ module.exports.sockets = {
// grant3rdPartyCookie: true, // grant3rdPartyCookie: true,
}
};

2
config/views.js
View File

@ -38,4 +38,4 @@ module.exports.views = {
layout: 'layouts/layout' layout: 'layouts/layout'
}; }

4
package.json
View File

@ -11,6 +11,7 @@
"async": "2.0.1", "async": "2.0.1",
"base64url": "^3.0.0", "base64url": "^3.0.0",
"bcrypt": "^3.0.2", "bcrypt": "^3.0.2",
"eslint-plugin-react": "^7.11.1",
"express-rate-limit": "^3.2.1", "express-rate-limit": "^3.2.1",
"forever": "^0.15.3", "forever": "^0.15.3",
"grunt": "^1.0.3", "grunt": "^1.0.3",
@ -26,14 +27,15 @@
"sails-hook-sockets": "^1.4.0" "sails-hook-sockets": "^1.4.0"
}, },
"devDependencies": { "devDependencies": {
"@sailshq/eslint": "^4.19.3",
"@babel/core": "^7.1.2", "@babel/core": "^7.1.2",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0", "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/polyfill": "^7.0.0", "@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.1.0", "@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.0.0", "@babel/preset-react": "^7.0.0",
"babel-loader": "^8.0.4", "babel-loader": "^8.0.4",
"babel-preset-es2015": "^6.24.1",
"css-loader": "^1.0.1", "css-loader": "^1.0.1",
"eslint": "^5.8.0",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^3.2.0",
"mini-css-extract-plugin": "^0.4.4", "mini-css-extract-plugin": "^0.4.4",
"node-sass": "^4.9.4", "node-sass": "^4.9.4",

8
tasks/config/babel.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/babel.js * https://sailsjs.com/anatomy/tasks/config/babel.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('babel', { grunt.config.set('babel', {
dist: { dist: {
options: { options: {
@ -25,7 +24,7 @@ module.exports = function(grunt) {
} }
] ]
} }
}); })
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -50,5 +49,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-babel'); // grunt.loadNpmTasks('grunt-babel');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

8
tasks/config/clean.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/clean.js * https://sailsjs.com/anatomy/tasks/config/clean.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('clean', { grunt.config.set('clean', {
dev: ['.tmp/public/**'], dev: ['.tmp/public/**'],
build: ['www'], build: ['www'],
@ -23,7 +22,7 @@ module.exports = function(grunt) {
'www/templates', 'www/templates',
'www/dependencies' 'www/dependencies'
] ]
}); })
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -48,5 +47,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-clean'); // grunt.loadNpmTasks('grunt-contrib-clean');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

8
tasks/config/coffee.js
View File

@ -10,8 +10,7 @@
* https://sailsjs.com/anatomy/tasks/config/coffee.js * https://sailsjs.com/anatomy/tasks/config/coffee.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('coffee', { grunt.config.set('coffee', {
dev: { dev: {
options: { options: {
@ -27,7 +26,7 @@ module.exports = function(grunt) {
ext: '.js' ext: '.js'
}] }]
} }
}); })
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -52,5 +51,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-coffee'); // grunt.loadNpmTasks('grunt-contrib-coffee');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

8
tasks/config/concat.js
View File

@ -10,8 +10,7 @@
* https://sailsjs.com/anatomy/tasks/config/concat.js * https://sailsjs.com/anatomy/tasks/config/concat.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('concat', { grunt.config.set('concat', {
js: { js: {
src: require('../pipeline').jsFilesToInject, src: require('../pipeline').jsFilesToInject,
@ -21,7 +20,7 @@ module.exports = function(grunt) {
src: require('../pipeline').cssFilesToInject, src: require('../pipeline').cssFilesToInject,
dest: '.tmp/public/concat/production.css' dest: '.tmp/public/concat/production.css'
} }
}); })
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -46,5 +45,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-concat'); // grunt.loadNpmTasks('grunt-contrib-concat');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

10
tasks/config/copy.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/copy.js * https://sailsjs.com/anatomy/tasks/config/copy.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('copy', { grunt.config.set('copy', {
dev: { dev: {
files: [{ files: [{
@ -35,8 +34,8 @@ module.exports = function(grunt) {
src: ['**/*'], src: ['**/*'],
dest: '.tmp/public/dist' dest: '.tmp/public/dist'
}] }]
}, }
}); })
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -61,5 +60,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-copy'); // grunt.loadNpmTasks('grunt-contrib-copy');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

8
tasks/config/cssmin.js
View File

@ -11,14 +11,13 @@
* https://sailsjs.com/anatomy/tasks/config/cssmin.js * https://sailsjs.com/anatomy/tasks/config/cssmin.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('cssmin', { grunt.config.set('cssmin', {
dist: { dist: {
src: ['.tmp/public/concat/production.css'], src: ['.tmp/public/concat/production.css'],
dest: '.tmp/public/min/production.min.css' dest: '.tmp/public/min/production.min.css'
} }
}); })
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -43,5 +42,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-cssmin'); // grunt.loadNpmTasks('grunt-contrib-cssmin');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

14
tasks/config/hash.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/hash.js * https://sailsjs.com/anatomy/tasks/config/hash.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('hash', { grunt.config.set('hash', {
options: { options: {
mapping: '', mapping: '',
@ -18,11 +17,11 @@ module.exports = function(grunt) {
destBasePath: '', destBasePath: '',
flatten: false, flatten: false,
hashLength: 8, hashLength: 8,
hashFunction: function(source, encoding){ hashFunction: function (source, encoding) {
if (!source || !encoding) { if (!source || !encoding) {
throw new Error('Consistency violation: Cannot compute unique hash for production .css/.js cache-busting suffix, because `source` and/or `encoding` are falsey-- but they should be truthy strings! Here they are, respectively:\nsource: '+require('util').inspect(source, {depth:null})+'\nencoding: '+require('util').inspect(encoding, {depth:null})); throw new Error('Consistency violation: Cannot compute unique hash for production .css/.js cache-busting suffix, because `source` and/or `encoding` are falsey-- but they should be truthy strings! Here they are, respectively:\nsource: ' + require('util').inspect(source, {depth: null}) + '\nencoding: ' + require('util').inspect(encoding, {depth: null}))
} }
return require('crypto').createHash('sha1').update(source, encoding).digest('hex'); return require('crypto').createHash('sha1').update(source, encoding).digest('hex')
} }
}, },
js: { js: {
@ -33,7 +32,7 @@ module.exports = function(grunt) {
src: '.tmp/public/min/*.css', src: '.tmp/public/min/*.css',
dest: '.tmp/public/hash/' dest: '.tmp/public/hash/'
} }
}); })
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -58,5 +57,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-hash'); // grunt.loadNpmTasks('grunt-hash');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

9
tasks/config/jst.js
View File

@ -10,8 +10,7 @@
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('jst', { grunt.config.set('jst', {
dev: { dev: {
@ -26,14 +25,13 @@ module.exports = function(grunt) {
// default interpolation. If you want to parse templates with the default _.template behavior // default interpolation. If you want to parse templates with the default _.template behavior
// (i.e. using <div><%= this.id %></div>), there's no need to overwrite `templateSettings.interpolate`. // (i.e. using <div><%= this.id %></div>), there's no need to overwrite `templateSettings.interpolate`.
files: { files: {
// e.g. // e.g.
// 'relative/path/from/gruntfile/to/compiled/template/destination' : ['relative/path/to/sourcefiles/**/*.html'] // 'relative/path/from/gruntfile/to/compiled/template/destination' : ['relative/path/to/sourcefiles/**/*.html']
'.tmp/public/jst.js': require('../pipeline').templateFilesToInject '.tmp/public/jst.js': require('../pipeline').templateFilesToInject
} }
} }
}); })
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -58,5 +56,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-jst'); // grunt.loadNpmTasks('grunt-contrib-jst');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

8
tasks/config/less.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/less.js * https://sailsjs.com/anatomy/tasks/config/less.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('less', { grunt.config.set('less', {
dev: { dev: {
files: [{ files: [{
@ -21,7 +20,7 @@ module.exports = function(grunt) {
ext: '.css' ext: '.css'
}] }]
} }
}); })
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -46,5 +45,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-less'); // grunt.loadNpmTasks('grunt-contrib-less');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

23
tasks/config/sails-linker.js
View File

@ -11,11 +11,9 @@
* https://sailsjs.com/anatomy/tasks/config/sails-linker.js * https://sailsjs.com/anatomy/tasks/config/sails-linker.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('sails-linker', { grunt.config.set('sails-linker', {
// ╦╔═╗╦ ╦╔═╗╔═╗╔═╗╦═╗╦╔═╗╔╦╗ // ╦╔═╗╦ ╦╔═╗╔═╗╔═╗╦═╗╦╔═╗╔╦╗
// ║╠═╣╚╗╔╝╠═╣╚═╗║ ╠╦╝║╠═╝ ║ // ║╠═╣╚╗╔╝╠═╣╚═╗║ ╠╦╝║╠═╝ ║
// ╚╝╩ ╩ ╚╝ ╩ ╩╚═╝╚═╝╩╚═╩╩ ╩ // ╚╝╩ ╩ ╚╝ ╩ ╩╚═╝╚═╝╩╚═╩╩ ╩
@ -41,7 +39,7 @@ module.exports = function(grunt) {
startTag: '<!--SCRIPTS-->', startTag: '<!--SCRIPTS-->',
endTag: '<!--SCRIPTS END-->', endTag: '<!--SCRIPTS END-->',
fileTmpl: '<script src="%s"></script>', fileTmpl: '<script src="%s"></script>',
appRoot: '.tmp/public', appRoot: '.tmp/public'
// relative: true // relative: true
// ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc. // ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc.
// (but be note that this can break custom font URLs) // (but be note that this can break custom font URLs)
@ -72,7 +70,7 @@ module.exports = function(grunt) {
startTag: '<!--SCRIPTS-->', startTag: '<!--SCRIPTS-->',
endTag: '<!--SCRIPTS END-->', endTag: '<!--SCRIPTS END-->',
fileTmpl: '<script src="%s"></script>', fileTmpl: '<script src="%s"></script>',
appRoot: '.tmp/public', appRoot: '.tmp/public'
// relative: true // relative: true
// ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc. // ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc.
// (but be note that this can break custom font URLs) // (but be note that this can break custom font URLs)
@ -84,7 +82,6 @@ module.exports = function(grunt) {
} }
}, },
// ╔═╗╔╦╗╦ ╦╦ ╔═╗╔═╗╦ ╦╔═╗╔═╗╔╦╗╔═╗ // ╔═╗╔╦╗╦ ╦╦ ╔═╗╔═╗╦ ╦╔═╗╔═╗╔╦╗╔═╗
// ╚═╗ ║ ╚╦╝║ ║╣ ╚═╗╠═╣║╣ ║╣ ║ ╚═╗ // ╚═╗ ║ ╚╦╝║ ║╣ ╚═╗╠═╣║╣ ║╣ ║ ╚═╗
// ╚═╝ ╩ ╩ ╩═╝╚═╝╚═╝╩ ╩╚═╝╚═╝ ╩ ╚═╝ // ╚═╝ ╩ ╩ ╩═╝╚═╝╚═╝╩ ╩╚═╝╚═╝ ╩ ╚═╝
@ -111,7 +108,7 @@ module.exports = function(grunt) {
startTag: '<!--STYLES-->', startTag: '<!--STYLES-->',
endTag: '<!--STYLES END-->', endTag: '<!--STYLES END-->',
fileTmpl: '<link rel="stylesheet" href="%s">', fileTmpl: '<link rel="stylesheet" href="%s">',
appRoot: '.tmp/public', appRoot: '.tmp/public'
// relative: true // relative: true
// ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc. // ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc.
// (but be note that this can break custom font URLs) // (but be note that this can break custom font URLs)
@ -143,7 +140,7 @@ module.exports = function(grunt) {
startTag: '<!--STYLES-->', startTag: '<!--STYLES-->',
endTag: '<!--STYLES END-->', endTag: '<!--STYLES END-->',
fileTmpl: '<link rel="stylesheet" href="%s">', fileTmpl: '<link rel="stylesheet" href="%s">',
appRoot: '.tmp/public', appRoot: '.tmp/public'
// relative: true // relative: true
// ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc. // ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc.
// (but be note that this can break custom font URLs) // (but be note that this can break custom font URLs)
@ -155,7 +152,6 @@ module.exports = function(grunt) {
} }
}, },
// ╔═╗╦═╗╔═╗╔═╗╔═╗╔╦╗╔═╗╦╦ ╔═╗╔╦╗ ╦ ╦╔╦╗╔╦╗╦ ╔╦╗╔═╗╔╦╗╔═╗╦ ╔═╗╔╦╗╔═╗╔═╗ // ╔═╗╦═╗╔═╗╔═╗╔═╗╔╦╗╔═╗╦╦ ╔═╗╔╦╗ ╦ ╦╔╦╗╔╦╗╦ ╔╦╗╔═╗╔╦╗╔═╗╦ ╔═╗╔╦╗╔═╗╔═╗
// ╠═╝╠╦╝║╣ ║ ║ ║║║║╠═╝║║ ║╣ ║║ ╠═╣ ║ ║║║║ ║ ║╣ ║║║╠═╝║ ╠═╣ ║ ║╣ ╚═╗ // ╠═╝╠╦╝║╣ ║ ║ ║║║║╠═╝║║ ║╣ ║║ ╠═╣ ║ ║║║║ ║ ║╣ ║║║╠═╝║ ╠═╣ ║ ║╣ ╚═╗
// ╩ ╩╚═╚═╝╚═╝╚═╝╩ ╩╩ ╩╩═╝╚═╝═╩╝ ╩ ╩ ╩ ╩ ╩╩═╝ ╩ ╚═╝╩ ╩╩ ╩═╝╩ ╩ ╩ ╚═╝╚═╝ // ╩ ╩╚═╚═╝╚═╝╚═╝╩ ╩╩ ╩╩═╝╚═╝═╩╝ ╩ ╩ ╩ ╩ ╩╩═╝ ╩ ╚═╝╩ ╩╩ ╩═╝╩ ╩ ╩ ╚═╝╚═╝
@ -180,7 +176,7 @@ module.exports = function(grunt) {
startTag: '<!--TEMPLATES-->', startTag: '<!--TEMPLATES-->',
endTag: '<!--TEMPLATES END-->', endTag: '<!--TEMPLATES END-->',
fileTmpl: '<script type="text/javascript" src="%s"></script>', fileTmpl: '<script type="text/javascript" src="%s"></script>',
appRoot: '.tmp/public', appRoot: '.tmp/public'
// relative: true // relative: true
// ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc. // ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc.
// (but be note that this can break custom font URLs) // (but be note that this can break custom font URLs)
@ -190,9 +186,9 @@ module.exports = function(grunt) {
'views/**/*.html': ['.tmp/public/jst.js'], 'views/**/*.html': ['.tmp/public/jst.js'],
'views/**/*.ejs': ['.tmp/public/jst.js'] 'views/**/*.ejs': ['.tmp/public/jst.js']
} }
}, }
});//</ grunt.config.set() > })// </ grunt.config.set() >
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -217,5 +213,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-sails-linker'); // grunt.loadNpmTasks('grunt-sails-linker');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

8
tasks/config/sync.js
View File

@ -10,8 +10,7 @@
* https://sailsjs.com/anatomy/tasks/config/sync.js * https://sailsjs.com/anatomy/tasks/config/sync.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('sync', { grunt.config.set('sync', {
dev: { dev: {
files: [{ files: [{
@ -20,7 +19,7 @@ module.exports = function(grunt) {
dest: '.tmp/public' dest: '.tmp/public'
}] }]
} }
}); })
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -45,5 +44,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-sync'); // grunt.loadNpmTasks('grunt-sync');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

11
tasks/config/uglify.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/uglify.js * https://sailsjs.com/anatomy/tasks/config/uglify.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('uglify', { grunt.config.set('uglify', {
dist: { dist: {
src: ['.tmp/public/concat/production.js'], src: ['.tmp/public/concat/production.js'],
@ -24,7 +23,7 @@ module.exports = function(grunt) {
'Promise', 'Promise',
'File', 'File',
'Location', 'Location',
'RttcRefPlaceholder', 'RttcRefPlaceholder'
], ],
keep_fnames: true//eslint-disable-line keep_fnames: true//eslint-disable-line
}, },
@ -32,7 +31,7 @@ module.exports = function(grunt) {
keep_fnames: true//eslint-disable-line keep_fnames: true//eslint-disable-line
} }
} }
}); })
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -57,6 +56,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-uglify'); // grunt.loadNpmTasks('grunt-contrib-uglify');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

8
tasks/config/watch.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/watch.js * https://sailsjs.com/anatomy/tasks/config/watch.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.config.set('watch', { grunt.config.set('watch', {
assets: { assets: {
@ -27,7 +26,7 @@ module.exports = function(grunt) {
'linkAssets' 'linkAssets'
] ]
} }
}); })
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails, // This Grunt plugin is part of the default asset pipeline in Sails,
@ -52,5 +51,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-watch'); // grunt.loadNpmTasks('grunt-contrib-watch');
// ``` // ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
};

38
tasks/pipeline.js
View File

@ -10,8 +10,6 @@
* https://sailsjs.com/anatomy/tasks/pipeline.js * https://sailsjs.com/anatomy/tasks/pipeline.js
*/ */
// ██████╗ ██╗ █████╗ ██╗███╗ ██╗ ██████╗███████╗███████╗ // ██████╗ ██╗ █████╗ ██╗███╗ ██╗ ██████╗███████╗███████╗
// ██╔══██╗██║ ██╔══██╗██║████╗ ██║ ██╔════╝██╔════╝██╔════╝ // ██╔══██╗██║ ██╔══██╗██║████╗ ██║ ██╔════╝██╔════╝██╔════╝
// ██████╔╝██║ ███████║██║██╔██╗ ██║ ██║ ███████╗███████╗ // ██████╔╝██║ ███████║██║██╔██╗ ██║ ██║ ███████╗███████╗
@ -40,8 +38,7 @@ var cssFilesToInject = [
// in no particular order. To customize the ordering, add additional // in no particular order. To customize the ordering, add additional
// items here, _above_ this one. // items here, _above_ this one.
'styles/**/*.css' 'styles/**/*.css'
]; ]
// ██████╗██╗ ██╗███████╗███╗ ██╗████████╗ ███████╗██╗██████╗ ███████╗ // ██████╗██╗ ██╗███████╗███╗ ██╗████████╗ ███████╗██╗██████╗ ███████╗
// ██╔════╝██║ ██║██╔════╝████╗ ██║╚══██╔══╝ ██╔════╝██║██╔══██╗██╔════╝ // ██╔════╝██║ ██║██╔════╝████╗ ██║╚══██╔══╝ ██╔════╝██║██╔══██╗██╔════╝
@ -73,8 +70,7 @@ var jsFilesToInject = [
// in no particular order. To customize the ordering, add additional items // in no particular order. To customize the ordering, add additional items
// here, _above_ this one. // here, _above_ this one.
'js/**/*.js' 'js/**/*.js'
]; ]
// ██████╗██╗ ██╗███████╗███╗ ██╗████████╗ ███████╗██╗██████╗ ███████╗ // ██████╗██╗ ██╗███████╗███╗ ██╗████████╗ ███████╗██╗██████╗ ███████╗
// ██╔════╝██║ ██║██╔════╝████╗ ██║╚══██╔══╝ ██╔════╝██║██╔══██╗██╔════╝ // ██╔════╝██║ ██║██╔════╝████╗ ██║╚══██╔══╝ ██╔════╝██║██╔══██╗██╔════╝
@ -103,9 +99,7 @@ var jsFilesToInject = [
// //
var templateFilesToInject = [ var templateFilesToInject = [
'templates/**/*.html' 'templates/**/*.html'
]; ]
// ███╗ ███╗██╗███████╗ ██████╗ ███████╗███████╗████████╗██╗ ██╗██████╗ // ███╗ ███╗██╗███████╗ ██████╗ ███████╗███████╗████████╗██╗ ██╗██████╗
// ████╗ ████║██║██╔════╝██╔════╝ ██╔════╝██╔════╝╚══██╔══╝██║ ██║██╔══██╗ // ████╗ ████║██║██╔════╝██╔════╝ ██╔════╝██╔════╝╚══██╔══╝██║ ██║██╔══██╗
@ -119,29 +113,29 @@ var templateFilesToInject = [
// the code below, unless you are modifying the default asset pipeline.** // the code below, unless you are modifying the default asset pipeline.**
// Default path for public folder (see documentation on sailsjs.com for more information) // Default path for public folder (see documentation on sailsjs.com for more information)
var tmpPath = '.tmp/public/'; var tmpPath = '.tmp/public/'
// Prefix relative paths to source files so they point to the proper locations // Prefix relative paths to source files so they point to the proper locations
// (i.e. where the other Grunt tasks spit them out, or in some cases, where // (i.e. where the other Grunt tasks spit them out, or in some cases, where
// they reside in the first place) // they reside in the first place)
module.exports.cssFilesToInject = cssFilesToInject.map((cssPath)=>{ module.exports.cssFilesToInject = cssFilesToInject.map((cssPath) => {
// If we're ignoring the file, make sure the ! is at the beginning of the path // If we're ignoring the file, make sure the ! is at the beginning of the path
if (cssPath[0] === '!') { if (cssPath[0] === '!') {
return require('path').join('!' + tmpPath, cssPath.substr(1)); return require('path').join('!' + tmpPath, cssPath.substr(1))
} }
return require('path').join(tmpPath, cssPath); return require('path').join(tmpPath, cssPath)
}); })
module.exports.jsFilesToInject = jsFilesToInject.map((jsPath)=>{ module.exports.jsFilesToInject = jsFilesToInject.map((jsPath) => {
// If we're ignoring the file, make sure the ! is at the beginning of the path // If we're ignoring the file, make sure the ! is at the beginning of the path
if (jsPath[0] === '!') { if (jsPath[0] === '!') {
return require('path').join('!' + tmpPath, jsPath.substr(1)); return require('path').join('!' + tmpPath, jsPath.substr(1))
} }
return require('path').join(tmpPath, jsPath); return require('path').join(tmpPath, jsPath)
}); })
module.exports.templateFilesToInject = templateFilesToInject.map((tplPath)=>{ module.exports.templateFilesToInject = templateFilesToInject.map((tplPath) => {
// If we're ignoring the file, make sure the ! is at the beginning of the path // If we're ignoring the file, make sure the ! is at the beginning of the path
if (tplPath[0] === '!') { if (tplPath[0] === '!') {
return require('path').join('!assets/', tplPath.substr(1)); return require('path').join('!assets/', tplPath.substr(1))
} }
return require('path').join('assets/', tplPath); return require('path').join('assets/', tplPath)
}); })

6
tasks/register/build.js
View File

@ -10,7 +10,7 @@
* https://sailsjs.com/anatomy/tasks/register/build.js * https://sailsjs.com/anatomy/tasks/register/build.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.registerTask('build', [ grunt.registerTask('build', [
// 'polyfill:dev', //« uncomment to ALSO transpile during development (for broader browser compat.) // 'polyfill:dev', //« uncomment to ALSO transpile during development (for broader browser compat.)
'compileAssets', 'compileAssets',
@ -18,5 +18,5 @@ module.exports = function(grunt) {
'linkAssetsBuild', 'linkAssetsBuild',
'clean:build', 'clean:build',
'copy:build' 'copy:build'
]); ])
}; }

15
tasks/register/buildProd.js
View File

@ -11,20 +11,19 @@
* https://sailsjs.com/anatomy/tasks/register/build-prod.js * https://sailsjs.com/anatomy/tasks/register/build-prod.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.registerTask('buildProd', [ grunt.registerTask('buildProd', [
'polyfill:prod', //« Remove this to skip transpilation in production (not recommended) 'polyfill:prod', // « Remove this to skip transpilation in production (not recommended)
'compileAssets', 'compileAssets',
'babel', //« Remove this to skip transpilation in production (not recommended) 'babel', // « Remove this to skip transpilation in production (not recommended)
'concat', 'concat',
'uglify', 'uglify',
'cssmin', 'cssmin',
'hash',//« Cache-busting 'hash', // « Cache-busting
'copy:beforeLinkBuildProd',//« For prettier URLs after cache-busting 'copy:beforeLinkBuildProd', // « For prettier URLs after cache-busting
'linkAssetsBuildProd', 'linkAssetsBuildProd',
'clean:build', 'clean:build',
'copy:build', 'copy:build',
'clean:afterBuildProd' 'clean:afterBuildProd'
]); ])
}; }

6
tasks/register/compileAssets.js
View File

@ -7,12 +7,12 @@
* https://sailsjs.com/anatomy/tasks/register/compile-assets.js * https://sailsjs.com/anatomy/tasks/register/compile-assets.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.registerTask('compileAssets', [ grunt.registerTask('compileAssets', [
'clean:dev', 'clean:dev',
'jst:dev', 'jst:dev',
'less:dev', 'less:dev',
'copy:dev', 'copy:dev',
'coffee:dev' 'coffee:dev'
]); ])
}; }

8
tasks/register/default.js
View File

@ -13,15 +13,11 @@
* *
*/ */
module.exports = function (grunt) { module.exports = function (grunt) {
grunt.registerTask('default', [ grunt.registerTask('default', [
// 'polyfill:dev', //« uncomment to ALSO transpile during development (for broader browser compat.) // 'polyfill:dev', //« uncomment to ALSO transpile during development (for broader browser compat.)
'compileAssets', 'compileAssets',
// 'babel', //« uncomment to ALSO transpile during development (for broader browser compat.) // 'babel', //« uncomment to ALSO transpile during development (for broader browser compat.)
'linkAssets', 'linkAssets',
'watch' 'watch'
]); ])
}
};

6
tasks/register/linkAssets.js
View File

@ -7,10 +7,10 @@
* https://sailsjs.com/anatomy/tasks/register/link-assets.js * https://sailsjs.com/anatomy/tasks/register/link-assets.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.registerTask('linkAssets', [ grunt.registerTask('linkAssets', [
'sails-linker:devJs', 'sails-linker:devJs',
'sails-linker:devStyles', 'sails-linker:devStyles',
'sails-linker:clientSideTemplates' 'sails-linker:clientSideTemplates'
]); ])
}; }

6
tasks/register/linkAssetsBuild.js
View File

@ -7,10 +7,10 @@
* https://sailsjs.com/anatomy/tasks/register/link-assets-build.js * https://sailsjs.com/anatomy/tasks/register/link-assets-build.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.registerTask('linkAssetsBuild', [ grunt.registerTask('linkAssetsBuild', [
'sails-linker:devJsBuild', 'sails-linker:devJsBuild',
'sails-linker:devStylesBuild', 'sails-linker:devStylesBuild',
'sails-linker:clientSideTemplatesBuild' 'sails-linker:clientSideTemplatesBuild'
]); ])
}; }

6
tasks/register/linkAssetsBuildProd.js
View File

@ -7,10 +7,10 @@
* https://sailsjs.com/anatomy/tasks/register/link-assets-build-prod.js * https://sailsjs.com/anatomy/tasks/register/link-assets-build-prod.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.registerTask('linkAssetsBuildProd', [ grunt.registerTask('linkAssetsBuildProd', [
'sails-linker:prodJsBuild', 'sails-linker:prodJsBuild',
'sails-linker:prodStylesBuild', 'sails-linker:prodStylesBuild',
'sails-linker:clientSideTemplatesBuild' 'sails-linker:clientSideTemplatesBuild'
]); ])
}; }

27
tasks/register/polyfill.js
View File

@ -7,22 +7,21 @@
* https://sailsjs.com/anatomy/tasks/register/polyfill.js * https://sailsjs.com/anatomy/tasks/register/polyfill.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.registerTask('polyfill:prod', 'Add the polyfill file to the top of the list of files to concatenate', ()=>{ grunt.registerTask('polyfill:prod', 'Add the polyfill file to the top of the list of files to concatenate', () => {
grunt.config.set('concat.js.src', [require('sails-hook-grunt/accessible/babel-polyfill')].concat(grunt.config.get('concat.js.src'))); grunt.config.set('concat.js.src', [require('sails-hook-grunt/accessible/babel-polyfill')].concat(grunt.config.get('concat.js.src')))
}); })
grunt.registerTask('polyfill:dev', 'Add the polyfill file to the top of the list of files to copy and link', ()=>{ grunt.registerTask('polyfill:dev', 'Add the polyfill file to the top of the list of files to copy and link', () => {
grunt.config.set('copy.dev.files', grunt.config.get('copy.dev.files').concat({ grunt.config.set('copy.dev.files', grunt.config.get('copy.dev.files').concat({
expand: true, expand: true,
cwd: require('path').dirname(require('sails-hook-grunt/accessible/babel-polyfill')), cwd: require('path').dirname(require('sails-hook-grunt/accessible/babel-polyfill')),
src: require('path').basename(require('sails-hook-grunt/accessible/babel-polyfill')), src: require('path').basename(require('sails-hook-grunt/accessible/babel-polyfill')),
dest: '.tmp/public/polyfill' dest: '.tmp/public/polyfill'
})); }))
var devLinkFiles = grunt.config.get('sails-linker.devJs.files'); var devLinkFiles = grunt.config.get('sails-linker.devJs.files')
grunt.config.set('sails-linker.devJs.files', Object.keys(devLinkFiles).reduce((linkerConfigSoFar, glob)=>{ grunt.config.set('sails-linker.devJs.files', Object.keys(devLinkFiles).reduce((linkerConfigSoFar, glob) => {
linkerConfigSoFar[glob] = ['.tmp/public/polyfill/polyfill.min.js'].concat(devLinkFiles[glob]); linkerConfigSoFar[glob] = ['.tmp/public/polyfill/polyfill.min.js'].concat(devLinkFiles[glob])
return linkerConfigSoFar; return linkerConfigSoFar
}, {})); }, {}))
}); })
}; }

13
tasks/register/prod.js
View File

@ -11,17 +11,16 @@
* https://sailsjs.com/anatomy/tasks/register/prod.js * https://sailsjs.com/anatomy/tasks/register/prod.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.registerTask('prod', [ grunt.registerTask('prod', [
'polyfill:prod', //« Remove this to skip transpilation in production (not recommended) 'polyfill:prod', // « Remove this to skip transpilation in production (not recommended)
'compileAssets', 'compileAssets',
'babel', //« Remove this to skip transpilation in production (not recommended) 'babel', // « Remove this to skip transpilation in production (not recommended)
'concat', 'concat',
'uglify', 'uglify',
'cssmin', 'cssmin',
'sails-linker:prodJs', 'sails-linker:prodJs',
'sails-linker:prodStyles', 'sails-linker:prodStyles',
'sails-linker:clientSideTemplates', 'sails-linker:clientSideTemplates'
]); ])
}; }

6
tasks/register/syncAssets.js
View File

@ -7,11 +7,11 @@
* https://sailsjs.com/anatomy/tasks/register/sync-assets.js * https://sailsjs.com/anatomy/tasks/register/sync-assets.js
* *
*/ */
module.exports = function(grunt) { module.exports = function (grunt) {
grunt.registerTask('syncAssets', [ grunt.registerTask('syncAssets', [
'jst:dev', 'jst:dev',
'less:dev', 'less:dev',
'sync:dev', 'sync:dev',
'coffee:dev' 'coffee:dev'
]); ])
}; }