jprdonnelly/freeCodeCamp
1
0
Fork 0
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git synced 2026-01-05 03:05:40 -05:00
Code Issues Projects Releases Wiki Activity

feat: split rdbms into individual blocks and two challengeTypes (#44978)

Browse Source 
* feat: split english rdbms into individual blocks

fix: stuff

fix: remove from partiallyComplete array on submit

fix: add suggestion

Update client/i18n/locales/english/translations.json

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Update client/i18n/locales/english/intro.json

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Update client/i18n/locales/english/intro.json

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Update client/i18n/locales/english/intro.json

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Update client/src/templates/Challenges/codeally/show.tsx

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Update client/src/templates/Challenges/codeally/show.tsx

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Update client/src/templates/Challenges/codeally/show.tsx

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Update client/src/templates/Challenges/codeally/show.tsx

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Update client/src/templates/Challenges/codeally/show.tsx

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Update client/src/templates/Challenges/codeally/show.tsx

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Update client/src/templates/Challenges/codeally/show.tsx

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Update client/src/templates/Challenges/codeally/show.tsx

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* fix: prettier

* fix: style suggestion

* Apply suggestions from code review

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
This commit is contained in:
Tom
2022-02-11 09:39:27 -06:00
committed by GitHub
parent 226a8248b7
commit 57cf47dad4
267 changed files with 3832 additions and 2229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api-server/src/common/models/user.js
View File

@@ -995,6 +995,25 @@ export default function initializeUser(User) {
});
};
User.prototype.getPartiallyCompletedChallenges$ =
function getPartiallyCompletedChallenges$() {
if (
Array.isArray(this.partiallyCompletedChallenges) &&
this.partiallyCompletedChallenges.length
) {
return Observable.of(this.partiallyCompletedChallenges);
}
const id = this.getId();
const filter = {
where: { id },
fields: { partiallyCompletedChallenges: true }
};
return this.constructor.findOne$(filter).map(user => {
this.partiallyCompletedChallenges = user.partiallyCompletedChallenges;
return user.partiallyCompletedChallenges;
});
};
User.getMessages = messages => Promise.resolve(messages);
User.remoteMethod('getMessages', {

9
api-server/src/common/models/user.json
View File

@@ -236,6 +236,15 @@
],
"default": []
},
"partiallyCompletedChallenges": {
"type": [
{
"completedDate": "number",
"id": "string"
}
],
"default": []
},
"portfolio": {
"type": "array",
"default": []

3
api-server/src/common/utils/index.js
View File

@@ -20,3 +20,6 @@ export const fixCompletedChallengeItem = obj =>
'files',
'isManuallyApproved'
]);
export const fixPartiallyCompletedChallengeItem = obj =>
pick(obj, ['id', 'completedDate']);