Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,14 @@
{
"ignore": ["jsx", "global"]
}
],
"prettier/prettier": [
"error",
{
"endOfLine": "auto"
}
]
},

"overrides": [
{
"files": "*.mdx",
Expand Down
1 change: 1 addition & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module.exports = {
trailingComma: 'none',
arrowParens: 'avoid',
proseWrap: 'always',
endOfLine: "auto",
overrides: [
{
files: '*.scss',
Expand Down
48 changes: 32 additions & 16 deletions graphql/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,8 @@ export type ResolversParentTypes = ResolversObject<{

export type AlertResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['Alert'] = ResolversParentTypes['Alert']
ParentType extends
ResolversParentTypes['Alert'] = ResolversParentTypes['Alert']
> = ResolversObject<{
id?: Resolver<ResolversTypes['Int'], ParentType, ContextType>
text?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>
Expand All @@ -1755,7 +1756,8 @@ export type AlertResolvers<

export type AuthResponseResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['AuthResponse'] = ResolversParentTypes['AuthResponse']
ParentType extends
ResolversParentTypes['AuthResponse'] = ResolversParentTypes['AuthResponse']
> = ResolversObject<{
cliToken?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>
error?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>
Expand All @@ -1766,7 +1768,8 @@ export type AuthResponseResolvers<

export type ChallengeResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['Challenge'] = ResolversParentTypes['Challenge']
ParentType extends
ResolversParentTypes['Challenge'] = ResolversParentTypes['Challenge']
> = ResolversObject<{
description?: Resolver<ResolversTypes['String'], ParentType, ContextType>
id?: Resolver<ResolversTypes['Int'], ParentType, ContextType>
Expand All @@ -1778,7 +1781,8 @@ export type ChallengeResolvers<

export type CommentResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['Comment'] = ResolversParentTypes['Comment']
ParentType extends
ResolversParentTypes['Comment'] = ResolversParentTypes['Comment']
> = ResolversObject<{
author?: Resolver<Maybe<ResolversTypes['User']>, ParentType, ContextType>
authorId?: Resolver<ResolversTypes['Int'], ParentType, ContextType>
Expand All @@ -1798,7 +1802,8 @@ export type CommentResolvers<

export type ExerciseResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['Exercise'] = ResolversParentTypes['Exercise']
ParentType extends
ResolversParentTypes['Exercise'] = ResolversParentTypes['Exercise']
> = ResolversObject<{
answer?: Resolver<ResolversTypes['String'], ParentType, ContextType>
author?: Resolver<ResolversTypes['User'], ParentType, ContextType>
Expand Down Expand Up @@ -1827,7 +1832,8 @@ export type ExerciseResolvers<

export type ExerciseCommentResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['ExerciseComment'] = ResolversParentTypes['ExerciseComment']
ParentType extends
ResolversParentTypes['ExerciseComment'] = ResolversParentTypes['ExerciseComment']
> = ResolversObject<{
author?: Resolver<ResolversTypes['User'], ParentType, ContextType>
authorId?: Resolver<ResolversTypes['Int'], ParentType, ContextType>
Expand All @@ -1854,7 +1860,8 @@ export type ExerciseCommentResolvers<

export type ExerciseSubmissionResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['ExerciseSubmission'] = ResolversParentTypes['ExerciseSubmission']
ParentType extends
ResolversParentTypes['ExerciseSubmission'] = ResolversParentTypes['ExerciseSubmission']
> = ResolversObject<{
exerciseId?: Resolver<ResolversTypes['Int'], ParentType, ContextType>
id?: Resolver<ResolversTypes['Int'], ParentType, ContextType>
Expand All @@ -1865,7 +1872,8 @@ export type ExerciseSubmissionResolvers<

export type LessonResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['Lesson'] = ResolversParentTypes['Lesson']
ParentType extends
ResolversParentTypes['Lesson'] = ResolversParentTypes['Lesson']
> = ResolversObject<{
challenges?: Resolver<
Array<ResolversTypes['Challenge']>,
Expand Down Expand Up @@ -1897,7 +1905,8 @@ export type LessonResolvers<

export type ModuleResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['Module'] = ResolversParentTypes['Module']
ParentType extends
ResolversParentTypes['Module'] = ResolversParentTypes['Module']
> = ResolversObject<{
author?: Resolver<ResolversTypes['User'], ParentType, ContextType>
content?: Resolver<ResolversTypes['String'], ParentType, ContextType>
Expand All @@ -1910,7 +1919,8 @@ export type ModuleResolvers<

export type MutationResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['Mutation'] = ResolversParentTypes['Mutation']
ParentType extends
ResolversParentTypes['Mutation'] = ResolversParentTypes['Mutation']
> = ResolversObject<{
acceptSubmission?: Resolver<
Maybe<ResolversTypes['Submission']>,
Expand Down Expand Up @@ -2154,7 +2164,8 @@ export type MutationResolvers<

export type QueryResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query']
ParentType extends
ResolversParentTypes['Query'] = ResolversParentTypes['Query']
> = ResolversObject<{
alerts?: Resolver<Array<ResolversTypes['Alert']>, ParentType, ContextType>
allUsers?: Resolver<
Expand Down Expand Up @@ -2231,7 +2242,8 @@ export type QueryResolvers<

export type SessionResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['Session'] = ResolversParentTypes['Session']
ParentType extends
ResolversParentTypes['Session'] = ResolversParentTypes['Session']
> = ResolversObject<{
lessonStatus?: Resolver<
Array<ResolversTypes['UserLesson']>,
Expand Down Expand Up @@ -2261,7 +2273,8 @@ export type StarResolvers<

export type SubmissionResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['Submission'] = ResolversParentTypes['Submission']
ParentType extends
ResolversParentTypes['Submission'] = ResolversParentTypes['Submission']
> = ResolversObject<{
challenge?: Resolver<ResolversTypes['Challenge'], ParentType, ContextType>
challengeId?: Resolver<ResolversTypes['Int'], ParentType, ContextType>
Expand Down Expand Up @@ -2293,15 +2306,17 @@ export type SubmissionResolvers<

export type SuccessResponseResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['SuccessResponse'] = ResolversParentTypes['SuccessResponse']
ParentType extends
ResolversParentTypes['SuccessResponse'] = ResolversParentTypes['SuccessResponse']
> = ResolversObject<{
success?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>
__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
}>

export type TokenResponseResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['TokenResponse'] = ResolversParentTypes['TokenResponse']
ParentType extends
ResolversParentTypes['TokenResponse'] = ResolversParentTypes['TokenResponse']
> = ResolversObject<{
success?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>
token?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>
Expand Down Expand Up @@ -2337,7 +2352,8 @@ export type UserResolvers<

export type UserLessonResolvers<
ContextType = Context,
ParentType extends ResolversParentTypes['UserLesson'] = ResolversParentTypes['UserLesson']
ParentType extends
ResolversParentTypes['UserLesson'] = ResolversParentTypes['UserLesson']
> = ResolversObject<{
id?: Resolver<ResolversTypes['Int'], ParentType, ContextType>
lessonId?: Resolver<ResolversTypes['Int'], ParentType, ContextType>
Expand Down
5 changes: 4 additions & 1 deletion helpers/static/parseMDX.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import slug from 'remark-slug'
import autolink from 'rehype-autolink-headings'

type ParsedMDX = {
(fileContents: Buffer, onlyFront?: boolean): Promise<{
(
fileContents: Buffer,
onlyFront?: boolean
): Promise<{
source?: MDXRemoteSerializeResult<Record<string, unknown>>
frontMatter: { [key: string]: any }
}>
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@
"@types/prismjs": "^1.26.0",
"@types/react": "^17.0.43",
"@types/react-dom": "^18.0.3",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"@typescript-eslint/eslint-plugin": "^6.2.1",
"@typescript-eslint/parser": "^6.2.1",
"babel-jest": "^29.6.2",
"babel-plugin-prismjs": "^2.1.0",
"copy-webpack-plugin": "^11.0.0",
Expand All @@ -112,15 +112,15 @@
"eslint-config-next": "^13.4.12",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-mdx": "^1.17.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "5.0.0",
"eslint-plugin-react": "^7.33.1",
"fetch-mock": "^9.11.0",
"husky": "^8.0.3",
"identity-obj-proxy": "^3.0.0",
"jest": "^27.5.1",
"jest-mock-extended": "^3.0.5",
"lint-staged": "^13.2.3",
"prettier": "^2.8.8",
"prettier": "^3.0.1",
"prisma": "5",
"react-docgen-typescript-plugin": "^1.0.5",
"react-test-renderer": "^17.0.1",
Expand Down
11 changes: 7 additions & 4 deletions pages/curriculum.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,13 @@ interface State {
const generateMap = (
session: GetSessionQuery['session']
): { [id: string]: ArrayElement<typeof session.lessonStatus> } => {
return session.lessonStatus.reduce((map, userLesson) => {
map[userLesson.lessonId] = userLesson
return map
}, {} as ReturnType<typeof generateMap>)
return session.lessonStatus.reduce(
(map, userLesson) => {
map[userLesson.lessonId] = userLesson
return map
},
{} as ReturnType<typeof generateMap>
)
}

// Progress Percentage should be calculated from lessons 0-6 because thats our current standard of finishing the curriculum.
Expand Down
Loading