commit 8263947a923772d1691f04f373366a0ef5e25681
parent 6b88fddff294c45c429075f053b7c9ed1a70764b
Author: AsherMorgan <59518073+AsherMorgan@users.noreply.github.com>
Date: Fri, 27 Nov 2020 09:07:21 -0800
Reorganize list of vocabulary sets.
Diffstat:
4 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/README.md b/README.md
@@ -11,26 +11,26 @@ Try it out [here](https://ashermorgan.github.io/Spanish-Quizzer/).
## Vocabulary Sets
Spanish-Quizzer comes with many vocabulary sets that can be filtered by word type, tense, direction, and more. Those vocabulary sets are:
- Common Words:
- - Common Verbs
- Common Adjectives
- Common Adverbs
- Common Prepositions
- Common Transitions
-- Spanish 1:
+ - Common Verbs
+- Basic Words:
- Colors (Los Colores)
- Days (Los Días)
- Months (Los Meses)
- Questions (Las Preguntas)
- - Weather (La Clima)
- - Family (La Familia)
+- Advanced Words:
+ - Childhood (La Niñez)
- Clothes (La Ropa)
-- Spanish 2:
- - Nature (La Naturaleza)
+ - Family (La Familia)
+ - Health (La Salud)
- House (La Casa)
- - Vacations (Las Vacaciones)
- - Childhood (La Niñez)
+ - Nature (La Naturaleza)
- Professions (Las Profesiones)
- - Health (La Salud)
+ - Vacations (Las Vacaciones)
+ - Weather (La Clima)
## Vocabulary Filters
The following filters can be used on vocabulary sets:
diff --git a/js/settings.js b/js/settings.js
@@ -379,28 +379,28 @@ let settings = Vue.component("settings", {
<select class="vocabSetName" v-model="filter.set">
<option>All Sets</option>
<optgroup label="Common Words">
- <option>Verbs</option>
<option>Adjectives</option>
<option>Adverbs</option>
<option>Prepositions</option>
<option>Transitions</option>
+ <option>Verbs</option>
</optgroup>
- <optgroup label="Spanish 1">
+ <optgroup label="Basic Words">
<option>Colors</option>
<option>Days</option>
<option>Months</option>
<option>Questions</option>
- <option>Weather</option>
- <option>Family</option>
- <option>Clothes</option>
</optgroup>
- <optgroup label="Spanish 2">
- <option>Nature</option>
- <option>House</option>
- <option>Vacation</option>
+ <optgroup label="Advanced Words">
<option>Childhood</option>
- <option>Professions</option>
+ <option>Clothes</option>
+ <option>Family</option>
<option>Health</option>
+ <option>House</option>
+ <option>Nature</option>
+ <option>Professions</option>
+ <option>Vacation</option>
+ <option>Weather</option>
</optgroup>
</select>
<select v-model="filter.type">
diff --git a/reference.html b/reference.html
@@ -34,28 +34,28 @@
<select aria-label="Vocab Set" v-model="set">
<option>Choose a vocab set</option>
<optgroup label="Common Words">
- <option>Verbs</option>
<option>Adjectives</option>
<option>Adverbs</option>
<option>Prepositions</option>
<option>Transitions</option>
+ <option>Verbs</option>
</optgroup>
- <optgroup label="Spanish 1">
+ <optgroup label="Basic Words">
<option>Colors</option>
<option>Days</option>
<option>Months</option>
<option>Questions</option>
- <option>Weather</option>
- <option>Family</option>
- <option>Clothes</option>
</optgroup>
- <optgroup label="Spanish 2">
- <option>Nature</option>
- <option>House</option>
- <option>Vacation</option>
+ <optgroup label="Advanced Words">
<option>Childhood</option>
- <option>Professions</option>
+ <option>Clothes</option>
+ <option>Family</option>
<option>Health</option>
+ <option>House</option>
+ <option>Nature</option>
+ <option>Professions</option>
+ <option>Vacation</option>
+ <option>Weather</option>
</optgroup>
</select>
<input type="text" aria-label="Search" v-model="query" placeholder="Search"
diff --git a/vocab/index.html b/vocab/index.html
@@ -23,32 +23,32 @@
<h2>Common Words</h2>
<ul>
- <li><a href="Verbs.csv">Common Verbs</a> (contains infinitives and conjugations)</li>
<li><a href="Adjectives.csv">Common Adjectives</a></li>
<li><a href="Adverbs.csv">Common Adverbs</a></li>
<li><a href="Prepositions.csv">Common Prepositions</a></li>
<li><a href="Transitions.csv">Common Transitions</a></li>
+ <li><a href="Verbs.csv">Common Verbs</a> (contains infinitives and conjugations)</li>
</ul>
- <h2>Spanish 1 Vocab</h2>
+ <h2>Basic Words</h2>
<ul>
<li><a href="Colors.csv">Colors</a> (Los Colores)</li>
<li><a href="Days.csv">Days</a> (Las Días)</li>
<li><a href="Months.csv">Months</a> (Los Meses)</li>
<li><a href="Questions.csv">Questions</a> (Las Preguntas)</li>
- <li><a href="Weather.csv">Weather</a> (La Clima)</li>
- <li><a href="Family.csv">Family</a> (La Familia)</li>
- <li><a href="Clothes.csv">Clothes</a> (La Ropa)</li>
</ul>
- <h2>Spanish 2 Vocab</h2>
+ <h2>Advanced Words</h2>
<ul>
- <li><a href="Nature.csv">Nature</a> (La Naturaleza)</li>
- <li><a href="House.csv">House</a> (La Casa)</li>
- <li><a href="Vacation.csv">Vacation</a> (Las Vacaciones)</li>
<li><a href="Childhood.csv">Childhood</a> (La Niñez)</li>
- <li><a href="Professions.csv">Professions</a> (Las Profesiones)</li>
+ <li><a href="Clothes.csv">Clothes</a> (La Ropa)</li>
+ <li><a href="Family.csv">Family</a> (La Familia)</li>
<li><a href="Health.csv">Health</a> (La Salud)</li>
+ <li><a href="House.csv">House</a> (La Casa)</li>
+ <li><a href="Nature.csv">Nature</a> (La Naturaleza)</li>
+ <li><a href="Professions.csv">Professions</a> (Las Profesiones)</li>
+ <li><a href="Vacation.csv">Vacation</a> (Las Vacaciones)</li>
+ <li><a href="Weather.csv">Weather</a> (La Clima)</li>
</ul>
</main>
</body>
