commit 65b8b89185c6c6c99e9d68a06b1525801b24651c
parent 2c39f5570218fc9a0081d9f422c61a4182023f31
Author: AsherMorgan <59518073+AsherMorgan@users.noreply.github.com>
Date: Sat, 21 Mar 2020 08:05:12 -0700
Implement colors, days, and months.
Diffstat:
4 files changed, 75 insertions(+), 64 deletions(-)
diff --git a/README.md b/README.md
@@ -17,8 +17,10 @@ Spanish Quizzer currently supports the following vocabulary sets:
- Common Adjectives
- Common Adverbs
- Common Prepositions
- - Basic words (Colors, Days, and Months)
- Spanish 1:
+ - Colors (Los Colores)
+ - Days (Los Días)
+ - Months (Los Meses)
- Weather (La Clima)
- Family (La Familia)
- Clothes (La Ropa)
diff --git a/Spanish Quizzer.js b/Spanish Quizzer.js
@@ -56,69 +56,83 @@ function Load() {
Sets[3] = 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/Colors.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[4] = 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/Days.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[5] = 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/Months.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[6] = 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/Weather.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[7] = 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/Family.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[8] = 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/Clothes.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[9] = 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/Nature.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[10] = 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/House.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", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Vacation.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[12] = results.data;
}
});
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Childhood.csv", {
+ download: true,
+ complete: function(results) {
+ // Set verbs
+ Sets[13] = results.data;
+ }
+ });
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Professions.csv", {
+ download: true,
+ complete: function(results) {
+ // Set verbs
+ Sets[14] = results.data;
+ }
+ });
}
@@ -159,6 +173,8 @@ function Start() {
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]));
+ Terms.push(...Filter.GetFilter(document.getElementById("settingsMode13").value).Apply(Sets[13]));
+ Terms.push(...Filter.GetFilter(document.getElementById("settingsMode14").value).Apply(Sets[14]));
// Shuffle terms
ShuffleTerms();
diff --git a/Vocab/Basics.csv b/Vocab/Basics.csv
@@ -1,31 +0,0 @@
-English,Spanish,Type
-April,Abril,Noun
-August,Agosto,Noun
-Black,Negro,Adjective
-Blue,Azúl,Adjective
-Brown,Marrón,Adjective
-December,Diciembre,Noun
-Domingo,Sunday,Noun
-February,Febrero,Noun
-Gray,Gris,Adjective
-Green,Verde,Adjective
-January,Enero,Noun
-July,Julio,Noun
-June,Junio,Noun
-March,Marzo,Noun
-May,Mayo,Noun
-Monday,Lunes,Noun
-November,Noviembre,Noun
-October,Octubre,Noun
-Orange,Anaranjado,Adjective
-Pink,Rosado,Adjective
-Purple,Morada,Adjective
-Red,Rojo,Adjective
-Sábado,Saturday,Noun
-September,Septiembre,Noun
-Thursday,Jueves,Noun
-Tuesday,Martes,Noun
-Viernes,Friday,Noun
-Wednesday,Miércoles,Noun
-White,Blanco,Adjective
-Yellow,Amarillo,Adjective
diff --git a/index.html b/index.html
@@ -26,7 +26,7 @@
<br/>
<table id="settingsTable">
<tr>
- <td class="label" colspan="2">Basics</td>
+ <td class="label" colspan="2">Common Words</td>
</tr>
<tr>
<td>
@@ -84,9 +84,13 @@
</select>
</td>
</tr>
+ <tr><td><br/></td></tr>
+ <tr>
+ <td class="label" colspan="2">Spanish 1</td>
+ </tr>
<tr>
<td>
- <label class="text" for="settingsMode4">Basic words</label>
+ <label class="text" for="settingsMode4">Colors</label>
</td>
<td>
<select id="settingsMode4" class="settingsFilter">
@@ -94,18 +98,12 @@
<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>
</td>
</tr>
- <tr><td><br/></td></tr>
- <tr>
- <td class="label" colspan="2">Spanish 1</td>
- </tr>
<tr>
<td>
- <label class="text" for="settingsMode5">Weather</label>
+ <label class="text" for="settingsMode5">Days</label>
</td>
<td>
<select id="settingsMode5" class="settingsFilter">
@@ -113,6 +111,32 @@
<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="settingsMode6">Months</label>
+ </td>
+ <td>
+ <select id="settingsMode6" 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>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <label class="text" for="settingsMode7">Weather</label>
+ </td>
+ <td>
+ <select id="settingsMode7" 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="2FieldsVerbs">Verbs</option>
</select>
@@ -120,10 +144,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode6">Family</label>
+ <label class="text" for="settingsMode8">Family</label>
</td>
<td>
- <select id="settingsMode6" class="settingsFilter">
+ <select id="settingsMode8" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -135,10 +159,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode7">Clothes</label>
+ <label class="text" for="settingsMode9">Clothes</label>
</td>
<td>
- <select id="settingsMode7" class="settingsFilter">
+ <select id="settingsMode9" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -154,10 +178,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode8">Nature</label>
+ <label class="text" for="settingsMode10">Nature</label>
</td>
<td>
- <select id="settingsMode8" class="settingsFilter">
+ <select id="settingsMode10" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -170,10 +194,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode9">House</label>
+ <label class="text" for="settingsMode11">House</label>
</td>
<td>
- <select id="settingsMode9" class="settingsFilter">
+ <select id="settingsMode11" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -186,10 +210,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode10">Vacation</label>
+ <label class="text" for="settingsMode12">Vacation</label>
</td>
<td>
- <select id="settingsMode10" class="settingsFilter">
+ <select id="settingsMode12" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -202,10 +226,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode11">Childhood</label>
+ <label class="text" for="settingsMode13">Childhood</label>
</td>
<td>
- <select id="settingsMode11" class="settingsFilter">
+ <select id="settingsMode13" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
@@ -218,10 +242,10 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode12">Professions</label>
+ <label class="text" for="settingsMode14">Professions</label>
</td>
<td>
- <select id="settingsMode12" class="settingsFilter">
+ <select id="settingsMode14" class="settingsFilter">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
