Merge pull request #397 from techcomrade/improve/upload_file

improve: issue #39 register new user
techcomrade · Jun 12, 2024 · 0edc4dd · 0edc4dd
2 parents 1a45479 + ebf0b86
commit 0edc4dd
Show file tree

Hide file tree

Showing 18 changed files with 433 additions and 36 deletions.
diff --git a/frontend_web/bin/index.js b/frontend_web/bin/index.js
@@ -59,15 +59,30 @@ app.post("/login", async (req, res, next) => {
       if (result.ok) {
         const userInfo = await result.json();
         const isDevEnv = config.default_api_url.match("127.0.0.1:3000") != null
-        res.cookie("user", userInfo.metadata.id);
+        res.cookie("user", userInfo.metadata.id, {
+          maxAge: 60000 * userInfo.metadata.expired_time,
+          httpOnly: false,
+        });
         res.cookie("access_token", userInfo.metadata.access_token, {
           maxAge: 60000 * userInfo.metadata.expired_time,
           httpOnly: false,
         });
-        res.cookie("refresh_token", userInfo.metadata.refresh_token);
-        res.cookie("role", userInfo.metadata.role);
-        res.cookie("api", isDevEnv ? config.default_api_url : `${config.redirect_url}/api`);
-        res.cookie("redirect_api", isDevEnv ? `http://${config.default_app_host}:${config.default_app_port}/login` : `${config.redirect_url}/login`);
+        res.cookie("refresh_token", userInfo.metadata.refresh_token, {
+          maxAge: 60000 * userInfo.metadata.expired_time,
+          httpOnly: false,
+        });
+        res.cookie("role", userInfo.metadata.role, {
+          maxAge: 60000 * userInfo.metadata.expired_time,
+          httpOnly: false,
+        });
+        res.cookie("api", isDevEnv ? config.default_api_url : `${config.redirect_url}/api`, {
+          maxAge: 60000 * userInfo.metadata.expired_time,
+          httpOnly: false,
+        });
+        res.cookie("redirect_api", isDevEnv ? `http://${config.default_app_host}:${config.default_app_port}/login` : `${config.redirect_url}/login`, {
+          maxAge: 60000 * userInfo.metadata.expired_time,
+          httpOnly: false,
+        });
         return res.status(200).json("login successfully");
       }
       return res.status(400).json("login failed");

diff --git a/frontend_web/public/index.html b/frontend_web/public/index.html
@@ -50,7 +50,6 @@
         refresh_token: "",
         user_id: "",
       };
-      console.log(window.location.host);
 
       const access_token = getCookie("access_token");
       if (access_token) {
@@ -70,7 +69,10 @@
           role: localStorage.getItem("role"),
           api: localStorage.getItem("api"),
         };
+        console.log("hi");
+
       } else {
+        console.log("hi");
         cookieData = {
           access_token: "",
           refresh_token: "",
@@ -79,6 +81,8 @@
         };
         var url = window.location.host;
         localStorage.clear();
+        window.location.href = "http://127.0.0.1:3001/login";
+
         if (url !== "127.0.0.1:3002") {
           window.location.href = "/login";
         } else {

diff --git a/frontend_web/src/layouts/DefaultLayout/DefaultLayout.js b/frontend_web/src/layouts/DefaultLayout/DefaultLayout.js
@@ -10,14 +10,13 @@ import BubbleChat from "../../components/BubbleChat/BubbleChat";
 const { Header, Content } = Layout;
 
 const DefaultLayout = ({ children }) => {
-  const userName = getLocalStorage("username");
   return (
     <HashRouter>
       <Layout style={{ height: "100vh" }}>
         <Sidebar />
         <Layout>
           <Header style={{backgroundColor: "#f5f5f5"}}>
-            <HeaderUser userName={userName} token />
+            <HeaderUser />
           </Header>
           <Layout>
             <Content className="main-content">

diff --git a/frontend_web/src/layouts/route.js b/frontend_web/src/layouts/route.js
@@ -1,6 +1,5 @@
 import Home from "../pages/Home/home";
 import DetailUser from "../pages/Account/Detail";
-import NotFound from "../pages/NotFound/notfound";
 import { Navigate, Route, Routes as ReactRoutes } from "react-router-dom";
 import UserTable from "../pages/User/userTable";
 import DeviceTable from "../pages/Device/deviceTable";
@@ -12,11 +11,14 @@ import {
   WechatWorkOutlined,
   UsergroupAddOutlined,
   DesktopOutlined,
-  LineChartOutlined
+  LineChartOutlined,
+  UserAddOutlined,
+  UserSwitchOutlined
 } from "@ant-design/icons";
 import { userRole } from "../constants";
 import { context } from "../utils/context";
-// import Chat from "../pages/Chat/chat";
+import Chat from "../pages/Chat/chat";
+import Register from "../pages/Register/register";
 
 export const AdminRouterMappingGroup = {
   User: {
@@ -39,9 +41,15 @@ export const AdminRouterMappingGroup = {
   },
   AssignmentPatientDoctor: {
     key: "/pda",
-    label: "Thông tin assignment",
+    label: "Thông tin bác sĩ bệnh nhân",
     component: <PdaTable />,
-    icon: <UnorderedListOutlined />,
+    icon: <UserSwitchOutlined />,
+  },
+  Register: {
+    key: "/registers",
+    label: "Người dùng đăng ký mới",
+    component: <Register />,
+    icon: <UserAddOutlined />,
   }
 };
 
@@ -64,12 +72,12 @@ export const doctorRouterMappingGroup = {
     component: <RecordTable />,
     icon: <LineChartOutlined />,
   },
-  // Chat:{
-  //   key:"/chat",
-  //   label: "Chat với bác sĩ",
-  //   component: <Chat />,
-  //   icon: <WechatWorkOutlined />
-  // }
+  Chat:{
+    key:"/chat",
+    label: "Chat với bệnh nhân",
+    component: <Chat />,
+    icon: <WechatWorkOutlined />
+  }
 };
 
 export const patientRouterMappingGroup = {
@@ -92,6 +100,13 @@ export const patientRouterMappingGroup = {
     component: <RecordTable />,
     icon: <LineChartOutlined />,
   }
+  ,
+  Chat:{
+    key:"/chat",
+    label: "Chat với bác sĩ",
+    component: <Chat />,
+    icon: <WechatWorkOutlined />
+  }
 };
 
 export const getRoutesByRole = (role) => {

diff --git a/frontend_web/src/pages/Account/Detail.js b/frontend_web/src/pages/Account/Detail.js
@@ -19,7 +19,6 @@ import "./detail.scss";
 import { convertGenderToString, convertRoleToString } from "../../constants";
 import { context } from "../../utils/context";
 
-const { Option } = Select;
 export default function Detail() {
   const dispatch = useDispatch();
 

diff --git a/frontend_web/src/pages/Chat/chat.js b/frontend_web/src/pages/Chat/chat.js
@@ -0,0 +1,10 @@
+import React, { useEffect, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+
+const Chat = () => {
+ return (
+    <>chat</>
+ )   
+}
+
+export default Chat;
diff --git a/frontend_web/src/pages/Chat/chat.scss b/frontend_web/src/pages/Chat/chat.scss
diff --git a/frontend_web/src/pages/Record/recordTable.js b/frontend_web/src/pages/Record/recordTable.js
@@ -248,7 +248,7 @@ const RecordTable = () => {
         editFunction={handleEditFunction}
         deleteButton
         deleteFunction={handleDeleteFunction}
-        name="Bảng quản lý record"
+        name="Dữ liệu y tế"
         data={dataTable}
         column={columns}
         updateSelectedData={setSelectedData}
@@ -262,7 +262,7 @@ const RecordTable = () => {
 
       <ModalControlData
         ref={modalUpdateRef}
-        title="Sửa thông tin record"
+        title="Sửa thông tin bản ghi"
         submitFunction={(data) => handleSubmitEditUser(data)}
       />
 
@@ -273,10 +273,10 @@ const RecordTable = () => {
       />
 
       <Modal
-        title="Download record status"
+        title="Trạng thái bản ghi"
         open={isModalOpen}
         onOk={handleOk}
-        okText="Download"
+        okText="Tải"
         confirmLoading={dataState.loadCheckRecordStatus === loadStatus.Loading}
         onCancel={handleCancel}
       >

diff --git a/frontend_web/src/pages/Register/register.js b/frontend_web/src/pages/Register/register.js
@@ -0,0 +1,10 @@
+import React, { useEffect, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+
+const Register = () => {
+ return (
+    <>Register</>
+ )   
+}
+
+export default Register;
diff --git a/frontend_web/src/pages/Register/register.scss b/frontend_web/src/pages/Register/register.scss
diff --git a/frontend_web/src/pages/User/userTable.js b/frontend_web/src/pages/User/userTable.js
@@ -30,7 +30,7 @@ import dayjs from "dayjs";
 import { UserDetail } from "./userDetail";
 import { context } from "../../utils/context";
 
-const UserTable = () => {
+const UserTable = (props) => {
   const dispatch = useDispatch();
   const dataState = useSelector((state) => state.user);
   const [dataTable, setDataTable] = useState([]);
@@ -91,8 +91,6 @@ const UserTable = () => {
      </Tag>)
       }
     }
-
-
   ];
 
   const handleData = (data, type) => {
@@ -176,19 +174,17 @@ const UserTable = () => {
   };
 
   const handleSubmitEditUser = (data) => {
-    // console.log(data);
     const { account_id, devices, role, records, status, ...payload } = { ...data };
-    console.log(payload);
     return dispatch(updateUser(payload));
   };
 
   const getTitleTable = () => {
     if (context.role === userRole.doctor) {
-      return "Quản lý bệnh nhân";
+      return "Thông tin bệnh nhân";
     } else if (context.role === userRole.patient) {
       return "Bác sĩ điều trị";
     } else {
-      return "Quản lý người dùng";
+      return "Thông tin người dùng";
     }
   };
   return (
@@ -209,7 +205,7 @@ const UserTable = () => {
       />
       <ModalControlData
         ref={modalUpdateRef}
-        title="Sửa thông tin người dùng"
+        title= {getTitleTable()}
         submitFunction={(data) => handleSubmitEditUser(data)}
       />
       <UserDetail ref={drawerRef} />

diff --git a/server-web/config/chatgpt_api.js b/server-web/config/chatgpt_api.js
@@ -0,0 +1,11 @@
+import { Configuration, OpenAIApi } from 'openai';
+import dotenv from 'dotenv';
+dotenv.config();
+
+const configuration = new Configuration({
+  apiKey: '',
+});
+
+const openai = new OpenAIApi(configuration);
+
+export default openai;
diff --git a/server-web/migrations/20240611041406-create-register-table.js b/server-web/migrations/20240611041406-create-register-table.js
@@ -0,0 +1,52 @@
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up (queryInterface, Sequelize) {
+    await queryInterface.createTable('registers', 
+      {
+        id: {
+          type: Sequelize.STRING,
+          allowNull: false,
+          primaryKey: true,
+        },
+        email:{
+          type: Sequelize.STRING,
+          allowNull: false,
+        },
+        password:{
+          type: Sequelize.STRING,
+          allowNull: false,
+        },
+        username: {
+          type: Sequelize.STRING,
+          allowNull: false,
+        },
+        gender: {
+          type: Sequelize.INTEGER,
+        },
+        birth: {
+          type: Sequelize.BIGINT,
+          allowNull: false,
+        },
+        phone_number: Sequelize.STRING,
+        image: Sequelize.STRING,
+        status: {
+          type: Sequelize.INTEGER,
+          allowNull: false,
+        },
+        information: Sequelize.STRING,
+        role: {
+          type: Sequelize.INTEGER,
+          allowNull: false,
+        },
+        created_at: Sequelize.BIGINT,
+        updated_at: Sequelize.BIGINT,
+      }
+    );
+  },
+
+  async down (queryInterface, Sequelize) {
+    await queryInterface.dropTable('register');
+  }
+};
diff --git a/server-web/models/RegisterModel/RegisterDTO.js b/server-web/models/RegisterModel/RegisterDTO.js
@@ -0,0 +1,47 @@
+const Sequelize = require("sequelize");
+const sequelize = require("../../config/sequelize");
+
+const User = sequelize.define(
+  "registers",
+  {
+    id: {
+      type: Sequelize.STRING,
+      allowNull: false,
+      primaryKey: true,
+    },
+    email: {
+      type: Sequelize.STRING,
+      allowNull: false,
+    },
+    password: {
+      type: Sequelize.STRING,
+      allowNull: false,
+    },
+    username: {
+      type: Sequelize.STRING,
+      allowNull: false,
+    },
+    gender: {
+      type: Sequelize.INTEGER,
+    },
+    birth: {
+      type: Sequelize.BIGINT,
+      allowNull: false,
+    },
+    phone_number: Sequelize.STRING,
+    image: Sequelize.STRING,
+    status: {
+      type: Sequelize.INTEGER,
+      allowNull: false,
+    },
+    information: Sequelize.STRING,
+    role: {
+      type: Sequelize.INTEGER,
+      allowNull: false,
+    },
+    created_at: Sequelize.BIGINT,
+    updated_at: Sequelize.BIGINT,
+  }
+);
+
+module.exports = User;