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.

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

Alex-Willenbrink's Solution' #6

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
19ca831
init commit
Sep 8, 2017
629f604
server set up
Sep 8, 2017
1afa556
found apple ticker bug
Alex-Willenbrink Sep 8, 2017
9d9ed5f
async js server code complete
Sep 8, 2017
b5939d2
trying slider options
Alex-Willenbrink Sep 8, 2017
8b98b30
client side routing
Sep 8, 2017
4cde427
fun errors for Eric
Alex-Willenbrink Sep 8, 2017
dd2e087
for looping dates, data scrubbed
Sep 8, 2017
096c542
screwing around with markup
Alex-Willenbrink Sep 8, 2017
58b83f0
starting on store, links, dropdown
Sep 8, 2017
0b98ff6
action creator maybe works?
Alex-Willenbrink Sep 8, 2017
991a754
last commit
Alex-Willenbrink Sep 8, 2017
7bb2152
data scrubbing is completely finished
Alex-Willenbrink Sep 10, 2017
ec34864
react redux components up and running along with date picker
Alex-Willenbrink Sep 11, 2017
558000c
forgot to commit
Alex-Willenbrink Sep 11, 2017
6ab5c2b
f
Alex-Willenbrink Sep 11, 2017
4e9a418
added PerfProfiler and made table displays more efficiently rendered
Alex-Willenbrink Sep 15, 2017
5a3c71d
will come back to implement reselect for StocksContainer
Alex-Willenbrink Sep 15, 2017
b6ea9f2
added date widget component for finding correct date
Alex-Willenbrink Oct 30, 2017
6f816cf
date slider separated into presentational and functional componnets a…
Alex-Willenbrink Oct 31, 2017
0ad985e
table to display stocks on different days is up
Alex-Willenbrink Oct 31, 2017
f11a5f5
stocks table sorts symbol by asc or desc, filter works for symbol, an…
Alex-Willenbrink Nov 1, 2017
1952775
if stock diff is 0, no wing is displayed
Alex-Willenbrink Nov 1, 2017
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
Prev Previous commit
Next Next commit
starting on store, links, dropdown
Eric Glover committed Sep 8, 2017
commit 58b83f02a0bc7e5f664de82110cc23e07f7fa864
835 changes: 827 additions & 8 deletions client/package-lock.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -15,13 +15,15 @@
"react-datetime-slider": "0.0.8",
"react-dom": "^15.6.1",
"react-loading": "^0.1.4",
"react-redux": "^5.0.6",
"react-router-dom": "^4.2.2",
"react-scripts": "1.0.13",
"react-tap-event-plugin": "^2.0.1",
"react-time-slider": "0.0.1",
"reactstrap": "^4.8.0",
"redux": "^3.7.2",
"redux-thunk": "^2.2.0"
"redux-thunk": "^2.2.0",
"thunk": "0.0.1"
},
"scripts": {
"start": "react-scripts start",
6 changes: 4 additions & 2 deletions client/public/index.html
Original file line number Diff line number Diff line change
@@ -8,8 +8,10 @@
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<!-- <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico"> -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
29 changes: 15 additions & 14 deletions client/src/Components/App.js
Original file line number Diff line number Diff line change
@@ -1,35 +1,36 @@
import React, { Component } from "react";

import { createStore, Provider, applyMiddleWare } from "react-redux";
import { Route, Switch } from "react-router-dom";
import { BrowserRouter as Router } from "react-router-dom";
//Portfolio, trade, transaction
import Portfolio from "./Portfolio";
import Trade from "./Trade";
import Transactions from "./Transactions";
import { Button } from "reactstrap";
import Example from "./Text";
// import classnames from "classnames";
// import reactTapEventPlugin from "react-tap-event-plugin";
// const moment = require("moment");

import StockContainer from "../Containers/StocksContainer";
import NavLinks from "./NavLinks";
import { NavLink } from "react-router-dom";

const store = createStore({});

class App extends Component {
render() {
return (
<div className="App">
<h1>Stock Portfolio App</h1>
<div>
{/* <NavLinks /> */}
<Example />
<Button color="danger">Danger</Button>
</div>
<Router>
<Switch>
<Route exact path="/Portfolio" component={Portfolio} />
<Route exact path="/Transactions" component={Transactions} />
<Route exact path="/Trade" component={Trade} />
</Switch>
<div className="container">
<h1>Stock Portfolio App</h1>
<NavLinks />
<StockContainer />
<Switch>
<Route exact path="/Portfolio" component={Portfolio} />
<Route exact path="/Transactions" component={Transactions} />
<Route exact path="/Trade" component={Trade} />
</Switch>
</div>
</Router>
</div>
);
6 changes: 3 additions & 3 deletions client/src/Components/NavLinks.js
Original file line number Diff line number Diff line change
@@ -27,14 +27,14 @@ export default class NavLinks extends Component {
render() {
return (
<ButtonDropdown isOpen={this.state.dropdownOpen} toggle={this.toggle}>
<DropdownToggle caret>Button Dropdown</DropdownToggle>
<DropdownToggle caret>SOMETHING FINANCIAL</DropdownToggle>
<DropdownMenu>
<DropdownItem header>
<DropdownItem>
<NavLink className="nav-link" exact to="/Portfolio">
Portfolio
</NavLink>
</DropdownItem>
<DropdownItem disabled>
<DropdownItem>
<NavLink className="nav-link" exact to="/Trade">
Trade
</NavLink>
6 changes: 6 additions & 0 deletions client/src/Components/Stocks.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import React, { Component } from "react";
import { Link } from "react-router-dom";

export const Stocks = () => {
<div>Table here later???</div>;
};
39 changes: 0 additions & 39 deletions client/src/Components/Text.js

This file was deleted.

12 changes: 12 additions & 0 deletions client/src/Containers/StocksContainer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from "react";
import { connect } from "react-redux";
import { Stocks } from "../Components/Stocks";

const mapStateToProps = state => {
return {};
};
const mapDispatchToProps = dispatch => {
return {};
};

export default connect(mapStateToProps, mapDispatchToProps)(Stocks);