reorganize api files

qbreader · Jun 20, 2023 · 55c0b70 · 55c0b70
1 parent 2feaee0
commit 55c0b70
Show file tree

Hide file tree

Showing 15 changed files with 434 additions and 384 deletions.
diff --git a/client/geoword/division.js b/client/geoword/division.js
@@ -3,7 +3,7 @@ const packetTitle = titleCase(packetName);
 
 document.getElementById('packet-name').textContent = packetTitle;
 
-fetch('/geoword/api/get-divisions?' + new URLSearchParams({ packetName }))
+fetch('/api/geoword/get-divisions?' + new URLSearchParams({ packetName }))
     .then(response => response.json())
     .then(data => {
         const { divisions } = data;
@@ -18,7 +18,7 @@ fetch('/geoword/api/get-divisions?' + new URLSearchParams({ packetName }))
 
 document.getElementById('form').addEventListener('submit', async event => {
     const division = document.getElementById('division').value;
-    fetch('/geoword/api/record-division', {
+    fetch('/api/geoword/record-division', {
         method: 'PUT',
         headers: {
             'Content-Type': 'application/json',

diff --git a/client/geoword/game.js b/client/geoword/game.js
@@ -16,14 +16,14 @@ let tossupsHeard = 0;
 
 document.getElementById('geoword-stats').href = '/geoword/stats/' + packetName;
 
-fetch('/geoword/api/get-question-count?' + new URLSearchParams({ packetName }))
+fetch('/api/geoword/get-question-count?' + new URLSearchParams({ packetName }))
     .then(response => response.json())
     .then(data => {
         packetLength = data.questionCount;
         document.getElementById('packet-length').textContent = packetLength;
     });
 
-fetch('/geoword/api/get-progress?' + new URLSearchParams({ packetName }))
+fetch('/api/geoword/get-progress?' + new URLSearchParams({ packetName }))
     .then(response => response.json())
     .then(data => {
         ({ division, numberCorrect, points, totalCorrectCelerity, tossupsHeard } = data);
@@ -48,7 +48,7 @@ const incorrectAudio = new Audio('/geoword/audio/incorrect.mp3');
 const sampleAudio = new Audio('/geoword/audio/sample.mp3');
 
 async function checkGeowordAnswer(givenAnswer, questionNumber) {
-    return await fetch('/geoword/api/check-answer?' + new URLSearchParams({
+    return await fetch('/api/geoword/check-answer?' + new URLSearchParams({
         givenAnswer,
         packetName,
         questionNumber,
@@ -106,7 +106,7 @@ function next() {
 }
 
 function recordProtest(packetName, questionNumber) {
-    fetch('/geoword/api/record-protest?', {
+    fetch('/api/geoword/record-protest?', {
         method: 'PUT',
         headers: {
             'Content-Type': 'application/json',
@@ -123,7 +123,7 @@ function recordProtest(packetName, questionNumber) {
 }
 
 function recordBuzz(packetName, questionNumber, celerity, points, givenAnswer) {
-    fetch('/geoword/api/record-buzz?' + new URLSearchParams({
+    fetch('/api/geoword/record-buzz?' + new URLSearchParams({
         packetName,
         questionNumber,
         celerity,

diff --git a/client/geoword/index.js b/client/geoword/index.js
@@ -4,7 +4,7 @@ getAccountUsername().then(username => {
     }
 });
 
-fetch('/geoword/api/packet-list')
+fetch('/api/geoword/packet-list')
     .then(response => response.json())
     .then(data => {
         const { packetList } = data;

diff --git a/client/geoword/leaderboard.js b/client/geoword/leaderboard.js
@@ -5,7 +5,7 @@ const packetTitle = titleCase(packetName);
 document.getElementById('packet-name').textContent = packetTitle;
 document.getElementById('division').textContent = division;
 
-fetch('/geoword/api/leaderboard?' + new URLSearchParams({ packetName, division }))
+fetch('/api/geoword/leaderboard?' + new URLSearchParams({ packetName, division }))
     .then(response => response.json())
     .then(data => {
         const { leaderboard } = data;

diff --git a/client/geoword/stats.js b/client/geoword/stats.js
@@ -3,7 +3,7 @@ const packetTitle = titleCase(packetName);
 
 document.getElementById('packet-name').textContent = packetTitle;
 
-fetch('/geoword/api/stats?' + new URLSearchParams({ packetName }))
+fetch('/api/geoword/stats?' + new URLSearchParams({ packetName }))
     .then(response => response.json())
     .then(data => {
         const { buzzArray, division, leaderboard } = data;
@@ -46,7 +46,7 @@ fetch('/geoword/api/stats?' + new URLSearchParams({ packetName }))
     });
 
 
-fetch('/geoword/api/get-divisions?' + new URLSearchParams({ packetName }))
+fetch('/api/geoword/get-divisions?' + new URLSearchParams({ packetName }))
     .then(response => response.json())
     .then(data => {
         const { divisions } = data;

diff --git a/database/users.js b/database/users.js
@@ -316,6 +316,12 @@ async function getUserId(username) {
 }
 
 
+async function isAdmin(username) {
+    const user = await getUser(username);
+    return user?.admin ?? false;
+}
+
+
 async function recordBonusData(username, data) {
     const user_id = await getUserId(username);
     const newData = {};
@@ -428,6 +434,7 @@ export {
     getUsername,
     getUserField,
     getUserId,
+    isAdmin,
     recordBonusData,
     recordTossupData,
     updateUser,

diff --git a/routes/api.js b/routes/api.js