Frontend

backend/authentication/authentication.js

@@ -39,7 +39,7 @@ router.post("", async function (req, res) {
             if (!user) {
                 user = new User({
                     email: payload["email"],
-                    password: "default-google-password-to-be-changed",
+                    password: "google-pass-to-be-changed",
                 });
                 await user.save();
             }

backend/controllers/reportsController.js

@@ -91,6 +91,7 @@ export const updateReport = async (req, res) => {
         res.status(200).json(report);
     } catch (error) {
         res.status(400).json({ message: "Error in report update" });
+        console.log(error.message)
     }
 };
 

frontend/src/components/Mappa/Mappa.vue

@@ -22,6 +22,8 @@ const props = defineProps({
     },
 });
 
+const filteredEmergencies = ref([])
+
 onMounted(() => {
     // Recupero i bordi del comune di Trento da OpenStreetMap
     fetch('https://nominatim.openstreetmap.org/search.php?city=Trento&polygon_geojson=1&format=json')
@@ -34,14 +36,20 @@ onMounted(() => {
         .catch(error => {
             console.error('Errore caricamento mappa:', error);
         });
+
+    filteredEmergencies.value = props.emergencies?.filter(emergency => {
+        return emergency.coordinates.lat !== null &&
+            emergency.coordinates.lon !== null;
+    })
+    console.log(filteredEmergencies)
 });
 </script>
 
 <template>
     <div class="map-div w-full h-full m-0 p-0 z-40">
         <l-map :zoom="zoom" :center="center">
             <l-tile-layer :url="url" :attribution="attribution"></l-tile-layer>
-            <l-marker v-for="marker in emergencies" :key="marker.id"
+            <l-marker v-for="marker in filteredEmergencies" :key="marker.id"
                 :lat-lng="[marker.coordinates.lat, marker.coordinates.lon]">
                 <l-popup>
                     <div class="flex justify-start">

frontend/src/components/Navbar/Navbar.vue

@@ -49,7 +49,7 @@ function chiudiMenuNavbar() {
                                 <p class="ms-1 mt-0.5">Storico emergenze</p>
                             </router-link>
                         </li>
-                        <li class="menu-title px-0">
+                        <li v-if="!loggedUser.role" class="menu-title px-0">
                             <router-link to="/accedi" class="px-0 flex" @click="chiudiMenuNavbar()">
                                 <KeyIcon class="size-6 mx-2" />
                                 <p class="ms-1 mt-0.5">Accedi</p>

frontend/src/components/Tabelle/TabellaSegnalazioni.vue

@@ -68,7 +68,7 @@ const filteredReports = computed(() => {
                             {{ index + 1 }}
                         </td>
                         <td v-if="props.isOperator">
-                            {{ report.email }}
+                            <span v-html="report.email ? report.email : '<i>Utente rimosso</i>'"></span>
                         </td>
                         <td v-else>
                             {{ report.createdAt }}

frontend/src/components/Toast/Toast.vue

@@ -1,6 +1,4 @@
 <script setup>
-import { computed } from 'vue';
-
 import {
     CheckCircleIcon,
     ExclamationTriangleIcon,

frontend/src/data/reports.js

@@ -168,3 +168,25 @@ export async function createReport(data) {
         return null;
     }
 }
+
+export async function updateReport(data) {
+    try {
+        const response = await fetch(apiReports + data.id, {
+            method: "PUT",
+            headers: {
+                "Content-Type": "application/json",
+                Authorization: `Bearer ${loggedUser.token}`,
+            },
+            body: JSON.stringify(data),
+        });
+
+        if (!response.ok) {
+            throw new Error("Errore nell'aggiornamento del report");
+        }
+
+        return response.json();
+    } catch (error) {
+        console.error("Errore da updateReport(): ", error);
+        return null;
+    }
+}

frontend/src/router/index.js

@@ -43,6 +43,11 @@ const router = createRouter({
       name: 'invia_segnalazione',
       component: () => import('../views/user/ViewSegnalazione.vue'),
     },
+    {
+      path: '/conferma_segnalazione',
+      name: 'conferma_segnalazione',
+      component: () => import('../views/dashboard/ViewEditSegnalazione.vue'),
+    },
     {
       path: '/pubblica_comunicazione',
       name: 'pubblica_comunicazione',

frontend/src/views/dashboard/ViewDashboard.vue

@@ -30,6 +30,10 @@ onMounted(async () => {
     if (route.query.published === 'true') {
         createToast("success", "Successo!", "Comunicazione pubblicata correttamente")
     }
+
+    if (route.query.published === 'true') {
+        createToast("success", "Successo!", "Comunicazione modificata correttamente")
+    }
 
     if (route.query.approved === 'true') {
         createToast("info", "Successo!", "Segnalazione approvata correttamente")
@@ -98,7 +102,7 @@ function createToast(type, title, msg) {
                         </div>
                     </div>
                     <div class="stat">
-                        <div class="stat-figure text-ghost">
+                        <div class="stat-figure text-warning">
                             <ShieldExclamationIcon class="inline-block size-12" />
                         </div>
                         <div class="stat-title">Segnalazioni inviate</div>
@@ -108,7 +112,7 @@ function createToast(type, title, msg) {
                         </div>
                     </div>
                     <div class="stat">
-                        <div class="stat-figure text-ghost">
+                        <div class="stat-figure text-primary">
                             <ShieldCheckIcon class="inline-block size-12" />
                         </div>
                         <div class="stat-title">Emergenze pubblicate</div>
@@ -177,7 +181,7 @@ function createToast(type, title, msg) {
 }
 
 .stat:hover {
-    color: var(--primary);
+    color: var(--primary) !important;
     transform: scale(1.05);
 }
 

frontend/src/views/dashboard/ViewEditComunicazione.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, onMounted } from 'vue'
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { loggedUser } from '../../states/loggedUser.js';
 import { updateEmergency } from '@/data/emergencies.js';
 
@@ -11,19 +11,21 @@ import WrongURL from '@/components/Error/WrongURL.vue';
 import Toast from '@/components/Toast/Toast.vue';
 
 const route = useRoute();
+const router = useRouter();
+
 const apiEmergencies = import.meta.env.VITE_API_BASE_URL + "/emergencies/";
 
 const self = ref()
 const title = ref()
-const category = ref("Di che tipo è l'emergenza?")
+const category = ref()
 const startDate = ref()
 const startTime = ref()
 const location = ref()
 const coordinates = ref({
     lat: null,
     lon: null
 });
-const state = ref("In che stato è l'emergenza?")
+const state = ref()
 const description = ref()
 
 onMounted(() => {
@@ -93,7 +95,7 @@ function modificaComunicazione() {
 
     console.log('Values: ', updatedEmergency)
     updateEmergency(updatedEmergency)
-    createToast("success", "Successo!", "Comunicazione modificata correttamente")
+    router.push({ path: '/dashboard', query: { edited: 'true' } })
 }
 
 const showToast = ref(false)
@@ -116,7 +118,7 @@ function createToast(type, title, msg) {
 
 <template>
     <div v-if="loggedUser.token && loggedUser.role === 'operator'">
-        <div v-if="self === null">
+        <div v-if="!self">
             <WrongURL />
         </div>
 
@@ -215,7 +217,7 @@ function createToast(type, title, msg) {
                     <div class="w-full">
                         <input @click="modificaComunicazione()" type="button" value="Modifica comunicazione"
                             class="btn btn-primary float-end rounded-lg mt-6" />
-                        <input @click="$router.go(-1)" type="button" value="Annulla"
+                        <input @click="$router.go(-1)" type="button" value="Torna alla dashboard"
                             class="btn btn-ghost btn-outline float-end rounded-lg mt-6 me-2" />
                     </div>
                 </form>