Skip to content

Commit

Permalink
Fix bugs. Show version number in footer.
Browse files Browse the repository at this point in the history
  • Loading branch information
faddiv committed Jan 12, 2020
1 parent 681e559 commit ee051a4
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ obj/
bin/
coverage/
wwwroot/
build/

# dependencies
node_modules/
Expand Down
2 changes: 2 additions & 0 deletions Wallet-Firebase/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
REACT_APP_VERSION=$npm_package_version
REACT_APP_NAME=$npm_package_name
2 changes: 1 addition & 1 deletion Wallet-Firebase/firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"rules": "database.rules.json"
},
"hosting": {
"public": "wwwroot"
"public": "build"
}
}
2 changes: 1 addition & 1 deletion Wallet-Firebase/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wallet-firebase",
"version": "5.0.0",
"version": "5.0.1",
"description": "",
"main": "MobileApp/index.tsx",
"private": true,
Expand Down
1 change: 1 addition & 0 deletions Wallet-Firebase/src/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const Layout: React.SFC<LayoutProps> = ({ ...rest }) => {
<Container role="main">
{rest.children}
</Container>
<footer className="text-center text-black-50 font-weight-light">Version: {process.env.REACT_APP_VERSION}</footer>
</>
);
};
Expand Down
4 changes: 2 additions & 2 deletions Wallet-Firebase/src/pages/home/subComponents/editRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ export const EditRow: React.SFC<EditRowProps> = ({ item, save, cancel }) => {
</Col>
</Row>
<Row form>
<Col xs={7}>
<Col>
<DateInput value={checkedDate} onChange={setCheckedDate} />
</Col>
<Col xs={5}>
<Col xs="auto">
<IconButton icon="check" size="lg" onClick={saveAndChecInternal} style={{ visibility: shouldCheck ? "visible" : "hidden" }} type="button" title="Done and save" />
<IconButton icon="save" size="lg" onClick={saveInternal} type="submit" title="Save changes" />
<IconButton icon="times" size="lg" onClick={cancelInternal} title="Cancel changes" />
Expand Down
4 changes: 2 additions & 2 deletions Wallet-Firebase/src/pages/home/subComponents/viewRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ export const ViewRow: React.SFC<ViewRowProps> = ({ item, remove, edit, index })
</Col>
</Row>
<Row>
<Col xs={8}>
<Col>
{checkedDate && moment(checkedDate).format("L")}
</Col>
<Col xs={4}>
<Col xs="auto">
<IconButton icon="edit" size="lg" onClick={editInternal} title="Edit" />
<IconButton icon="trash" size="lg" onClick={removeInternal} title="Delete" />
</Col>
Expand Down
2 changes: 1 addition & 1 deletion Wallet-Firebase/src/walletCommon/navbar/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class Navbar2 extends React.Component<NavbarProps, NavbarState> {
<Navbar color="dark" dark expand="md" fixed="top">
<NavbarBrand href="/">Wallet</NavbarBrand>
<NavbarToggler onClick={this.toggleNavbar} />
<Collapse open={open} navbar id="walletNavbar">
<Collapse isOpen={open} navbar id="walletNavbar">
<Nav className="mr-auto" navbar>
<MenuItem to="/" exact>Home</MenuItem>
<MenuItem to="/sharedPrices" exact>Share prices</MenuItem>
Expand Down

0 comments on commit ee051a4

Please sign in to comment.