trithuc-mvc-react 2.7.4 → 2.7.6

package/api/index.js

@@ -1,4 +1,4 @@
-import { storeGetToken } from "@/utils/storage";
+import { storeGetlanguage, storeGetToken } from "@/utils/storage";
 import axios from "axios";
 
 let baseUrl = "";
@@ -35,6 +35,21 @@ const token = storeGetToken();
 if (token) {
   setAuthToken(token);
 }
+// Sử dụng interceptor để thêm ngôn ngữ vào headers
+api.interceptors.request.use((config) => {
+  const token = storeGetToken();
+  const language = storeGetlanguage(); // Lấy ngôn ngữ từ local storage
+
+  if (token) {
+    config.headers["Authorization"] = `Bearer ${token}`; // Gán token vào headers
+  }
+
+  if (language) {
+    config.headers["Accept-Language"] = language; // Gán ngôn ngữ vào headers
+  }
+
+  return config;
+});
 export default api;
 
 export const getDatasFromTable = async ({ tableName, page, pageSize, data }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trithuc-mvc-react",
-  "version": "2.7.4",
+  "version": "2.7.6",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -13,36 +13,36 @@
   },
   "description": "",
   "dependencies": {
-    "@emotion/react": "^11.11.1",
-    "@emotion/styled": "^11.11.0",
-    "@hookform/resolvers": "^3.1.1",
-    "@iconify/react": "^4.1.1",
-    "axios": "^1.4.0",
-    "date-fns": "^2.30.0",
+    "@emotion/react": "^11.13.3",
+    "@emotion/styled": "^11.13.0",
+    "@hookform/resolvers": "^3.9.1",
+    "@iconify/react": "^5.0.2",
+    "axios": "^1.7.7",
+    "date-fns": "^4.1.0",
     "lodash": "^4.17.21",
-    "moment": "^2.29.4",
+    "moment": "^2.30.1",
     "prop-types": "^15.8.1",
-    "yup": "^1.2.0"
+    "yup": "^1.4.0"
   },
   "devDependencies": {
-    "@types/react": "^18.2.15",
-    "@types/react-dom": "^18.2.7",
-    "eslint": "^8.45.0",
-    "eslint-plugin-react": "^7.32.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.3",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
+    "eslint": "^9.14.0",
+    "eslint-plugin-react": "^7.37.2",
+    "eslint-plugin-react-hooks": "^5.0.0",
+    "eslint-plugin-react-refresh": "^0.4.14",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "peerDependencies": {
-    "@mui/icons-material": "^5.14.1",
-    "@mui/material": "^5.14.1",
+    "@mui/material": "^5.14.17",
+    "@mui/icons-material": "^5.14.17",
     "react": ">=16",
     "react-dom": ">=16",
     "react-query": "^3.39.3",
     "react-toastify": "^9.1.3",
     "material-ui-confirm": "^3.0.9",
-    "@mui/x-date-pickers": "^6.10.2",
+    "@mui/x-date-pickers": "^6.20.2",
     "react-hook-form": "^7.45.2"
   }
 }

package/utils/storage.js

@@ -1,32 +1,44 @@
 import CryptoJS from "crypto-js";
+import moment from "moment";
 
 // Khóa bí mật để mã hóa và giải mã MD5 https://zozo.vn/ws/tools/md5encode
 const secretKey = "b0dc70c6a34c0555ac9c63907617f5a5"; // Bạn nên lưu trữ key này an toàn
 
 // Hàm mã hóa dữ liệu
 const encryptData = (data) => {
+  if (!data) {
+    return null;
+  }
+
   try {
     return CryptoJS.AES.encrypt(JSON.stringify(data), secretKey).toString();
   } catch (error) {
     console.log("Error encrypting data:", error);
+    return null;
   }
 };
 
-// Hàm giải mã dữ liệu
 const decryptData = (ciphertext) => {
+  if (!ciphertext) {
+    return null;
+  }
+
   try {
     const bytes = CryptoJS.AES.decrypt(ciphertext, secretKey);
     const decryptedData = bytes.toString(CryptoJS.enc.Utf8);
+
     if (!decryptedData) {
       throw new Error("Decrypted data is null or invalid.");
     }
+
     return JSON.parse(decryptedData);
   } catch (error) {
-    console.log("Error decrypting data:", error);
+    console.error("Error decrypting data:", error, "Ciphertext:", ciphertext);
     return null;
   }
 };
 
+
 export const storeUserData = (data) => {
   if (!data) return;
 
@@ -118,3 +130,49 @@ export const storeGetThamSoHeThong = (TenThamSo) => {
   const getCurrentInfor =decryptData(encryptedData) || {};
   return getCurrentInfor?.ThamSoHeThong?.find((item) => item.TenThamSo === TenThamSo)?.GiaTri || "";
 };
+export const storeGetcolor= () => {
+  const encryptedData = localStorage.getItem("color");
+  if (!encryptedData) return "defaultColor";
+  return decryptData(encryptedData);
+};
+export const storeSetcolor = (data) => {
+  if (!data) return;
+  const encryptedData = encryptData(data);
+  localStorage.setItem("color",encryptedData);
+};
+export const storeGetlanguage = () => {
+  const encryptedData = localStorage.getItem("language");
+  if (!encryptedData) return "vi";
+  return decryptData(encryptedData);
+};
+export const storeSetlanguage = (data) => {
+  if (!data) return;
+  const encryptedData = encryptData(data);
+  localStorage.setItem("language",encryptedData);
+};
+export const storeGetlanguageVersion = () => {
+  const encryptedData = localStorage.getItem("languageVersion");
+  if (!encryptedData) return moment(Date.now()).format("DD/MM/YYYY HH:mm:ss");
+  return decryptData(encryptedData);
+};
+export const storeSetlanguageVersion = (data) => {
+  if (!data) return;
+  const encryptedData = encryptData(data);
+  localStorage.setItem("languageVersion",encryptedData);
+};
+export const storeGetlanguageData = () => {
+  const encryptedData = localStorage.getItem("languageData");
+  if (!encryptedData) return null;
+  return decryptData(encryptedData);
+};
+export const storeSetlanguageData = (data) => {
+  if (!data) return;
+  const encryptedData = encryptData(data);
+  localStorage.setItem("languageData",encryptedData);
+};
+export const storeGetlanguageSystemKey = (TypeKey,SystemKey,TypeLanguage) => {
+  const encryptedData = localStorage.getItem("languageData");
+  if (!encryptedData) return null;
+  const languageData =decryptData(encryptedData) || {};
+  return languageData?.find((item) => item.TypeKey === TypeKey && item.SystemKey === SystemKey && item.TypeLanguage === TypeLanguage)?.Description || "";
+};