allow user to edit all code; update layout for more code editor space

json-everything · Jun 12, 2024 · 44c932f · 44c932f
1 parent cdb6b9b
commit 44c932f
Show file tree

Hide file tree

Showing 9 changed files with 428 additions and 54 deletions.
diff --git a/LearnJsonEverything/Services/CompilationHelpers.cs b/LearnJsonEverything/Services/CompilationHelpers.cs
@@ -72,8 +72,7 @@ public static (ILessonRunner<T>?, string[]) GetRunner<T>(LessonData lesson)
 		if (_references is null)
 			return (null, ["Compilation assemblies still loading.  Please wait until complete and try again."]);
 
-		var fullSource = lesson.ContextCode
-			.Replace("/* USER CODE */", lesson.UserCode ?? string.Empty);
+		var fullSource = lesson.UserCode ?? string.Empty;
 
 		Console.WriteLine($"Compiling...\n\n{fullSource}");
 

diff --git a/LearnJsonEverything/Services/InstructionsBuilder.cs b/LearnJsonEverything/Services/InstructionsBuilder.cs
@@ -1,7 +1,6 @@
 using System.Text;
 using System.Text.Json.Nodes;
 using Humanizer;
-using Json.More;
 
 namespace LearnJsonEverything.Services;
 
@@ -19,12 +18,6 @@ public static class InstructionsBuilder
 
 		 /* INSTRUCTIONS */
 
-		 #### Code template
-
-		 ```csharp
-		 /* CONTEXT CODE */
-		 ```
-
 		 #### Tests
 		 /* TESTS */
 

diff --git a/LearnJsonEverything/Services/Runners/SchemaHost.cs b/LearnJsonEverything/Services/Runners/SchemaHost.cs
@@ -1,4 +1,5 @@
-using Json.Schema;
+using System.Text.Json;
+using Json.Schema;
 
 namespace LearnJsonEverything.Services.Runners;
 
@@ -16,9 +17,11 @@ public string[] Run(LessonData lesson)
 		foreach (var test in lesson.Tests)
 		{
 			var expectedValidity = test!["isValid"]!.GetValue<bool>();
+			Console.WriteLine($"Running `{test["instance"].Print()}`");
 			var result = runner.Run(test.AsObject());
+			Console.WriteLine($"Result: {JsonSerializer.Serialize(result, SerializerContext.Default.EvaluationResults)}");
 			correct &= expectedValidity == result.IsValid;
-			results.Add($"{(expectedValidity == result.IsValid ? Iconography.SuccessIcon : Iconography.ErrorIcon)} {test["instance"]!.Print()}");
+			results.Add($"{(expectedValidity == result.IsValid ? Iconography.SuccessIcon : Iconography.ErrorIcon)} {test["instance"].Print()}");
 		}
 
 		lesson.Achieved |= correct;

diff --git a/LearnJsonEverything/Services/SerializationHelpers.cs b/LearnJsonEverything/Services/SerializationHelpers.cs
@@ -28,6 +28,7 @@ public static string ToLiteral(this string valueTextForCompiler)
 }
 
 [JsonSerializable(typeof(JsonSchema))]
+[JsonSerializable(typeof(EvaluationResults))]
 [JsonSerializable(typeof(JsonNode))]
 [JsonSerializable(typeof(JsonObject))]
 [JsonSerializable(typeof(JsonArray))]

diff --git a/LearnJsonEverything/Shared/Teacher.razor b/LearnJsonEverything/Shared/Teacher.razor
@@ -47,6 +47,7 @@
 					<button class="btn btn-primary m-1" disabled="@_previousButtonDisabled" @onclick="PreviousLesson">&lt; Previous</button>
 					<button class="btn btn-primary m-1" @onclick="Run">Run</button>
 					<button class="btn btn-primary m-1" @onclick="RevealSolution">Reveal Solution</button>
+					<button class="btn btn-primary m-1" @onclick="ResetLesson">Reset</button>
 					<button class="btn btn-primary m-1" disabled="@_nextButtonDisabled" @onclick="NextLesson">Next &gt;</button>
 				</div>
 			</div>
@@ -108,6 +109,14 @@
 		return _codeEditor.SetValue(_currentLesson?.Solution ?? string.Empty);
 	}
 
+	private async Task ResetLesson()
+	{
+		_currentLesson!.UserCode = null;
+		_currentLesson.Achieved = false;
+		await LoadLesson();
+		await SaveLessonPlanCompletion();
+	}
+
 	private Task PreviousLesson()
 	{
 		_currentLesson = _lessons.GetPrevious(_currentLesson?.Id);
@@ -130,7 +139,7 @@
 		_currentLesson ??= _lessons[0];
 		Instructions = InstructionsBuilder.BuildInstructions(_currentLesson);
 		_nextButtonDisabled = !CanMoveToNextLesson();
-		await _codeEditor.SetValue(_currentLesson.UserCode ?? string.Empty);
+		await _codeEditor.SetValue(_currentLesson.UserCode ?? _currentLesson.ContextCode);
 		await _outputEditor.SetValue(string.Empty);
 		UpdateNavigation();
 		await JsRuntime.InvokeVoidAsync("BlazorScrollToTopOfElement", "instructions-panel");

diff --git a/LearnJsonEverything/Shared/Teacher.razor.css b/LearnJsonEverything/Shared/Teacher.razor.css
@@ -2,8 +2,11 @@
   padding: 5px;
 }
 
-#workspace, #output {
-  height: calc(50% - 45px/2);
+#workspace {
+  height: calc(70% - 45px/2);
+}
+#output {
+  height: calc(30% - 45px/2);
 }
 
 #controls {

diff --git a/LearnJsonEverything/wwwroot/data/lessons/path.yaml b/LearnJsonEverything/wwwroot/data/lessons/path.yaml
@@ -21,7 +21,6 @@
   title: Parsing
   instructions: |
     Parse the given JSON Path text into a `path` variable.
-  inputTemplate: ''
   contextCode: |-
     using System.Text.Json;
     using System.Text.Json.Nodes;
@@ -42,7 +41,24 @@
         }
     }
   solution: |-
-    var path = JsonPath.Parse(pathText);
+    using System.Text.Json;
+    using System.Text.Json.Nodes;
+    using Json.Path;
+    
+    namespace LearnJsonEverything;
+    
+    public class Lesson : ILessonRunner<PathResult>
+    {
+        public PathResult Run(JsonObject test)
+        {
+            var data = test["data"];
+            var pathText = "$.foo.bar";
+
+            var path = JsonPath.Parse(pathText);
+
+            return path.Evaluate(data);
+        }
+    }
   tests:
   - data: { "foo": { "bar": "a string" } }
     result: ['a string']