Skip to content

add fetch users to actions / reducer #50

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

Open
psastras wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add fetch users to actions / reducer #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
"tslint": "^4.1.1",
"typescript": "^2.1.4",
"webdriverio": "^4.4.0",
"webpack": "^2.1.0-beta.27",
"webpack-dev-server": "^2.1.0-beta.12",
"webpack": "^2.2.0-rc.1",
"webpack-dev-server": "^2.2.0-rc.0",
"webpack-node-externals": "^1.5.4"
},
"dependencies": {
Expand Down
17 changes: 17 additions & 0 deletions src/flux/actions/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import Client from 'src/client';
import * as NProgress from 'nprogress';
import { createAction } from 'redux-actions';

const chatalyticsHost = process.env.NODE_ENV === 'development' ? 'http://localhost' : '';
const chatalyticsPort = process.env.NODE_ENV === 'development' ? 8080 : 80;

const client = new Client(chatalyticsHost, chatalyticsPort);

export const getUsers = createAction('GET_USERS', async () => {
try {
NProgress.start();
return await client.users.getUsers();
} finally {
NProgress.done();
}
});
23 changes: 23 additions & 0 deletions src/flux/reducers/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { message } from 'antd';
import { handleActions, ActionMeta } from 'redux-actions';
import * as Actions from 'src/flux/actions/client';
import User from 'src/model/user';

export class ClientState {
public readonly users: Map<string, User>;
}

export const clientReducer = handleActions({
GET_USERS: (state, action: ActionMeta<string, {}>) => {
if (action.error) {
message.error(`Error fetching users`);
} else {
return Object.assign({}, state, {
users: action.payload,
});
}
return state;
},
}, {
users: new Map<string, User>(),
});
3 changes: 3 additions & 0 deletions src/flux/reducers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import { routerReducer } from 'react-router-redux';
import { handleActions, ActionMeta } from 'redux-actions';
import * as request from 'superagent';
import * as moment from 'moment';
import { clientReducer, ClientState } from './client';

export class State {
public readonly client: ClientState;
public readonly data: Object;
public readonly dateRange: { end: moment.Moment, start: moment.Moment};
public readonly routing: any;
Expand Down Expand Up @@ -40,6 +42,7 @@ export const dateRangeReducer = handleActions({
});

export default combineReducers<State>({
client: clientReducer,
data: dataReducer,
dateRange: dateRangeReducer,
routing: routerReducer,
Expand Down
24 changes: 20 additions & 4 deletions src/pages/home/stats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,35 @@ import Vega from 'src/pages/components/charts/vega';
import Async from 'src/pages/components/async';
import { connect } from 'react-redux';
import { State } from 'src/flux/reducers';
import { ClientState } from 'src/flux/reducers/client';
import * as ClientActions from 'src/flux/actions/client';

// tslint:disable-next-line:no-var-requires
const example = require('src/assets/chart_examples/area_graph.json');
// tslint:disable-next-line:no-var-requires
const humanize = require('humanize-plus');

interface StatsProps {
client?: ClientState;
endDate?: moment.Moment;
startDate?: moment.Moment;
fetchUsers?: () => void;
}

export class Stats extends React.Component<StatsProps, {}> {
public render() {
const { startDate, endDate } = this.props;

public componentWillMount(): void {
this.props.fetchUsers();
}

public render(): JSX.Element {
const { startDate, endDate, client } = this.props;
return (
<div>
<Row style={{ textAlign: 'center', padding: '5em 0' }}>
<h1>Over the past {startDate.from(endDate, true)} there have been</h1>
<h2>
{humanize.intComma(543977)} chat messages across {humanize.intComma(353)}
{humanize.intComma(543977)} chat messages across {humanize.intComma(client.users.size)}
&nbsp;active users in {humanize.intComma(45)} active rooms
</h2>
</Row>
Expand All @@ -40,9 +49,16 @@ export class Stats extends React.Component<StatsProps, {}> {

const mapStateToProps = (state: State, props: StatsProps): StatsProps => {
return {
client: state.client,
endDate: state.dateRange.end,
startDate: state.dateRange.start,
};
};

export default connect(mapStateToProps)(Stats);
const mapDispatchToProps = (dispatch): StatsProps => {
return {
fetchUsers: () => dispatch(ClientActions.getUsers()),
};
};

export default connect(mapStateToProps, mapDispatchToProps)(Stats);
4 changes: 2 additions & 2 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
devtool: "source-map",
entry: [
"./src/index.tsx",
"webpack-dev-server/client?http://127.0.0.1:8080",
"webpack-dev-server/client?http://localhost:3000",
"webpack/hot/only-dev-server",
],

Expand Down Expand Up @@ -49,7 +49,7 @@ module.exports = {

output: {
filename: "bundle.js",
publicPath: "http://127.0.0.1:8080/",
publicPath: "http://localhost:3000/",
},

plugins: [
Expand Down
45 changes: 18 additions & 27 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2508,15 +2508,6 @@ end-of-stream@^1.0.0:
dependencies:
once "~1.3.0"

enhanced-resolve@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz#a115c32504b6302e85a76269d7a57ccdd962e359"
dependencies:
graceful-fs "^4.1.2"
memory-fs "^0.3.0"
object-assign "^4.0.1"
tapable "^0.2.3"

enhanced-resolve@^3.0.0:
version "3.0.2"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.0.2.tgz#0fa709f29e59ee23e6bbcb070c85f992d6247cd1"
Expand Down Expand Up @@ -4279,16 +4270,16 @@ media-typer@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"

memory-fs@^0.3.0, memory-fs@~0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"
memory-fs@^0.4.0, memory-fs@~0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
dependencies:
errno "^0.1.3"
readable-stream "^2.0.1"

memory-fs@^0.4.0, memory-fs@~0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
memory-fs@~0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"
dependencies:
errno "^0.1.3"
readable-stream "^2.0.1"
Expand Down Expand Up @@ -6310,7 +6301,7 @@ select-hose@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"

selenium-standalone@^5.8.0:
selenium-standalone@^5.9.0:
version "5.9.0"
resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-5.9.0.tgz#988c89da94277e5b8f236718f28e9eecccde99bd"
dependencies:
Expand Down Expand Up @@ -6836,7 +6827,7 @@ tap-xunit@^1.4.0:
xmlbuilder "~4.1.0"
xtend "~4.0.0"

tapable@^0.2.3, tapable@^0.2.5, tapable@~0.2.3:
tapable@^0.2.5, tapable@~0.2.5:
version "0.2.5"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.5.tgz#1ff6ce7ade58e734ca9bfe36ba342304b377a4d0"

Expand Down Expand Up @@ -7356,7 +7347,7 @@ webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"

webpack-dev-middleware@^1.4.0:
webpack-dev-middleware@^1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.9.0.tgz#a1c67a3dfd8a5c5d62740aa0babe61758b4c84aa"
dependencies:
Expand All @@ -7365,9 +7356,9 @@ webpack-dev-middleware@^1.4.0:
path-is-absolute "^1.0.0"
range-parser "^1.0.3"

webpack-dev-server@^2.1.0-beta.12:
version "2.1.0-beta.12"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.1.0-beta.12.tgz#f717e7b69214dae0e7a2061c12d128432d7520ef"
webpack-dev-server@^2.2.0-rc.0:
version "2.2.0-rc.0"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.2.0-rc.0.tgz#ea8a11e211d9524b8999945fe5645481a51fdf46"
dependencies:
chokidar "^1.6.0"
compression "^1.5.2"
Expand All @@ -7382,7 +7373,7 @@ webpack-dev-server@^2.1.0-beta.12:
spdy "^3.4.1"
strip-ansi "^3.0.0"
supports-color "^3.1.1"
webpack-dev-middleware "^1.4.0"
webpack-dev-middleware "^1.9.0"
yargs "^6.0.0"

webpack-node-externals@^1.5.4:
Expand All @@ -7396,16 +7387,16 @@ webpack-sources@^0.1.0:
source-list-map "~0.1.0"
source-map "~0.5.3"

webpack@^2.1.0-beta.27:
version "2.1.0-beta.28"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.1.0-beta.28.tgz#8f9402c05bae04ab8d3918489b3547544a2e2641"
webpack@^2.2.0-rc.1:
version "2.2.0-rc.1"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.0-rc.1.tgz#5a85e73942b6ecc23ce6bc9e6d0883883e692e29"
dependencies:
acorn "^4.0.3"
acorn-dynamic-import "^2.0.0"
ajv "^4.7.0"
ajv-keywords "^1.1.1"
async "^2.1.2"
enhanced-resolve "^2.2.0"
enhanced-resolve "^3.0.0"
interpret "^1.0.0"
json-loader "^0.5.4"
loader-runner "^2.2.0"
Expand All @@ -7416,7 +7407,7 @@ webpack@^2.1.0-beta.27:
object-assign "^4.0.1"
source-map "^0.5.3"
supports-color "^3.1.0"
tapable "~0.2.3"
tapable "~0.2.5"
uglify-js "~2.7.3"
watchpack "^1.0.0"
webpack-sources "^0.1.0"
Expand Down