Fix: struct change

Slouchwind · Sep 20, 2024 · 1248c5c · 1248c5c
1 parent 3a6a728
commit 1248c5c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/components/imgCol.tsx b/components/imgCol.tsx
@@ -30,7 +30,7 @@ export default function ImgCol(
         <div className='imgCol' style={imgStyle} {...other}>
             <img
                 className='col'
-                src={`https://schale.gg/images/student/collection/${id}.webp`}
+                src={`https://schaledb.com/images/student/collection/${id}.webp`}
                 alt={`${id || ''} collection image`}
             />
         </div>

diff --git a/components/students/students.ts b/components/students/students.ts
@@ -66,7 +66,7 @@ export interface schaleInfo {
 
 export interface studentsJson {
     fileJson?: fileInfo[];
-    schaleJson?: schaleInfo[];
+    schaleJson?: { [id: number]: schaleInfo };
 }
 
 export interface studentInfo {

diff --git a/components/students/studentsMethods.ts b/components/students/studentsMethods.ts
@@ -10,19 +10,20 @@ export async function getStudentsJson(locale: string): Promise<studentsJson> {
         'en-US': 'en'
     };
     const fileJson: fileInfo[] = await fetch('../students.json').then(r => r.json());
-    const schaleJson: schaleInfo[] = await fetch(`https://schale.gg/data/${localeCodes[locale as Locales]}/students.min.json`).then(r => r.json());
+    const schaleJson: schaleInfo[] = await fetch(`https://schaledb.com/data/${localeCodes[locale as Locales]}/students.min.json`).then(r => r.json());
     return { fileJson, schaleJson };
 }
 
 export function getStudentInfo({ fileJson, schaleJson }: studentsJson, studentId: number): studentInfo {
-    const file = fileJson && fileJson.filter(info => (info.id === studentId))[0];
-    const schale = schaleJson && schaleJson.filter(info => (info.Id === studentId))[0];
+    console.log({ fileJson, schaleJson });
+    const file = fileJson?.filter(info => (info.id === studentId))[0];
+    const schale = schaleJson?.[studentId];
     return { file, schale };
 }
 
 export function getAllStudentsList({ schaleJson }: studentsJson): number[] {
     if (!schaleJson) return [];
-    return schaleJson.map(v => v.Id).sort();
+    return Object.keys(schaleJson).map(k => Number(k));
 }
 
 export function getStuSenText(

diff --git a/pages/chat.tsx b/pages/chat.tsx
@@ -292,7 +292,7 @@ interface StudentsSelectorProps {
 
 function StudentsSelector({ schaleJson, studentsList, onClick, selectStudents }: StudentsSelectorProps) {
     let chooseStudentsList = Object.entries(selectStudents).filter(v => v[1]).map(v => Number(v[0]));
-    let selector = schaleJson?.map(({ Id: id }) => {
+    let selector = getAllStudentsList({ schaleJson })?.map(id => {
         if (!studentsList.includes(id)) return;
         return (
             <ImgCol