Client: refactor + minor changes
This commit is contained in:
		@@ -3,7 +3,7 @@ import { Redirect, Route, Switch } from 'react-router-dom'
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import './App.css'
 | 
					import './App.css'
 | 
				
			||||||
import Admin from './Admin'
 | 
					import Admin from './Admin'
 | 
				
			||||||
import Activity from './Activities/index'
 | 
					import Activity from './Activity/index'
 | 
				
			||||||
import Dashboard from './Dashboard'
 | 
					import Dashboard from './Dashboard'
 | 
				
			||||||
import Logout from './User/Logout'
 | 
					import Logout from './User/Logout'
 | 
				
			||||||
import NavBar from './NavBar'
 | 
					import NavBar from './NavBar'
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -45,7 +45,7 @@ class Statistics extends React.Component {
 | 
				
			|||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <div className="card-body">
 | 
					        <div className="card-body">
 | 
				
			||||||
          {Object.keys(statistics).length === 0 ? (
 | 
					          {Object.keys(statistics).length === 0 ? (
 | 
				
			||||||
            'No activities!'
 | 
					            'No workouts'
 | 
				
			||||||
          ) : (
 | 
					          ) : (
 | 
				
			||||||
            <div className="chart-month">
 | 
					            <div className="chart-month">
 | 
				
			||||||
              <div className="row chart-radio">
 | 
					              <div className="row chart-radio">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,7 +13,7 @@ export default function UserStatistics (props) {
 | 
				
			|||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
            <div className="col-9 text-right">
 | 
					            <div className="col-9 text-right">
 | 
				
			||||||
              <div className="huge">{user.nbActivities}</div>
 | 
					              <div className="huge">{user.nbActivities}</div>
 | 
				
			||||||
              <div>{user.nbActivities === 1 ? 'activity' : 'activities'}</div>
 | 
					              <div>{`workout${user.nbActivities !== 1 && 's'}`}</div>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -42,7 +42,7 @@ function NavBar(props) {
 | 
				
			|||||||
                      pathname: '/activities/add',
 | 
					                      pathname: '/activities/add',
 | 
				
			||||||
                    }}
 | 
					                    }}
 | 
				
			||||||
                  >
 | 
					                  >
 | 
				
			||||||
                    Add a workout
 | 
					                    Add workout
 | 
				
			||||||
                  </Link>
 | 
					                  </Link>
 | 
				
			||||||
                </li>
 | 
					                </li>
 | 
				
			||||||
              )}
 | 
					              )}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user