piair/MyINPulse
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: fixing conflits

Browse Source
This commit is contained in:
ALAMI Adnane 2025-04-16 10:36:06 +02:00
parent 6306a00eca
commit 37e631a096
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/MyINPulse-front/src/components/canvas/CanvasItem.vue
View File

@ -50,15 +50,17 @@ import axios from "axios";
import { axiosInstance } from "@/services/api.ts"; import { axiosInstance } from "@/services/api.ts";
const IS_MOCK_MODE = true; const IS_MOCK_MODE = true;
const IS_ADMIN = false;
const props = defineProps<{ const props = defineProps<{
projectId: number; projectId: number;
title: number; title: number;
title_text: string; title_text: string;
description: string; description: string;
is_admin: number;
}>(); }>();
const IS_ADMIN = props.is_admin;
const expanded = ref(false); const expanded = ref(false);
const currentDescriptions = ref<string[]>([]); const currentDescriptions = ref<string[]>([]);
currentDescriptions.value[0] = props.description; currentDescriptions.value[0] = props.description;

5
front/MyINPulse-front/src/components/canvas/LeanCanvas.vue
View File

@ -8,6 +8,7 @@
:description="item.description" :description="item.description"
:projectId="item.projectId" :projectId="item.projectId"
:class="['canvas-item', item.class, 'card', 'shadow', 'p-3']" :class="['canvas-item', item.class, 'card', 'shadow', 'p-3']"
:is_admin=is_admin
/> />
</div> </div>
</template> </template>
@ -16,6 +17,10 @@
import { ref, onMounted } from "vue"; import { ref, onMounted } from "vue";
import CanvasItem from "@/components/canvas/CanvasItem.vue"; import CanvasItem from "@/components/canvas/CanvasItem.vue";
const props = defineProps<{
is_admin: number;
}>();
const items = ref([ 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: 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" }, { projectId: 1, title: 2, title_text: "2. Segments", description: "Les segments de clientèle visés", class: "Segments" },