Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

送金完了の通知 #60

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+25 −10
Open

送金完了の通知 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70b81f7
総資産表示
Dec 3, 2018
050f3dc
送金完了通知の実装
Dec 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/components/Send.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ const styles = theme => ({
width: "100%",
},
submitButtonWeb: {
background: "#FF8C00",
margin: theme.spacing.unit,
width: 200,
},
submitButtonApp: {
background: "#FF8C00",
justifyContent: "center",
transform: 'translate(50%,-50%)',
width: "50%",
Expand Down Expand Up @@ -59,7 +61,19 @@ const styles = theme => ({
left: '50%',
transform: 'translate(-50%,-50%)',
},
property:{
width: 200,
fontWeight: 'normal',
justifyContent: "center",
marginBottom: theme.spacing.unit*2,
marginLeft: theme.spacing.unit,
marginRight: theme.spacing.unit,
},
Big:{
fontSize: '30px',
},
});

const Send = (props) =>{
const { classes } = props;
const ERR_EMPTY_MESSAGE="入力されていません";
Expand All @@ -73,6 +87,9 @@ const Send = (props) =>{
onSubmit={e=>{props.sendSubmit(e)}}
>
<div>
{!(IS_TABLET)?<Typography variant="h6" className={classes.property}>
総資産 <span className={classes.Big}>{props.Propety}</span> FNY
</Typography>:null}
<TextField　className={IS_TABLET?classes.textFieldApp:classes.textFieldWeb}
label="送金金額"
id="sendMoney"
Expand Down
13 changes: 8 additions & 5 deletions src/containers/AppSend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class AppSend extends Component {
submitModal: false,
errorEmptyNum: false,
errorEmptyMoney: false,
Propety: 253,
};

handleChange =e=> {
Expand Down Expand Up @@ -60,11 +61,13 @@ class AppSend extends Component {
errorEmptyNum: false,
submitModal: false,
});
alert('送金できました！');
};
render(){
return (
<div className='Send'>
<Send
Propety={this.state.Propety}
sendSubmit={(e)=>{this.sendSubmit(e)}}
errorMoney={this.state.errorMoney}
errorNum={this.state.errorNum}
Expand All @@ -73,11 +76,11 @@ class AppSend extends Component {
submitModal={this.state.submitModal}
closeModal={this.closeModal}
sendDetermine={this.sendDetermine}
handleChange={(e)=>{this.handleChange(e)}}
sendMoney={this.state.sendMoney}
studentNum={this.state.studentNum}
/>
</div>
handleChange={(e)=>{this.handleChange(e)}}
sendMoney={this.state.sendMoney}
studentNum={this.state.studentNum}
/>
</div>
);
}
}
Expand Down
5 changes: 0 additions & 5 deletions src/containers/Request_BACKUP_63967.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import React, { Component } from 'react';
import RequestInput from '../components/RequestInput.js';
import RequestButton from '../components/RequestButton.js';
<<<<<<< HEAD
import RequestButtonModal from '../components/RequestButtonModal.js';

=======
>>>>>>> 携帯版の要求画面を作成
import '../App.css'

class Request extends Component {
Expand Down