fix: fixing conflits
This commit is contained in:
parent
6306a00eca
commit
37e631a096
@ -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;
|
||||
|
@ -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" },
|
||||
|
Loading…
x
Reference in New Issue
Block a user