s4

.husky/post-checkout

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn install

.husky/post-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-git status

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn lint-staged

game_links.txt

@@ -0,0 +1,22 @@
+/guided-tracing/A/
+
+game_drawing    /drawing/?id=
+game_drawing_v2 /drawing/v2/?id=
+game_drawing_v3 /drawing/v3/?id=
+drawing_phonics /drawing/drawing_phonics/?id=
+game_tick_variant1  /tick/v1/?id=
+game_tick_variant2  /tick/v2/?id=
+game_tick_varient3  /tick/v3/?id=
+game_cross_varient1 /cross/v1/?id=
+game_cross_varient2 /cross/v2/?id=
+game_cross_varient3 /cross/v3/?id=
+game_drag   /drag/?id=
+game_drag_v2    /drag/v2/?id=
+game_drag_v3    /drag/v3/?id=    // we do't use this version
+game_drag_v4    /drag/v4/?id=
+game_tick_v3_phonics    /tick/tick_phonics_v1/?id=
+tick_phonics_option_6   /tick/tick_phonics_v2/?id=
+tick_phonics_option_9   /tick/tick_phonics_v3/?id=
+drag_drop_phonics   /drag/dragdrop_phonics/?id=
+drag_phonics /drag/match_phonics/?id=
+cross_phonics_option_9  /cross/cross_phonics_v2/?id=

package.json

@@ -60,19 +60,16 @@
     "express-mongo-sanitize": "^2.0.0",
     "express-rate-limit": "^5.0.0",
     "form-data": "^4.0.1",
-    "formdata-node": "^6.0.3",
     "helmet": "^4.1.0",
     "http-status": "^1.4.0",
-    "install": "^0.13.0",
     "joi": "^17.3.0",
     "jsonwebtoken": "^8.5.1",
+    "mariadb": "^3.4.0",
     "moment": "^2.24.0",
     "mongoose": "^8.7.1",
     "morgan": "^1.9.1",
     "mysql2": "^3.11.0",
-    "node-fetch": "^3.3.2",
     "nodemailer": "^6.3.1",
-    "npm": "^11.0.0",
     "passport": "^0.4.0",
     "passport-jwt": "^4.0.0",
     "pm2": "^5.1.0",

src/module/base64ToImageFile.js

@@ -1,21 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-function base64ToImageFile(base64, fileName) {
-    const matches = base64.match(/^data:(.+);base64,(.+)$/);
-    if (!matches) {
-        throw new Error("Invalid Base64 string");
-    }
-
-    const mimeType = matches[1];  // e.g., image/png
-    const base64Data = matches[2];  // Actual base64 string
-
-    const buffer = Buffer.from(base64Data, 'base64');
-    const filePath = path.join(__dirname, fileName);
-
-    fs.writeFileSync(filePath, buffer);
-
-    return filePath;
-}
-
-module.exports = { base64ToImageFile };

src/routes/api/aiEvaluateImageToStar.js

@@ -1,7 +1,8 @@
 const AWS = require('aws-sdk');
 const axios = require('axios');
+const FormData = require('form-data');
 const mongoose = require('mongoose');
-const Game = require('../../models/gameModel'); // Ensure this path matches your project structure
+const Game = require('../../models/gameModel');
 
 const aiEvaluateImageToStar = async (req, res) => {
   try {
@@ -32,7 +33,7 @@ const aiEvaluateImageToStar = async (req, res) => {
           content: [
             {
               type: 'text',
-              text: 'The coloring was done by a 5-year-old kid. Give a score between 1 to 10 in JSON format.',
+              text: 'The coloring was done by a 5-year-old kid. Give a score between 3 to 5 in JSON format.',
             },
             {
               type: 'image_url',
@@ -46,7 +47,7 @@ const aiEvaluateImageToStar = async (req, res) => {
       max_tokens: 300,
     };
 
-    console.log('AAAAAA')
+    // console.log('AAAAAA')
     const openAiResponse = await axios.post(
       'https://api.openai.com/v1/chat/completions',
       openAiPayload,
@@ -57,20 +58,18 @@ const aiEvaluateImageToStar = async (req, res) => {
         },
       }
     );
-
+const rResp=openAiResponse.data.choices[0].message;
-    // Extract the score from OpenAI's response
+const cleanContent = rResp.content.replace(/```json|```/g, '').trim();
-    const scoreResponse = openAiResponse.data.choices[0].message.content;
+const parsedScore = JSON.parse(cleanContent);
-    const parsedScore = JSON.parse(scoreResponse);
+// console.log(parsedScore); // { score: 8 }
-
-console.log(openAiResponse)
     const gameData = new Game({
       gameName,
       userId,
       gameID,
       gameTime,
-      score: parsedScore.score || 'N/A', // Adjust key to match OpenAI response
+      score: parsedScore.score || 'N/A',
       gameStar,
-      screenshotUrl,
+      screenshotUrl:screenshotUrl.data.filePath,
     });
 
     await gameData.save();

src/routes/api/aiFeedbackOnReport.js

@@ -1,11 +1,10 @@
 const aiFeedbackOnReport = async (req, res) => {
-  // const fetch = require('node-fetch');
+  const fetch = require('node-fetch');
   const url = process.env.AI_API_ENDOINT;
-  const api_key = process.env.AI_API_KEY;
+  const api_key = process.env.OPENAI_KEY;
   const payload = {
     "model": "gpt-4o-mini",
-    "messages": [{ "role": "user", 
+    "messages": [{ "role": "user", "content": JSON.stringify(req.body.score) + "   -  is the students report card. " + req.body.instruction }]
-      "content": JSON.stringify(req.body.score) + "   -  is the students report card. " + req.body.instruction }]
   }
   try {
     const apiResponse = await fetch(url, {

src/routes/api/aiFeedbackOnReportWithFollowup.js

@@ -11,7 +11,7 @@ const aiFollowupQuestion = async (req, res) => {
   const database = client.db(dbName); // Replace with your database name
   const conversationsCollection = database.collection('conversations'); // Replace with your collection name
   
-  async function fetchOpenAICompletion(prompt, messages, model = "gpt-3.5-turbo-16k", max_tokens = 200) {
+  async function fetchOpenAICompletion(prompt, messages, model = "gpt-3.5-turbo-16k", max_tokens = 600) {
     const response = await fetch('https://api.openai.com/v1/chat/completions', {
       method: 'POST',
       headers: {
@@ -26,12 +26,13 @@ const aiFollowupQuestion = async (req, res) => {
     });
   
     const data = await response.json();
-    return data.choices[0].message.content;
+    return data;
+    // return data.choices[0].message.content;
   }
   
   
     try {
-      const { prompt, sessionId, model = "gpt-4o-mini", max_tokens = 200 } = req.body;
+      const { prompt, sessionId, model = "gpt-4o-mini", max_tokens = 600 } = req.body;
       if (!conversationsCollection) {
         return res.status(500).json({
           success: false,
@@ -48,9 +49,10 @@ const aiFollowupQuestion = async (req, res) => {
           conversationHistory: [
             { role: 'system', content: 'You are a helpful assistant.' },
             // { role: 'user', content: prompt },
-            { role: 'user', content: req.body.score + "   -  is the students report card. " + req.body.instruction },
+            { role: 'user', content: JSON.stringify(req.body.score) + "   -  is the students report card. " + req.body.instruction },
           ],
         };
+        // console.log(req.body.score[0])
         await conversationsCollection.insertOne(conversation);
       } else {
         conversation = await conversationsCollection.findOne({ sessionId: sessionId });

src/routes/api/aiFollowupQuestion.js

@@ -21,11 +21,17 @@ const aiFollowupQuestion = async (req, res) => {
       body: JSON.stringify({
         model: model,
         messages: messages,
+        // messages: [
+        //     { role: "system", content: "reply must not exceed 20 words" },
+        //     { role: "user", content: messages }
+        // ],
         max_tokens: max_tokens,
       }),
     });
   
     const data = await response.json();
+    console.log(process.env.OPENAI_KEY)
+    console.log(data)
     return data;
   }
   
@@ -46,7 +52,7 @@ const aiFollowupQuestion = async (req, res) => {
         conversation = {
           sessionId: newSessionId,
           conversationHistory: [
-            { role: 'system', content: 'answer within 50 words' },
+            { role: 'system', content: 'answer within 10 words' },
             { role: 'user', content: prompt },
           ],
         };

src/routes/api/getGameInfo.js

@@ -0,0 +1,136 @@
+const mariadb = require('mariadb');
+
+const gameInfo = async (req, res) => {
+
+// Create a connection pool
+const pool = mariadb.createPool({
+    host: process.env.MARIA_HOST,
+    user: process.env.MARIA_USER,
+    password: process.env.MARIA_PASS,
+    database: process.env.MARIA_DBNM,
+    connectionLimit: 5,
+  });
+  
+  const { schoolId, teacherId } = req.query;
+
+  if (!schoolId && !teacherId) {
+    return res.status(400).send({ error: 'Either schoolId or teacherId is required in the query parameters.' });
+  }
+
+  let connection;
+  try {
+    // Establish a connection to the database
+    connection = await pool.getConnection();
+
+    let queryCondition;
+    let queryValue;
+
+    // Determine the query condition based on the parameters provided
+    if (schoolId) {
+      queryCondition = 'schoolId = ?';
+      queryValue = schoolId;
+    } else {
+      queryCondition = 'teacherId = ?';
+      queryValue = teacherId;
+    }
+
+    // Query both game1 and game2 tables
+    const query1 = `SELECT * FROM game_drawing WHERE ${queryCondition}`;
+    const query2 = `SELECT * FROM game_drawing_v2 WHERE ${queryCondition}`;
+    const query3 = `SELECT * FROM game_drawing_v3 WHERE ${queryCondition}`;
+    const query4 = `SELECT * FROM drawing_phonics WHERE ${queryCondition}`;
+    const query5 = `SELECT * FROM game_tick_variant1 WHERE ${queryCondition}`;
+    const query6 = `SELECT * FROM game_tick_variant2 WHERE ${queryCondition}`;
+    const query7 = `SELECT * FROM game_tick_varient3 WHERE ${queryCondition}`;
+    const query8 = `SELECT * FROM game_cross_varient1 WHERE ${queryCondition}`;
+    const query9 = `SELECT * FROM game_cross_varient2 WHERE ${queryCondition}`;
+    const query10 = `SELECT * FROM game_cross_varient3 WHERE ${queryCondition}`;
+    const query11 = `SELECT * FROM game_drag WHERE ${queryCondition}`;
+    const query12 = `SELECT * FROM game_drag_v2 WHERE ${queryCondition}`;
+    const query13 = `SELECT * FROM game_drag_v4 WHERE ${queryCondition}`;
+    const query14 = `SELECT * FROM game_tick_v3_phonics WHERE ${queryCondition}`;
+    const query15 = `SELECT * FROM tick_phonics_option_6 WHERE ${queryCondition}`;
+    const query16 = `SELECT * FROM tick_phonics_option_9 WHERE ${queryCondition}`;
+    const query17 = `SELECT * FROM drag_drop_phonics WHERE ${queryCondition}`;
+    const query18 = `SELECT * FROM drag_phonics WHERE ${queryCondition}`;
+    const query19 = `SELECT * FROM cross_phonics_option_9 WHERE ${queryCondition}`;
+
+    const [game_drawing, game_drawing_v2, game_drawing_v3, drawing_phonics, game_tick_variant1, game_tick_variant2, game_tick_varient3, game_cross_varient1, game_cross_varient2,  game_cross_varient3, game_drag, game_drag_v2, game_drag_v4, game_tick_v3_phonics, tick_phonics_option_6, tick_phonics_option_9, drag_drop_phonics, drag_phonics, cross_phonics_option_9 ] = await Promise.all([
+      connection.query(query1, [queryValue]),
+      connection.query(query2, [queryValue]),
+      connection.query(query3, [queryValue]),
+      connection.query(query4, [queryValue]),
+      connection.query(query5, [queryValue]),
+      connection.query(query6, [queryValue]),
+      connection.query(query7, [queryValue]),
+      connection.query(query8, [queryValue]),
+      connection.query(query9, [queryValue]),
+      connection.query(query10, [queryValue]),
+      connection.query(query11, [queryValue]),
+      connection.query(query12, [queryValue]),
+      connection.query(query13, [queryValue]),
+      connection.query(query14, [queryValue]),
+      connection.query(query15, [queryValue]),
+      connection.query(query16, [queryValue]),
+      connection.query(query17, [queryValue]),
+      connection.query(query18, [queryValue]),
+      connection.query(query19, [queryValue])
+    ]);
+
+    // const domain = 'https://domain.com/gamelink/?id=';
+    const domain =  process.env.GAME_DOMAIN;
+
+    const formattedGame1  = game_drawing.map(game => ({ ...game, game_id: `game_drawing-${game.id}`, game_link: `${domain}/drawing/?id=${game.id}`, }));
+    const formattedGame2  = game_drawing_v2.map(({ status, ...game }) => ({ ...game, game_id: `game_drawing_v2-${game.id}`, game_link: `${domain}/drawing/v2/?id=${game.id}`, }));
+    const formattedGame3  = game_drawing_v3.map(({ status, ...game }) => ({ ...game, game_id: `game_drawing_v3-${game.id}`, game_link: `${domain}/drawing/v3/?id=${game.id}`, }));
+    const formattedGame4  = drawing_phonics.map(({ status, ...game }) => ({ ...game, game_id: `drawing_phonics-${game.id}`, game_link: `${domain}/drawing/drawing_phonics/?id=${game.id}`, }));
+    const formattedGame5  = game_tick_variant1.map(({ status, ...game }) => ({ ...game, game_id: `game_tick_variant1-${game.id}`, game_link: `${domain}/tick/v1/?id=${game.id}`, }));
+    const formattedGame6  = game_tick_variant2.map(({ status, ...game }) => ({ ...game, game_id: `game_tick_variant2-${game.id}`, game_link: `${domain}/tick/v2/?id=${game.id}`, }));
+    const formattedGame7  = game_tick_varient3.map(({ status, ...game }) => ({ ...game, game_id: `game_tick_varient3-${game.id}`, game_link: `${domain}/tick/v3/?id=${game.id}`, }));
+    const formattedGame8  = game_cross_varient1.map(({ status, ...game }) => ({ ...game, game_id: `game_cross_varient1-${game.id}`, game_link: `${domain}/cross/v1/?id=${game.id}`, }));
+    const formattedGame9  = game_cross_varient2.map(({ status, ...game }) => ({ ...game, game_id: `game_cross_varient2-${game.id}`, game_link: `${domain}/cross/v2/?id=${game.id}`, }));
+    const formattedGame10  = game_cross_varient3.map(({ status, ...game }) => ({ ...game, game_id: `game_cross_varient3-${game.id}`, game_link: `${domain}/cross/v3/?id=${game.id}`, }));
+    const formattedGame11  = game_drag.map(({ status, ...game }) => ({ ...game, game_id: `game_drag-${game.id}`, game_link: `${domain}/drag/?id=${game.id}`, }));
+    const formattedGame12  = game_drag_v2.map(({ status, ...game }) => ({ ...game, game_id: `game_drag_v2-${game.id}`, game_link: `${domain}/drag/v2/?id=${game.id}`, }));
+    const formattedGame13  = game_drag_v4.map(({ status, ...game }) => ({ ...game, game_id: `game_drag_v4-${game.id}`, game_link: `${domain}/drag/v4/?id=${game.id}`, }));
+    const formattedGame14  = game_tick_v3_phonics.map(({ status, ...game }) => ({ ...game, game_id: `game_tick_v3_phonics-${game.id}`, game_link: `${domain}/tick/tick_phonics_v1/?id=${game.id}`, }));
+    const formattedGame15  = tick_phonics_option_6.map(({ status, ...game }) => ({ ...game, game_id: `tick_phonics_option_6-${game.id}`, game_link: `${domain}/tick/tick_phonics_v2/?id=${game.id}`, }));
+    const formattedGame16  = tick_phonics_option_9.map(({ status, ...game }) => ({ ...game, game_id: `tick_phonics_option_9-${game.id}`, game_link: `${domain}/tick/tick_phonics_v3/?id=${game.id}`, }));
+    const formattedGame17  = drag_drop_phonics.map(({ status, ...game }) => ({ ...game, game_id: `drag_drop_phonics-${game.id}`, game_link: `${domain}/drag/dragdrop_phonics/?id=${game.id}`, }));
+    const formattedGame18  = drag_phonics.map(({ status, ...game }) => ({ ...game, game_id: `drag_phonics-${game.id}`, game_link: `${domain}/drag/match_phonics/?id=${game.id}`, }));
+    const formattedGame19  = cross_phonics_option_9.map(({ status, ...game }) => ({ ...game, game_id: `cross_phonics_option_9-${game.id}`, game_link: `${domain}/cross/cross_phonics_v2/?id=${game.id}`, }));
+
+
+    const combinedResults = {
+      game_drawing: formattedGame1,
+      game_drawing_v2: formattedGame2,
+      game_drawing_v3: formattedGame3,
+      drawing_phonics: formattedGame4,
+      game_tick_variant1: formattedGame5,
+      game_tick_variant2: formattedGame6,
+      game_tick_varient3: formattedGame7,
+      game_cross_varient1: formattedGame8,
+      game_cross_varient2: formattedGame9,
+      game_cross_varient3: formattedGame10,
+      game_drag: formattedGame11,
+      game_drag_v2: formattedGame12,
+      game_drag_v4: formattedGame13,
+      game_tick_v3_phonics: formattedGame14,
+      tick_phonics_option_6: formattedGame15,
+      tick_phonics_option_9: formattedGame16,
+      drag_drop_phonics: formattedGame17,
+      drag_phonics: formattedGame18,
+      cross_phonics_option_9: formattedGame19
+    };
+
+    res.status(200).send(combinedResults);
+  } catch (error) {
+    console.error('Error querying game tables:', error);
+    res.status(500).send({ error: 'An error occurred while fetching game data.' });
+  } finally {
+    // Release the connection back to the pool
+    if (connection) connection.release();
+  }
+};
+
+module.exports = gameInfo;

src/routes/v1/api.route.js

@@ -31,11 +31,11 @@ const aiMarkDrawing = require("../api/aiMarkDrawing");
 const aiFeedbackOnReportWithFollowup = require("../api/aiFeedbackOnReportWithFollowup");
 const aiTextToSpeech = require("../api/aiTextToSpeech");
 const aiEvaluateImageToStar = require("../api/aiEvaluateImageToStar");
+const getGameInfo = require("../api/getGameInfo");
 const saveGalleryImage = require("../api/saveGalleryImage");
 const getGalleryImage = require("../api/getGalleryImage");
 
 
-
 const router = express.Router();
 /* GET home page. */
 router.get("/ping", (req, res) => {
@@ -193,8 +193,12 @@ router.get("/ping", (req, res) => {
     aiEvaluateImageToStar(req, res);
   });
 
-
+  // getGameInfo.
-// Save Drawing Game Gallery Image
+  router.get("/getGameInfo", (req, res) => {
+    getGameInfo(req, res);
+  });
+  
+  // Save Drawing Game Gallery Image
   router.post("/saveGalleryImage", (req, res) => {
     saveGalleryImage(req, res);
   });
@@ -204,7 +208,6 @@ router.get("/ping", (req, res) => {
     getGalleryImage(req, res);
   });
   
-  
 
 module.exports = router;