Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10,014 changes: 10,014 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"react-scripts": "0.7.0"
},
"dependencies": {
"eslint": "^6.2.2",
"prop-types": "^15.5.8",
"react": "^15.3.2",
"react-dom": "^15.3.2",
Expand Down
8 changes: 4 additions & 4 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ function App(props) {
</div>
</div>
<div className="row">
<Comments newComments={props.newComments} />
<Tasks newTasks={props.newTasks} />
<Orders newOrders={props.newOrders} />
<Tickets tickets={props.tickets} />
<Comments />
<Tasks />
<Orders />
<Tickets />
</div>
<AreaChart />
<div className="row">
Expand Down
12 changes: 11 additions & 1 deletion src/components/Comments.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import {connect} from 'react-redux';

function Comments(props) {
return (
Expand Down Expand Up @@ -26,4 +27,13 @@ function Comments(props) {
</div>);
}

export default Comments;
const mapStateToProps = function (state) {
return {
newComments: state.newComments
};
};

export default connect(mapStateToProps)(Comments);


// export default Comments;
10 changes: 8 additions & 2 deletions src/components/Orders.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import {connect} from "react-redux";

function Orders(props) {
return (
Expand All @@ -25,5 +26,10 @@ function Orders(props) {
</div>
</div>);
}

export default Orders;
const mapStateToProps = function (state) {
return {
newOrders: state.newOrders
};
};
export default connect(mapStateToProps,null)(Orders);
// export default Orders;
11 changes: 8 additions & 3 deletions src/components/Tasks.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import {connect} from "react-redux";

function Tasks(props) {
return ( <div className="col-lg-3 col-md-6">
Expand All @@ -24,6 +25,10 @@ function Tasks(props) {
</div>
</div>);
}

export default Tasks;

const mapStateToProps = function (state) {
return {
newTasks: state.newTasks
};
};
export default connect(mapStateToProps,null)(Tasks);
// export default Tasks;
11 changes: 9 additions & 2 deletions src/components/TasksPanel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from "react";
import TaskItem from "./TaskItem";
import {connect} from "react-redux";

function TasksPanel(props) {
return ( <div className="panel panel-default">
<div className="panel-heading">
Expand All @@ -21,5 +23,10 @@ function TasksPanel(props) {
</div>
);
}

export default TasksPanel;
const mapStateToProps = function (state) {
return {
tasks: state.tasks
};
};
export default connect(mapStateToProps,null)(TasksPanel);
// export default TasksPanel;
5 changes: 3 additions & 2 deletions src/components/Tickets.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ function Tickets(props) {
</div>
</div>);
}

const mapStateToProps = function (state) {
return {
tickets: state.tickets
};
};
export default (Tickets);
// export default connect(mapStateToProps,null)(Tickets);
export default connect(mapStateToProps,null)(Tickets);


// export default Tickets;
10 changes: 8 additions & 2 deletions src/components/TopNav.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";
import MessagePreview from "./MessagePreview";
import {connect} from "react-redux";

function TopNav(props) {
return (
Expand Down Expand Up @@ -65,5 +66,10 @@ function TopNav(props) {
</li>
</ul>);
}

export default TopNav;
const mapStateToProps = function (state) {
return {
messages: state.messages
};
};
export default connect(mapStateToProps,null)(TopNav);
// export default TopNav;
10 changes: 9 additions & 1 deletion src/components/TransactionsPanel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";
import TransactionRow from "./TransactionRow";
import {connect} from "react-redux";

function TransactionsPanel(props) {
return (
Expand Down Expand Up @@ -35,4 +36,11 @@ function TransactionsPanel(props) {
</div> );
}

export default TransactionsPanel;
const mapStateToProps = function (state) {
return {
orders: state.orders
};
};
export default connect(mapStateToProps,null)(TransactionsPanel);

// export default TransactionsPanel;
28 changes: 5 additions & 23 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,13 @@ import React from "react";
import ReactDOM from "react-dom";
import App from "./App";
import "./index.css";
import state from "./state";
//import state from "./state";
import {Provider} from "react-redux";
import store from "./store";

const {
dateTime,
newComments,
newTasks,
newOrders,
tickets,
orders,
taskItem,
tasks,
messages
} = state;

ReactDOM.render(
<App
taskItem={taskItem}
dateTime={dateTime}
newComments={newComments}
newTasks={newTasks}
newOrders={newOrders}
tickets={tickets}
orders={orders}
messages={messages}
tasks={tasks}
/>,
<Provider store={store}><App/></Provider>,
document.getElementById("root")
);
//
60 changes: 60 additions & 0 deletions src/reducers/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import { combineReducers } from 'redux';

function newComments(state = 0, action){
if(action.type === "SEE_COMMENTS"){
return action.value;
}
return state;
}

function newTasks(state = 0, action){
if(action.type === "SEE_TASKS"){
return action.value;
}
return state;
}

function newOrders(state = 0, action){
if(action.type === "SEE_ORDERS"){
return action.value;
}
return state;
}

function tickets(state = 0, action){
if(action.type === "SET_TICKETS"){
return action.value;
}
return state;
}

function orders(state = 0, action){
if(action.type === "SET_ORDERS"){
return action.value;
}
return state;
}

function tasks(state = 0, action){
if(action.type === "SET_TASKS"){
return action.value;
}
return state;
}

function messages(state = 0, action){
if(action.type === "SET_MESSAGES"){
return action.value;
}
return state;
}

export default combineReducers({
newComments,
newTasks,
newOrders,
tickets,
orders,
tasks,
messages
})
7 changes: 7 additions & 0 deletions src/store.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import {createStore} from "redux";
import state from "./state";
import reducers from "./reducers/index";

let store = createStore(reducers, state);

export default store;