diff --git a/build2.zip b/build2.zip deleted file mode 100644 index ce7258b..0000000 Binary files a/build2.zip and /dev/null differ diff --git a/src/pages/pnspsUserDetailPage_Public/UserInformationCard_Public.js b/src/pages/pnspsUserDetailPage_Public/UserInformationCard_Public.js index 07af1ed..a75eba5 100644 --- a/src/pages/pnspsUserDetailPage_Public/UserInformationCard_Public.js +++ b/src/pages/pnspsUserDetailPage_Public/UserInformationCard_Public.js @@ -1,6 +1,6 @@ // material-ui import { - Grid, TextField, Typography + Grid, TextField, Typography, Select, Button, Snackbar, Alert } from '@mui/material'; import MainCard from "../../components/MainCard"; import * as React from "react"; @@ -8,6 +8,9 @@ import {useForm} from "react-hook-form"; import {useEffect, useState} from "react"; import Checkbox from "@mui/material/Checkbox"; import LoadingComponent from "../extra-pages/LoadingComponent"; + +import {POST_UP_FILE} from "../../utils/ApiPathConst"; +import axios from "axios"; //import {useParams} from "react-router-dom"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -35,6 +38,7 @@ const UserInformationCard_Public = ({isCollectData, updateUserObject,userData}) if (Object.keys(userData).length > 0 &¤tUserData !== undefined) { setLocked(currentUserData.locked); setOnReady(true); + } }, [currentUserData]); @@ -48,6 +52,33 @@ const UserInformationCard_Public = ({isCollectData, updateUserObject,userData}) updateUserObject(objectData); }, [isCollectData]); + + const uploadFile = (event)=>{ + var formData = new FormData(); + formData.append("multipartFile", event.target.files[0]); + formData.append("refType", "userId"); + formData.append("refId", currentUserData.id); + axios.post(POST_UP_FILE,formData,{ + headers: { + "Content-Type":"multipart/form-data" + } + }).then( + (response)=>{ + console.log(response); + setOpen(true); + } + ).catch(error => { + console.log(error); + return false; + }); + }; + + const [open, setOpen] = React.useState(false); + const handleClose = () => { + + setOpen(false); + }; + return ( !onReady ? @@ -60,10 +91,14 @@ const UserInformationCard_Public = ({isCollectData, updateUserObject,userData}) Information -
+ + + This is a success message! + + - + @@ -94,7 +129,10 @@ const UserInformationCard_Public = ({isCollectData, updateUserObject,userData}) @@ -113,7 +151,10 @@ const UserInformationCard_Public = ({isCollectData, updateUserObject,userData}) @@ -121,6 +162,16 @@ const UserInformationCard_Public = ({isCollectData, updateUserObject,userData}) + + + + + + + Chinese Name: + + + + + + + + + + + + Country: + + + + + + + + + + + + + Address: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { const params = useParams(); - const [userData, setUserData] = React.useState({}); + const [userData, setUserData] = useState({}); const [onReady, setOnReady] = useState(false); const [isCollectData, setIsCollectData] = useState(false); const [editedCustomerData, setEditedCustomerData] = useState({}); @@ -34,6 +35,13 @@ const UserMaintainPage_Public = () => { useEffect(() => { console.log(params) + // HttpGet({ + // url: `${apiPath}${GET_USER_PATH}/${params.id}`, + // onSuccess: (response)=>{ + // setUserData(response.data); + // } + // }); + axios.get(`${apiPath}${GET_USER_PATH}/${params.id}`) .then((response) => { if (response.status === 200) { diff --git a/src/pages/pnspsUserSearchPage_Public/index.js b/src/pages/pnspsUserSearchPage_Public/index.js index bb9a5c0..9778609 100644 --- a/src/pages/pnspsUserSearchPage_Public/index.js +++ b/src/pages/pnspsUserSearchPage_Public/index.js @@ -33,6 +33,7 @@ const UserSearchPage_Public = () => { }, [searchCriteria]); function getUserList(){ + axios.get(`${apiPath}${GET_PUBLIC_USER_PATH}`, {params: searchCriteria} ) diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js index a56b273..325cb2b 100644 --- a/src/utils/ApiPathConst.js +++ b/src/utils/ApiPathConst.js @@ -1,3 +1,5 @@ +import {apiPath} from "../auth/utils"; + // GET request //Group Config @@ -11,6 +13,11 @@ export const GET_PUBLIC_USER_PATH = '/user/public'; export const GET_AUTH_LIST = '/user/auth/combo'; export const GET_USER_COMBO_LIST = '/user/combo'; + +//File Up/Download +export const POST_UP_FILE = apiPath+'/file/ul'; +export const GET_DOWN_FILE = apiPath+'/file/dl/{id}/{skey}/{filename}'; + // POST request //Login export const POST_LOGIN = '/login';