Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API & Client - replace user id with username in activities, records and stats

Browse Source
This commit is contained in:
Sam
2020-02-08 15:17:07 +01:00
parent 9f487a4d68
commit 6270b15e11
20 changed files with 230 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fittrackee_client/src/actions/stats.js
View File

@ -1,8 +1,8 @@
import FitTrackeeGenericApi from '../fitTrackeeApi'
import { setData, setError } from './index'
export const getStats = (userId, type, data) => dispatch =>
FitTrackeeGenericApi.getData(`stats/${userId}/${type}`, data)
export const getStats = (userName, type, data) => dispatch =>
FitTrackeeGenericApi.getData(`stats/${userName}/${type}`, data)
.then(ret => {
if (ret.status === 'success') {
dispatch(setData('statistics', ret.data))

11
fittrackee_client/src/components/Common/Stats/index.jsx
View File

@ -13,7 +13,8 @@ class Statistics extends React.PureComponent {
componentDidUpdate(prevProps) {
if (
(this.props.user.id && this.props.user.id !== prevProps.user.id) ||
(this.props.user.username &&
this.props.user.username !== prevProps.user.username) ||
this.props.statsParams !== prevProps.statsParams
) {
this.updateData()
@ -21,9 +22,9 @@ class Statistics extends React.PureComponent {
}
updateData() {
if (this.props.user.id) {
if (this.props.user.username) {
this.props.loadActivities(
this.props.user.id,
this.props.user.username,
this.props.user.weekm,
this.props.statsParams
)
@ -61,7 +62,7 @@ export default connect(
user: state.user,
}),
dispatch => ({
loadActivities: (userId, weekm, data) => {
loadActivities: (userName, weekm, data) => {
const dateFormat = 'yyyy-MM-dd'
// depends on user config (first day of week)
const time =
@ -73,7 +74,7 @@ export default connect(
to: format(data.end, dateFormat),
time: time,
}
dispatch(getStats(userId, data.type, params))
dispatch(getStats(userName, data.type, params))
},
})
)(Statistics)