From 72dd7699d6bd61e17b4c3dc0098ca0989a94b2c8 Mon Sep 17 00:00:00 2001
From: N3WT DE COMPET <n3wt.school@gmail.com>
Date: Fri, 31 Jan 2025 15:41:23 +0100
Subject: [PATCH] refactor: SpecialitySection + TeacherSection (en cours)

---
 Front-End/src/components/InputText.js         |  2 +-
 .../Structure/Configuration/ClassesSection.js |  2 +-
 .../Configuration/SpecialitiesSection.js      | 28 +---------
 .../Structure/Configuration/SpecialityItem.js | 31 +++++++++++
 .../Configuration/StructureManagement.js      |  8 +--
 .../Configuration/TeachersSection.js          | 54 ++++++++++++-------
 6 files changed, 75 insertions(+), 50 deletions(-)
 create mode 100644 Front-End/src/components/Structure/Configuration/SpecialityItem.js

diff --git a/Front-End/src/components/InputText.js b/Front-End/src/components/InputText.js
index c203ccb..f76f041 100644
--- a/Front-End/src/components/InputText.js
+++ b/Front-End/src/components/InputText.js
@@ -1,7 +1,7 @@
 export default function InputText({name, type, label, value, onChange, errorMsg, placeholder, className, required}) {
     return (
         <>
-            <div className={`mb-4 ${className}`}>
+            <div className={`${className}`}>
                 <label htmlFor={name} className="block text-sm font-medium text-gray-700">
                     {label}
                     {required && <span className="text-red-500 ml-1">*</span>}
diff --git a/Front-End/src/components/Structure/Configuration/ClassesSection.js b/Front-End/src/components/Structure/Configuration/ClassesSection.js
index d2f8d07..31cd45d 100644
--- a/Front-End/src/components/Structure/Configuration/ClassesSection.js
+++ b/Front-End/src/components/Structure/Configuration/ClassesSection.js
@@ -100,7 +100,7 @@ const ClassesSection = ({ classes, teachers, handleCreate, handleEdit, handleDel
               transform: (row) => (
                 <div key={row.id} className="flex flex-wrap justify-center items-center space-x-2">
                   {row.teachers_details.map((teacher, index) => (
-                    <TeacherLabel key={teacher.id} nom={teacher.last_name} prenom={teacher.first_name} index={index} />
+                    <TeacherLabel key={`${teacher.id}-${index}`} nom={teacher.last_name} prenom={teacher.first_name} index={index} />
                   ))}                    
                 </div>
               )
diff --git a/Front-End/src/components/Structure/Configuration/SpecialitiesSection.js b/Front-End/src/components/Structure/Configuration/SpecialitiesSection.js
index 06cc45c..762bbca 100644
--- a/Front-End/src/components/Structure/Configuration/SpecialitiesSection.js
+++ b/Front-End/src/components/Structure/Configuration/SpecialitiesSection.js
@@ -3,33 +3,9 @@ import { useState } from 'react';
 import Table from '@/components/Table';
 import Popup from '@/components/Popup';
 import InputTextWithColorIcon from '@/components/InputTextWithColorIcon';
-import { DndProvider, useDrag } from 'react-dnd';
+import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
-
-const ItemTypes = {
-  SPECIALITY: 'speciality',
-};
-
-const SpecialityItem = ({ speciality }) => {
-  const [{ isDragging }, drag] = useDrag(() => ({
-    type: ItemTypes.SPECIALITY,
-    item: { id: speciality.id, name: speciality.name },
-    collect: (monitor) => ({
-      isDragging: !!monitor.isDragging(),
-    }),
-  }));
-
-  return (
-    <div
-      ref={drag}
-      className="inline-block px-3 py-1 rounded-full font-bold text-white text-center"
-      style={{ backgroundColor: speciality.color_code, opacity: isDragging ? 0.5 : 1 }}
-      title={speciality.name}
-    >
-      {speciality.name}
-    </div>
-  );
-};
+import SpecialityItem from '@/components/Structure/Configuration/SpecialityItem';
 
 const SpecialitiesSection = ({ specialities, setSpecialities, handleCreate, handleEdit, handleDelete }) => {
 
diff --git a/Front-End/src/components/Structure/Configuration/SpecialityItem.js b/Front-End/src/components/Structure/Configuration/SpecialityItem.js
new file mode 100644
index 0000000..8f0b801
--- /dev/null
+++ b/Front-End/src/components/Structure/Configuration/SpecialityItem.js
@@ -0,0 +1,31 @@
+import { useDrag } from 'react-dnd';
+import React from 'react';
+
+const ItemTypes = {
+  SPECIALITY: 'speciality',
+};
+
+const SpecialityItem = ({ speciality, isDraggable = true }) => {
+  const [{ isDragging }, drag] = useDrag(() => ({
+    type: ItemTypes.SPECIALITY,
+    item: { id: speciality.id, name: speciality.name },
+    collect: (monitor) => ({
+      isDragging: !!monitor.isDragging(),
+    }),
+    canDrag: () => isDraggable,
+  }), [isDraggable]);
+
+  return (
+    <div
+      ref={isDraggable ? drag : null}
+      className={`inline-block px-3 py-1 rounded-lg font-bold text-white text-center ${isDraggable ? 'cursor-pointer' : ''} transition-transform duration-200 ease-in-out ${
+        isDragging ? 'opacity-30' : 'opacity-100'
+      } ${isDraggable ? 'hover:shadow-lg hover:scale-125' : ''}`}
+      style={{ backgroundColor: speciality.color_code }}
+    >
+      {speciality.name}
+    </div>
+  );
+};
+
+export default SpecialityItem;
\ No newline at end of file
diff --git a/Front-End/src/components/Structure/Configuration/StructureManagement.js b/Front-End/src/components/Structure/Configuration/StructureManagement.js
index e5fda63..f343ff7 100644
--- a/Front-End/src/components/Structure/Configuration/StructureManagement.js
+++ b/Front-End/src/components/Structure/Configuration/StructureManagement.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import SpecialitiesSection from '@/components/Structure/Configuration/SpecialitiesSection';
 import TeachersSection from '@/components/Structure/Configuration/TeachersSection';
 import ClassesSection from '@/components/Structure/Configuration/ClassesSection';
@@ -9,7 +9,7 @@ const StructureManagement = ({ specialities, setSpecialities, teachers, setTeach
   return (
     <div className="max-w-8xl mx-auto p-4 mt-6 space-y-6">
       <ClassesProvider>
-        <div className="max-w-4xl p-4 bg-white rounded-lg shadow-md">
+        <div className="w-2/5 p-4 bg-white rounded-lg shadow-md">
           <SpecialitiesSection
             specialities={specialities}
             setSpecialities={setSpecialities}
@@ -18,7 +18,7 @@ const StructureManagement = ({ specialities, setSpecialities, teachers, setTeach
             handleDelete={(id) => handleDelete(`${BE_SCHOOL_SPECIALITY_URL}`, id, setSpecialities)}
           />
         </div>
-        <div className="max-w-8xl p-4 bg-white rounded-lg shadow-md">
+        <div className="w-4/5 p-4 bg-white rounded-lg shadow-md">
           <TeachersSection
             teachers={teachers}
             setTeachers={setTeachers}
@@ -28,7 +28,7 @@ const StructureManagement = ({ specialities, setSpecialities, teachers, setTeach
             handleDelete={(id) => handleDelete(`${BE_SCHOOL_TEACHER_URL}`, id, setTeachers)}
           />
         </div>
-        <div className="p-4 bg-white rounded-lg shadow-md">
+        <div className="w-4/5 p-4 bg-white rounded-lg shadow-md">
           <ClassesSection
             classes={classes}
             teachers={teachers}
diff --git a/Front-End/src/components/Structure/Configuration/TeachersSection.js b/Front-End/src/components/Structure/Configuration/TeachersSection.js
index 0eb1e57..d6d7d0a 100644
--- a/Front-End/src/components/Structure/Configuration/TeachersSection.js
+++ b/Front-End/src/components/Structure/Configuration/TeachersSection.js
@@ -1,14 +1,14 @@
 import React, { useState, useEffect } from 'react';
-import { Plus, Edit3, Trash2, GraduationCap, Check, X } from 'lucide-react';
+import { Plus, Edit3, Trash2, GraduationCap, Check, X, Hand } from 'lucide-react';
 import Table from '@/components/Table';
 import Popup from '@/components/Popup';
-import InputTextIcon from '@/components/InputTextIcon';
 import ToggleSwitch from '@/components/ToggleSwitch';
 import { createProfile, updateProfile } from '@/app/lib/authAction';
 import useCsrfToken from '@/hooks/useCsrfToken';
 import { DndProvider, useDrag, useDrop } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import InputText from '@/components/InputText';
+import SpecialityItem from '@/components/Structure/Configuration/SpecialityItem';
 
 const ItemTypes = {
   SPECIALITY: 'speciality',
@@ -17,6 +17,9 @@ const ItemTypes = {
 const SpecialitiesDropZone = ({ teacher, handleSpecialitiesChange, specialities, isEditing }) => {
   const [localSpecialities, setLocalSpecialities] = useState(teacher.specialities_details || []);
 
+  useEffect(() => {
+  }, [specialities]);
+
   useEffect(() => {
     setLocalSpecialities(teacher.specialities_details || []);
   }, [teacher.specialities_details]);
@@ -25,21 +28,29 @@ const SpecialitiesDropZone = ({ teacher, handleSpecialitiesChange, specialities,
     handleSpecialitiesChange(localSpecialities.map(speciality => speciality.id));
   }, [localSpecialities]);
 
-  const [{ isOver }, drop] = useDrop(() => ({
+  const [{ isOver, canDrop }, drop] = useDrop({
     accept: ItemTypes.SPECIALITY,
     drop: (item) => {
       const specialityDetails = specialities.find(speciality => speciality.id === item.id);
-      if (!localSpecialities.some(speciality => speciality.id === item.id)) {
-        setLocalSpecialities(prevSpecialities => [
-          ...prevSpecialities,
-          { id: item.id, name: specialityDetails.name, color_code: specialityDetails.color_code }
-        ]);
+      const exists = localSpecialities.some(speciality => speciality.id === item.id);
+      if (!exists) {
+        setLocalSpecialities(prevSpecialities => {
+          const updatedSpecialities = [
+            ...prevSpecialities,
+            { id: item.id, name: specialityDetails.name, color_code: specialityDetails.color_code }
+          ];
+          return updatedSpecialities;
+        });
       }
     },
     collect: (monitor) => ({
       isOver: !!monitor.isOver(),
+      canDrop: !!monitor.canDrop(),
     }),
-  }));
+    canDrop: () => {
+      return isEditing;
+    },
+  });
 
   const handleRemoveSpeciality = (id) => {
     setLocalSpecialities(prevSpecialities => {
@@ -49,16 +60,19 @@ const SpecialitiesDropZone = ({ teacher, handleSpecialitiesChange, specialities,
   };
 
   return (
-    <div ref={drop} className="p-2 rounded-md flex flex-col items-center">
+    <div ref={drop} className={`p-2 rounded-md flex flex-col items-center ${isEditing ? 'border-2 border-dashed border-blue-500 bg-blue-50' : ''} ${
+      isOver && canDrop ? 'border-2 border-solid border-blue-300' : ''
+    }`}
+    >
+    {isEditing && (
+        <div className="mb-2 text-blue-500 font-semibold flex items-center space-x-2">
+          <Hand className="w-5 h-5" /> {/* Ajoutez l'icône Hand */}
+          <span>Déposez une spécialité ici</span>
+        </div>
+      )}
       {localSpecialities.map((speciality, index) => (
         <div key={`${speciality.id}-${index}`} className="flex items-center space-x-2 mb-2">
-          <span
-            className="px-3 py-1 rounded-full font-bold text-white"
-            style={{ backgroundColor: speciality.color_code }}
-            title={speciality.name}
-          >
-            {speciality.name}
-          </span>
+          <SpecialityItem key={speciality.id} speciality={speciality} isDraggable={false}/>
           {isEditing && (
             <button
               type="button"
@@ -276,7 +290,11 @@ const TeachersSection = ({ teachers, setTeachers, specialities, handleCreate, ha
           return teacher.email;
         case 'SPECIALITES':
           return (
-            <SpecialitiesDropZone teacher={teacher} handleSpecialitiesChange={handleSpecialitiesChange} specialities={specialities} isEditing={false} />
+            <div className="flex justify-center space-x-2 flex-wrap">
+              {teacher.specialities_details.map((speciality) => (
+                <SpecialityItem key={speciality.id} speciality={speciality} isDraggable={false} />
+              ))}
+            </div>
           );
         case 'PROFIL':
             if (teacher.associated_profile) {