@{
VocabHeader Term = Logic.Included[0];
-
@Term.EN
-
}
@@ -28,6 +26,7 @@
protected override void OnInitialized()
{
+ PlayOneShot();
NormalIndex = Rand.Next(0, 4);
Generated.Add(Logic.Included[0].RU);
}
diff --git a/Components/OpenMojiWatermark.razor b/Components/LessonPage/OpenMojiWatermark.razor
similarity index 100%
rename from Components/OpenMojiWatermark.razor
rename to Components/LessonPage/OpenMojiWatermark.razor
diff --git a/Components/VocabIcon.razor b/Components/LessonPage/VocabIcon.razor
similarity index 100%
rename from Components/VocabIcon.razor
rename to Components/LessonPage/VocabIcon.razor
diff --git a/Components/LessonTypeMatch.txt b/Components/LessonTypeMatch.txt
deleted file mode 100644
index 6215a7c..0000000
--- a/Components/LessonTypeMatch.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-@inject LessonService Lessons
-@inject ProfileService Profile
-
-
Select Matching Words
-
-@if (State == null)
-{
- return;
-}
-
-@if(State.Key != "")
-{
-
-
- @for (int i = 0; i < Lessons.LessonHeaders[State.Key].Vocab.Count; i++)
- {
- int Index = i;
- VocabHeader Item = Lessons.VocabHeaders[Lessons.LessonHeaders[State.Key].Vocab[Index]];
-
- }
-
-
- @for (int i = 0; i < Lessons.LessonHeaders[State.Key].Vocab.Count; i++)
- {
- int Index = i;
- VocabHeader Item = Lessons.VocabHeaders[Lessons.LessonHeaders[State.Key].Vocab[Index]];
-
- }
-
-
-} else
-{
-
-}
-
-
-
-@code
-{
- [Parameter, EditorRequired]
- public LessonStateData State {get; set;} = default!;
-
- [Parameter]
- public EventCallback
StateChanged { get; set; }
-
- [Parameter, EditorRequired]
- public Action? OnFinish { get; set; }
-
- string Active = "";
-
- void Select(string Chosen)
- {
- if (Active == "")
- {
- Active = Chosen;
- }
- else
- {
- if (Lessons.VocabHeaders.ContainsKey(Chosen)) //if Chosen is Russian
- {
- if (!Lessons.VocabHeaders.ContainsKey(Active)) //if Active is English
- {
-
- if (Lessons.VocabHeaders[Chosen].EN == Active)
- {
- State.Tested.Add(Chosen);
- State.Results.Add(true);
- StateChanged.InvokeAsync(State);
-
- Active = "";
- }
- else
- {
- //State.Tested.Add(Chosen);
- //State.Results.Add(false);
- //StateChanged.InvokeAsync(State);
-
- Active = "";
- }
- }
- else
- {
- Active = Chosen;
- }
- }
- else //if Chosen is English
- {
- if (Lessons.VocabHeaders.ContainsKey(Active)) //if Active is Russian
- {
- if (Lessons.VocabHeaders[Active].EN == Chosen)
- {
- State.Tested.Add(Active);
- State.Results.Add(true);
- StateChanged.InvokeAsync(State);
-
- Active = "";
- }
- else
- {
-
- //State.Tested.Add(Active);
- //State.Results.Add(false);
- //StateChanged.InvokeAsync(State);
-
- Active = "";
- }
- }
- else
- {
- Active = Chosen;
- }
- }
- }
-
- if (State.Tested.Count == Lessons.LessonHeaders[State.Key].Vocab.Count)
- OnFinish?.Invoke();
-
- /*
- if (RightSelected != -1)
- {
- if (Index == RightSelected)
- {
- State.Tested.Add(Lessons.LessonHeaders[State.Key].Vocab[Index]);
- State.Results.Add(true);
- StateChanged.InvokeAsync(State);
-
- LeftSelected = -1;
- RightSelected = -1;
-
- if (State.Tested.Count == Lessons.LessonHeaders[State.Key].Vocab.Count)
- OnFinish?.Invoke();
- }
- else
- {
- LeftSelected = Index;
- }
- }*/
- }
- }
\ No newline at end of file
diff --git a/Components/NoLearnedTerms.razor b/Components/NoLearnedTerms.razor
index 226f976..fc13c88 100644
--- a/Components/NoLearnedTerms.razor
+++ b/Components/NoLearnedTerms.razor
@@ -2,5 +2,5 @@
You haven't learned any terms.
-
+