Refactor Analysis

.env.example

@@ -30,7 +30,7 @@ NUXT_REDIS_HOST=localhost
 NUXT_REDIS_PORT=6379
 NUXT_REDIS_PASSWORD=
 NUXT_REDIS_DB=0
-NUXT_REDIS_KEY_PREFIX=nuha_auth:
+NUXT_REDIS_KEY_PREFIX=nuha:
 
 # Strapi configs
 STRAPI_URL=

.sample.env

@@ -52,8 +52,8 @@ NUXT_REDIS_PORT=6379
 NUXT_REDIS_PASSWORD=supersecret
 #samplr#NUXT_REDIS_DB=0
 NUXT_REDIS_DB=0
-#samplr#NUXT_REDIS_KEY_PREFIX=nuha_auth:
-NUXT_REDIS_KEY_PREFIX=nuha_auth:
+#samplr#NUXT_REDIS_KEY_PREFIX=nuha:
+NUXT_REDIS_KEY_PREFIX=nuha:
 
 # Base URL (update for production)
 #samplr#NUXT_PUBLIC_BASE_URL=http://localhost:3000
@@ -75,3 +75,10 @@ NUXT_API_PARTY_ENDPOINTS_CMS_URL=http://localhost:1337
 NUXT_API_PARTY_ENDPOINTS_CMS_TOKEN=
 #samplr#NUXT_PUBLIC_CMS_PREFIX=/api
 NUXT_PUBLIC_CMS_PREFIX=/api
+
+#samplr#NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_MATOMO_URL=
+NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_MATOMO_URL=
+#samplr#NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_SITE_ID=
+NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_SITE_ID=
+#samplr#NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_TRACKER_URL=
+NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_TRACKER_URL=

.woodpecker/build-latest-image.yaml

@@ -32,7 +32,7 @@ variables:
 
 steps:
   - name: run-pre-commit-hooks
-    image: josaorg/pre-commit-runner
+    image: registry.cloud.josa.ngo/library/pre-commit-runner
     settings:
       args: "--all-files"
       skip: "end-of-file-fixer, run-samplr"

.woodpecker/build-stable-image.yaml

@@ -33,7 +33,7 @@ variables:
 
 steps:
   - name: run-pre-commit-hooks
-    image: josaorg/pre-commit-runner
+    image: registry.cloud.josa.ngo/library/pre-commit-runner
     settings:
       args: "--all-files"
       skip: "end-of-file-fixer, run-samplr"

Dockerfile

@@ -38,7 +38,7 @@ ENV NUXT_REDIS_HOST=redis
 ENV NUXT_REDIS_PORT=6379
 ENV NUXT_REDIS_PASSWORD=
 ENV NUXT_REDIS_DB=0
-ENV NUXT_REDIS_KEY_PREFIX=nuha_auth:
+ENV NUXT_REDIS_KEY_PREFIX=nuha:
 
 COPY --from=builder --chown=nuxt:nodejs /app/.output /app/.output
 

README.md

@@ -144,6 +144,11 @@ NUXT_AI_MODEL_URL=your-ai-endpoint
 # Sets the default AI model dialect
 # Must match a supported region code from your the CMS (e.g., 'egy' for Egyptian model)
 NUXT_PUBLIC_AI_MODEL_DEFAULT_REGION=egy
+
+# Matomo Analytics Configurations
+NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_MATOMO_URL=
+NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_SITE_ID=
+NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_TRACKER_URL=
 ```
 
 ## CMS Setup

assets/css/typography.css

@@ -1,22 +1,22 @@
 @layer base {
   h1 {
-    @apply font-LTZarid text-h1-m lg:text-h1;
+    @apply font-LTZarid text-h1-m lg:text-h1 print:!font-LTZarid;
   }
 
   h2 {
-    @apply font-LTZarid text-h2-m lg:text-h2;
+    @apply font-LTZarid text-h2-m lg:text-h2 print:!font-LTZarid;
   }
 
   h3 {
-    @apply font-LTZarid text-h3-m lg:text-h3;
+    @apply font-LTZarid text-h3-m lg:text-h3 print:!font-LTZarid;
   }
 
   h4 {
-    @apply font-LTZarid text-h4-m lg:text-h4;
+    @apply font-LTZarid text-h4-m lg:text-h4 print:!font-LTZarid;
   }
 
   body {
-    @apply font-IBMPlexSansArabic text-base font-normal;
+    @apply font-IBMPlexSansArabic text-base font-normal print:!font-IBMPlexSansArabic;
   }
 
   small {

components/Analyze/DownloadModal.vue

@@ -20,6 +20,31 @@
       />
 
       <div class="grid grid-cols-1 gap-3">
+        <!-- XLSX Download (Highlighted) -->
+        <UiButton
+          variant="outline"
+          size="lg"
+          class="h-auto p-4"
+          :disabled="downloading"
+          @click="downloadXLSX"
+        >
+          <template #icon>
+            <Icon name="mdi:file-excel" size="24" />
+          </template>
+          <div class="flex-1 text-start">
+            <div class="font-bold">
+              {{ $t('analyze.results.download.xlsx') }}
+            </div>
+            <div class="mt-1 text-sm opacity-70">
+              {{ $t('analyze.results.download.xlsxDescription') }}
+            </div>
+            <div class="mt-1 flex items-center gap-1 text-sm opacity-90">
+              <Icon name="mdi:star" size="18" />
+              {{ $t('analyze.help.fileUpload.excelHint') }}
+            </div>
+          </div>
+        </UiButton>
+
         <!-- PDF Download -->
         <UiButton
           variant="ghost"
@@ -41,44 +66,44 @@
           </div>
         </UiButton>
 
-        <!-- CSV Download -->
+        <!-- JSON Download -->
         <UiButton
           variant="ghost"
           size="lg"
           class="h-auto border border-colors-neutral-foreground border-opacity-20 p-4"
           :disabled="downloading"
-          @click="downloadCSV"
+          @click="downloadJSON"
         >
           <template #icon>
-            <Icon name="mdi:file-table" size="24" class="text-green-600" />
+            <Icon name="mdi:code-json" size="24" class="text-blue-600" />
           </template>
           <div class="flex-1 text-start">
             <div class="font-medium">
-              {{ $t('analyze.results.download.csv') }}
+              {{ $t('analyze.results.download.json') }}
             </div>
             <div class="mt-1 text-sm opacity-70">
-              {{ $t('analyze.results.download.csvDescription') }}
+              {{ $t('analyze.results.download.jsonDescription') }}
             </div>
           </div>
         </UiButton>
 
-        <!-- JSON Download -->
+        <!-- CSV Download -->
         <UiButton
           variant="ghost"
           size="lg"
           class="h-auto border border-colors-neutral-foreground border-opacity-20 p-4"
           :disabled="downloading"
-          @click="downloadJSON"
+          @click="downloadCSV"
         >
           <template #icon>
-            <Icon name="mdi:code-json" size="24" class="text-blue-600" />
+            <Icon name="mdi:file-table" size="24" class="text-green-600" />
           </template>
           <div class="flex-1 text-start">
             <div class="font-medium">
-              {{ $t('analyze.results.download.json') }}
+              {{ $t('analyze.results.download.csv') }}
             </div>
             <div class="mt-1 text-sm opacity-70">
-              {{ $t('analyze.results.download.jsonDescription') }}
+              {{ $t('analyze.results.download.csvDescription') }}
             </div>
           </div>
         </UiButton>
@@ -101,7 +126,8 @@
 
   interface Props {
     modelValue: boolean
-    analysisData: AIAnalysisResponse | null
+    analysisData?: AIAnalysisResponse | null
+    jobId?: string
     onPrintPDF?: () => void
   }
 
@@ -136,7 +162,7 @@
   }
 
   const downloadFile = async (endpoint: string, filename: string) => {
-    if (!props.analysisData) {
+    if (!props.jobId && !props.analysisData) {
       showNotification(t('analyze.results.download.downloadError'), 'error')
       return
     }
@@ -147,7 +173,8 @@
       const response = await $fetch(endpoint, {
         method: 'POST',
         body: {
-          data: props.analysisData,
+          job_id: props.jobId,
+          // data: props.analysisData,
         },
       })
 
@@ -157,7 +184,7 @@
       if (endpoint.includes('csv')) {
         // CSV response is already a string
         fileContent = response as string
-        mimeType = 'text/csv'
+        mimeType = 'text/csv;charset=utf-8'
       } else {
         // JSON response needs to be stringified if it's an object
         fileContent =
@@ -168,7 +195,9 @@
       }
 
       // Create blob and download
-      const blob = new Blob([fileContent], { type: mimeType })
+      const blob = new Blob([new Uint8Array([0xef, 0xbb, 0xbf]), fileContent], {
+        type: mimeType,
+      })
 
       const url = window.URL.createObjectURL(blob)
       const link = document.createElement('a')
@@ -200,6 +229,51 @@
     }
   }
 
+  const downloadXLSX = async () => {
+    if (!props.jobId && !props.analysisData) {
+      showNotification(t('analyze.results.download.downloadError'), 'error')
+      return
+    }
+
+    downloading.value = true
+
+    try {
+      const response = await $fetch('/api/analyze/download/xlsx', {
+        method: 'POST',
+        body: {
+          job_id: props.jobId,
+          // data: props.analysisData,
+        },
+        responseType: 'arrayBuffer',
+      })
+
+      const timestamp = new Date()
+        .toISOString()
+        .replace(/[:.]/g, '-')
+        .slice(0, -5)
+
+      const blob = new Blob([response], {
+        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      })
+
+      const url = window.URL.createObjectURL(blob)
+      const link = document.createElement('a')
+      link.href = url
+      link.download = `nuha_analysis_results_${timestamp}.xlsx`
+      document.body.appendChild(link)
+      link.click()
+      document.body.removeChild(link)
+      window.URL.revokeObjectURL(url)
+
+      showNotification(t('analyze.results.download.downloadSuccess'))
+    } catch (error) {
+      console.error('Download error:', error)
+      showNotification(t('analyze.results.download.downloadError'), 'error')
+    } finally {
+      downloading.value = false
+    }
+  }
+
   const downloadCSV = () => {
     // ISO 8601 format: YYYY-MM-DDTHH-MM-SS
     const timestamp = new Date()