Skip to content

Commit

Permalink
Merge pull request #37 from SWF2023-HongikIngan/feature/eng
Browse files Browse the repository at this point in the history
eng
  • Loading branch information
smarthug authored Aug 1, 2023
2 parents 9967c33 + b7ce862 commit 8aa959d
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions packages/nextjs/components/Appbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ export default function ResponsiveDrawer() {
},
}}
>
<MenuItem onClick={() => handleClose("/")}>홈으로</MenuItem>
<MenuItem onClick={() => handleClose("/report")}>제보하기</MenuItem>
<MenuItem onClick={() => handleClose("/")}>전체보기</MenuItem>
<MenuItem onClick={() => handleClose("/")}>Home</MenuItem>
<MenuItem onClick={() => handleClose("/report")}>Report</MenuItem>
<MenuItem onClick={() => handleClose("/")}>List</MenuItem>
</Menu>
<ConnectButton label="CONNECT WALLET" />
</Toolbar>
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/components/WriterIPFS.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function Writer({ contractName, functionName, args, text }) {
variant="contained"
onClick={Write}
>
제보하기
Report
</Button>
);
}
12 changes: 6 additions & 6 deletions packages/nextjs/pages/report-legacy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ function CreateNFTWhenContractExist() {
}}
>
<InputLabel shrink htmlFor="uncontrolled-native">
재난 종류
Disaster type
</InputLabel>
<Select
inputProps={{
Expand All @@ -233,10 +233,10 @@ function CreateNFTWhenContractExist() {
value={type}
onChange={(e: any) => setType(e.target.value)}
>
<StyledMenuItem value={"heavyrain"}>호우</StyledMenuItem>
<StyledMenuItem value={"fire"}>화재</StyledMenuItem>
<StyledMenuItem value={"flood"}>홍수/침수</StyledMenuItem>
<StyledMenuItem value={"collapse"}>붕괴</StyledMenuItem>
<StyledMenuItem value={"heavyrain"}>Heavyrain</StyledMenuItem>
<StyledMenuItem value={"fire"}>Fire</StyledMenuItem>
<StyledMenuItem value={"flood"}>Flood</StyledMenuItem>
<StyledMenuItem value={"collapse"}>Collapse</StyledMenuItem>
</Select>
</FormControl>

Expand All @@ -248,7 +248,7 @@ function CreateNFTWhenContractExist() {
variant="contained"
type="submit"
>
제보하기
Report
</Button>
</form>
{/* <Button variant='contained' onClick={getTokenId}>getID</Button> */}
Expand Down
28 changes: 14 additions & 14 deletions packages/nextjs/pages/report/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ function CreateNFTWhenContractExist() {
)}
<ReportTitle>
<Image src="/icn_report.png" width={36} height={36} alt="icn_report" />
제보하기
Report
</ReportTitle>
<UploadTitle>사진 업로드</UploadTitle>
<UploadTitle>Upload Image</UploadTitle>
<div style={test}>
<UploadSection className="container">
{thumbs.length === 0 ? (
Expand All @@ -192,7 +192,7 @@ function CreateNFTWhenContractExist() {
}}
>
<TextField
label="제목"
label="Title"
value={name}
onChange={e => setName(e.target.value)}
style={{
Expand All @@ -202,7 +202,7 @@ function CreateNFTWhenContractExist() {

<TextField
multiline={true}
label="신고 내용"
label="Report Content"
minRows={3}
value={description}
onChange={e => setDescription(e.target.value)}
Expand All @@ -211,17 +211,17 @@ function CreateNFTWhenContractExist() {
}}
/>

<ReportCategoryTitle>제보 종류</ReportCategoryTitle>
<ReportCategoryTitle>Type of Report</ReportCategoryTitle>

<ButtonBox>
<InfoButton active={alertLevel === 0} onClick={() => changeAlertLevel(0)}>
정보
Info
</InfoButton>
<ButtonCaution active={alertLevel === 1} onClick={() => changeAlertLevel(1)}>
주의
Caution
</ButtonCaution>
<AlertButton active={alertLevel === 2} onClick={() => changeAlertLevel(2)}>
경보
Alert
</AlertButton>
</ButtonBox>

Expand All @@ -231,7 +231,7 @@ function CreateNFTWhenContractExist() {
}}
>
<InputLabel shrink htmlFor="uncontrolled-native">
재난 종류
Disaster type
</InputLabel>
<Select
inputProps={{
Expand All @@ -241,10 +241,10 @@ function CreateNFTWhenContractExist() {
value={type}
onChange={handleType}
>
<StyledMenuItem value={"heavyrain"}>호우</StyledMenuItem>
<StyledMenuItem value={"fire"}>화재</StyledMenuItem>
<StyledMenuItem value={"flood"}>홍수/침수</StyledMenuItem>
<StyledMenuItem value={"collapse"}>붕괴</StyledMenuItem>
<StyledMenuItem value={"heavyrain"}>Heavyrain</StyledMenuItem>
<StyledMenuItem value={"fire"}>Fire</StyledMenuItem>
<StyledMenuItem value={"flood"}>Flood</StyledMenuItem>
<StyledMenuItem value={"collapse"}>Collapse</StyledMenuItem>
</Select>
</FormControl>
<Button
Expand All @@ -255,7 +255,7 @@ function CreateNFTWhenContractExist() {
variant="contained"
onClick={Write}
>
제보하기
Report
</Button>
</form>
</StyledBox>
Expand Down

0 comments on commit 8aa959d

Please sign in to comment.