Skip to content

Commit c7ecf7c

Browse files
committed
changed the directory structure.
1 parent 7debce8 commit c7ecf7c

File tree

11 files changed

+19
-30
lines changed

11 files changed

+19
-30
lines changed

BankApplicationFrontend/src/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import React from 'react';
44
import ReactDOM from 'react-dom';
55

6-
import MainPage from './pages/MainPage';
6+
import MainPage from './pages/MainPage/MainPage';
77

88
import 'bootstrap/dist/css/bootstrap.min.css';
99

BankApplicationFrontend/src/components/MoneyBar.js renamed to BankApplicationFrontend/src/components/MoneyBar/MoneyBar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import React from 'react';
22
import { Alert } from 'react-bootstrap'
33
import { connect } from 'react-redux'
44

5-
import Request from '../services/Request'
6-
import { showDialog, currenciesUptodate } from '../actions';
5+
import Request from '../../services/Request'
6+
import { showDialog, currenciesUptodate } from '../../actions';
77

88
const mapStateToProps = state => ({
99
loggedInUsername: state.login,

BankApplicationFrontend/src/components/PopupDialog.js renamed to BankApplicationFrontend/src/components/PopupDialog/PopupDialog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react'
22
import { Modal, Button } from 'react-bootstrap'
33
import { connect } from 'react-redux'
4-
import { closeDialog } from '../actions';
4+
import { closeDialog } from '../../actions';
55

66
const mapStateToProps = state => ({
77
show: state.dialog.isOpen,

BankApplicationFrontend/src/pages/inner/LoginPage.js renamed to BankApplicationFrontend/src/pages/LoginPage/LoginPage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Form, Button } from 'react-bootstrap';
33
import { Redirect } from 'react-router-dom';
44
import { connect } from 'react-redux'
55

6-
import FormElement from '../../components/FormElement';
6+
import FormElement from '../../components/FormElement/FormElement';
77
import Request from '../../services/Request';
88
import { login, showDialog } from '../../actions';
99

BankApplicationFrontend/src/pages/MainPage.js renamed to BankApplicationFrontend/src/pages/MainPage/MainPage.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ import { Container } from 'react-bootstrap'
33
import { BrowserRouter as Router, Route } from 'react-router-dom'
44
import { connect } from 'react-redux'
55

6-
import NavBarTop from '../components/NavigationBar/NavigationBar';
7-
import PopupDialog from '../components/PopupDialog';
6+
import NavBarTop from '../../components/NavigationBar/NavigationBar';
7+
import PopupDialog from '../../components/PopupDialog/PopupDialog';
88

9-
import HomePage from './inner/HomePage';
10-
import UsersPage from './inner/UsersPage';
11-
import CurrencyPage from './CurrencyPage/CurrencyPage';
12-
import TransferPage from './inner/TransferPage';
13-
import HistoryPage from './inner/HistoryPage';
9+
import HomePage from '../HomePage/HomePage';
10+
import UsersPage from '../UsersPage/UsersPage';
11+
import CurrencyPage from '../CurrencyPage/CurrencyPage';
12+
import TransferPage from '../TransferPage/TransferPage';
13+
import HistoryPage from '../HistoryPage/HistoryPage';
1414

15-
import RegisterPage from './inner/RegisterPage';
16-
import LoginPage from './inner/LoginPage';
15+
import RegisterPage from '../RegisterPage/RegisterPage';
16+
import LoginPage from '../LoginPage/LoginPage';
1717

18-
import MoneyBar from '../components/MoneyBar';
18+
import MoneyBar from '../../components/MoneyBar/MoneyBar';
1919

20-
import { login } from '../actions';
20+
import { login } from '../../actions';
2121

2222
const mapDispatchToProps = dispatch => ({
2323
login: (username) => dispatch(login(username))
@@ -45,8 +45,8 @@ class MainPage extends React.Component {
4545
<MoneyBar />
4646
<Route exact path="/" component={HomePage} />
4747
<Route exact path="/users" component={UsersPage} />
48-
<Route exact path="/currency" render={() => <CurrencyPage onOwnedCurrenciesUpdated={this.retrieveWealthAndUpdateState} />} />
49-
<Route exact path="/transfer" render={() => <TransferPage onOwnedCurrenciesUpdated={this.retrieveWealthAndUpdateState} />} />
48+
<Route exact path="/currency" component={CurrencyPage} />
49+
<Route exact path="/transfer" component={TransferPage} />
5050
<Route exact path="/history" component={HistoryPage} />
5151
<Route exact path="/login" component={LoginPage} />
5252
<Route exact path="/register" component={RegisterPage} />

BankApplicationFrontend/src/pages/inner/RegisterPage.js renamed to BankApplicationFrontend/src/pages/RegisterPage/RegisterPage.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import { Redirect } from 'react-router-dom';
33
import { Form, Button } from 'react-bootstrap';
44
import { connect } from 'react-redux'
5-
import FormElement from '../../components/FormElement';
5+
import FormElement from '../../components/FormElement/FormElement';
66
import Request from '../../services/Request';
77
import { login, showDialog } from '../../actions';
88

@@ -37,7 +37,6 @@ class RegisterPage extends React.Component {
3737
this.handleFirstPasswordChange = this.handleFirstPasswordChange.bind(this);
3838
this.handleSecondPasswordChange = this.handleSecondPasswordChange.bind(this);
3939
this.handleTcNoChange = this.handleTcNoChange.bind(this);
40-
this.resetFields = this.resetFields.bind(this);
4140
}
4241

4342
handleUsernameChange(e) {
@@ -56,15 +55,6 @@ class RegisterPage extends React.Component {
5655
this.setState({ secondPass: e.target.value });
5756
}
5857

59-
resetFields() {
60-
this.setState({
61-
username: '',
62-
tcno: '',
63-
firstPass: '',
64-
secondPass: ''
65-
});
66-
}
67-
6858
handleClick() {
6959

7060
if (this.state.firstPass != this.state.secondPass) {
@@ -96,7 +86,6 @@ class RegisterPage extends React.Component {
9686
}
9787
this.props.showPopup(0, errorMessage);
9888
}).finally(() => {
99-
this.resetFields();
10089
this.setState({
10190
isProcessingRegister: false
10291
});

0 commit comments

Comments
 (0)