chore: commit lint fixes for the api

This commit is contained in:
Bouncey
2019-02-06 14:19:58 +00:00
committed by mrugesh mohapatra
parent 010fa63e76
commit 07266b7e43
17 changed files with 159 additions and 154 deletions

View File

@ -4,14 +4,19 @@ export function dashify(str) {
return ('' + str) return ('' + str)
.toLowerCase() .toLowerCase()
.replace(/\s/g, '-') .replace(/\s/g, '-')
.replace(/[^a-z0-9\-\.]/gi, '') .replace(/[^a-z0-9\-.]/gi, '')
.replace(/\:/g, ''); .replace(/:/g, '');
} }
// todo: unify with server/utils/index.js:dasherize // todo: unify with server/utils/index.js:dasherize
const dasherize = dashify; const dasherize = dashify;
export { dasherize }; export { dasherize };
export const fixCompletedChallengeItem = obj => pick( export const fixCompletedChallengeItem = obj =>
obj, pick(obj, [
[ 'id', 'completedDate', 'solution', 'githubLink', 'challengeType', 'files' ] 'id',
); 'completedDate',
'solution',
'githubLink',
'challengeType',
'files',
]);

View File

@ -88,7 +88,7 @@ module.exports = function(app) {
.then(() => { .then(() => {
req.flash( req.flash(
'success', 'success',
"We've successfully updated your email preferences." 'We\'ve successfully updated your email preferences.'
); );
return res.redirectWithFlash( return res.redirectWithFlash(
`${homeLocation}/unsubscribed/${unsubscribeId}` `${homeLocation}/unsubscribed/${unsubscribeId}`
@ -144,7 +144,7 @@ module.exports = function(app) {
.then(() => { .then(() => {
req.flash( req.flash(
'success', 'success',
"We've successfully updated your email preferences. Thank you " + 'We\'ve successfully updated your email preferences. Thank you ' +
'for resubscribing.' 'for resubscribing.'
); );
return res.redirectWithFlash(homeLocation); return res.redirectWithFlash(homeLocation);
@ -175,7 +175,7 @@ module.exports = function(app) {
} }
pulls = pulls pulls = pulls
? Object.keys(JSON.parse(pulls)).length ? Object.keys(JSON.parse(pulls)).length
: "Can't connect to github"; : 'Can\'t connect to github';
return request( return request(
[ [
@ -193,7 +193,7 @@ module.exports = function(app) {
issues = issues =
pulls === parseInt(pulls, 10) && issues pulls === parseInt(pulls, 10) && issues
? Object.keys(JSON.parse(issues)).length - pulls ? Object.keys(JSON.parse(issues)).length - pulls
: "Can't connect to GitHub"; : 'Can\'t connect to GitHub';
return res.send({ return res.send({
issues: issues, issues: issues,
pulls: pulls pulls: pulls

View File

@ -229,7 +229,7 @@ function createPostReportUserProfile(app) {
to: 'team@freecodecamp.org', to: 'team@freecodecamp.org',
cc: user.email, cc: user.email,
from: 'team@freecodecamp.org', from: 'team@freecodecamp.org',
subject: 'Abuse Report : Reporting ' + username + "'s profile.", subject: `Abuse Report : Reporting ${username}'s profile.`,
text: dedent(` text: dedent(`
Hello Team,\n Hello Team,\n
This is to report the profile of ${username}.\n This is to report the profile of ${username}.\n

View File

@ -3,7 +3,7 @@ import helmet from 'helmet';
import { homeLocation } from '../../../config/env'; import { homeLocation } from '../../../config/env';
let trusted = [ let trusted = [
"'self'", '\'self\'',
'https://search.freecodecamp.org', 'https://search.freecodecamp.org',
homeLocation, homeLocation,
'https://' + process.env.AUTH0_DOMAIN 'https://' + process.env.AUTH0_DOMAIN
@ -31,8 +31,8 @@ export default function csp() {
'https://*.algolia.net' 'https://*.algolia.net'
]), ]),
scriptSrc: [ scriptSrc: [
"'unsafe-eval'", '\'unsafe-eval\'',
"'unsafe-inline'", '\'unsafe-inline\'',
'*.google-analytics.com', '*.google-analytics.com',
'*.gstatic.com', '*.gstatic.com',
'https://*.cloudflare.com', 'https://*.cloudflare.com',
@ -48,7 +48,7 @@ export default function csp() {
'*.ytimg.com' '*.ytimg.com'
].concat(trusted), ].concat(trusted),
styleSrc: [ styleSrc: [
"'unsafe-inline'", '\'unsafe-inline\'',
'*.gstatic.com', '*.gstatic.com',
'*.googleapis.com', '*.googleapis.com',
'*.bootstrapcdn.com', '*.bootstrapcdn.com',

View File

@ -11,7 +11,7 @@ function getExtract(str) {
function addResponsiveClass(str) { function addResponsiveClass(str) {
return str.replace(/\<img/g, '<img class="img-responsive"'); return str.replace(/<img/g, '<img class="img-responsive"');
} }
export function getMediumFeed() { export function getMediumFeed() {

View File

@ -25,7 +25,6 @@ export default function userServices() {
config, config,
cb) { cb) {
const queryUser = req.user; const queryUser = req.user;
console.log(queryUser.completedChallengeCount)
const source = queryUser && Observable.forkJoin( const source = queryUser && Observable.forkJoin(
queryUser.getCompletedChallenges$(), queryUser.getCompletedChallenges$(),
queryUser.getPoints$(), queryUser.getPoints$(),

View File

@ -1,4 +1,3 @@
function getCompletedCertCount(user) { function getCompletedCertCount(user) {
return [ return [
'isApisMicroservicesCert', 'isApisMicroservicesCert',
@ -7,26 +6,28 @@ function getCompletedCertCount(user) {
'isInfosecQaCert', 'isInfosecQaCert',
'isJsAlgoDataStructCert', 'isJsAlgoDataStructCert',
'isRespWebDesignCert' 'isRespWebDesignCert'
].reduce((sum, key) => user[key] ? sum + 1 : sum, 0); ].reduce((sum, key) => (user[key] ? sum + 1 : sum), 0);
} }
function getLegacyCertCount(user) { function getLegacyCertCount(user) {
return [ return ['isFrontEndCert', 'isBackEndCert', 'isDataVisCert'].reduce(
'isFrontEndCert', (sum, key) => (user[key] ? sum + 1 : sum),
'isBackEndCert', 0
'isDataVisCert' );
].reduce((sum, key) => user[key] ? sum + 1 : sum, 0);
} }
export default function populateUser(db, user) { export default function populateUser(db, user) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let populatedUser = {...user}; let populatedUser = { ...user };
db.collection('user') db.collection('user')
.aggregate([ .aggregate([
{ $match: { _id: user.id } }, { $match: { _id: user.id } },
{ $project: { points: { $size: '$progressTimestamps' } } } { $project: { points: { $size: '$progressTimestamps' } } },
]).get(function(err, [{ points = 1 } = {}]) { ])
if (err) { return reject(err); } .get(function(err, [{ points = 1 } = {}]) {
if (err) {
return reject(err);
}
user.points = points; user.points = points;
let completedChallengeCount = 0; let completedChallengeCount = 0;
let completedProjectCount = 0; let completedProjectCount = 0;

View File

@ -2,25 +2,25 @@ exports.dasherize = function dasherize(name) {
return ('' + name) return ('' + name)
.toLowerCase() .toLowerCase()
.replace(/\s/g, '-') .replace(/\s/g, '-')
.replace(/[^a-z0-9\-\.]/gi, '') .replace(/[^a-z0-9\-.]/gi, '')
.replace(/\:/g, ''); .replace(/:/g, '');
} };
exports.nameify = function nameify(str) { exports.nameify = function nameify(str) {
return ('' + str) return ('' + str).replace(/[^a-zA-Z0-9\s]/g, '').replace(/:/g, '');
.replace(/[^a-zA-Z0-9\s]/g, '') };
.replace(/\:/g, '');
}
exports.unDasherize = function unDasherize(name) { exports.unDasherize = function unDasherize(name) {
return ('' + name) return (
('' + name)
// replace dash with space // replace dash with space
.replace(/\-/g, ' ') .replace(/-/g, ' ')
// strip nonalphanumarics chars except whitespace // strip nonalphanumarics chars except whitespace
.replace(/[^a-zA-Z\d\s]/g, '') .replace(/[^a-zA-Z\d\s]/g, '')
.trim(); .trim()
} );
};
exports.addPlaceholderImage = function addPlaceholderImage(name) { exports.addPlaceholderImage = function addPlaceholderImage(name) {
return `https://identicon.org?t=${name}&s=256`; return `https://identicon.org?t=${name}&s=256`;
} };