Skip to content

Commit

Permalink
Merge branch 'develop-fe' into 'develop'
Browse files Browse the repository at this point in the history 
[merge] : develop-fe -> develop merge

See merge request s10-blockchain-contract-sub2/S10P22A708!219
  • Loading branch information
๊น€์ง€์€ committed Apr 4, 2024
2 parents a6f8acb + 1da1f4d commit f344752
Show file tree
Hide file tree
Showing 16 changed files with 99 additions and 55 deletions.
23 changes: 15 additions & 8 deletions frontend/src/App.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import BusinessProjectEnroll from "./pages/BusinessProjectEnroll";
import { Invest } from "./pages/Invest";
import { Charge } from "./pages/Charge";
import { Exchange } from "./pages/Exchange";
import FirstMainPage from "./pages/FirstMainPage";
import { AdminPage } from "./pages/AdminPage";

import SettlementDetail from "./components/Admin/SettlementDetail";
Expand Down Expand Up @@ -77,7 +76,7 @@ function App() {
eventSource.addEventListener("settlementAllow", handleEvent);
eventSource.addEventListener("fundingProgressStatusCron", funding);
eventSource.onerror = (error) => {
console.error('EventSource failed:', error);
console.error("EventSource failed:", error);
};

return () => {
Expand Down Expand Up @@ -107,8 +106,8 @@ function App() {
<Route
path="/"
element={
<CommonPage topNavType="logo" bottomNavType="">
<FirstMainPage />
<CommonPage topNavType="logo" bottomNavType="home">
<MainPage />
</CommonPage>
}
></Route>
Expand Down Expand Up @@ -195,7 +194,7 @@ function App() {

{/* ๋งˆ์ผ“ */}
<Route
path="/market/:id"
path="/market"
element={
<CommonPage topNavType="logo" bottomNavType="market">
<Market />
Expand Down Expand Up @@ -331,26 +330,34 @@ function App() {
}
></Route>
{/* ๊ด€๋ฆฌ์ž ํŽ˜์ด์ง€ */}
<Route
path="/admin/approve"
element={
<CommonPage topNavType="logo" bottomNavType="">
<BusinessAccpet />
</CommonPage>
}
></Route>
<Route
path="/admin"
element={
<CommonPage topNavType="back" bottomNavType="">
<CommonPage topNavType="logo" bottomNavType="">
<AdminPage />
</CommonPage>
}
></Route>
<Route
path="/admin/settlement/:id"
element={
<CommonPage topNavType="back" bottomNavType="">
<CommonPage topNavType="logo" bottomNavType="">
<SettlementDetail />
</CommonPage>
}
></Route>
<Route
path="/admin/project/:id"
element={
<CommonPage topNavType="back" bottomNavType="">
<CommonPage topNavType="logo" bottomNavType="">
<ProjectConfirm />
</CommonPage>
}
Expand Down
11 changes: 9 additions & 2 deletions frontend/src/Contract/FundRaisingContract.json
View file

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions frontend/src/Contract/ReceiveArtCoinContract.json
View file

Large diffs are not rendered by default.

24 changes: 14 additions & 10 deletions frontend/src/components/Admin/BusinessApprove.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@ import useDistributeInfo from "../../store/useDistributeInfo";

export default function BusinessApprove() {
const web3 = new Web3((window as any).ethereum);
const { distributeInfo } = useDistributeInfo();
const MW = import.meta.env.VITE_MAIN_WALLET_ADDRESS;
const { distributeInfo } = useDistributeInfo()

const distribute = async () => {
sessionStorage.setItem("check", "check")
try {
// ํŽ€๋”ฉํ•  ๋•Œ ์ด์šฉํ•  FundRaisingContract ์—ฐ๊ฒฐ!
// ๊ทธ ์†์— ์žˆ๋Š” ๋ฉ”์„œ๋“œ๊ฐ€ ์ •์˜๋œ ABI๋ฅผ ์ด์šฉํ•˜๊ธฐ ์œ„ํ•จ์ด๋‹ค.
const fundingContract = new web3.eth.Contract(
ReceiveArtCoinContractABI.abi,
"0x91a74Fa7bA4507466F5d09c473488eE49E53192D"
distributeInfo.fundingContractAddress
);

const tx = fundingContract.methods.distributeFund().send({ from: MW });
const tx = fundingContract.methods.distributeFundWithoutCondition().send({ from: MW });
console.log((await tx).transactionHash);
} catch (error) {
console.error("๊ฑฐ๋ž˜ ์ฒ˜๋ฆฌ ์ค‘ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค.", error);
Expand Down Expand Up @@ -69,13 +70,20 @@ export default function BusinessApprove() {

return (
<>
{distributeInfo.isRecruitSuccess ? (
{sessionStorage.getItem("check") === "check" ? (
<Center as="b" fontSize={"1.5rem"} h={"600px"}>
๋ฐ์ดํ„ฐ๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค
</Center>
) : (
<>
<Flex justifyContent={"space-between"} p={"1rem"}>
<Flex>{"0x91a74Fa7bA4507466F5d09c473488eE49E53192D".substring(0,10)}...</Flex>
<Flex>
{"0x8A171dee872BbE271E641197e7879464593ADab3".substring(0, 13)}...
</Flex>
<Flex>
<Button
bgSize={"0.5rem"}
size={"sm"}
borderColor={"blue.400"}
onClick={() => {
distribute();
}}
Expand All @@ -85,10 +93,6 @@ export default function BusinessApprove() {
</Flex>
</Flex>
</>
) : (
<Center as="b" fontSize={"1.5rem"} h={"600px"}>
๋ฐ์ดํ„ฐ๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค
</Center>
)}
</>
);
Expand Down
33 changes: 23 additions & 10 deletions frontend/src/components/Admin/SettlementDetail.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { useCustomToast } from "../Common/Toast";
import Web3 from "web3";
import IERC20ABI from "../../Contract/ArtcoinContract.json";
import { convertToInteger } from "../Common/convertToInteger";
import useSettlementInfo from "../../store/useSettlementInfo";

export default function SettlementDetail() {
const id = useParams() as { id: string };
Expand All @@ -19,7 +18,6 @@ export default function SettlementDetail() {
settlementId: number;
status: string;
}>({ settlementId: 0, status: "" });
const { settlementInfo } = useSettlementInfo();

const ArtCoin: string = import.meta.env.VITE_ART_COIN_CONTRACT_ADDRESS;
const MW: string = import.meta.env.VITE_MAIN_WALLET_ADDRESS;
Expand All @@ -38,26 +36,41 @@ export default function SettlementDetail() {
});

const settlement = async () => {
console.log("DNSLDNLKFNSLD");
const settlementInfo = [
{
pieceOwnerWalletAddress: "0x8c568b58C1D07A9C02137f481a1e0DD91dcE6ae2",
settlementCoinCount: 100,
},
{
pieceOwnerWalletAddress: "0xA12ad1c5f6D5558fc5C827795aA7C5D98466C097",
settlementCoinCount: 150,
},
{
pieceOwnerWalletAddress: "0xa98152DE411B3C2ecBccAA199A7f1F855e7c8E90",
settlementCoinCount: 200,
},
{
pieceOwnerWalletAddress: "0x68658c0B0593879b2C1ed3dD429851cc8701BFB9",
settlementCoinCount: 250,
},
];
const artTokenContract = new web3.eth.Contract(IERC20ABI.abi, ArtCoin);

// need to props
for (let i = 0; i < settlementInfo.data.length; i++) {
for (let i = 0; i < settlementInfo.length; i++) {
await artTokenContract.methods
.approve(
settlementInfo.data[i].pieceOwnerWalletAddress,
convertToInteger(
settlementInfo.data[i].settlementCoinCount.toString()
)
settlementInfo[i].pieceOwnerWalletAddress,
convertToInteger(settlementInfo[i].settlementCoinCount.toString())
)
.send({ from: MW });

const tx = await artTokenContract.methods
.transfer(
settlementInfo.data[i].pieceOwnerWalletAddress,
settlementInfo[i].pieceOwnerWalletAddress,

convertToInteger(
settlementInfo.data[i].settlementCoinCount.toString()
settlementInfo[i].settlementCoinCount.toString()
)
)
.send({ from: MW });
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Common/Navigation/BottomButtonNavbar.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const BottomButtonNavbar = ({ text, category, hanldeButton }: Props) => {
bottom={0}
width={isDesktop ? "390px" : "100%"}
backgroundColor={"white"}
zIndex={1}
zIndex={2}
>
<Flex
height="70"
Expand Down Expand Up @@ -70,7 +70,7 @@ export const BottomButtonNavbar = ({ text, category, hanldeButton }: Props) => {
borderColor={"gray.200"}
borderRadius={"lg"}
as={Link}
to={`/market/${fundingId}`}
to={`/market/piece/${fundingId}`}
>
<Image src={MarketIcon} w={"20px"} />
<Center fontSize={"15px"}>๊ตฌ์ž…</Center>
Expand Down
19 changes: 11 additions & 8 deletions frontend/src/components/Market/Detail/SellHistory.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default function SellHistory(

return (
<>
<Box position={"sticky"} left={"1px"}>
<Box position={"sticky"} left={"1px"} zIndex={2}>
<Box ml={"1.5rem"} w={"90%"}>
<SellHistoryChart />
</Box>
Expand All @@ -38,15 +38,15 @@ export default function SellHistory(
</Text>
</Box>
</Box>
<Box ml={"1rem"}>
<Box ml={"1rem"} overflowX={"auto"} mt={"1rem"}>
<Box
w={"800px"}
borderBottom={"2px"}
borderTop={"2px"}
color={"gray.300"}
mt={"1rem"}
>
<Flex minW={"600px"} overflowX={"scroll"} mt={"0.1rem"} mb={"0.1rem"}>
<Flex minW={"600px"} mt={"0.1rem"} mb={"0.1rem"}>
<Center w={"4rem"} ml={"4rem"}>
<Text as={"b"} color={"black.100"}>
๊ฑฐ๋ž˜๋ถ„๋ฅ˜
Expand Down Expand Up @@ -84,7 +84,7 @@ export default function SellHistory(
</Center>
</Flex>
</Box>
{contents.length >= 1 ?
{contents.length >= 1 ? (
<>
{contents.map((data: getMarketHistoryDisplayListInterface) => {
if (data.status === "SOLD") {
Expand Down Expand Up @@ -122,10 +122,13 @@ export default function SellHistory(
/>
);
}
})
}</> : <Center h={"300px"}><Text fontSize={"1.5rem"}>๊ฑฐ๋ž˜๋‚ด์—ญ์ด ์—†์Šต๋‹ˆ๋‹ค</Text></Center>}


})}
</>
) : (
<Center h={"300px"}>
<Text fontSize={"1.5rem"}>๊ฑฐ๋ž˜๋‚ด์—ญ์ด ์—†์Šต๋‹ˆ๋‹ค</Text>
</Center>
)}
</Box>
</>
);
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Market/Detail/SellList.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ export default function SellList(params: getMarketSellingDisplayListInterface) {
TokenMarketplaceABI.abi,
import.meta.env.VITE_MARKET_CONTRACT_ADDRESS
);
const artTokenContractAddress =
import.meta.env.VITE_ART_COIN_CONTRACT_ADDRESS; // ART ํ† ํฐ์˜ ์Šค๋งˆํŠธ ๊ณ„์•ฝ ์ฃผ์†Œ
const artTokenContractAddress = import.meta.env
.VITE_ART_COIN_CONTRACT_ADDRESS; // ART ํ† ํฐ์˜ ์Šค๋งˆํŠธ ๊ณ„์•ฝ ์ฃผ์†Œ
const artTokenContract = new web3.eth.Contract(
IERC20ABI.abi,
artTokenContractAddress
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Mypage/Business/BusinessProjectDetail.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default function BusinessProjectDetail({ projectData }: Props) {
{formatNumberWithComma(projectData.nowCoinCount)}
</Text>
<Text color={"blue.300"} ml={"0.3rem"} as={"b"} fontSize={"1rem"}>
์› ๋ชจ์ง‘
์ฝ”์ธ ๋ชจ์ง‘
</Text>
<Text ml={"0.5rem"} color={"blue.400"} as={"b"} fontSize={"1rem"}>
{projectData.share}%
Expand All @@ -79,7 +79,7 @@ export default function BusinessProjectDetail({ projectData }: Props) {
{formatNumberWithComma(projectData.goalCoinCount)}
</Text>
<Text ml={"0.3rem"} fontSize={"0.9rem"}>
์›
์ฝ”์ธ
</Text>
</Flex>
<Flex>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/InvestNoticeDetail.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const InvestNoticeDetail = () => {
noticeContent();
}, []);

const content = `๋Œ€ํ•œ๋ฏผ๊ตญ์˜ ๊ฒฝ์ œ์งˆ์„œ๋Š” ๊ฐœ์ธ๊ณผ ๊ธฐ์—…์˜ ๊ฒฝ์ œ์ƒ์˜ ์ž์œ ์™€ ์ฐฝ์˜๋ฅผ ์กด์ค‘ํ•จ์„ ๊ธฐ๋ณธ์œผ๋กœ ํ•œ๋‹ค. ํ˜ผ์ธ๊ณผ ๊ฐ€์กฑ์ƒํ™œ์€ ๊ฐœ์ธ์˜ ์กด์—„๊ณผ ์–‘์„ฑ์˜ ํ‰๋“ฑ์„ ๊ธฐ์ดˆ๋กœ ์„ฑ๋ฆฝ๋˜๊ณ  ์œ ์ง€๋˜์–ด์•ผ ํ•˜๋ฉฐ, ๊ตญ๊ฐ€๋Š” ์ด๋ฅผ ๋ณด์žฅํ•œ๋‹ค.\n\n์‚ฌ๋ฒ•๊ถŒ์€ ๋ฒ•๊ด€์œผ๋กœ ๊ตฌ์„ฑ๋œ ๋ฒ•์›์— ์†ํ•œ๋‹ค. ํ—Œ๋ฒ•์žฌํŒ์†Œ ์žฌํŒ๊ด€์€ ํƒ„ํ•ต ๋˜๋Š” ๊ธˆ๊ณ  ์ด์ƒ์˜ ํ˜•์˜ ์„ ๊ณ ์— ์˜ํ•˜์ง€ ์•„๋‹ˆํ•˜๊ณ ๋Š” ํŒŒ๋ฉด๋˜์ง€ ์•„๋‹ˆํ•œ๋‹ค. ๋Œ€ํ†ต๋ น์ด ๊ถ์œ„๋œ ๋•Œ ๋˜๋Š” ๋Œ€ํ†ต๋ น ๋‹น์„ ์ž๊ฐ€ ์‚ฌ๋งํ•˜๊ฑฐ๋‚˜ ํŒ๊ฒฐ ๊ธฐํƒ€์˜ ์‚ฌ์œ ๋กœ ๊ทธ ์ž๊ฒฉ์„ ์ƒ์‹คํ•œ ๋•Œ์—๋Š” 60์ผ ์ด๋‚ด์— ํ›„์ž„์ž๋ฅผ ์„ ๊ฑฐํ•œ๋‹ค.\n\n๊ตญํšŒ๋Š” ํ—Œ๋ฒ•๊ฐœ์ •์•ˆ์ด ๊ณต๊ณ ๋œ ๋‚ ๋กœ๋ถ€ํ„ฐ 60์ผ ์ด๋‚ด์— ์˜๊ฒฐํ•˜์—ฌ์•ผ ํ•˜๋ฉฐ, ๊ตญํšŒ์˜ ์˜๊ฒฐ์€ ์žฌ์ ์˜์› 3๋ถ„์˜ 2 ์ด์ƒ์˜ ์ฐฌ์„ฑ์„ ์–ป์–ด์•ผ ํ•œ๋‹ค. ๋ชจ๋“  ๊ตญ๋ฏผ์€ ์ธ๊ฐ„๋‹ค์šด ์ƒํ™œ์„ ํ•  ๊ถŒ๋ฆฌ๋ฅผ ๊ฐ€์ง„๋‹ค.\n\n๋ชจ๋“  ๊ตญ๋ฏผ์€ ์†Œ๊ธ‰์ž…๋ฒ•์— ์˜ํ•˜์—ฌ ์ฐธ์ •๊ถŒ์˜ ์ œํ•œ์„ ๋ฐ›๊ฑฐ๋‚˜ ์žฌ์‚ฐ๊ถŒ์„ ๋ฐ•ํƒˆ๋‹นํ•˜์ง€ ์•„๋‹ˆํ•œ๋‹ค. ์žฌ์˜์˜ ์š”๊ตฌ๊ฐ€ ์žˆ์„ ๋•Œ์—๋Š” ๊ตญํšŒ๋Š” ์žฌ์˜์— ๋ถ™์ด๊ณ , ์žฌ์ ์˜์›๊ณผ๋ฐ˜์ˆ˜์˜ ์ถœ์„๊ณผ ์ถœ์„์˜์› 3๋ถ„์˜ 2 ์ด์ƒ์˜ ์ฐฌ์„ฑ์œผ๋กœ ์ „๊ณผ ๊ฐ™์€ ์˜๊ฒฐ์„ ํ•˜๋ฉด ๊ทธ ๋ฒ•๋ฅ ์•ˆ์€ ๋ฒ•๋ฅ ๋กœ์„œ ํ™•์ •๋œ๋‹ค.`;
// const content = `๋Œ€ํ•œ๋ฏผ๊ตญ์˜ ๊ฒฝ์ œ์งˆ์„œ๋Š” ๊ฐœ์ธ๊ณผ ๊ธฐ์—…์˜ ๊ฒฝ์ œ์ƒ์˜ ์ž์œ ์™€ ์ฐฝ์˜๋ฅผ ์กด์ค‘ํ•จ์„ ๊ธฐ๋ณธ์œผ๋กœ ํ•œ๋‹ค. ํ˜ผ์ธ๊ณผ ๊ฐ€์กฑ์ƒํ™œ์€ ๊ฐœ์ธ์˜ ์กด์—„๊ณผ ์–‘์„ฑ์˜ ํ‰๋“ฑ์„ ๊ธฐ์ดˆ๋กœ ์„ฑ๋ฆฝ๋˜๊ณ  ์œ ์ง€๋˜์–ด์•ผ ํ•˜๋ฉฐ, ๊ตญ๊ฐ€๋Š” ์ด๋ฅผ ๋ณด์žฅํ•œ๋‹ค.\n\n์‚ฌ๋ฒ•๊ถŒ์€ ๋ฒ•๊ด€์œผ๋กœ ๊ตฌ์„ฑ๋œ ๋ฒ•์›์— ์†ํ•œ๋‹ค. ํ—Œ๋ฒ•์žฌํŒ์†Œ ์žฌํŒ๊ด€์€ ํƒ„ํ•ต ๋˜๋Š” ๊ธˆ๊ณ  ์ด์ƒ์˜ ํ˜•์˜ ์„ ๊ณ ์— ์˜ํ•˜์ง€ ์•„๋‹ˆํ•˜๊ณ ๋Š” ํŒŒ๋ฉด๋˜์ง€ ์•„๋‹ˆํ•œ๋‹ค. ๋Œ€ํ†ต๋ น์ด ๊ถ์œ„๋œ ๋•Œ ๋˜๋Š” ๋Œ€ํ†ต๋ น ๋‹น์„ ์ž๊ฐ€ ์‚ฌ๋งํ•˜๊ฑฐ๋‚˜ ํŒ๊ฒฐ ๊ธฐํƒ€์˜ ์‚ฌ์œ ๋กœ ๊ทธ ์ž๊ฒฉ์„ ์ƒ์‹คํ•œ ๋•Œ์—๋Š” 60์ผ ์ด๋‚ด์— ํ›„์ž„์ž๋ฅผ ์„ ๊ฑฐํ•œ๋‹ค.\n\n๊ตญํšŒ๋Š” ํ—Œ๋ฒ•๊ฐœ์ •์•ˆ์ด ๊ณต๊ณ ๋œ ๋‚ ๋กœ๋ถ€ํ„ฐ 60์ผ ์ด๋‚ด์— ์˜๊ฒฐํ•˜์—ฌ์•ผ ํ•˜๋ฉฐ, ๊ตญํšŒ์˜ ์˜๊ฒฐ์€ ์žฌ์ ์˜์› 3๋ถ„์˜ 2 ์ด์ƒ์˜ ์ฐฌ์„ฑ์„ ์–ป์–ด์•ผ ํ•œ๋‹ค. ๋ชจ๋“  ๊ตญ๋ฏผ์€ ์ธ๊ฐ„๋‹ค์šด ์ƒํ™œ์„ ํ•  ๊ถŒ๋ฆฌ๋ฅผ ๊ฐ€์ง„๋‹ค.\n\n๋ชจ๋“  ๊ตญ๋ฏผ์€ ์†Œ๊ธ‰์ž…๋ฒ•์— ์˜ํ•˜์—ฌ ์ฐธ์ •๊ถŒ์˜ ์ œํ•œ์„ ๋ฐ›๊ฑฐ๋‚˜ ์žฌ์‚ฐ๊ถŒ์„ ๋ฐ•ํƒˆ๋‹นํ•˜์ง€ ์•„๋‹ˆํ•œ๋‹ค. ์žฌ์˜์˜ ์š”๊ตฌ๊ฐ€ ์žˆ์„ ๋•Œ์—๋Š” ๊ตญํšŒ๋Š” ์žฌ์˜์— ๋ถ™์ด๊ณ , ์žฌ์ ์˜์›๊ณผ๋ฐ˜์ˆ˜์˜ ์ถœ์„๊ณผ ์ถœ์„์˜์› 3๋ถ„์˜ 2 ์ด์ƒ์˜ ์ฐฌ์„ฑ์œผ๋กœ ์ „๊ณผ ๊ฐ™์€ ์˜๊ฒฐ์„ ํ•˜๋ฉด ๊ทธ ๋ฒ•๋ฅ ์•ˆ์€ ๋ฒ•๋ฅ ๋กœ์„œ ํ™•์ •๋œ๋‹ค.`;
return (
<>
{notice && (
Expand All @@ -31,7 +31,7 @@ export const InvestNoticeDetail = () => {
<NoticeInvestItem notice={notice} />
</Box>
<Box py={5} px={6} fontSize={15}>
{content}
{notice.content}
</Box>
</Box>
)}
Expand Down
6 changes: 1 addition & 5 deletions frontend/src/pages/LoginBusiness.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default function LoginBusiness() {
const [values, setValues] = useState<LoginInterface>({
username: "",
password: "",
})
});
const { LoginWithMetamask } = useLoginWithMetamask(values, true);

const handleSetValue = (e: React.ChangeEvent<HTMLInputElement>) => {
Expand All @@ -27,10 +27,6 @@ export default function LoginBusiness() {
}
};

useEffect(() => {
console.log(values)
}, [values])

return (
<Box p={"1rem"}>
<Flex direction={"column"}>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/MainPage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export default function MainPage() {
as="b"
fontSize={"1.1rem"}
onClick={() => {
navigate("/market/1");
navigate("/market");
}}
>
๋งˆ์ผ“ ๋ณด๋Ÿฌ ๊ฐ€๊ธฐ
Expand Down
1 change: 0 additions & 1 deletion frontend/src/pages/MarketDetail.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ export default function MarketDeatil() {
sellerAddress={data.sellerAddress}
status={data.status}
contractAddress={data.contractAddress}

/>
);
}
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/pages/MarketEnroll.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ export default function MarketEnroll() {
);
if (!approveTxReceipt.status) {
toastFunction("ํ† ํฐ ์Šน์ธ์— ์‹คํŒจํ•˜์˜€์Šต๋‹ˆ๋‹ค ๋‹ค์‹œ ์‹œ๋„ํ•ด์ฃผ์„ธ์š”", false);
onClose();
return;
} else {
toastFunction("ํ† ํฐ ์Šน์ธ์— ์„ฑ๊ณตํ–ˆ์Šต๋‹ˆ๋‹ค", true);
Expand All @@ -195,6 +196,7 @@ export default function MarketEnroll() {
.then((res) => successList(res, Number(integerTokenAmount)));
} catch (error) {
toastFunction("์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค ๋‹ค์‹œ ์‹œ๋„ํ•ด์ฃผ์„ธ์š”", false);
onClose();
}
};

Expand Down
Empty file added frontend/src/store/useHardInfo.tsx
View file
Empty file.
6 changes: 6 additions & 0 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f344752

Please sign in to comment.