close #233

qbreader · Dec 20, 2023 · 73efd34 · 73efd34
1 parent ed0b2e9
commit 73efd34
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 15 deletions.
diff --git a/client/admin/category-reports.html b/client/admin/category-reports.html
@@ -105,7 +105,6 @@ <h5 class="modal-title">Fix Category</h5>
                                 <option value="Biology">Biology</option>
                                 <option value="Chemistry">Chemistry</option>
                                 <option value="Physics">Physics</option>
-                                <option value="Math">Math</option>
                                 <option value="Other Science">Other Science</option>
                                 <option disabled>──────────</option>
                                 <option value="Visual Fine Arts">Visual Fine Arts</option>

diff --git a/client/database/index.js b/client/database/index.js
@@ -1,6 +1,6 @@
 const paginationShiftLength = screen.width > 992 ? 10 : 5;
 const CATEGORY_BUTTONS = [['Literature', 'primary'], ['History', 'success'], ['Science', 'danger'], ['Fine Arts', 'warning'], ['Religion', 'secondary'], ['Mythology', 'secondary'], ['Philosophy', 'secondary'], ['Social Science', 'secondary'], ['Current Events', 'secondary'], ['Geography', 'secondary'], ['Other Academic', 'secondary'], ['Trash', 'secondary']];
-const SUBCATEGORY_BUTTONS = [['American Literature', 'primary'], ['British Literature', 'primary'], ['Classical Literature', 'primary'], ['European Literature', 'primary'], ['World Literature', 'primary'], ['Other Literature', 'primary'], ['American History', 'success'], ['Ancient History', 'success'], ['European History', 'success'], ['World History', 'success'], ['Other History', 'success'], ['Biology', 'danger'], ['Chemistry', 'danger'], ['Physics', 'danger'], ['Math', 'danger'], ['Other Science', 'danger'], ['Visual Fine Arts', 'warning'], ['Auditory Fine Arts', 'warning'], ['Other Fine Arts', 'warning']];
+const SUBCATEGORY_BUTTONS = [['American Literature', 'primary'], ['British Literature', 'primary'], ['Classical Literature', 'primary'], ['European Literature', 'primary'], ['World Literature', 'primary'], ['Other Literature', 'primary'], ['American History', 'success'], ['Ancient History', 'success'], ['European History', 'success'], ['World History', 'success'], ['Other History', 'success'], ['Biology', 'danger'], ['Chemistry', 'danger'], ['Physics', 'danger'], ['Other Science', 'danger'], ['Visual Fine Arts', 'warning'], ['Auditory Fine Arts', 'warning'], ['Other Fine Arts', 'warning']];
 let validCategories = [];
 let validSubcategories = [];
 function downloadQuestionsAsJSON(tossups, bonuses, filename = 'data.json') {

diff --git a/client/database/index.jsx b/client/database/index.jsx
@@ -30,7 +30,6 @@ const SUBCATEGORY_BUTTONS = [
     ['Biology', 'danger'],
     ['Chemistry', 'danger'],
     ['Physics', 'danger'],
-    ['Math', 'danger'],
     ['Other Science', 'danger'],
     ['Visual Fine Arts', 'warning'],
     ['Auditory Fine Arts', 'warning'],

diff --git a/client/multiplayer/room.html b/client/multiplayer/room.html
@@ -333,9 +333,6 @@ <h5 class="text-center">Subcategories</h5>
                             <input class="btn-check" id="Physics" type="checkbox" autocomplete="off">
                             <label class="btn btn-outline-danger w-100 rounded-0 my-1" for="Physics">Physics<br></label>
 
-                            <input class="btn-check" id="Math" type="checkbox" autocomplete="off">
-                            <label class="btn btn-outline-danger w-100 rounded-0 my-1" for="Math">Math<br></label>
-
                             <input class="btn-check" id="Other Science" type="checkbox" autocomplete="off">
                             <label class="btn btn-outline-danger w-100 rounded-0 my-1" for="Other Science">Other
                                 Science<br></label>

diff --git a/client/singleplayer/bonuses.html b/client/singleplayer/bonuses.html
@@ -297,9 +297,6 @@ <h5 class="text-center">Subcategories</h5>
                             <input class="btn-check" id="Physics" type="checkbox" autocomplete="off">
                             <label class="btn btn-outline-danger w-100 rounded-0 my-1" for="Physics">Physics<br></label>
 
-                            <input class="btn-check" id="Math" type="checkbox" autocomplete="off">
-                            <label class="btn btn-outline-danger w-100 rounded-0 my-1" for="Math">Math<br></label>
-
                             <input class="btn-check" id="Other Science" type="checkbox" autocomplete="off">
                             <label class="btn btn-outline-danger w-100 rounded-0 my-1" for="Other Science">Other
                                 Science<br></label>

diff --git a/client/singleplayer/tossups.html b/client/singleplayer/tossups.html
@@ -300,9 +300,6 @@ <h5 class="text-center">Subcategories</h5>
                             <input class="btn-check" id="Physics" type="checkbox" autocomplete="off">
                             <label class="btn btn-outline-danger w-100 rounded-0 my-1" for="Physics">Physics<br></label>
 
-                            <input class="btn-check" id="Math" type="checkbox" autocomplete="off">
-                            <label class="btn btn-outline-danger w-100 rounded-0 my-1" for="Math">Math<br></label>
-
                             <input class="btn-check" id="Other Science" type="checkbox" autocomplete="off">
                             <label class="btn btn-outline-danger w-100 rounded-0 my-1" for="Other Science">Other
                                 Science<br></label>

diff --git a/client/utilities.js b/client/utilities.js
@@ -3,7 +3,7 @@
 const SUBCATEGORIES = {
     'Literature': ['American Literature', 'British Literature', 'Classical Literature', 'European Literature', 'World Literature', 'Other Literature'],
     'History': ['American History', 'Ancient History', 'European History', 'World History', 'Other History'],
-    'Science': ['Biology', 'Chemistry', 'Physics', 'Math', 'Other Science'],
+    'Science': ['Biology', 'Chemistry', 'Physics', 'Other Science'],
     'Fine Arts': ['Visual Fine Arts', 'Auditory Fine Arts', 'Other Fine Arts'],
     'Religion': ['Religion'],
     'Mythology': ['Mythology'],

diff --git a/constants.js b/constants.js
@@ -7,7 +7,7 @@ const DEFAULT_MAX_YEAR = 2023;
 const DIFFICULTIES = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 
 const CATEGORIES = ['Literature', 'History', 'Science', 'Fine Arts', 'Religion', 'Mythology', 'Philosophy', 'Social Science', 'Current Events', 'Geography', 'Other Academic', 'Trash'];
-const SUBCATEGORIES_FLATTENED = ['American Literature', 'British Literature', 'Classical Literature', 'European Literature', 'World Literature', 'Other Literature', 'American History', 'Ancient History', 'European History', 'World History', 'Other History', 'Biology', 'Chemistry', 'Physics', 'Math', 'Other Science', 'Visual Fine Arts', 'Auditory Fine Arts', 'Other Fine Arts', 'Religion', 'Mythology', 'Philosophy', 'Social Science', 'Current Events', 'Geography', 'Other Academic', 'Trash'];
+const SUBCATEGORIES_FLATTENED = ['American Literature', 'British Literature', 'Classical Literature', 'European Literature', 'World Literature', 'Other Literature', 'American History', 'Ancient History', 'European History', 'World History', 'Other History', 'Biology', 'Chemistry', 'Physics', 'Other Science', 'Visual Fine Arts', 'Auditory Fine Arts', 'Other Fine Arts', 'Religion', 'Mythology', 'Philosophy', 'Social Science', 'Current Events', 'Geography', 'Other Academic', 'Trash'];
 const SUBCATEGORY_TO_CATEGORY = {
     'American Literature': 'Literature',
     'British Literature': 'Literature',
@@ -69,7 +69,7 @@ const PERMANENT_ROOMS = [
     {
         name: 'science',
         categories: ['Science'],
-        subcategories: ['Biology', 'Chemistry', 'Physics', 'Math', 'Other Science'],
+        subcategories: ['Biology', 'Chemistry', 'Physics', 'Other Science'],
     },
     {
         name: 'fine-arts',