changes

app/components/marketing/email/JobConfigurator.vue

@@ -183,9 +183,6 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch, onMounted } from "vue";
-import axios from "axios";
-import { useNuxtApp } from "nuxt/app";
 import { apiUrl, putApiUrl } from "~/components/marketing/email/Email.utils";
 
 const props = defineProps({
@@ -223,10 +220,10 @@ const fetchJobs = async () => {
   }
   isLoading.value = true;
   try {
-    const response = await axios.get(`${apiUrl}/Email_Job/`, {
+    const response = await $fetch(`${apiUrl}/Email_Job/`, {
       params: { template_id: props.templateId },
     });
-    jobs.value = response.data.rows || [];
+    jobs.value = response.rows || [];
   } catch (error) {
     console.error("Error fetching email jobs:", error);
     $snackbar(`Error fetching jobs`);
@@ -260,14 +257,17 @@ const closeForm = () => {
 const saveJob = async () => {
   isSaving.value = true;
   try {
-    let response;
     const data = { ...jobForm.value };
-    if (isEditing.value) {
+    const response = isEditing.value
-      response = await axios.put(`${putApiUrl}/Email_Job/${data.id}`, data);
+      ? await $fetch(`${putApiUrl}/Email_Job/${data.id}`, {
-    } else {
+          method: "PUT",
-      response = await axios.post(`${apiUrl}/Email_Job/`, data);
+          body: data,
-    }
+        })
-    if (response.status === 200 || response.status === 201) {
+      : await $fetch(`${apiUrl}/Email_Job/`, {
+          method: "POST",
+          body: data,
+        });
+    if (response) {
       $snackbar(`Job saved successfully`);
       await fetchJobs();
       closeForm();
@@ -283,7 +283,10 @@ const saveJob = async () => {
 const toggleJobStatus = async (job: any) => {
   const updatedJob = { ...job, active: !job.active };
   try {
-    await axios.put(`${putApiUrl}/Email_Job/${job.id}`, updatedJob);
+    await $fetch(`${putApiUrl}/Email_Job/${job.id}`, {
+      method: "PUT",
+      body: updatedJob,
+    });
     $snackbar(`Job status updated`);
     await fetchJobs();
   } catch (error) {
@@ -300,7 +303,9 @@ const confirmDelete = (job: any) => {
 
 const deleteJob = async (jobId: number) => {
   try {
-    await axios.delete(`${putApiUrl}/Email_Job/${jobId}`);
+    await $fetch(`${putApiUrl}/Email_Job/${jobId}`, {
+      method: "DELETE",
+    });
     $snackbar(`Job deleted successfully`);
     await fetchJobs();
   } catch (error) {

app/components/marketing/email/dataGmail/SaveListGmail.vue

@@ -93,8 +93,6 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch, nextTick } from "vue";
-import axios from "axios";
 import { useNuxtApp } from "nuxt/app";
 import { apiUrl, putApiUrl } from "~/components/marketing/email/Email.utils";
 
@@ -167,7 +165,7 @@ const handleSave = async () => {
   const isUpdate = isEditMode.value && props.id;
 
   try {
-    dataEmailList.value = await axios.get(apiUrlPost).then((res) => res.data.rows);
+    dataEmailList.value = await $fetch(apiUrlPost).then((res) => res.data.rows);
     let response;
 
     if (dataEmailList.value.some((item) => item.name === data.value.name.trim() && item.id !== props.id)) {
@@ -176,19 +174,18 @@ const handleSave = async () => {
       return;
     }
 
+    const body = {
+      name: data.value.name.trim(),
+      email: data.value.email,
+    };
+
     if (isUpdate) {
-      response = await axios.put(`${apiUrlPut}${props.id}`, {
+      response = await $fetch(`${apiUrlPut}${props.id}`, { method: "PUT", body });
-        name: data.value.name.trim(),
-        email: data.value.email,
-      });
     } else {
-      response = await axios.post(apiUrlPost, {
+      response = await $fetch(apiUrlPost, { method: "POST", body });
-        name: data.value.name.trim(),
-        email: data.value.email,
-      });
     }
 
-    if (response.status === 200 || response.status === 201 || response.status === 204) {
+    if (response) {
       $snackbar(isUpdate ? `"${data.value.name}" cập nhật thành công!` : `"${data.value.name}" tạo thành công!`);
 
       loading.value = false;
@@ -198,13 +195,8 @@ const handleSave = async () => {
       throw new Error(`Failed to ${isUpdate ? "update" : "create"} the Gmail list`);
     }
   } catch (error) {
-    console.error(`Error ${isUpdate ? "cập nhật" : "tạo"} danh sách:`, error);
+    console.error(`Lỗi khi ${isUpdate ? "cập nhật" : "tạo"} danh sách`, error);
-
+    $snackbar(`Lỗi khi ${isUpdate ? "cập nhật" : "tạo"} danh sách`);
-    const errorMessage = axios.isAxiosError(error)
-      ? error.response?.data?.message || `Lỗi khi ${isUpdate ? "cập nhật" : "tạo"} danh sách`
-      : "Đã xảy ra lỗi";
-
-    $snackbar(errorMessage);
     loading.value = false;
   }
 };
@@ -214,11 +206,14 @@ const handleCreateNew = async () => {
   const emailListUrl = `${apiUrl}/Email_List/`;
 
   try {
-    const response = await axios.post(emailListUrl, {
+    const response = await $fetch(emailListUrl, {
-      name: data.value.name.trim(),
+      method: "POST",
-      email: data.value.email,
+      body: {
+        name: data.value.name.trim(),
+        email: data.value.email,
+      },
     });
-    if (response.status === 200 || response.status === 201) {
+    if (response) {
       $snackbar("Tạo danh sách email mới thành công!");
     }
   } catch (error) {

nuxt.config.ts

@@ -25,7 +25,6 @@ export default defineNuxtConfig({
         '@vue/devtools-core',
         '@vue/devtools-kit',
         '@vueup/vue-quill',
-        'axios',
         'dayjs', // CJS
         'dayjs/locale/vi', // CJS
         'dayjs/plugin/isSameOrAfter', // CJS

package-lock.json

@@ -12,7 +12,6 @@
         "@vue-email/components": "^0.0.21",
         "@vue-email/render": "^0.0.9",
         "@vueup/vue-quill": "^1.2.0",
-        "axios": "^1.9.0",
         "bulma": "^1.0.4",
         "crypto-js": "^4.2.0",
         "dayjs": "^1.11.13",
@@ -1501,7 +1500,7 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.10.0.tgz",
       "integrity": "sha512-UmeW7z4LfctwoQ5wkhVzgq8tXkreED2xZGpX+Bg+zA+WJFZCT6c062AfCK/Dfk81xZnnwdhJCUMkitihRaoC2Q==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
@@ -1785,17 +1784,6 @@
       "integrity": "sha512-+6vJA3L98yv+IdfKGZHBNiGW5KHn22e/JwID0Strsz8h4S/csAu/OuICwxrg44k5MRiZHWIo8XXuJgQTriRP4w==",
       "dev": true
     },
-    "node_modules/@nuxt/cli/node_modules/commander": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
-      "integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@nuxt/cli/node_modules/std-env": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.1.0.tgz",
@@ -4304,17 +4292,6 @@
         "@types/unist": "*"
       }
     },
-    "node_modules/@types/node": {
-      "version": "20.19.25",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.25.tgz",
-      "integrity": "sha512-ZsJzA5thDQMSQO788d7IocwwQbI8B5OPzmqNvpf3NY/+MHDAS759Wo0gd2WQeXYt5AAAQjzcrTVC6SKCuYgoCQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "undici-types": "~6.21.0"
-      }
-    },
     "node_modules/@types/resolve": {
       "version": "1.20.2",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
@@ -5406,12 +5383,6 @@
       "integrity": "sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==",
       "dev": true
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "license": "MIT"
-    },
     "node_modules/autoprefixer": {
       "version": "10.5.0",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.0.tgz",
@@ -5448,17 +5419,6 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/axios": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
-      "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
-      "license": "MIT",
-      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.4",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
     "node_modules/b4a": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.3.tgz",
@@ -6231,7 +6191,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz",
       "integrity": "sha512-rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6272,18 +6232,6 @@
         "color-support": "bin.js"
       }
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "license": "MIT",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/comma-separated-tokens": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
@@ -6763,7 +6711,7 @@
       "version": "0.3.4",
       "resolved": "https://registry.npmjs.org/db0/-/db0-0.3.4.tgz",
       "integrity": "sha512-RiXXi4WaNzPTHEOu8UPQKMooIbqOEyqA1t7Z6MsdxSCeb8iUC9ko3LcmsLmeUt2SM5bctfArZKkRQggKZz7JNw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "peerDependencies": {
         "@electric-sql/pglite": "*",
@@ -6938,15 +6886,6 @@
       "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.7.tgz",
       "integrity": "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ=="
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
@@ -6958,7 +6897,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
       "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==",
-      "dev": true,
+      "devOptional": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=0.10"
@@ -7298,21 +7237,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/es-toolkit": {
       "version": "1.42.0",
       "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.42.0.tgz",
@@ -7561,26 +7485,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/follow-redirects": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/foreground-child": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
@@ -7597,22 +7501,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/form-data": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
-      "license": "MIT",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/frac": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
@@ -8378,7 +8266,7 @@
       "version": "5.11.1",
       "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.11.1.tgz",
       "integrity": "sha512-ehuGcf94bQXhfagULNXrJdfnWO38v070jxSx/qE87Kjzmu2fU7ro5EFAb+OPituLqgfyuQaym5DlrNydW2sJ9A==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@ioredis/commands": "1.10.0",
         "cluster-key-slot": "1.1.1",
@@ -9234,27 +9122,6 @@
         "node": ">=16"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/mimic-fn": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
@@ -10955,12 +10822,6 @@
       "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
       "license": "ISC"
     },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT"
-    },
     "node_modules/quansync": {
       "version": "0.2.11",
       "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz",
@@ -11085,7 +10946,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz",
       "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -11095,7 +10956,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz",
       "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "redis-errors": "^1.0.0"
@@ -11873,7 +11734,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz",
       "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/statuses": {
@@ -12427,14 +12288,6 @@
       "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==",
       "license": "MIT"
     },
-    "node_modules/undici-types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/unenv": {
       "version": "2.0.0-rc.24",
       "resolved": "https://registry.npmjs.org/unenv/-/unenv-2.0.0-rc.24.tgz",

package.json

@@ -17,7 +17,6 @@
     "@vue-email/components": "^0.0.21",
     "@vue-email/render": "^0.0.9",
     "@vueup/vue-quill": "^1.2.0",
-    "axios": "^1.9.0",
     "bulma": "^1.0.4",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.13",