Amout scholaship

Author: vtamara

apps/nextjs/app/[lang]/[pathPrefix]/page.tsx

@@ -29,7 +29,7 @@ export default function Page({ params }: PageProps) {
   const parameters = use(params)
   const { lang, pathPrefix } = parameters
 
-  const { course, loading, error, percentageCompleted } = useGuideData({
+  const { course, loading, error, percentageCompleted, amountScholarship } = useGuideData({
     lang,
     pathPrefix,
   })
@@ -121,6 +121,12 @@ export default function Page({ params }: PageProps) {
                   {lang === 'es' ? 'Total de guías aprovadas: ' : 'Total de guías aprovadas: '}
                   {course.guias.filter(g => g.completed).length}
                 </div>
+                {amountScholarship !== null && (
+                  <div className="text-sm text-gray-600 font-medium">
+                    {lang === 'es' ? 'Total en USDT ganado: ' : 'Total USDT earned: '}
+                    ${amountScholarship.toFixed(2)} USDT
+                  </div>
+                )}
               </div>
             </div>
           )}

apps/nextjs/app/api/scholarship/route.ts

@@ -100,18 +100,24 @@ export async function GET(req: NextRequest) {
     let canSubmit = false
     let amountPerGuide = 0
     let percentageCompleted = null
+    let amountScholarship = null
 
     // Obtener porcentaje completado del curso si hay usuario y curso válido
     if (retMessage === '' && billeteraUsuario && billeteraUsuario.usuario_id && !isNaN(courseIdNumber)) {
       try {
         const courseUsuario = await db
           .selectFrom('course_usuario')
-          .select('percentagecompleted')
+          .select(['percentagecompleted', 'amountscholarship'])
           .where('usuario_id', '=', billeteraUsuario.usuario_id)
           .where('proyectofinanciero_id', '=', courseIdNumber)
           .executeTakeFirst()
-        if (courseUsuario && courseUsuario.percentagecompleted !== null) {
-          percentageCompleted = Number(courseUsuario.percentagecompleted)
+        if (courseUsuario) {
+          if (courseUsuario.percentagecompleted !== null) {
+            percentageCompleted = Number(courseUsuario.percentagecompleted)
+          }
+          if (courseUsuario.amountscholarship !== null) {
+            amountScholarship = Number(courseUsuario.amountscholarship)
+          }
         }
       } catch (error) {
         console.error('Error fetching percentage completed:', error)
@@ -206,6 +212,7 @@ export async function GET(req: NextRequest) {
     console.log('** Normal exit with amountPerGuide=', amountPerGuide)
     console.log('** Normal exit with canSubmit=', canSubmit)
     console.log('** Normal exit with percentageCompleted=', percentageCompleted)
+    console.log('** Normal exit with amountScholarship=', amountScholarship)
     console.log('** Normal exit with message=', retMessage)
     return NextResponse.json(
       {
@@ -215,6 +222,7 @@ export async function GET(req: NextRequest) {
         amountPerGuide: amountPerGuide,
         canSubmit: canSubmit,
         percentageCompleted: percentageCompleted,
+        amountScholarship: amountScholarship,
         message: retMessage,
       },
       { status: 200 },

apps/nextjs/lib/hooks/useGuideData.ts

@@ -54,6 +54,7 @@ export function useGuideData({
   const [previousGuidePath, setPreviousGuidePath] = useState('')
   const [coursePath, setCoursePath] = useState('')
   const [percentageCompleted, setPercentageCompleted] = useState<number | null>(null)
+  const [amountScholarship, setAmountScholarship] = useState<number | null>(null)
 
   useEffect(() => {
     const fetchGuideData = async () => {
@@ -107,16 +108,19 @@ export function useGuideData({
         const detailResponse = await axios.get(detailUrl)
         const detailedCourse = detailResponse.data
 
-        // Fetch percentage completed
+        // Fetch percentage completed and scholarship amount
         if (session && address && detailedCourse.id) {
           try {
             const scholarshipUrl = `/api/scholarship?courseId=${detailedCourse.id}&walletAddress=${address}&token=${csrfToken}`
             const scholarshipRes = await axios.get(scholarshipUrl)
             if (scholarshipRes.data.percentageCompleted !== null) {
               setPercentageCompleted(Number(scholarshipRes.data.percentageCompleted))
             }
+            if (scholarshipRes.data.amountScholarship !== null) {
+              setAmountScholarship(Number(scholarshipRes.data.amountScholarship))
+            }
           } catch (err) {
-            console.error('Error fetching percentage completed:', err)
+            console.error('Error fetching scholarship data:', err)
             // Don't fail the whole request
           }
         }
@@ -189,6 +193,7 @@ export function useGuideData({
     previousGuidePath,
     coursePath,
     percentageCompleted,
+    amountScholarship,
   }
 }