sync naming with server

Author: ShMcK

typings/graphql.d.ts

@@ -76,12 +76,15 @@ export type GithubUser = {
 export type Level = {
 	__typename?: 'Level',
 	id: Scalars['ID'],
-	index?: number
 	title: Scalars['String'],
+	/** A summary of the level */
 	description: Scalars['String'],
+	/** The lesson content of the level, parsed as markdown */
+	content: Scalars['String'],
+	/** A set of tasks for users linked to unit tests */
 	steps: Array<Step>,
+	/** Actions run on level start up for configuring setup */
 	setup?: Maybe<StepActions>,
-	status: ProgressStatus,
 };
 
 export type Mutation = {
@@ -102,11 +105,6 @@ export type MutationCreateTutorialVersionArgs = {
 	input: CreateTutorialVersionInput
 };
 
-export type ProgressStatus =
-	'ACTIVE' |
-	'COMPLETE' |
-	'INCOMPLETE';
-
 export type Query = {
 	__typename?: 'Query',
 	tutorial?: Maybe<Tutorial>,
@@ -135,10 +133,9 @@ export type Step = {
 	__typename?: 'Step',
 	id: Scalars['ID'],
 	title: Scalars['String'],
-	description: Scalars['String'],
+	content: Scalars['String'],
 	setup: StepActions,
 	solution: StepActions,
-	status: ProgressStatus,
 };
 
 /** Load commits, open files or run commands */
@@ -336,7 +333,6 @@ export type ResolversTypes = {
 	Sha1: ResolverTypeWrapper<Scalars['Sha1']>,
 	Level: ResolverTypeWrapper<Level>,
 	Step: ResolverTypeWrapper<Step>,
-	ProgressStatus: ProgressStatus,
 	Boolean: ResolverTypeWrapper<Scalars['Boolean']>,
 	tutorialRepoInput: TutorialRepoInput,
 	Commit: ResolverTypeWrapper<Commit>,
@@ -374,7 +370,6 @@ export type ResolversParentTypes = {
 	Sha1: Scalars['Sha1'],
 	Level: Level,
 	Step: Step,
-	ProgressStatus: ProgressStatus,
 	Boolean: Scalars['Boolean'],
 	tutorialRepoInput: TutorialRepoInput,
 	Commit: Commit,
@@ -432,9 +427,9 @@ export type LevelResolvers<ContextType = any, ParentType extends ResolversParent
 	id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>,
 	title?: Resolver<ResolversTypes['String'], ParentType, ContextType>,
 	description?: Resolver<ResolversTypes['String'], ParentType, ContextType>,
+	content?: Resolver<ResolversTypes['String'], ParentType, ContextType>,
 	steps?: Resolver<Array<ResolversTypes['Step']>, ParentType, ContextType>,
 	setup?: Resolver<Maybe<ResolversTypes['StepActions']>, ParentType, ContextType>,
-	status?: Resolver<ResolversTypes['ProgressStatus'], ParentType, ContextType>,
 };
 
 export type MutationResolvers<ContextType = any, ParentType extends ResolversParentTypes['Mutation'] = ResolversParentTypes['Mutation']> = {
@@ -456,10 +451,9 @@ export interface Sha1ScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes
 export type StepResolvers<ContextType = any, ParentType extends ResolversParentTypes['Step'] = ResolversParentTypes['Step']> = {
 	id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>,
 	title?: Resolver<ResolversTypes['String'], ParentType, ContextType>,
-	description?: Resolver<ResolversTypes['String'], ParentType, ContextType>,
+	content?: Resolver<ResolversTypes['String'], ParentType, ContextType>,
 	setup?: Resolver<ResolversTypes['StepActions'], ParentType, ContextType>,
 	solution?: Resolver<ResolversTypes['StepActions'], ParentType, ContextType>,
-	status?: Resolver<ResolversTypes['ProgressStatus'], ParentType, ContextType>,
 };
 
 export type StepActionsResolvers<ContextType = any, ParentType extends ResolversParentTypes['StepActions'] = ResolversParentTypes['StepActions']> = {
@@ -583,5 +577,4 @@ export interface IntrospectionResultData {
 			}[];
 		}[];
 	};
-}
-
+}

web-app/src/services/apollo/queries/tutorial.ts

@@ -28,6 +28,7 @@ export default gql`
 					id
 					title
 					description
+					content
 					setup {
 						commits
 						commands
@@ -36,7 +37,7 @@ export default gql`
 					steps {
 						id
 						title
-						description
+						content
 						setup {
 							commits
 							commands

web-app/stories/Level.stories.tsx

@@ -16,14 +16,15 @@ storiesOf('Level', module)
       id: 'L1',
       index: 2,
       title: 'A Title',
-      description: 'Some description',
+      description: 'A summary of the level',
+      content: 'Some content here in markdown',
       setup: null,
       status: 'ACTIVE',
       steps: [
         {
           id: 'L1:S1',
           title: 'First Step',
-          description: 'First step description',
+          content: 'First step description',
           setup: {
             id: 'L1:S1:SETUP',
             commits: ['abcdefg'],
@@ -37,7 +38,7 @@ storiesOf('Level', module)
         {
           id: 'L1:S2',
           title: 'Second Step',
-          description: 'Second step description',
+          content: 'Second step description',
           setup: {
             id: 'L1:S2:SETUP',
             commits: ['abcdefg'],
@@ -51,7 +52,7 @@ storiesOf('Level', module)
         {
           id: 'L1:S3',
           title: 'Third Step',
-          description: 'Third step description',
+          content: 'Third step description',
           setup: {
             id: 'L1:S3:SETUP',
             commits: ['abcdefg'],