Move quizbowl folder to shared

client/admin/category-reports/index.jsx

@@ -1,6 +1,6 @@
 import getBonusPartLabel from '../../scripts/utilities/get-bonus-part-label.js';
 import QuestionCard from '../../scripts/components/QuestionCard.jsx';
-import { CATEGORY_TO_ALTERNATE_SUBCATEGORIES, SUBCATEGORY_TO_CATEGORY } from '../../../quizbowl/categories.js';
+import { CATEGORY_TO_ALTERNATE_SUBCATEGORIES, SUBCATEGORY_TO_CATEGORY } from '../../../shared/categories.js';
 
 const fontSize = window.localStorage.getItem('database-font-size') === 'true' ? (window.localStorage.getItem('font-size') ?? 16) : 16;
 

client/db/index.jsx

@@ -8,7 +8,7 @@ import DifficultyDropdown from '../scripts/components/DifficultyDropdown.jsx';
 import Star from '../scripts/components/Star.jsx';
 import { getDropdownValues, setDropdownValues } from '../scripts/utilities/dropdown-checklist.js';
 import filterParams from '../scripts/utilities/filter-params.js';
-import CategoryManager from '../../quizbowl/category-manager.js';
+import CategoryManager from '../../shared/category-manager.js';
 import reportQuestion from '../scripts/api/report-question.js';
 import getSetList from '../scripts/api/get-set-list.js';
 

client/play/bonuses/SoloBonusRoom.js

@@ -1,4 +1,4 @@
-import BonusRoom from '../../../quizbowl/BonusRoom.js';
+import BonusRoom from '../../../shared/BonusRoom.js';
 import api from '../../scripts/api/index.js';
 
 async function getPacket ({ setName, packetNumber }) {

client/play/bonuses/index.jsx

@@ -1,9 +1,9 @@
 import { getDropdownValues } from '../../scripts/utilities/dropdown-checklist.js';
 import CategoryModal from '../../scripts/components/CategoryModal.jsx';
 import DifficultyDropdown from '../../scripts/components/DifficultyDropdown.jsx';
-import CategoryManager from '../../../quizbowl/category-manager.js';
-import Player from '../../../quizbowl/Player.js';
-import Team from '../../../quizbowl/Team.js';
+import CategoryManager from '../../../shared/category-manager.js';
+import Player from '../../../shared/Player.js';
+import Team from '../../../shared/Team.js';
 import SoloBonusRoom from './SoloBonusRoom.js';
 import SoloBonusClient from './SoloBonusClient.js';
 

client/play/mp/index.js

@@ -1,4 +1,4 @@
-import getRandomName from '../../../quizbowl/get-random-name.js';
+import getRandomName from '../../../shared/get-random-name.js';
 
 const ROOM_NAME_MAX_LENGTH = 32;
 

client/play/mp/room.jsx

@@ -1,12 +1,12 @@
 import MultiplayerTossupBonusClient from './MultiplayerTossupBonusClient.js';
 import { showAlert } from './alert.js';
 
-import CategoryManager from '../../../quizbowl/category-manager.js';
+import CategoryManager from '../../../shared/category-manager.js';
 import { getDropdownValues } from '../../scripts/utilities/dropdown-checklist.js';
 import CategoryModal from '../../scripts/components/CategoryModal.jsx';
 import DifficultyDropdown from '../../scripts/components/DifficultyDropdown.jsx';
 import { MODE_ENUM } from '../../../shared/constants.js';
-import getRandomName from '../../../quizbowl/get-random-name.js';
+import getRandomName from '../../../shared/get-random-name.js';
 
 const room = {
   bonus: {},

client/play/tossups/SoloTossupRoom.js

@@ -1,5 +1,5 @@
 import api from '../../scripts/api/index.js';
-import TossupRoom from '../../../quizbowl/TossupRoom.js';
+import TossupRoom from '../../../shared/TossupRoom.js';
 
 let starredTossupIds = null;
 async function getStarredTossup () {

client/play/tossups/ai-mode/AIBot.js

@@ -1,4 +1,4 @@
-import Player from '../../../../quizbowl/Player.js';
+import Player from '../../../../shared/Player.js';
 
 export default class AIBot {
   constructor (room, name = 'ai-bot') {

client/play/tossups/index.jsx

@@ -1,5 +1,5 @@
-import CategoryManager from '../../../quizbowl/category-manager.js';
-import Player from '../../../quizbowl/Player.js';
+import CategoryManager from '../../../shared/category-manager.js';
+import Player from '../../../shared/Player.js';
 import { getDropdownValues } from '../../scripts/utilities/dropdown-checklist.js';
 import CategoryModal from '../../scripts/components/CategoryModal.jsx';
 import DifficultyDropdown from '../../scripts/components/DifficultyDropdown.jsx';

client/scripts/utilities/filter-params.js

@@ -1,5 +1,5 @@
 import { DEFAULT_MAX_YEAR, DEFAULT_MIN_YEAR, DIFFICULTIES } from '../../../shared/constants.js';
-import { CATEGORY_TO_SUBCATEGORY, CATEGORY_TO_ALTERNATE_SUBCATEGORIES } from '../../../quizbowl/categories.js';
+import { CATEGORY_TO_SUBCATEGORY, CATEGORY_TO_ALTERNATE_SUBCATEGORIES } from '../../../shared/categories.js';
 
 function removeRedundantCategories (params) {
   let { categories, subcategories, alternateSubcategories } = params;

database/qbreader/admin/update-subcategory.js

@@ -1,6 +1,6 @@
 import { tossups, perTossupData, bonuses, perBonusData } from '../collections.js';
 
-import { SUBCATEGORY_TO_CATEGORY } from '../../../quizbowl/categories.js';
+import { SUBCATEGORY_TO_CATEGORY } from '../../../shared/categories.js';
 
 /**
  *

database/qbreader/get-random-bonuses.js

@@ -1,6 +1,6 @@
 import { bonuses } from './collections.js';
 
-import { CATEGORIES, SUBCATEGORIES } from '../../quizbowl/categories.js';
+import { CATEGORIES, SUBCATEGORIES } from '../../shared/categories.js';
 import { DIFFICULTIES, DEFAULT_MIN_YEAR, DEFAULT_MAX_YEAR } from '../../shared/constants.js';
 
 // eslint-disable-next-line no-unused-vars

database/qbreader/get-random-tossups.js

@@ -1,6 +1,6 @@
 import { tossups } from './collections.js';
 
-import { CATEGORIES, SUBCATEGORIES } from '../../quizbowl/categories.js';
+import { CATEGORIES, SUBCATEGORIES } from '../../shared/categories.js';
 import { DIFFICULTIES, DEFAULT_MIN_YEAR, DEFAULT_MAX_YEAR } from '../../shared/constants.js';
 
 // eslint-disable-next-line no-unused-vars

database/qbreader/get-set.js

@@ -1,6 +1,6 @@
 import { tossups, bonuses } from './collections.js';
 
-import { CATEGORIES, SUBCATEGORIES } from '../../quizbowl/categories.js';
+import { CATEGORIES, SUBCATEGORIES } from '../../shared/categories.js';
 // eslint-disable-next-line no-unused-vars
 import * as types from '../../types.js';
 

routes/api/random-name.js

@@ -1,4 +1,4 @@
-import getRandomName from '../../quizbowl/get-random-name.js';
+import getRandomName from '../../shared/get-random-name.js';
 
 import { Router } from 'express';
 

routes/index.js

@@ -29,7 +29,7 @@ router.use('/db', dbRouter);
 router.use('/play', playRouter);
 router.use('/user', userRouter);
 
-router.use('/quizbowl', express.static('quizbowl'));
+router.use('/shared', express.static('shared'));
 
 router.use(ssiMiddleware);
 router.use(express.static('client', { extensions: ['html'] }));

routes/validators/category-bundle.js

@@ -7,7 +7,7 @@ import {
   SUBCATEGORIES,
   SUBCATEGORY_TO_CATEGORY,
   CATEGORY_TO_ALTERNATE_SUBCATEGORIES
-} from '../../quizbowl/categories.js';
+} from '../../shared/categories.js';
 
 // eslint-disable-next-line no-unused-vars
 import express from 'express';

routes/validators/enum.js

@@ -1,4 +1,4 @@
-import { ALTERNATE_SUBCATEGORIES, CATEGORIES, SUBCATEGORIES } from '../../quizbowl/categories.js';
+import { ALTERNATE_SUBCATEGORIES, CATEGORIES, SUBCATEGORIES } from '../../shared/categories.js';
 
 /**
  * Validates that a field's value is one of the allowed enum values.

server/multiplayer/ServerMultiplayerRoomMixin.js

@@ -4,7 +4,7 @@ import { HEADER, ENDC, OKCYAN, OKBLUE } from '../bcolors.js';
 import isAppropriateString from '../moderation/is-appropriate-string.js';
 import { MODE_ENUM, QUESTION_TYPE_ENUM, TOSSUP_PROGRESS_ENUM } from '../../shared/constants.js';
 import insertTokensIntoHTML from '../../shared/insert-tokens-into-html.js';
-// import TossupRoom from '../../quizbowl/TossupRoom.js';
+// import TossupRoom from '../../shared/TossupRoom.js';
 import RateLimit from '../RateLimit.js';
 
 import getRandomTossups from '../../database/qbreader/get-random-tossups.js';
@@ -14,7 +14,7 @@ import getSetList from '../../database/qbreader/get-set-list.js';
 import getNumPackets from '../../database/qbreader/get-num-packets.js';
 
 import checkAnswer from 'qb-answer-checker';
-import Team from '../../quizbowl/Team.js';
+import Team from '../../shared/Team.js';
 
 const BAN_DURATION = 1000 * 60 * 30; // 30 minutes
 

server/multiplayer/ServerPlayer.js

@@ -1,4 +1,4 @@
-import Player from '../../quizbowl/Player.js';
+import Player from '../../shared/Player.js';
 import { USERNAME_MAX_LENGTH } from './constants.js';
 
 export default class ServerPlayer extends Player {

server/multiplayer/ServerTossupBonusRoom.js

@@ -1,6 +1,6 @@
 import { EARLY_CORRECT_CELERITY_THRESHOLD } from './constants.js';
 import ServerMultiplayerRoomMixin from './ServerMultiplayerRoomMixin.js';
-import TossupBonusRoom from '../../quizbowl/TossupBonusRoom.js';
+import TossupBonusRoom from '../../shared/TossupBonusRoom.js';
 import { QUESTION_TYPE_ENUM, TOSSUP_PROGRESS_ENUM } from '../../shared/constants.js';
 
 export default class ServerTossupBonusRoom extends ServerMultiplayerRoomMixin(TossupBonusRoom) {

server/multiplayer/ServerTossupRoom.js

@@ -1,5 +1,5 @@
 import ServerMultiplayerRoomMixin from './ServerMultiplayerRoomMixin.js';
-import TossupRoom from '../../quizbowl/TossupRoom.js';
+import TossupRoom from '../../shared/TossupRoom.js';
 import { TOSSUP_PROGRESS_ENUM } from '../../shared/constants.js';
 
 export default class ServerTossupRoom extends ServerMultiplayerRoomMixin(TossupRoom) {

server/multiplayer/constants.js

@@ -1,4 +1,4 @@
-import { CATEGORIES, CATEGORY_TO_SUBCATEGORY, SUBCATEGORIES } from '../../quizbowl/categories.js';
+import { CATEGORIES, CATEGORY_TO_SUBCATEGORY, SUBCATEGORIES } from '../../shared/categories.js';
 
 export const ROOM_NAME_MAX_LENGTH = 32;
 export const USERNAME_MAX_LENGTH = 32;

server/multiplayer/handle-wss-connection.js

@@ -2,8 +2,8 @@ import { MAX_ONLINE_PLAYERS, MAX_CONNECTIONS_PER_IP, PERMANENT_ROOMS, VERIFIED_R
 import ServerTossupBonusRoom from './ServerTossupBonusRoom.js';
 import { configurePermanentRoomSettings } from './configure-permanent-room.js';
 import { checkToken } from '../authentication.js';
-import CategoryManager from '../../quizbowl/category-manager.js';
-import getRandomName from '../../quizbowl/get-random-name.js';
+import CategoryManager from '../../shared/category-manager.js';
+import getRandomName from '../../shared/get-random-name.js';
 import hasValidCharacters from '../moderation/has-valid-characters.js';
 import { clientIp, isBannedIp } from '../moderation/ip-filter.js';
 import isAppropriateString from '../moderation/is-appropriate-string.js';

quizbowl/BonusRoom.js → shared/BonusRoom.js

@@ -1,4 +1,4 @@
-import { ANSWER_TIME_LIMIT, BONUS_PROGRESS_ENUM, MODE_ENUM } from '../shared/constants.js';
+import { ANSWER_TIME_LIMIT, BONUS_PROGRESS_ENUM, MODE_ENUM } from './constants.js';
 import QuestionRoom from './QuestionRoom.js';
 
 export const BonusRoomMixin = (QuestionRoomClass) => class extends QuestionRoomClass {

quizbowl/QuestionRoom.js → shared/QuestionRoom.js

@@ -1,5 +1,5 @@
 import { CATEGORIES, SUBCATEGORIES, ALTERNATE_SUBCATEGORIES, SUBCATEGORY_TO_CATEGORY, ALTERNATE_SUBCATEGORY_TO_CATEGORY } from './categories.js';
-import { DEFAULT_MIN_YEAR, DEFAULT_MAX_YEAR, MODE_ENUM } from '../shared/constants.js';
+import { DEFAULT_MIN_YEAR, DEFAULT_MAX_YEAR, MODE_ENUM } from './constants.js';
 import CategoryManager from './category-manager.js'; // eslint-disable-line no-unused-vars
 import Room from './Room.js';
 

quizbowl/TossupBonusRoom.js → shared/TossupBonusRoom.js

@@ -1,4 +1,4 @@
-import { BONUS_PROGRESS_ENUM, QUESTION_TYPE_ENUM, TOSSUP_PROGRESS_ENUM } from '../shared/constants.js';
+import { BONUS_PROGRESS_ENUM, QUESTION_TYPE_ENUM, TOSSUP_PROGRESS_ENUM } from './constants.js';
 import { BonusRoomMixin } from './BonusRoom.js';
 import { TossupRoomMixin } from './TossupRoom.js';
 import QuestionRoom from './QuestionRoom.js';

quizbowl/TossupRoom.js → shared/TossupRoom.js

@@ -1,5 +1,5 @@
-import { ANSWER_TIME_LIMIT, DEAD_TIME_LIMIT, MODE_ENUM, TOSSUP_PROGRESS_ENUM } from '../shared/constants.js';
-import insertTokensIntoHTML from '../shared/insert-tokens-into-html.js';
+import { ANSWER_TIME_LIMIT, DEAD_TIME_LIMIT, MODE_ENUM, TOSSUP_PROGRESS_ENUM } from './constants.js';
+import insertTokensIntoHTML from './insert-tokens-into-html.js';
 import QuestionRoom from './QuestionRoom.js';
 
 export const TossupRoomMixin = (QuestionRoomClass) => class extends QuestionRoomClass {

tools/validate/category.js

@@ -1,5 +1,5 @@
 import { bonuses, tossups } from '../../database/qbreader/collections.js';
-import { CATEGORIES } from '../../quizbowl/categories.js';
+import { CATEGORIES } from '../../shared/categories.js';
 
 export default async function categoryValidation () {
   let total = 0;

tools/validate/subcategory.js

@@ -1,5 +1,5 @@
 import { bonuses, tossups } from '../../database/qbreader/collections.js';
-import { SUBCATEGORIES } from '../../quizbowl/categories.js';
+import { SUBCATEGORIES } from '../../shared/categories.js';
 
 export default async function subcategoryValidation () {
   let total = 0;