refactor

fittrackee_client/src/components/Activity/ActivityDisplay/ActivityCardHeader.jsx

@@ -1,7 +1,8 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
 
-import { formatActivityDate, getDateWithTZ } from '../../../utils'
+import { getDateWithTZ } from '../../../utils'
+import { formatActivityDate } from '../../../utils/activities'
 
 
 export default function ActivityCardHeader(props) {

fittrackee_client/src/components/Activity/ActivityDisplay/ActivityMap.jsx

@@ -4,7 +4,8 @@ import { GeoJSON, Map, TileLayer } from 'react-leaflet'
 import { connect } from 'react-redux'
 
 import { getActivityGpx } from '../../../actions/activities'
-import { getGeoJson, thunderforestApiKey } from '../../../utils'
+import { thunderforestApiKey } from '../../../utils'
+import { getGeoJson } from '../../../utils/activities'
 
 class ActivityMap extends React.Component {
 

fittrackee_client/src/components/Activity/ActivityForms/FormWithoutGpx.jsx

@@ -5,7 +5,7 @@ import {
   addActivityWithoutGpx, editActivity
 } from '../../../actions/activities'
 import { history } from '../../../index'
-import { formatActivityDate } from '../../../utils'
+import { formatActivityDate } from '../../../utils/activities'
 
 function FormWithoutGpx (props) {
   const { activity, onAddOrEdit, sports } = props

fittrackee_client/src/components/Common/Stats/CustomTooltip.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { formatDuration } from '../../../utils'
+import { formatDuration } from '../../../utils/stats'
 
 const formatValue = (displayedData, value) => displayedData === 'duration'
   ? formatDuration(value, true)

fittrackee_client/src/components/Common/Stats/StatsChart.jsx

@@ -3,7 +3,8 @@ import {
    Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis
 } from 'recharts'
 
-import { activityColors, formatDuration } from '../../../utils'
+import { activityColors } from '../../../utils/activities'
+import { formatDuration } from '../../../utils/stats'
 import CustomTooltip from './CustomTooltip'
 
 

fittrackee_client/src/components/Common/Stats/index.jsx

@@ -3,7 +3,7 @@ import React from 'react'
 import { connect } from 'react-redux'
 
 import { getStats } from '../../../actions/stats'
-import { formatStats } from '../../../utils'
+import { formatStats } from '../../../utils/stats'
 import StatsChart from './StatsChart'
 
 

fittrackee_client/src/components/Dashboard/Calendar.jsx

@@ -6,7 +6,8 @@ import { connect } from 'react-redux'
 import { Link } from 'react-router-dom'
 
 import { getMonthActivities } from '../../actions/activities'
-import { getDateWithTZ, recordsLabels } from '../../utils'
+import { getDateWithTZ } from '../../utils'
+import { recordsLabels } from '../../utils/activities'
 
 const getStartAndEndMonth = date => {
   const monthStart = dateFns.startOfMonth(date)

fittrackee_client/src/components/Dashboard/Records.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
 
-import { formatRecord } from '../../utils'
+import { formatRecord } from '../../utils/activities'
 
 export default function RecordsCard (props) {
   const { records, sports, user } = props