From a0eeb6715e15890e30875833da63c9f55147fab6 Mon Sep 17 00:00:00 2001 From: ALAMI Adnane Date: Mon, 21 Apr 2025 17:38:14 +0200 Subject: [PATCH] fix: fixing the eslint stuff --- .../src/components/ProjectComponent.vue | 193 +++++++++++++++--- .../src/components/canvas/CanvasItem.vue | 4 +- .../src/components/canvas/HeaderCanvas.vue | 3 +- .../src/components/canvas/LeanCanvas.vue | 6 +- front/MyINPulse-front/src/router/router.ts | 6 + front/MyINPulse-front/src/views/AdminMain.vue | 1 + .../MyINPulse-front/src/views/CanvasView.vue | 6 +- 7 files changed, 187 insertions(+), 32 deletions(-) diff --git a/front/MyINPulse-front/src/components/ProjectComponent.vue b/front/MyINPulse-front/src/components/ProjectComponent.vue index 983115f..b383b6f 100644 --- a/front/MyINPulse-front/src/components/ProjectComponent.vue +++ b/front/MyINPulse-front/src/components/ProjectComponent.vue @@ -2,9 +2,22 @@

{{ projectName }}

-
- -
+
+ +
+
    @@ -19,12 +32,15 @@ @@ -78,19 +189,6 @@ const goToLink = () => { background-color: #45a049; transform: scale(1.05); } - - .contact-btn { - background-color: #007BFF; - color: #fff; - } - - .contact-btn:hover { - background-color: #0056b3; - transform: scale(1.05); - } - - - .project-body { margin-top: 15px; @@ -115,16 +213,65 @@ const goToLink = () => { } - button { - padding: 10px 15px; - background-color: #007bff; + .header-actions { + display: flex; + align-items: center; + gap: 20px; + position: relative; +} + +.contact-button, +.return-button { + background-color: #009CDE; color: white; border: none; + padding: 10px 15px; cursor: pointer; + font-size: 14px; border-radius: 5px; + text-decoration: none; + transition: background-color 0.2s ease; + font-family: Arial, sans-serif; +} + +.return-button:hover, +.contact-button:hover { + background-color: #007bad; +} + + +.contact-dropdown { + position: absolute; + top: 100%; + left: 0; + background-color: #000; + color: white; + box-shadow: 0px 4px 8px rgba(255, 255, 255, 0.2); + border-radius: 8px; + padding: 10px; + margin-top: 5px; + z-index: 1000; + min-width: 200px; + display: none; +} + +.contact-dropdown button { + display: block; + width: 100%; + padding: 5px; + text-align: left; + border: none; + background: none; + cursor: pointer; + color: white; +} + +.contact-dropdown button:hover { + background-color: #009CDE; +} + +.contact-dropdown.dropdown-visible { + display: block; } - button:hover { - background-color: #0056b3; - } \ No newline at end of file diff --git a/front/MyINPulse-front/src/components/canvas/CanvasItem.vue b/front/MyINPulse-front/src/components/canvas/CanvasItem.vue index 226c456..3c665b8 100755 --- a/front/MyINPulse-front/src/components/canvas/CanvasItem.vue +++ b/front/MyINPulse-front/src/components/canvas/CanvasItem.vue @@ -56,10 +56,10 @@ const props = defineProps<{ title: number; titleText: string; description: string; - is_admin: number; + isAdmin: number; }>(); -const IS_ADMIN = props.is_admin; +const IS_ADMIN = props.isAdmin; const expanded = ref(false); const currentDescriptions = ref([]); diff --git a/front/MyINPulse-front/src/components/canvas/HeaderCanvas.vue b/front/MyINPulse-front/src/components/canvas/HeaderCanvas.vue index 3332465..980d251 100644 --- a/front/MyINPulse-front/src/components/canvas/HeaderCanvas.vue +++ b/front/MyINPulse-front/src/components/canvas/HeaderCanvas.vue @@ -125,7 +125,7 @@ const contactSingle = (email: string) => { }); }; - +/* const copyToClipboard = (email: string) => { navigator.clipboard.writeText(email).then(() => { alert(`Adresse copiée : ${email}`); @@ -133,6 +133,7 @@ const copyToClipboard = (email: string) => { console.error("Erreur lors de la copie :", err); }); }; +*/ onMounted(() => fetchEntrepreneurs(props.projectId, IS_MOCK_MODE)); diff --git a/front/MyINPulse-front/src/components/canvas/LeanCanvas.vue b/front/MyINPulse-front/src/components/canvas/LeanCanvas.vue index 69f332f..aa763b1 100644 --- a/front/MyINPulse-front/src/components/canvas/LeanCanvas.vue +++ b/front/MyINPulse-front/src/components/canvas/LeanCanvas.vue @@ -4,11 +4,11 @@ v-for="(item, index) in items" :key="index" :title="item.title" - :titleText="item.title_text" + :title-text="item.title_text" :description="item.description" :project-id="item.projectId" :class="['canvas-item', item.class, 'card', 'shadow', 'p-3']" - :is_admin=is_admin + :is-admin= props.isAdmin />
@@ -18,7 +18,7 @@ import { ref, onMounted } from "vue"; import CanvasItem from "@/components/canvas/CanvasItem.vue"; const props = defineProps<{ - is_admin: number; + isAdmin: number; }>(); const items = ref([ diff --git a/front/MyINPulse-front/src/router/router.ts b/front/MyINPulse-front/src/router/router.ts index c2a127a..50bf2b0 100644 --- a/front/MyINPulse-front/src/router/router.ts +++ b/front/MyINPulse-front/src/router/router.ts @@ -34,6 +34,12 @@ const router = createRouter({ name: 'signup', component: () => import('../views/EntrepSignUp.vue'), }, + + { + path: '/JorCproject', + name: 'JorCproject', + component: () => import('../views/JoinOrCreatProjectForEntrep.vue'), + }, ], }) diff --git a/front/MyINPulse-front/src/views/AdminMain.vue b/front/MyINPulse-front/src/views/AdminMain.vue index 2b2bd4b..c3e775b 100644 --- a/front/MyINPulse-front/src/views/AdminMain.vue +++ b/front/MyINPulse-front/src/views/AdminMain.vue @@ -10,6 +10,7 @@ :project-name="project.name" :list-name="project.members" :project-link="project.link" + :project-id="0" />
diff --git a/front/MyINPulse-front/src/views/CanvasView.vue b/front/MyINPulse-front/src/views/CanvasView.vue index 3c9c983..90ebfc4 100644 --- a/front/MyINPulse-front/src/views/CanvasView.vue +++ b/front/MyINPulse-front/src/views/CanvasView.vue @@ -10,7 +10,7 @@

Cliquez sur un champ du tableau pour afficher son contenu en détail ci-dessous.

- +

@@ -26,7 +26,7 @@ import HeaderCanvas from "../components/canvas/HeaderCanvas.vue"; import LeanCanvas from '../components/canvas/LeanCanvas.vue'; -import { ref, onMounted, defineProps} from "vue"; +import { ref, onMounted /*, defineProps*/} from "vue"; import { axiosInstance } from "@/services/api.ts"; const IS_MOCK_MODE = true; @@ -41,7 +41,7 @@ const props = defineProps<{ is_admin = token.includes("MyINPulse-admin") */ -const is_admin = 0 +const isAdmin = 0 // Variables pour les informations de l'administrateur const admin = ref({