saving progress; better scrollbar

Author: gregsdennis

Diff for: LearnJsonEverything/Services/CompilationHelpers.cs

@@ -61,13 +61,13 @@ public static class CompilationHelpers
 		return _references;
 	}
 
-	public static (ILessonRunner<T>?, string[]) GetRunner<T>(LessonData lesson, string userCode)
+	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 */", userCode);
+			.Replace("/* USER CODE */", lesson.UserCode ?? string.Empty);
 
 		Console.WriteLine($"Compiling...\n\n{fullSource}");
 

Diff for: LearnJsonEverything/Services/LessonData.cs

@@ -13,4 +13,5 @@ public class LessonData
 	public string ContextCode { get; set; }
 	public JsonArray Tests { get; set; }
 	public bool Achieved { get; set; }
+	public string? UserCode { get; set; }
 }

Diff for: LearnJsonEverything/Services/LessonPlan.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
 namespace LearnJsonEverything.Services;

Diff for: LearnJsonEverything/Services/Runners/SchemaRunner.cs

@@ -1,13 +1,7 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using Json.More;
 using Json.Schema;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-
-using static LearnJsonEverything.Services.SerializationHelpers;
 
 namespace LearnJsonEverything.Services.Runners;
 
@@ -55,9 +49,9 @@ .. tests.Select(test => $"|`{test.Instance.AsJsonString()}`|{test.IsValid}|")
 		return string.Join(Environment.NewLine, lines);
 	}
 
-	public static string[] Run(string userCode, LessonData lesson)
+	public static string[] Run(LessonData lesson)
 	{
-		var (runner, errors) = CompilationHelpers.GetRunner<EvaluationResults>(lesson, userCode);
+		var (runner, errors) = CompilationHelpers.GetRunner<EvaluationResults>(lesson);
 
 		if (runner is null) return errors;
 

Diff for: LearnJsonEverything/Services/SerializationHelpers.cs

@@ -20,9 +20,10 @@ public static string ToLiteral(this string valueTextForCompiler)
 [JsonSerializable(typeof(JsonObject))]
 [JsonSerializable(typeof(JsonArray))]
 [JsonSerializable(typeof(LessonPlan))]
-[JsonSerializable(typeof(LessonData))]
 [JsonSerializable(typeof(LessonData[]))]
-[JsonSerializable(typeof(SchemaRunner.SchemaTest))]
+[JsonSerializable(typeof(SchemaSaveData[]))]
 [JsonSerializable(typeof(SchemaRunner.SchemaTest[]))]
 [JsonSourceGenerationOptions(WriteIndented = true, PropertyNameCaseInsensitive = true)]
-internal partial class SerializerContext : JsonSerializerContext;
+internal partial class SerializerContext : JsonSerializerContext;
+
+public record SchemaSaveData(Guid id, bool completed, string? userCode);

Diff for: LearnJsonEverything/Shared/Teacher.razor

@@ -84,10 +84,12 @@
 
 			await _outputEditor.SetValue(string.Empty);
 
-			var results = SchemaRunner.Run(userCode, _currentLesson!);
+			_currentLesson!.UserCode = userCode;
+			var results = SchemaRunner.Run(_currentLesson);
 
 			await _outputEditor.SetValue(string.Join(Environment.NewLine, results!));
 			_nextButtonDisabled = !CanMoveToNextLesson();
+			await SaveLessonPlanCompletion();
 		}
 		catch (Exception e)
 		{
@@ -113,12 +115,14 @@
 		return LoadLesson();
 	}
 
-	private Task LoadLesson()
+	private async Task LoadLesson()
 	{
 		_currentLesson ??= _lessons[0];
 		Instructions = SchemaRunner.BuildInstructions(_currentLesson);
 		_nextButtonDisabled = !CanMoveToNextLesson();
-		return _outputEditor.SetValue(string.Empty);
+		if (_currentLesson.UserCode is not null)
+			await _codeEditor.SetValue(_currentLesson.UserCode);
+		await _outputEditor.SetValue(string.Empty);
 	}
 
 	private bool CanMoveToNextLesson()
@@ -131,7 +135,6 @@
 	protected override async Task OnInitializedAsync()
 	{
 		await DownloadLessonPlan();
-		
 		await LoadLesson();
 
 		await base.OnInitializedAsync();
@@ -144,6 +147,34 @@
 		var json = yaml.ToJsonNode().FirstOrDefault();
 		Console.WriteLine(json.AsJsonString());
 		_lessons = json.Deserialize(SerializerContext.Default.LessonPlan)!;
+
+		var completed = await LoadLessonPlanCompletion();
+		foreach (var saveData in completed)
+		{
+			var lesson = _lessons[saveData.id];
+			lesson.Achieved = saveData.completed;
+			lesson.UserCode = saveData.userCode;
+		}
+
+		_currentLesson = _lessons.SkipWhile(x => x.Achieved).FirstOrDefault() ?? _lessons.Last();
+	}
+
+	private async Task SaveLessonPlanCompletion()
+	{
+		var completionData = _lessons.Where(x => x.UserCode is not null)
+			.Select(x => new SchemaSaveData(x.Id, x.Achieved, x.UserCode))
+			.ToArray();
+		var json = JsonSerializer.Serialize(completionData, SerializerContext.Default.SchemaSaveDataArray);
+
+		await DataManager.Set(LessonSource, json);
+	}
+
+	private async Task<SchemaSaveData[]> LoadLessonPlanCompletion()
+	{
+		var json = await DataManager.Get(LessonSource);
+		if (json is null) return [];
+
+		return JsonSerializer.Deserialize(json, SerializerContext.Default.SchemaSaveDataArray)!;
 	}
 
 	private async Task SelectLesson(Guid lessonId)

Diff for: LearnJsonEverything/Shared/Teacher.razor.css

@@ -47,4 +47,20 @@
 
 ol, ul {
   padding-left: .5rem;
+}
+
+div::-webkit-scrollbar {
+  width: 5px !important;
+  height: 5px !important;
+}
+
+div::-webkit-scrollbar-track {
+  -webkit-box-shadow: none !important;
+  background-color: transparent;
+}
+
+div::-webkit-scrollbar-thumb {
+  background-color: #CCBCD9 !important;
+  border: 1px solid #1a1a1a !important;
+  border-radius: 2.5px !important;
 }