gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(deps): upgrade eslint, prettier & related packages

Browse Source
This commit is contained in:
Mrugesh Mohapatra
2021-03-11 00:31:46 +05:30
committed by Mrugesh Mohapatra
parent 0a53a1d7f0
commit 6c91f81b0e
94 changed files with 1462 additions and 1411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@ -1,4 +1,3 @@
**/node_modules/**
client/.cache/**
client/static/**
client/public/**

24
.eslintrc.json
View File

@ -7,8 +7,18 @@
},
"parser": "babel-eslint",
"root": true,
"extends": ["./.eslintrc-base.json", "prettier", "prettier/react"],
"plugins": ["react", "import", "prefer-object-spread", "prettier", "react-hooks", "jsx-a11y"],
"extends": [
"./.eslintrc-base.json",
"prettier"
],
"plugins": [
"react",
"import",
"prefer-object-spread",
"prettier",
"react-hooks",
"jsx-a11y"
],
"globals": {
"Promise": true,
"window": true,
@ -20,8 +30,14 @@
"settings": {
"react": {
"version": "16.4.2",
"import/ignore": ["node_modules", "\\.json$"],
"import/extensions": [".js", ".jsx"]
"import/ignore": [
"node_modules",
"\\.json$"
],
"import/extensions": [
".js",
".jsx"
]
}
}
}

3
.prettierrc
View File

@ -4,5 +4,6 @@
"singleQuote": true,
"jsxSingleQuote": true,
"tabWidth": 2,
"trailingComma": "none"
"trailingComma": "none",
"arrowParens": "avoid"
}

6
api-server/src/server/boot/donate.js
View File

@ -41,9 +41,9 @@ export default function donateBoot(app, done) {
metadata: {
/* eslint-disable camelcase */
sb_service: `freeCodeCamp.org`,
sb_tier: `${
donationSubscriptionConfig.duration[duration]
} $${amount / 100} Donation`
sb_tier: `${donationSubscriptionConfig.duration[duration]} $${
amount / 100
} Donation`
/* eslint-enable camelcase */
}
},

8
api-server/src/server/boot/settings.js
View File

@ -77,9 +77,7 @@ function refetchCompletedChallenges(req, res, next) {
}
const updateMyEmailValidators = [
check('email')
.isEmail()
.withMessage('Email format is invalid.')
check('email').isEmail().withMessage('Email format is invalid.')
];
function updateMyEmail(req, res, next) {
@ -117,9 +115,7 @@ function updateMyCurrentChallenge(req, res, next) {
}
const updateMyThemeValidators = [
check('theme')
.isIn(Object.keys(themes))
.withMessage('Theme is invalid.')
check('theme').isIn(Object.keys(themes)).withMessage('Theme is invalid.')
];
function updateMyTheme(req, res, next) {

5
api-server/src/server/index.js
View File

@ -64,7 +64,10 @@ boot(app, __dirname, err => {
setupPassport(app);
const { db } = app.datasources;
db.on('connected', _.once(() => log('db connected')));
db.on(
'connected',
_.once(() => log('db connected'))
);
app.start = _.once(function () {
const server = app.listen(app.get('port'), function () {
app.emit('started');

10
api-server/src/server/utils/date-utils.js
View File

@ -3,14 +3,8 @@ import moment from 'moment-timezone';
// day count between two epochs (inclusive)
export function dayCount([head, tail], timezone = 'UTC') {
return Math.ceil(
moment(
moment(head)
.tz(timezone)
.endOf('day')
).diff(
moment(tail)
.tz(timezone)
.startOf('day'),
moment(moment(head).tz(timezone).endOf('day')).diff(
moment(tail).tz(timezone).startOf('day'),
'days',
true
)

4
api-server/src/server/utils/rx.js
View File

@ -49,9 +49,7 @@ export function timeCache(time, unit) {
// set new expire time in MS and create new subscription to source
if (!expireCacheAt || expireCacheAt < Date.now()) {
// set expire in ms;
expireCacheAt = moment()
.add(time, unit)
.valueOf();
expireCacheAt = moment().add(time, unit).valueOf();
cache = new AsyncSubject();
source.subscribe(cache);
}

35
api-server/src/server/utils/user-stats.js
View File

@ -25,36 +25,23 @@ export function prepUniqueDaysByHours(cals, tz = 'UTC') {
data.push(cur);
prev = cur;
} else if (
moment(cur)
.tz(tz)
.diff(
moment(prev)
.tz(tz)
.startOf('day'),
'hours'
) >= hoursDay
moment(cur).tz(tz).diff(moment(prev).tz(tz).startOf('day'), 'hours') >=
hoursDay
) {
data.push(cur);
prev = cur;
}
}, []),
sortBy(e => e),
map(ts =>
moment(ts)
.tz(tz)
.startOf('hours')
.valueOf()
)
map(ts => moment(ts).tz(tz).startOf('hours').valueOf())
)(cals);
}
export function calcCurrentStreak(cals, tz = 'UTC') {
let prev = last(cals);
if (
moment()
.tz(tz)
.startOf('day')
.diff(moment(prev).tz(tz), 'hours') > hoursBetween
moment().tz(tz).startOf('day').diff(moment(prev).tz(tz), 'hours') >
hoursBetween
) {
return 0;
}
@ -62,10 +49,8 @@ export function calcCurrentStreak(cals, tz = 'UTC') {
let streakContinues = true;
forEachRight(cur => {
if (
moment(prev)
.tz(tz)
.startOf('day')
.diff(moment(cur).tz(tz), 'hours') <= hoursBetween
moment(prev).tz(tz).startOf('day').diff(moment(cur).tz(tz), 'hours') <=
hoursBetween
) {
prev = cur;
currentStreak++;
@ -86,10 +71,8 @@ export function calcLongestStreak(cals, tz = 'UTC') {
const last = cals[index === 0 ? 0 : index - 1];
// is streak broken
if (
moment(head)
.tz(tz)
.startOf('day')
.diff(moment(last).tz(tz), 'hours') > hoursBetween
moment(head).tz(tz).startOf('day').diff(moment(last).tz(tz), 'hours') >
hoursBetween
) {
tail = head;
}

3
client/plugins/fcc-source-challenges/create-challenge-nodes.js
View File

@ -11,7 +11,8 @@ function createChallengeNode(challenge, reporter) {
// sections.
if (
typeof challenge.description !== 'string' &&
(challenge.challengeType !== 11 && challenge.challengeType !== 7)
challenge.challengeType !== 11 &&
challenge.challengeType !== 7
) {
reporter.warn(`

10
client/src/client-only-routes/ShowCertification.js
View File

@ -298,8 +298,9 @@ const ShowCertification = props => {
bsSize='lg'
bsStyle='primary'
target='_blank'
href={`https://www.linkedin.com/profile/add?startTask=CERTIFICATION_NAME&name=${certTitle}&organizationId=4831032&issueYear=${certYear}&issueMonth=${certMonth +
1}&certUrl=${certURL}`}
href={`https://www.linkedin.com/profile/add?startTask=CERTIFICATION_NAME&name=${certTitle}&organizationId=4831032&issueYear=${certYear}&issueMonth=${
certMonth + 1
}&certUrl=${certURL}`}
>
{t('profile.add-linkedin')}
</Button>
@ -399,7 +400,4 @@ const ShowCertification = props => {
ShowCertification.displayName = 'ShowCertification';
ShowCertification.propTypes = propTypes;
export default connect(
mapStateToProps,
mapDispatchToProps
)(ShowCertification);
export default connect(mapStateToProps, mapDispatchToProps)(ShowCertification);

5
client/src/client-only-routes/ShowSettings.js
View File

@ -211,7 +211,4 @@ export function ShowSettings(props) {
ShowSettings.displayName = 'ShowSettings';
ShowSettings.propTypes = propTypes;
export default connect(
mapStateToProps,
mapDispatchToProps
)(ShowSettings);
export default connect(mapStateToProps, mapDispatchToProps)(ShowSettings);

5
client/src/client-only-routes/ShowUser.js
View File

@ -155,8 +155,5 @@ ShowUser.displayName = 'ShowUser';
ShowUser.propTypes = propTypes;
export default withTranslation()(
connect(
mapStateToProps,
mapDispatchToProps
)(ShowUser)
connect(mapStateToProps, mapDispatchToProps)(ShowUser)
);

5
client/src/components/AppMountNotifier.js
View File

@ -24,7 +24,4 @@ AppMountNotifier.propTypes = {
render: PropTypes.func.isRequired
};
export default connect(
mapStateToProps,
mapDispatchToProps
)(AppMountNotifier);
export default connect(mapStateToProps, mapDispatchToProps)(AppMountNotifier);

5
client/src/components/Donation/DonationModal.js
View File

@ -163,7 +163,4 @@ function DonateModal({
DonateModal.displayName = 'DonateModal';
DonateModal.propTypes = propTypes;
export default connect(
mapStateToProps,
mapDispatchToProps
)(DonateModal);
export default connect(mapStateToProps, mapDispatchToProps)(DonateModal);

7
client/src/components/Header/components/Login.js
View File

@ -10,12 +10,9 @@ import { apiLocation, homeLocation } from '../../../../../config/env.json';
import './login.css';
const mapStateToProps = createSelector(
isSignedInSelector,
isSignedIn => ({
const mapStateToProps = createSelector(isSignedInSelector, isSignedIn => ({
isSignedIn
})
);
}));
function Login(props) {
const { t } = useTranslation();

5
client/src/components/Header/components/NavLinks.js
View File

@ -207,7 +207,4 @@ export class NavLinks extends Component {
NavLinks.propTypes = propTypes;
NavLinks.displayName = 'NavLinks';
export default connect(
null,
mapDispatchToProps
)(withTranslation()(NavLinks));
export default connect(null, mapDispatchToProps)(withTranslation()(NavLinks));

5
client/src/components/createLanguageRedirect.js
View File

@ -7,10 +7,7 @@ const createLanguageRedirect = ({ clientLocale, lang }) => {
.filter(item => (item !== clientLocale && item !== lang ? item : ''))
.join('/');
const hostTail = window?.location?.host
.split('.')
.slice(1)
.join('.');
const hostTail = window?.location?.host.split('.').slice(1).join('.');
const nextClient = lang !== 'chinese' ? 'www' : 'chinese';
const nextLocation = `${window?.location?.protocol}//${nextClient}.${hostTail}`;

7
client/src/components/layouts/Certification.js
View File

@ -6,12 +6,9 @@ import { fetchUser, isSignedInSelector, executeGA } from '../../redux';
import { createSelector } from 'reselect';
import Helmet from 'react-helmet';
const mapStateToProps = createSelector(
isSignedInSelector,
isSignedIn => ({
const mapStateToProps = createSelector(isSignedInSelector, isSignedIn => ({
isSignedIn
})
);
}));
const mapDispatchToProps = { fetchUser, executeGA };

5
client/src/components/layouts/Learn.js
View File

@ -90,7 +90,4 @@ LearnLayout.propTypes = {
})
};
export default connect(
mapStateToProps,
mapDispatchToProps
)(LearnLayout);
export default connect(mapStateToProps, mapDispatchToProps)(LearnLayout);

12
client/src/components/profile/components/TimeLine.js
View File

@ -336,9 +336,17 @@ function useIdToNameMap() {
certPath: getPathFromID(id)
});
}
edges.forEach(({ node: { id, title, fields: { slug } } }) => {
edges.forEach(
({
node: {
id,
title,
fields: { slug }
}
}) => {
idToNameMap.set(id, { challengeTitle: title, challengePath: slug });
});
}
);
return idToNameMap;
}

4
client/src/components/settings/Certification.js
View File

@ -386,9 +386,7 @@ export class CertificationSettings extends Component {
newChallengeFound = true;
}
const valuesSaved = values(formChalObj)
.filter(Boolean)
.filter(isString);
const valuesSaved = values(formChalObj).filter(Boolean).filter(isString);
const isProjectSectionComplete = valuesSaved.length === oldSubmissions;

7
client/src/components/settings/Privacy.js
View File

@ -14,12 +14,9 @@ import Spacer from '../helpers/Spacer';
import ToggleSetting from './ToggleSetting';
import SectionHeader from './SectionHeader';
const mapStateToProps = createSelector(
userSelector,
user => ({
const mapStateToProps = createSelector(userSelector, user => ({
user
})
);
}));
const mapDispatchToProps = dispatch =>
bindActionCreators({ submitProfileUI }, dispatch);

5
client/src/pages/search.js
View File

@ -45,7 +45,4 @@ class SearchPage extends Component {
SearchPage.displayName = 'SearchPage';
SearchPage.propTypes = propTypes;
export default connect(
null,
mapDispatchToProps
)(withTranslation()(SearchPage));
export default connect(null, mapDispatchToProps)(withTranslation()(SearchPage));

9
client/src/templates/Challenges/classic/Editor.js
View File

@ -971,9 +971,6 @@ Editor.propTypes = propTypes;
// NOTE: withRef gets replaced by forwardRef in react-redux 6,
// https://github.com/reduxjs/react-redux/releases/tag/v6.0.0
export default connect(
mapStateToProps,
mapDispatchToProps,
null,
{ withRef: true }
)(Editor);
export default connect(mapStateToProps, mapDispatchToProps, null, {
withRef: true
})(Editor);

5
client/src/templates/Challenges/classic/EditorTabs.js
View File

@ -86,7 +86,4 @@ class EditorTabs extends Component {
EditorTabs.displayName = 'EditorTabs';
EditorTabs.propTypes = propTypes;
export default connect(
mapStateToProps,
mapDispatchToProps
)(EditorTabs);
export default connect(mapStateToProps, mapDispatchToProps)(EditorTabs);

5
client/src/templates/Challenges/classic/MobileLayout.js
View File

@ -101,7 +101,4 @@ class MobileLayout extends Component {
MobileLayout.displayName = 'MobileLayout';
MobileLayout.propTypes = propTypes;
export default connect(
mapStateToProps,
mapDispatchToProps
)(MobileLayout);
export default connect(mapStateToProps, mapDispatchToProps)(MobileLayout);

9
client/src/templates/Challenges/classic/MultifileEditor.js
View File

@ -274,9 +274,6 @@ MultifileEditor.propTypes = propTypes;
// NOTE: withRef gets replaced by forwardRef in react-redux 6,
// https://github.com/reduxjs/react-redux/releases/tag/v6.0.0
export default connect(
mapStateToProps,
mapDispatchToProps,
null,
{ withRef: true }
)(MultifileEditor);
export default connect(mapStateToProps, mapDispatchToProps, null, {
withRef: true
})(MultifileEditor);

5
client/src/templates/Challenges/components/Hotkeys.js
View File

@ -90,7 +90,4 @@ function Hotkeys({
Hotkeys.displayName = 'Hotkeys';
Hotkeys.propTypes = propTypes;
export default connect(
mapStateToProps,
mapDispatchToProps
)(Hotkeys);
export default connect(mapStateToProps, mapDispatchToProps)(Hotkeys);

5
client/src/templates/Challenges/components/Preview.js
View File

@ -63,7 +63,4 @@ class Preview extends Component {
Preview.displayName = 'Preview';
Preview.propTypes = propTypes;
export default connect(
null,
mapDispatchToProps
)(withTranslation()(Preview));
export default connect(null, mapDispatchToProps)(withTranslation()(Preview));

12
client/src/templates/Challenges/components/ResetModal.js
View File

@ -18,12 +18,9 @@ const propTypes = {
reset: PropTypes.func.isRequired
};
const mapStateToProps = createSelector(
isResetModalOpenSelector,
isOpen => ({
const mapStateToProps = createSelector(isResetModalOpenSelector, isOpen => ({
isOpen
})
);
}));
const mapDispatchToProps = dispatch =>
bindActionCreators(
@ -80,7 +77,4 @@ function ResetModal({ reset, close, isOpen }) {
ResetModal.displayName = 'ResetModal';
ResetModal.propTypes = propTypes;
export default connect(
mapStateToProps,
mapDispatchToProps
)(ResetModal);
export default connect(mapStateToProps, mapDispatchToProps)(ResetModal);

5
client/src/templates/Challenges/components/Side-Panel.js
View File

@ -47,7 +47,10 @@ export class SidePanel extends Component {
// users navigate from another challenge
MathJax.Hub.Config({
tex2jax: {
inlineMath: [['$', '$'], ['\\(', '\\)']],
inlineMath: [
['$', '$'],
['\\(', '\\)']
],
processEscapes: true,
processClass: 'rosetta-code|project-euler'
}

5
client/src/templates/Challenges/components/Tool-Panel.js
View File

@ -105,7 +105,4 @@ function ToolPanel({
ToolPanel.displayName = 'ToolPanel';
ToolPanel.propTypes = propTypes;
export default connect(
mapStateToProps,
mapDispatchToProps
)(ToolPanel);
export default connect(mapStateToProps, mapDispatchToProps)(ToolPanel);

12
client/src/templates/Challenges/rechallenge/builders.js
View File

@ -43,11 +43,7 @@ const padContentWithCssCatch = partial(compileHeadTail, cssCatch);
export const jsToHtml = cond([
[
matchesProperty('ext', 'js'),
flow(
padContentWithJsCatch,
wrapInScript,
setExtToHTML
)
flow(padContentWithJsCatch, wrapInScript, setExtToHTML)
],
[stubTrue, identity]
]);
@ -55,11 +51,7 @@ export const jsToHtml = cond([
export const cssToHtml = cond([
[
matchesProperty('ext', 'css'),
flow(
padContentWithCssCatch,
wrapInStyle,
setExtToHTML
)
flow(padContentWithCssCatch, wrapInStyle, setExtToHTML)
],
[stubTrue, identity]
]);

5
client/src/templates/Challenges/redux/code-lock-epic.js
View File

@ -3,10 +3,7 @@ import { ofType } from 'redux-observable';
import { types, unlockCode } from './';
function codeLockEpic(action$) {
return action$.pipe(
ofType(types.updateFile),
map(unlockCode)
);
return action$.pipe(ofType(types.updateFile), map(unlockCode));
}
export default codeLockEpic;

6
client/src/templates/Challenges/redux/create-question-epic.js
View File

@ -58,9 +58,11 @@ function createQuestionEpic(action$, state$, { window }) {
? `**Your project link(s)**\n`
: `**Your code so far**`
}
${projectFormValues
${
projectFormValues
?.map(([key, val]) => `${key}: ${val}\n`)
?.join('') || filesToMarkdown(files)}
?.join('') || filesToMarkdown(files)
}
${endingText}`
);

6
client/src/templates/Challenges/redux/execute-challenge-saga.js
View File

@ -74,9 +74,9 @@ export function* executeChallengeSaga({
yield put(initLogs());
yield put(initConsole(i18next.t('learn.running-tests')));
// reset tests to initial state
const tests = (yield select(challengeTestsSelector)).map(
({ text, testString }) => ({ text, testString })
);
const tests = (yield select(
challengeTestsSelector
)).map(({ text, testString }) => ({ text, testString }));
yield put(updateTests(tests));
yield fork(takeEveryLog, consoleProxy);

7
client/src/templates/Introduction/components/CertChallenge.js
View File

@ -18,12 +18,9 @@ const propTypes = {
};
const mapStateToProps = state => {
return createSelector(
userSelector,
user => ({
return createSelector(userSelector, user => ({
user
})
)(state);
}))(state);
};
export class CertChallenge extends Component {

7
client/src/templates/Introduction/components/Challenges.js
View File

@ -11,12 +11,9 @@ import GreenPass from '../../../assets/icons/GreenPass';
import GreenNotCompleted from '../../../assets/icons/GreenNotCompleted';
const mapStateToProps = state => {
return createSelector(
completedChallengesSelector,
completedChallenges => ({
return createSelector(completedChallengesSelector, completedChallenges => ({
completedChallenges: completedChallenges.map(({ id }) => id)
})
)(state);
}))(state);
};
const mapDispatchToProps = dispatch =>

14
client/utils/titleify.js
View File

@ -16,12 +16,7 @@ function prototyper(str) {
.map(str => {
if (prototypeRE.test(str)) {
if (str.length > 9) {
return prototyper(
str
.trim()
.split('prototype')
.join('-prototype-')
);
return prototyper(str.trim().split('prototype').join('-prototype-'));
}
return str;
}
@ -39,12 +34,7 @@ function prototyper(str) {
return `${titleify(first)}.prototype.${finalSecond}`;
}
if (noProto.length === 1) {
return prototyper(
noProto[0]
.toLowerCase()
.split('.')
.join('-')
);
return prototyper(noProto[0].toLowerCase().split('.').join('-'));
}
return titleify(str, true);
}

24
config/donation-settings.js
View File

@ -53,22 +53,22 @@ const donationSubscriptionConfig = {
const paypalConfigTypes = {
live: {
month: {
'500': { planId: 'P-1L11422374370240ULZKX3PA' },
'1000': { planId: 'P-61K21421WY874920PL6E36YI' },
'2000': { planId: 'P-31999436LF709112VL6E374A' },
'3000': { planId: 'P-1KY930839N8045117L6E4BKY' },
'4000': { planId: 'P-0JW4843250567551AL6E4CAI' },
'5000': { planId: 'P-0WR49877YD949401BL6E4CTA' }
500: { planId: 'P-1L11422374370240ULZKX3PA' },
1000: { planId: 'P-61K21421WY874920PL6E36YI' },
2000: { planId: 'P-31999436LF709112VL6E374A' },
3000: { planId: 'P-1KY930839N8045117L6E4BKY' },
4000: { planId: 'P-0JW4843250567551AL6E4CAI' },
5000: { planId: 'P-0WR49877YD949401BL6E4CTA' }
}
},
staging: {
month: {
'500': { planId: 'P-37N14480BW163382FLZYPVMA' },
'1000': { planId: 'P-28B62039J8092810UL6E3FXA' },
'2000': { planId: 'P-7HR706961M9170433L6HI5VI' },
'3000': { planId: 'P-35V33574BU596924JL6HI6XY' },
'4000': { planId: 'P-45M45060289267734L6HJSXA' },
'5000': { planId: 'P-0MD70861FY4172444L6HJTUQ' }
500: { planId: 'P-37N14480BW163382FLZYPVMA' },
1000: { planId: 'P-28B62039J8092810UL6E3FXA' },
2000: { planId: 'P-7HR706961M9170433L6HI5VI' },
3000: { planId: 'P-35V33574BU596924JL6HI6XY' },
4000: { planId: 'P-45M45060289267734L6HJSXA' },
5000: { planId: 'P-0MD70861FY4172444L6HJTUQ' }
}
}
};

13
curriculum/schema/challengeSchema.js
View File

@ -25,10 +25,7 @@ const schema = Joi.object()
block: Joi.string().regex(slugRE),
blockId: Joi.objectId(),
challengeOrder: Joi.number(),
challengeType: Joi.number()
.min(0)
.max(11)
.required(),
challengeType: Joi.number().min(0).max(11).required(),
checksum: Joi.number(),
// TODO: require this only for normal challenges, not certs
dashedName: Joi.string().regex(slugRE),
@ -62,9 +59,7 @@ const schema = Joi.object()
}),
question: Joi.object().keys({
text: Joi.string().required(),
answers: Joi.array()
.items(Joi.string())
.required(),
answers: Joi.array().items(Joi.string()).required(),
solution: Joi.number().required()
}),
required: Joi.array().items(
@ -92,9 +87,7 @@ const schema = Joi.object()
Joi.object().keys({
id: Joi.string().allow(''),
text: Joi.string().required(),
testString: Joi.string()
.allow('')
.required()
testString: Joi.string().allow('').required()
}),
// our tests used in certification verification
Joi.object().keys({

10
curriculum/test/test-challenges.js
View File

@ -198,9 +198,9 @@ async function setup() {
for (const challenge of challenges) {
const dashedBlockName = challenge.block;
if (!meta[dashedBlockName]) {
meta[dashedBlockName] = (await getMetaForBlock(
dashedBlockName
)).challengeOrder;
meta[dashedBlockName] = (
await getMetaForBlock(dashedBlockName)
).challengeOrder;
}
}
return {
@ -475,7 +475,9 @@ function populateTestsForLang({ lang, challenges, meta }) {
describe('Check tests against solutions', function () {
solutions.forEach((solution, index) => {
it(`Solution ${index + 1} must pass the tests`, async function() {
it(`Solution ${
index + 1
} must pass the tests`, async function () {
this.timeout(5000 * tests.length + 2000);
const testRunner = await createTestRunner(
challenge,

27
cypress/integration/landing.js
View File

@ -43,43 +43,28 @@ describe('Landing page', () => {
});
it('Has 5 brand logos', () => {
cy.get('.logo-row')
.children()
.its('length')
.should('eq', 5);
cy.get('.logo-row').children().its('length').should('eq', 5);
});
it('Has `as seens as` section', () => {
cy.contains('Build projects.').should('be.visible');
cy.get('.big-heading')
.siblings()
.get('svg');
cy.get('.big-heading').siblings().get('svg');
});
it('Has a visible large image on large viewports', function () {
cy.viewport(1200, 660)
.get(selectors.landingPageImage)
.should('be.visible');
cy.viewport(1200, 660).get(selectors.landingPageImage).should('be.visible');
cy.viewport(1199, 660)
.get(selectors.landingPageImage)
.should('not.exist');
cy.viewport(1199, 660).get(selectors.landingPageImage).should('not.exist');
});
it('Has links to all the certifications', function () {
cy.get(selectors.certifications)
.children()
.its('length')
.should('eq', 10);
cy.get(selectors.certifications).children().its('length').should('eq', 10);
cy.wrap(certifications).each(cert => {
cy.get(selectors.certifications).contains(cert);
});
});
it('Has 3 testimonial cards', function () {
cy.get(selectors.testimonials)
.children()
.its('length')
.should('eq', 3);
cy.get(selectors.testimonials).children().its('length').should('eq', 3);
});
});

12
cypress/integration/learn/common-components/navbar.js
View File

@ -68,9 +68,7 @@ describe('Navbar', () => {
() => {
cy.get(selectors.menuButton).click();
cy.get(selectors.navigationLinks).contains('Forum');
cy.get(selectors.navigationLinks)
.contains('Curriculum')
.click();
cy.get(selectors.navigationLinks).contains('Curriculum').click();
cy.url().should('include', '/learn');
cy.get(selectors.navigationLinks).contains('Curriculum');
cy.get(selectors.navigationLinks).contains('Forum');
@ -84,9 +82,7 @@ describe('Navbar', () => {
() => {
cy.contains(selectors.smallCallToAction, 'Sign in');
cy.get(selectors.menuButton).click();
cy.get(selectors.navigationLinks)
.contains('Curriculum')
.click();
cy.get(selectors.navigationLinks).contains('Curriculum').click();
cy.contains(selectors.smallCallToAction, 'Sign in');
}
);
@ -95,9 +91,7 @@ describe('Navbar', () => {
cy.login();
cy.get('a[href*="/settings"]').should('be.visible');
cy.get(selectors.menuButton).click();
cy.get(selectors.navigationLinks)
.contains('Profile')
.click();
cy.get(selectors.navigationLinks).contains('Profile').click();
cy.url().should('include', '/developmentuser');
});

20
cypress/integration/learn/common-components/searchBar.js
View File

@ -30,17 +30,13 @@ describe('Search bar', () => {
it('Should accept input and display hits', () => {
search('freeCodeCamp');
cy.get('.ais-Hits-list')
.children()
.should('to.have.length.of.at.least', 1);
cy.get('.ais-Hits-list').children().should('to.have.length.of.at.least', 1);
});
it('Should clear hits when input is cleared', () => {
search('freeCodeCamp');
cy.get('.ais-Hits-list')
.children()
.should('to.have.length.of.at.least', 1);
cy.get('.ais-Hits-list').children().should('to.have.length.of.at.least', 1);
clear();
@ -52,9 +48,7 @@ describe('Search bar', () => {
search('freeCodeCamp');
cy.get('.ais-Hits-list')
.children()
.should('to.have.length.of', 8);
cy.get('.ais-Hits-list').children().should('to.have.length.of', 8);
});
it('Should show up to 5 hits when height < 768px', () => {
@ -62,17 +56,13 @@ describe('Search bar', () => {
search('freeCodeCamp');
cy.get('.ais-Hits-list')
.children()
.should('to.have.length.of', 5);
cy.get('.ais-Hits-list').children().should('to.have.length.of', 5);
});
it('Should show no hits for queries that do not exist in the Algolia index', () => {
search('testtttt');
cy.get('.ais-Hits-list')
.children()
.should('to.have.length.of', 0);
cy.get('.ais-Hits-list').children().should('to.have.length.of', 0);
cy.contains('No tutorials found');
});

20
cypress/integration/settings/username-change.js
View File

@ -96,9 +96,7 @@ describe('Username input field', () => {
'the URL to your profile and your certifications.'
).should('not.exist');
cy.get('@usernameForm')
.contains('Save')
.should('be.disabled');
cy.get('@usernameForm').contains('Save').should('be.disabled');
});
it('Should not show anything if user types their current name', () => {
@ -106,9 +104,7 @@ describe('Username input field', () => {
.clear({ force: true })
.type('developmentuser', { force: true });
cy.get('@usernameForm')
.contains('Save')
.should('be.disabled');
cy.get('@usernameForm').contains('Save').should('be.disabled');
});
// eslint-disable-next-line max-len
@ -117,9 +113,7 @@ describe('Username input field', () => {
.clear({ force: true })
.type('developmentuser', { force: true });
cy.get('@usernameForm')
.contains('Save')
.should('be.disabled');
cy.get('@usernameForm').contains('Save').should('be.disabled');
});
it('Should show warning if username includes invalid character', () => {
@ -141,9 +135,7 @@ describe('Username input field', () => {
.clear({ force: true })
.type('Quincy Larson', { force: true });
cy.get('@usernameForm')
.contains('Save')
.should('be.disabled');
cy.get('@usernameForm').contains('Save').should('be.disabled');
});
it('Should change username if `Save` button is clicked', () => {
@ -153,9 +145,7 @@ describe('Username input field', () => {
cy.contains('Username is available');
cy.get('@usernameForm')
.contains('Save')
.click({ force: true });
cy.get('@usernameForm').contains('Save').click({ force: true });
cy.contains('Account Settings for quincy').should('be.visible');
cy.resetUsername();

1746
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@ -71,8 +71,8 @@
"cypress": "^6.6.0",
"debug": "^4.3.1",
"docsify-cli": "^4.4.3",
"eslint": "^5.16.0",
"eslint-config-prettier": "^6.12.0",
"eslint": "^7.21.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-babel": "^5.3.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
@ -92,7 +92,7 @@
"markdownlint": "^0.21.0",
"npm-run-all": "^4.1.5",
"ora": "^3.4.0",
"prettier": "^1.18.2",
"prettier": "^2.2.1",
"prismjs": "^1.23.0",
"readdirp-walk": "^1.7.0",
"shx": "^0.3.3",

6
tools/challenge-helper-scripts/create-step-between.js
View File

@ -24,8 +24,10 @@ if (
start < 1 ||
start !== end - 1
) {
throw 'Step not created. Steps specified must be' +
' consecutive numbers and start step must be greater than 0.';
throw (
'Step not created. Steps specified must be' +
' consecutive numbers and start step must be greater than 0.'
);
}
const existingSteps = getExistingStepNums(projectPath);

16
tools/challenge-helper-scripts/utils.js
View File

@ -73,14 +73,8 @@ const reorderSteps = () => {
const projectPath = getProjectPath();
const projectName = process.env.CALLING_DIR
? process.env.CALLING_DIR.split(path.sep)
.slice(-1)
.toString()
: process
.cwd()
.split(path.sep)
.slice(-1)
.toString();
? process.env.CALLING_DIR.split(path.sep).slice(-1).toString()
: process.cwd().split(path.sep).slice(-1).toString();
const curriculumPath = process.env.CALLING_DIR
? ''
@ -187,8 +181,10 @@ const getExistingStepNums = projectPath => {
) {
let stepNum = fileName.split('.')[0].split('-')[1];
if (!/^\d{3}$/.test(stepNum)) {
throw `Step not created. File ${fileName} has a step number containing non-digits.` +
' Please run reorder-steps script first.';
throw (
`Step not created. File ${fileName} has a step number containing non-digits.` +
' Please run reorder-steps script first.'
);
}
stepNum = parseInt(stepNum, 10);
stepNums.push(stepNum);

10
tools/challenge-parser/parser/plugins/add-seed.js
View File

@ -90,14 +90,16 @@ function validateEditableMarkers({ value, position }) {
lines.forEach((line, index) => {
if (line.match(twoMarkersRE)) {
throw Error(
`Line ${baseLineNumber +
index} has two markers. Each line should only have one.`
`Line ${
baseLineNumber + index
} has two markers. Each line should only have one.`
);
}
if (line.match(formattedMarkerRE)) {
throw Error(
`Line ${baseLineNumber +
index} has a malformed marker. It should be --fcc-editable-region--`
`Line ${
baseLineNumber + index
} has a malformed marker. It should be --fcc-editable-region--`
);
}
});

4
tools/challenge-parser/parser/plugins/replace-imports.js
View File

@ -11,9 +11,7 @@ const { editableRegionMarker } = require('./add-seed');
const tableAndStrikeThrough = require('./table-and-strikethrough');
async function parse(file) {
return await remark()
.use(tableAndStrikeThrough)
.parse(file);
return await remark().use(tableAndStrikeThrough).parse(file);
}
function plugin() {

2
utils/validate.js
View File

@ -12,7 +12,7 @@ const usernameIsHttpStatusCode = {
const isNumeric = num => !isNaN(num);
const validCharsRE = /^[a-zA-Z0-9\-_+]*$/;
const isHttpStatusCode = str =>
isNumeric(str) && (parseInt(str, 10) >= 100 && parseInt(str, 10) <= 599);
isNumeric(str) && parseInt(str, 10) >= 100 && parseInt(str, 10) <= 599;
const isValidUsername = str => {
if (!validCharsRE.test(str)) return invalidCharError;
if (str.length < 3) return usernameTooShort;