diff --git a/client/src/templates/Challenges/codeally/show.tsx b/client/src/templates/Challenges/codeally/show.tsx index 1dec2704e43..ee0a29b30ae 100644 --- a/client/src/templates/Challenges/codeally/show.tsx +++ b/client/src/templates/Challenges/codeally/show.tsx @@ -280,32 +280,33 @@ class ShowCodeAlly extends Component { - {isSignedIn && challengeType === challengeTypes.codeAllyCert && ( - <> -
- {t('learn.complete-both-steps')} -
-
- - {t('learn.step-1')} - {(isPartiallyCompleted || isCompleted) && ( - - )} - -
- {t('learn.runs-in-vm')} -
- - - - - )} + {isSignedIn && + challengeType === challengeTypes.codeAllyCert && ( + <> +
+ {t('learn.complete-both-steps')} +
+
+ + {t('learn.step-1')} + {(isPartiallyCompleted || isCompleted) && ( + + )} + +
+ {t('learn.runs-in-vm')} +
+ + + + + )}
{ : t('buttons.click-start-course')}
- {isSignedIn && challengeType === challengeTypes.codeAllyCert && ( - <> -
- - {t('learn.step-2')} - {isCompleted && ( - +
+ + {t('learn.step-2')} + {isCompleted && ( + + )} + +
+ {t('learn.submit-public-url')} +
+ + + + - )} - -
- {t('learn.submit-public-url')} -
- - - - - - )} + + )}
diff --git a/package-lock.json b/package-lock.json index 17c25fd928c..d6911757e4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,13 +90,13 @@ "husky": "8.0.2", "jest": "27.5.1", "js-yaml": "3.14.1", - "lint-staged": "13.1.0", + "lint-staged": "^13.1.0", "lodash": "4.17.21", "markdownlint": "0.26.2", "mock-fs": "5.2.0", "npm-run-all": "4.1.5", "ora": "5.4.1", - "prettier": "2.7.1", + "prettier": "^2.8.0", "prismjs": "1.29.0", "process": "0.11.10", "rimraf": "3.0.2", @@ -41697,8 +41697,9 @@ } }, "node_modules/prettier": { - "version": "2.7.1", - "license": "MIT", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.0.tgz", + "integrity": "sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==", "bin": { "prettier": "bin-prettier.js" }, @@ -53902,6 +53903,21 @@ "npm": ">=8" } }, + "tools/challenge-helper-scripts/node_modules/prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "tools/challenge-parser": { "name": "@freecodecamp/challenge-parser", "version": "0.0.1", @@ -56298,6 +56314,14 @@ "prettier": "2.7.1", "ts-node": "10.9.1", "typescript": "4.9.3" + }, + "dependencies": { + "prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "dev": true + } } }, "@freecodecamp/curriculum-helpers": { @@ -82171,7 +82195,9 @@ "version": "2.0.0" }, "prettier": { - "version": "2.7.1" + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.0.tgz", + "integrity": "sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==" }, "pretty-bytes": { "version": "5.6.0" diff --git a/package.json b/package.json index af16c084fc6..4394e663d15 100644 --- a/package.json +++ b/package.json @@ -178,13 +178,13 @@ "husky": "8.0.2", "jest": "27.5.1", "js-yaml": "3.14.1", - "lint-staged": "13.1.0", + "lint-staged": "^13.1.0", "lodash": "4.17.21", "markdownlint": "0.26.2", "mock-fs": "5.2.0", "npm-run-all": "4.1.5", "ora": "5.4.1", - "prettier": "2.7.1", + "prettier": "^2.8.0", "prismjs": "1.29.0", "process": "0.11.10", "rimraf": "3.0.2", diff --git a/tools/scripts/lint/validate-keys.ts b/tools/scripts/lint/validate-keys.ts index 069596978c0..f9b8436a5c4 100644 --- a/tools/scripts/lint/validate-keys.ts +++ b/tools/scripts/lint/validate-keys.ts @@ -5,6 +5,7 @@ import linksObject from '../../../client/i18n/locales/english/links.json'; import metaObject from '../../../client/i18n/locales/english/meta-tags.json'; import motivationObject from '../../../client/i18n/locales/english/motivation.json'; import translationsObject from '../../../client/i18n/locales/english/translations.json'; +// If this trending.json is missing, most likely the download-trending script failed. import trendingObject from '../../../client/i18n/locales/english/trending.json'; /**