Merge pull request #459 from ruxailab/deployProdFix

fix(notifications): and added firebase config files
ruxailab · Apr 24, 2024 · c7658f5 · c7658f5
2 parents 3cd36ca + 22ce629
commit c7658f5
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 147 deletions.
diff --git a/.firebaserc b/.firebaserc
@@ -2,7 +2,8 @@
   "projects": {
     "default": "retlab-dev",
     "dev": "retlab-dev",
-    "production": "retlab"
+    "production": "retlab",
+    "prod": "ruxailab-prod"
   },
   "targets": {
     "retlab-dev": {

diff --git a/firebase.json b/firebase.json
@@ -4,26 +4,33 @@
     "indexes": "firestore.indexes.json"
   },
   "functions": {
-    "predeploy": [
-      "npm --prefix \"$RESOURCE_DIR\" run lint"
-    ],
+    "predeploy": ["npm --prefix \"$RESOURCE_DIR\" run lint"],
     "source": "functions"
   },
-  "hosting": {
-    "site": "ruxailab-dev",
-    "public": "dist",
-    "ignore": [
-      "firebase.json",
-      "**/.*",
-      "**/node_modules/**"
-    ],
-    "rewrites": [
-      {
-        "source": "**",
-        "destination": "/index.html"
-      }
-    ]
-  },
+  "hosting": [
+    {
+      "site": "ruxailab-dev",
+      "public": "dist",
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ]
+    },
+    {
+      "site": "ruxailab-prod",
+      "public": "dist",
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ]
+    }
+  ],
   "emulators": {
     "auth": {
       "port": 9099

diff --git a/package.json b/package.json
@@ -10,8 +10,8 @@
     "test": "vue-cli-service test:unit",
     "build-dev": "vue-cli-service build --mode development",
     "build-prod": "vue-cli-service build --mode production",
-    "deploy-dev": "firebase use dev && firebase deploy --only hosting",
-    "deploy-prod": "firebase use production && firebase deploy --only hosting"
+    "deploy-dev": "firebase use dev && firebase deploy --only hosting:ruxailab-dev",
+    "deploy-prod": "firebase use prod && firebase deploy --only hosting:ruxailab-prod"
   },
   "dependencies": {
     "axios": "^1.5.0",

diff --git a/src/components/atoms/NotificationButton.vue b/src/components/atoms/NotificationButton.vue
@@ -107,7 +107,7 @@ export default {
         user: this.user,
       })
       // Redirect to notification url
-      this.$router.go(`${notification.redirectsTo}`)
+      this.$router.push(notification.redirectsTo)
     },
     checkIfHasNewNotifications() {
       const newNot = this.user.notifications.filter((n) => n.read === false)

diff --git a/src/components/organisms/HeuristicsTestAnswer.vue b/src/components/organisms/HeuristicsTestAnswer.vue
@@ -195,7 +195,13 @@
           </v-card>
 
           <!-- Tab 3 - Heuristics-->
-          <v-card v-if="tab == 2" rounded="xl" flat class="mb-6 py-2" style="background: #f5f7ff">
+          <v-card
+            v-if="tab == 2"
+            rounded="xl"
+            flat
+            class="mb-6 py-2"
+            style="background: #f5f7ff"
+          >
             <div>
               <v-card-title class="subtitleView">
                 Heuristics Data
@@ -701,7 +707,6 @@ export default {
       //✓
       this.$emit('goToCoops')
     },
-
     usuability_percentage_array() {
       const teste = this.heuristicsStatistics
       const array_scores = []

diff --git a/src/views/admin/AnswerView.vue b/src/views/admin/AnswerView.vue
@@ -23,129 +23,6 @@ export default {
     showFinalResult() {
       return finalResult()
     },
-    evaluatorStatistics() {
-      return this.$store.state.Answer.evaluatorStatistics
-    },
-    sortedEvaluatorStatistics() {
-    return this.evaluatorStatistics.items.slice().sort((a, b) => {
-      const parseDate = (dateStr) => {
-        const [day, month, yearTime] = dateStr.split('/')
-        const [year, time] = yearTime.split(', ')
-        const [hours, minutes, seconds] = time.split(':')
-        // Adjust the date format to 'month/day/year'
-        return new Date(`${month}/${day}/${year} ${time}`)
-      }
-
-      const dateA = parseDate(a.lastUpdate)
-      const dateB = parseDate(b.lastUpdate)
-
-      return dateB - dateA // sort in descending order
-    })
-  },
-    heuristicsEvaluator() {
-      const table = {
-        header: [],
-        items: [],
-      }
-      const options = this.test.testOptions.map((op) => op.value)
-      const max = Math.max(...options)
-      const min = Math.min(...options)
-
-      table.header.push({
-        text: 'HEURISTICS',
-        align: 'start',
-        value: 'heuristic',
-      })
-      if (this.resultEvaluator) {
-        this.resultEvaluator.forEach((evaluator) => {
-          const header = table.header.find((h) => h.text == evaluator.id)
-          if (!header) {
-            table.header.push({
-              text: evaluator.id,
-              align: 'center',
-              value: evaluator.id,
-            })
-          }
-          evaluator.heuristics.forEach((heuristic) => {
-            const item = table.items.find((i) => i.heuristic == heuristic.id)
-            if (item) {
-              Object.assign(item, {
-                [evaluator.id]: heuristic.result,
-              })
-            } else {
-              table.items.push({
-                heuristic: heuristic.id,
-                max: max * heuristic.totalQuestions,
-                min: min * heuristic.totalQuestions,
-                [evaluator.id]: heuristic.result,
-              })
-            }
-          })
-        })
-      }
-      return table
-    },
-    heuristicsStatistics() {
-      const table = {
-        header: [],
-        items: [],
-      }
-
-      table.header = [
-        {
-          text: 'HEURISTICS',
-          align: 'start',
-          sortable: false,
-          value: 'name',
-        },
-        {
-          text: 'Percentage (%)',
-          value: 'percentage',
-          align: 'center',
-          sortable: false,
-        },
-
-        {
-          text: 'Standard deviation',
-          value: 'sd',
-          align: 'center',
-          sortable: false,
-        },
-        {
-          text: 'Average',
-          value: 'average',
-          align: 'center',
-          sortable: false,
-        },
-        { text: 'Max', value: 'max', align: 'center', sortable: false },
-        { text: 'Min', value: 'min', align: 'center', sortable: false },
-      ]
-
-      if (this.heuristicsEvaluator.items) {
-        this.heuristicsEvaluator.items.forEach((item) => {
-          const results = Object.entries(item)
-            .filter((item) => item[0].includes('Ev'))
-            .map((item) => item[1])
-          const valueToConvert = results
-              .reduce((total, value) => total + value / results.length, 0)
-              .toFixed(2),
-            convertedValue =
-              ((valueToConvert - item.min) / (item.max - item.min)) * 100
-          table.items.push({
-            name: item.heuristic,
-            max: Math.max(item.max).toFixed(2),
-            min: Math.min(item.min).toFixed(2),
-            percentage: convertedValue.toFixed(2),
-            sd: standardDeviation(results).toFixed(2),
-            average: results
-              .reduce((total, value) => total + value / results.length, 0)
-              .toFixed(2),
-          })
-        })
-      }
-      return table
-    },
-
     testAnswerDocument() {
       return this.$store.state.Answer.testAnswerDocument
     },