commit d794b402e879bcbe0813e528d2440c8300634c28
parent a7556b8f5773042bd324575fcdc77599cb2a8364
Author: AsherMorgan <59518073+AsherMorgan@users.noreply.github.com>
Date: Fri, 20 Mar 2020 07:40:53 -0700
Implement adverbs.
Diffstat:
3 files changed, 67 insertions(+), 42 deletions(-)
diff --git a/README.md b/README.md
@@ -12,15 +12,19 @@ Try it [here](https://ashermorgan.github.io/Spanish-Quizzer/).
## Vocabulary Sets
Spanish Quizzer currently supports the following vocabulary sets:
-- Common Verbs (with conjugations)
-- Common Adjectives
-- Common Prepositions
-- Basic words (Colors, Days, and Months)
-- Weather (La Clima)
-- Family (La Familia)
-- Clothes (La Ropa)
-- Nature (La Naturaleza)
-- House (La Casa)
-- Vacations (Las Vacaciones)
-- Childhood (La Niñez)
-- Professions (Las Profesiones)
-\ No newline at end of file
+- Basics:
+ - Common Verbs (with conjugations)
+ - Common Adjectives
+ - Common Adverbs
+ - Common Prepositions
+ - Basic words (Colors, Days, and Months)
+- Spanish 1:
+ - Weather (La Clima)
+ - Family (La Familia)
+ - Clothes (La Ropa)
+- Spanish 2:
+ - Nature (La Naturaleza)
+ - House (La Casa)
+ - Vacations (Las Vacaciones)
+ - Childhood (La Niñez)
+ - Professions (Las Profesiones)
+\ No newline at end of file
diff --git a/Spanish Quizzer.js b/Spanish Quizzer.js
@@ -27,7 +27,7 @@ function Load() {
document.getElementById("settingsError").textContent = "";
// Load CSVs
- Sets = [null, null, null, null, null, null, null, null, null, null, null, null];
+ Sets = [];
Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Verbs.csv", {
download: true,
complete: function(results) {
@@ -42,76 +42,83 @@ function Load() {
Sets[1] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Prepositions.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Adverbs.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[2] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Basics.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Prepositions.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[3] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Weather.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Basics.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[4] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Family.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Weather.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[5] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Clothes.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Family.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[6] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Nature.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Clothes.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[7] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/House.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Nature.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[8] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Vacation.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/House.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[9] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Childhood.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Vacation.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[10] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Professions.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Childhood.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[11] = results.data;
}
});
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Professions.csv", {
+ download: true,
+ complete: function(results) {
+ // Set verbs
+ Sets[12] = results.data;
+ }
+ });
}
@@ -151,6 +158,7 @@ function Start() {
Terms.push(...Filter.GetFilter(document.getElementById("settingsMode9").value).Apply(Sets[9]));
Terms.push(...Filter.GetFilter(document.getElementById("settingsMode10").value).Apply(Sets[10]));
Terms.push(...Filter.GetFilter(document.getElementById("settingsMode11").value).Apply(Sets[11]));
+ Terms.push(...Filter.GetFilter(document.getElementById("settingsMode12").value).Apply(Sets[12]));
// Shuffle terms
ShuffleTerms();
diff --git a/index.html b/index.html
@@ -60,7 +60,7 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode2">Prepositions</label>
+ <label class="text" for="settingsMode2">Adverbs</label>
</td>
<td>
<select id="settingsMode2" class="settingsFilter">
@@ -73,7 +73,7 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode3">Basic words</label>
+ <label class="text" for="settingsMode3">Prepositions</label>
</td>
<td>
<select id="settingsMode3" class="settingsFilter">
@@ -81,6 +81,19 @@
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
<option value="2Fields2to1">Spanish to English</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <label class="text" for="settingsMode4">Basic words</label>
+ </td>
+ <td>
+ <select id="settingsMode4" class="settingsFilter">
+ <option value="None">None</option>
+ <option value="2FieldsAll">All</option>
+ <option value="2Fields1to2">English to Spanish</option>
+ <option value="2Fields2to1">Spanish to English</option>
<option value="2FieldsNouns">Nouns</option>
<option value="2FieldsAdjectives">Adjectives</option>
</select>
@@ -92,10 +105,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode4">Weather</label>
+ <label class="text" for="settingsMode5">Weather</label>
</td>
<td>
- <select id="settingsMode4" class="settingsFilter">
+ <select id="settingsMode5" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -107,10 +120,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode5">Family</label>
+ <label class="text" for="settingsMode6">Family</label>
</td>
<td>
- <select id="settingsMode5" class="settingsFilter">
+ <select id="settingsMode6" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -122,10 +135,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode6">Clothes</label>
+ <label class="text" for="settingsMode7">Clothes</label>
</td>
<td>
- <select id="settingsMode6" class="settingsFilter">
+ <select id="settingsMode7" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -141,10 +154,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode7">Nature</label>
+ <label class="text" for="settingsMode8">Nature</label>
</td>
<td>
- <select id="settingsMode7" class="settingsFilter">
+ <select id="settingsMode8" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -157,10 +170,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode8">House</label>
+ <label class="text" for="settingsMode9">House</label>
</td>
<td>
- <select id="settingsMode8" class="settingsFilter">
+ <select id="settingsMode9" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -173,10 +186,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode9">Vacation</label>
+ <label class="text" for="settingsMode10">Vacation</label>
</td>
<td>
- <select id="settingsMode9" class="settingsFilter">
+ <select id="settingsMode10" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -189,10 +202,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode10">Childhood</label>
+ <label class="text" for="settingsMode11">Childhood</label>
</td>
<td>
- <select id="settingsMode10" class="settingsFilter">
+ <select id="settingsMode11" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -205,10 +218,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode11">Professions</label>
+ <label class="text" for="settingsMode12">Professions</label>
</td>
<td>
- <select id="settingsMode11" class="settingsFilter">
+ <select id="settingsMode12" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
