diff --git a/.gitignore b/.gitignore
index a0ddef4..118e8b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,9 @@ node_modules
 .vite
 .env
 dist
-milestone.db
\ No newline at end of file
+milestone.db
+*.sql
+
+*.toml
+
+*.db
diff --git a/README.md b/README.md
index 78a69d7..3a0372e 100644
--- a/README.md
+++ b/README.md
@@ -76,10 +76,11 @@ Pour accéder à l'aperçu de la version de production, visitez http://milestone
 Voici les étapes à suivre pour se connecter en tant qu'administrateur :
 
 
-1. Copier le fichier `.default` en `.env` avec la commande `cp .default .env` puis le remplir avec un nom d'utilisateur et un mot de passe admin.
+1. Renommer le fichier `.default` en `.env` avec la commande `cp .default .env` puis le remplir avec un nom d'utilisateur et un mot de passe admin et vous avez la possibilite de laisser URL de base comme elle est ou la changer mais absolument l'indiquer.
+URL de Base du serveur par defaut est : http://localhost:3000/api
 
 
-2.  `node prisma/seed.js` pour injecter les données dans la base de données.
+2. Executer la commande `node prisma/seed.js` pour injecter les données dans la base de données.
 
   
 3. Exécuter la commande `npx prisma generate` pour générer cet utilisateur avec le rôle admin.
diff --git a/app.vue b/app.vue
index 12a67a2..0e2ddd4 100644
--- a/app.vue
+++ b/app.vue
@@ -57,6 +57,7 @@ const showAddTask = ref(false);
 const showAddUser = ref(false);
 const showScrollToTop = ref(false);
 const showWarning = ref(true);
+
 const show = () => {
   showForm.value = true;
 };
diff --git a/components/LoginForm.vue b/components/LoginForm.vue
index 5c230b9..05c3233 100644
--- a/components/LoginForm.vue
+++ b/components/LoginForm.vue
@@ -130,7 +130,7 @@ const login = async (isAdmin = true) => {
     : {
         name: username.value,
       };
-  const res = await fetch("http://localhost:3000/api/login", {
+  const res = await fetch(`${import.meta.env.VITE_APP_API_URL}/login`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
diff --git a/components/ModifUser.vue b/components/ModifUser.vue
index 22514b6..3b81bcf 100644
--- a/components/ModifUser.vue
+++ b/components/ModifUser.vue
@@ -18,7 +18,7 @@
       <input class="inputStyle" type="password" v-model="passwordInput" />
     </div>
     <input class="inputStyle inputSubmit" type="submit" value="Modifier" />
-    <button @click="$emit('close')">Arrêter les modifications</button>
+    <button @click="$emit('close'), endUserEdit()">Arrêter les modifications</button>
     <span v-if="error !== ''">{{ error }}</span>
   </form>
 </template>
@@ -31,11 +31,12 @@ const jwt = jwtStore.jwt;
 const userStore = useUserStore();
 const emit = defineEmits(["close", "errorOnUpdateUser"]);
 
-const { id, name, role, password } = defineProps({
+const { id, name, role, password, isSelected } = defineProps({
   id: Number,
   name: String,
   role: String,
   password: String,
+  isSelected: Boolean
 });
 
 const nameInput = ref(name);
@@ -56,6 +57,11 @@ const editUser = async () => {
   }
   await userStore.setUsers(jwt);
 };
+const endUserEdit = () => {
+  for (let currentUser of userStore.users){
+      currentUser.isSelected = false
+  }
+};
 </script>
 
 <style scoped>
diff --git a/components/TaskList.vue b/components/TaskList.vue
index 4a51cb5..8e447c2 100644
--- a/components/TaskList.vue
+++ b/components/TaskList.vue
@@ -38,9 +38,6 @@
           v-if="jwtStore.role === 'ADMIN'  && task.isSelected"
           class="modif-form"
         />
-        <!-- <button v-if="task.isSelected" @click="endTaskEdit, task.isSelected = false">
-        Terminer les modifications
-      </button> -->
       </div>
     </div>
   </div>
@@ -59,17 +56,17 @@ const error = ref("");
 
 const md = new MarkdownIt();
 
-const endTaskEdit = () => {
-  taskStore.tasks.sort((a, b) => {
-    if (a.completed < b.completed) {
-      return 1;
-    }
-    if (a.completed > b.completed) {
-      return -1;
-    }
-    return 0;
-  });
-};
+// const endTaskEdit = () => {
+//   taskStore.tasks.sort((a, b) => {
+//     if (a.completed < b.completed) {
+//       return 1;
+//     }
+//     if (a.completed > b.completed) {
+//       return -1;
+//     }
+//     return 0;
+//   });
+// };
 
 const scrollToTask = (id) => {
   const task = document.getElementById(id);
diff --git a/components/UserList.vue b/components/UserList.vue
index 01e95ad..7d8a9f4 100644
--- a/components/UserList.vue
+++ b/components/UserList.vue
@@ -35,8 +35,9 @@
             </span>
             <ModifUser
               v-bind="user"
-              v-if="showModifUserForm"
-              @close="showModifUserForm = false"
+              v-if="showModifUserForm && user.isSelected"
+              @close="showModifUserForm=false"
+              @submit="showModifUserForm=false"
               @errorOnUpdateUser="
                 error = `La modification de l'utilisateur ${user.name} a échoué.`
               "
@@ -68,11 +69,19 @@ const error = ref("");
 
 const scrollToUser = (id) => {
   showModifUserForm.value = !showModifUserForm.value;
+  
+  const newId = id.substring(4)
   const user = document.getElementById(id);
-  console.log(user);
   setTimeout(() => {
     user.scrollIntoView({ behavior: "smooth" });
   }, 10);
+  for (let currentUser of userStore.users){
+    if (currentUser.id != newId){
+      currentUser.isSelected = false
+    } else {
+      currentUser.isSelected = true
+    }
+  } 
 };
 
 if (users === false) {
diff --git a/prisma/migrations/20221021140708_first_migration/migration.sql b/prisma/migrations/20221021140708_first_migration/migration.sql
deleted file mode 100644
index bc4ee1a..0000000
--- a/prisma/migrations/20221021140708_first_migration/migration.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- CreateTable
-CREATE TABLE "User" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "name" TEXT NOT NULL,
-    "password" TEXT NOT NULL,
-    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" DATETIME NOT NULL
-);
-
--- CreateTable
-CREATE TABLE "Task" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "title" TEXT NOT NULL,
-    "content" TEXT NOT NULL,
-    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "completed" BOOLEAN NOT NULL DEFAULT false
-);
diff --git a/prisma/migrations/20221027134053_unique_constraint_name/migration.sql b/prisma/migrations/20221027134053_unique_constraint_name/migration.sql
deleted file mode 100644
index e083f15..0000000
--- a/prisma/migrations/20221027134053_unique_constraint_name/migration.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-  Warnings:
-
-  - A unique constraint covering the columns `[name]` on the table `User` will be added. If there are existing duplicate values, this will fail.
-
-*/
--- CreateIndex
-CREATE UNIQUE INDEX "User_name_key" ON "User"("name");
diff --git a/prisma/migrations/20221101192207_jwt_added/migration.sql b/prisma/migrations/20221101192207_jwt_added/migration.sql
deleted file mode 100644
index effcfeb..0000000
--- a/prisma/migrations/20221101192207_jwt_added/migration.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "User" ADD COLUMN "token" TEXT;
diff --git a/prisma/migrations/20221103153107_updated_at_field_added_to_task/migration.sql b/prisma/migrations/20221103153107_updated_at_field_added_to_task/migration.sql
deleted file mode 100644
index 942b222..0000000
--- a/prisma/migrations/20221103153107_updated_at_field_added_to_task/migration.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "Task" ADD COLUMN "updatedAt" DATETIME;
diff --git a/prisma/migrations/20221103181417_role_added/migration.sql b/prisma/migrations/20221103181417_role_added/migration.sql
deleted file mode 100644
index 0ded6a1..0000000
--- a/prisma/migrations/20221103181417_role_added/migration.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- RedefineTables
-PRAGMA foreign_keys=OFF;
-CREATE TABLE "new_User" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "name" TEXT NOT NULL,
-    "password" TEXT NOT NULL,
-    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" DATETIME NOT NULL,
-    "token" TEXT,
-    "role" TEXT NOT NULL DEFAULT 'USER'
-);
-INSERT INTO "new_User" ("createdAt", "id", "name", "password", "token", "updatedAt") SELECT "createdAt", "id", "name", "password", "token", "updatedAt" FROM "User";
-DROP TABLE "User";
-ALTER TABLE "new_User" RENAME TO "User";
-CREATE UNIQUE INDEX "User_name_key" ON "User"("name");
-PRAGMA foreign_key_check;
-PRAGMA foreign_keys=ON;
diff --git a/prisma/migrations/20230110160238_protected_content_enabled/migration.sql b/prisma/migrations/20230110160238_protected_content_enabled/migration.sql
deleted file mode 100644
index 3617271..0000000
--- a/prisma/migrations/20230110160238_protected_content_enabled/migration.sql
+++ /dev/null
@@ -1,16 +0,0 @@
--- RedefineTables
-PRAGMA foreign_keys=OFF;
-CREATE TABLE "new_Task" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "title" TEXT NOT NULL,
-    "content" TEXT NOT NULL,
-    "isContentPrivate" BOOLEAN NOT NULL DEFAULT false,
-    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "completed" BOOLEAN NOT NULL DEFAULT false,
-    "updatedAt" DATETIME
-);
-INSERT INTO "new_Task" ("completed", "content", "createdAt", "id", "title", "updatedAt") SELECT "completed", "content", "createdAt", "id", "title", "updatedAt" FROM "Task";
-DROP TABLE "Task";
-ALTER TABLE "new_Task" RENAME TO "Task";
-PRAGMA foreign_key_check;
-PRAGMA foreign_keys=ON;
diff --git a/prisma/migrations/20231006131256_add_discord_and_twitch_ids_to_user/migration.sql b/prisma/migrations/20231006131256_add_discord_and_twitch_ids_to_user/migration.sql
deleted file mode 100644
index 74bb42b..0000000
--- a/prisma/migrations/20231006131256_add_discord_and_twitch_ids_to_user/migration.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- AlterTable
-ALTER TABLE "User" ADD COLUMN "discordId" TEXT;
-ALTER TABLE "User" ADD COLUMN "twitchId" TEXT;
diff --git a/prisma/migrations/20240201161313_change_the_user_password_to_be_not_required/migration.sql b/prisma/migrations/20240201161313_change_the_user_password_to_be_not_required/migration.sql
deleted file mode 100644
index d61105e..0000000
--- a/prisma/migrations/20240201161313_change_the_user_password_to_be_not_required/migration.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- RedefineTables
-PRAGMA foreign_keys=OFF;
-CREATE TABLE "new_User" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "name" TEXT NOT NULL,
-    "password" TEXT,
-    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" DATETIME NOT NULL,
-    "token" TEXT,
-    "role" TEXT NOT NULL DEFAULT 'USER',
-    "discordId" TEXT,
-    "twitchId" TEXT
-);
-INSERT INTO "new_User" ("createdAt", "discordId", "id", "name", "password", "role", "token", "twitchId", "updatedAt") SELECT "createdAt", "discordId", "id", "name", "password", "role", "token", "twitchId", "updatedAt" FROM "User";
-DROP TABLE "User";
-ALTER TABLE "new_User" RENAME TO "User";
-CREATE UNIQUE INDEX "User_name_key" ON "User"("name");
-PRAGMA foreign_key_check;
-PRAGMA foreign_keys=ON;
diff --git a/prisma/migrations/migration_lock.toml b/prisma/migrations/migration_lock.toml
deleted file mode 100644
index e5e5c47..0000000
--- a/prisma/migrations/migration_lock.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
-provider = "sqlite"
\ No newline at end of file
diff --git a/prisma/milestone.db b/prisma/milestone.db
deleted file mode 100644
index 8d7b557..0000000
Binary files a/prisma/milestone.db and /dev/null differ
diff --git a/stores/discord.js b/stores/discord.js
index d54ec56..2f2142a 100644
--- a/stores/discord.js
+++ b/stores/discord.js
@@ -7,7 +7,7 @@ export const useDiscordStore = defineStore("discord", {
     }),
     actions: {
         async fetchDiscordUser(jwt) {
-            const res = await fetch("http://localhost:3000/api/discord-id", {
+            const res = await fetch(`${import.meta.env.VITE_APP_API_URL}/discord-id`, {
                 method: "GET",
                 headers: {
                     "Content-Type": "application/json",
diff --git a/stores/task.js b/stores/task.js
index c424dab..97e1fe1 100644
--- a/stores/task.js
+++ b/stores/task.js
@@ -8,7 +8,7 @@ export const useTaskStore = defineStore("tasks", {
   actions: {
     async setTasks() {
       const res = await fetch(
-        "http://localhost:3000/api/task",
+        `${import.meta.env.VITE_APP_API_URL}/task`,
         {
           method: "GET",
         }
@@ -38,7 +38,7 @@ export const useTaskStore = defineStore("tasks", {
     async addTask(jwt, title, content, completed) {
       console.log("addTask", title, content, completed, jwt);
       const res = await fetch(
-        "http://localhost:3000/api/task",
+        `${import.meta.env.VITE_APP_API_URL}/task`,
         {
           method: "POST",
           headers: {
@@ -73,7 +73,7 @@ export const useTaskStore = defineStore("tasks", {
 
     async updateTask(jwt, id, title, content, completed, isContentPrivate) {
       const res = await fetch(
-        "http://localhost:3000/api/task/" + id,
+        `${import.meta.env.VITE_APP_API_URL}/task/${id}` ,
         {
           method: "PUT",
           headers: {
@@ -118,7 +118,7 @@ export const useTaskStore = defineStore("tasks", {
         return;
       }
       const res = await fetch(
-        "http://localhost:3000/api/task/" + id,
+        `${import.meta.env.VITE_APP_API_URL}/task/${id}`,
         {
           //await fait attendre que toute la fonction soit déroulée
           headers: {
diff --git a/stores/user.js b/stores/user.js
index a77cd51..fa485de 100644
--- a/stores/user.js
+++ b/stores/user.js
@@ -7,7 +7,7 @@ export const useUserStore = defineStore("users", {
   }),
   actions: {
     async setUsers(jwt) {
-      const res = await fetch("http://localhost:3000/api/user", {
+      const res = await fetch(`${import.meta.env.VITE_APP_API_URL}/user`, {
         method: "GET",
         headers: {
           "Content-Type": "application/json",
@@ -33,7 +33,7 @@ export const useUserStore = defineStore("users", {
     },
 
     async addUser(jwt, name, role, password, discordId, twitchId) {
-      const res = await fetch("http://localhost:3000/api/user", {
+      const res = await fetch(`${import.meta.env.VITE_APP_API_URL}/user`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -74,7 +74,7 @@ export const useUserStore = defineStore("users", {
       if (!conf) {
         return;
       }
-      const res = await fetch(`http://localhost:3000/api/user/${id}`, {
+      const res = await fetch(`${import.meta.env.VITE_APP_API_URL}/user/${id}`, {
         method: "DELETE",
         headers: {
           "Content-Type": "application/json",
@@ -104,7 +104,7 @@ export const useUserStore = defineStore("users", {
     },
 
     async updateUser(jwt, id, name, role, password, discordId, twitchId) {
-      const res = await fetch(`http://localhost:3000/api/user/${id}`, {
+      const res = await fetch(`${import.meta.env.VITE_APP_API_URL}/user/${id}`, {
         method: "PUT",
         headers: {
           "Content-Type": "application/json",
@@ -144,7 +144,7 @@ export const useUserStore = defineStore("users", {
     async checkThirdPartyUserExistence(userId) {
       try {
         const res = await fetch(
-          `http://localhost:3000/api/third-party/${userId}`
+          `${import.meta.env.VITE_APP_API_URL}`/third-party/`${userId}`
         );
 
         const data = await res.json();