From 37e631a096ccd82d94a7fdd3af55bb8e96ae504b Mon Sep 17 00:00:00 2001
From: ALAMI Adnane <Adnane.Alami@bordeaux-inp.fr>
Date: Wed, 16 Apr 2025 10:36:06 +0200
Subject: [PATCH] fix: fixing conflits
---
front/MyINPulse-front/src/components/canvas/CanvasItem.vue | 4 +++-
front/MyINPulse-front/src/components/canvas/LeanCanvas.vue | 5 +++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/front/MyINPulse-front/src/components/canvas/CanvasItem.vue b/front/MyINPulse-front/src/components/canvas/CanvasItem.vue
index 51cd5be..a397c02 100755
--- a/front/MyINPulse-front/src/components/canvas/CanvasItem.vue
+++ b/front/MyINPulse-front/src/components/canvas/CanvasItem.vue
@@ -50,15 +50,17 @@ import axios from "axios";
import { axiosInstance } from "@/services/api.ts";
const IS_MOCK_MODE = true;
-const IS_ADMIN = false;
const props = defineProps<{
projectId: number;
title: number;
title_text: string;
description: string;
+ is_admin: number;
}>();
+const IS_ADMIN = props.is_admin;
+
const expanded = ref(false);
const currentDescriptions = ref<string[]>([]);
currentDescriptions.value[0] = props.description;
diff --git a/front/MyINPulse-front/src/components/canvas/LeanCanvas.vue b/front/MyINPulse-front/src/components/canvas/LeanCanvas.vue
index 8f84140..58733fe 100644
--- a/front/MyINPulse-front/src/components/canvas/LeanCanvas.vue
+++ b/front/MyINPulse-front/src/components/canvas/LeanCanvas.vue
@@ -8,6 +8,7 @@
:description="item.description"
:projectId="item.projectId"
:class="['canvas-item', item.class, 'card', 'shadow', 'p-3']"
+ :is_admin=is_admin
/>
</div>
</template>
@@ -16,6 +17,10 @@
import { ref, onMounted } from "vue";
import CanvasItem from "@/components/canvas/CanvasItem.vue";
+const props = defineProps<{
+ is_admin: number;
+}>();
+
const items = ref([
{ projectId: 1, title: 1, title_text: "1. Problème", description: "3 problèmes essentiels à résoudre pour le client", class: "Probleme" },
{ projectId: 1, title: 2, title_text: "2. Segments", description: "Les segments de clientèle visés", class: "Segments" },