Skip to content

Commit

Permalink
feat: #4 인풋 mui 적용, 로고텍스트 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
shrewdas committed Jan 11, 2023
1 parent 3eb16e7 commit 0cd4d2f
Show file tree
Hide file tree
Showing 10 changed files with 2,907 additions and 85 deletions.
2,902 changes: 2,869 additions & 33 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@material-ui/core": "^4.12.4",
"@mui/material": "^5.11.3",
"@testing-library/jest-dom": "^5.16.5",
Expand All @@ -12,6 +14,7 @@
"@types/node": "^16.18.11",
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.10",
"node-sass": "^8.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.6.1",
Expand Down
2 changes: 1 addition & 1 deletion react-repo
Submodule react-repo updated from 7f41d4 to 3eb16e
3 changes: 3 additions & 0 deletions src/components/StoreRegister/Input.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.Input {
//text-align: center;
}
15 changes: 0 additions & 15 deletions src/components/StoreRegister/InputSample.js

This file was deleted.

11 changes: 8 additions & 3 deletions src/components/StoreRegister/Logo.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
.Logo {
width: 120px;
height: 120px;
width: 150px;
height: 190px;
margin-top: 110px;
object-fit: cover;
}

.Logo
.LogoText {
margin-top: -1.5em;
font-family: "BMDOHYEON";
font-size: 1.5em;
}

// margin-top: 9em;
//width: 120px;
Expand Down
4 changes: 2 additions & 2 deletions src/components/StoreRegister/Logo.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React from "react";
import LogoImage from '../../assets/image/LogoImage.png'; //이미지 불러오기

import './Logo.scss';

function Logo() {
return (
<div>
<img src={LogoImage} className="Logo"/>
<div className="LogeImage">Waiter</div>
<div className="LogoText">Waiter</div>
</div>
);
}
Expand Down
9 changes: 0 additions & 9 deletions src/components/StoreRegister/StoreRegister.tsx

This file was deleted.

41 changes: 19 additions & 22 deletions src/components/StoreRegister/input.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
import React from "react";

function InputSample() {
import * as React from 'react';
import Box from '@mui/material/Box';
import TextField from '@mui/material/TextField';

export default function Input() {
return (
<div>
<input />
<button>초기화</button>
<div>
<b>이름</b>
어쩌고저쩌고...
</div>
<div>
<b>전화번호</b>
어쩌고저쩌고...
</div>
<div>
<b>인원수</b>
어쩌고저쩌고...
</div>
</div>
<Box
component="form"
sx={{
'& > :not(style)': { m: 1, width: '25ch' },
}}
noValidate
autoComplete="off"
>
<TextField id="standard-basic" label="가게명/업소명" variant="standard" />
<TextField id="standard-basic" label="가게 번호" variant="standard" />
<TextField id="standard-basic" label="가게 주소" variant="standard" />
<TextField id="standard-basic" label="비밀번호 (4자리)" variant="standard" />
</Box>
);
}

export default InputSample;
}
2 changes: 2 additions & 0 deletions src/pages/StoreRegister/StoreRegister.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ import React from "react";
import Logo from "../../components/StoreRegister/Logo";
//import RegisterButton from "../../components/CustomerRegister/RegisterButton";
//import RegisterInput from "../../components/CustomerRegister/RegisterInput";
import Input from "../../components/StoreRegister/Input";

function CustomerRegister() {
document.body.style.backgroundColor = "#FFFBD9";
return(
<div>
<Logo/>
<Input/>
</div>);
}

Expand Down

0 comments on commit 0cd4d2f

Please sign in to comment.