fix: conflits

front/MyINPulse-front/src/views/AdminMain.vue

@@ -33,17 +33,17 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from "vue";
-import { callApi } from "@/services/api";
+import { ref/*, onMounted*/ } from "vue";
+//import { callApi } from "@/services/api";
 
 import Header from "../components/HeaderComponent.vue";
-import Agenda from "../components/Agenda.vue";
+import Agenda from "../components/AgendaComponent.vue";
 import ProjectComp from "../components/ProjectComponent.vue";
 import PendingProjectComponent from "@/components/PendingProjectComponent.vue";
 import AddProjectForm from "@/components/AddProjectForm.vue";
 
-const PORT = "8081";
-const URI = `http://localhost:${PORT}`;
+//const PORT = "8081";
+//const URI = `http://localhost:${PORT}`;
 
 //const projects = ref<{ name: string; link: string; members: string[] }[]>([]);
 
@@ -119,10 +119,28 @@ const rendezVous = ref([
 <style scoped>
 
 #container {
-    margin: 0;
-    display: grid;
-    grid-template-columns: 3fr 1fr; /* Main body takes 3/4, agenda 1/4 */
-    height: 100vh; /* Full viewport height */
+  display: grid;
+  grid-template-columns: 3fr 1fr;
+  gap: 2rem;
+  padding: 2rem;
+  background-color: #f4f6f9;
+  min-height: 100vh;
+  box-sizing: border-box;
+}
+
+#main {
+  background-color: #fff;
+  padding: 2rem;
+  border-radius: 12px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
+}
+
+h3 {
+  font-size: 1.5rem;
+  color: #333;
+  margin-bottom: 1.2rem;
+  border-bottom: 2px solid #ddd;
+  padding-bottom: 0.5rem;
 }
 
 button {
@@ -131,10 +149,19 @@ button {
   color: white;
   border: none;
   cursor: pointer;
-  border-radius: 5px;
+  border-radius: 6px;
+  font-weight: 500;
+  transition: background-color 0.2s ease;
 }
+
 button:hover {
   background-color: #0056b3;
 }
 
+/* Add spacing between project sections */
+#main > * + * {
+  margin-top: 2rem;
+}
+
+
 </style>