Change the Route for profile user stats

Author: Chethan2k1

src/app/components/Leaderboard/LeaderboardElement.tsx

@@ -16,10 +16,11 @@ const colors = ['#FFB900', '#69797E', '#847545', '#038387'];
 export class LeaderboardElement extends React.Component<LeaderboardInterfaces.ElementProps, {}> {
   public render() {
     const { player, index, isPlayAgainstDisabled, runMatch, currentUsername } = this.props;
+    let urlToProfile;
     if (player.username === currentUsername) {
-      const urlToProfile = `/profile`;
+      urlToProfile = `/profile`;
     } else {
-      const urlToProfile = `/profile/${player.username}`;
+      urlToProfile = `/profile/${player.username}`;
     }
     const playerTotalMatches = player.numWin + player.numLoss + player.numTie;
 

src/app/components/ProfileUserStats.tsx

@@ -1,8 +1,9 @@
 import * as ProfileUserInterface from 'app/types/ProfileUser';
 import * as React from 'react';
 
-export class ProfileUserStats extends React.Component<ProfileUserInterface.Props, {}> {
+export default class ProfileUserStats extends React.Component<ProfileUserInterface.Props, {}> {
   public render() {
+    console.log(this.props.match.params.username);
     return <p>This is the Page for Profile user stats</p>;
-  }
+  } 
 }

src/app/containers/ProfileUsersStats.ts

@@ -1,5 +1,5 @@
 import { ProfileUserActions } from 'app/actions';
-import { ProfileUserStats } from 'app/components/ProfileUserStats';
+import ProfileUserStats from 'app/components/ProfileUserStats';
 import { RootState } from 'app/reducers';
 import * as ProfileUserInterfaces from 'app/types/ProfileUser';
 import { connect } from 'react-redux';

src/app/index.tsx

@@ -3,8 +3,8 @@ import Login from 'app/containers/Authentication/Login';
 import Register from 'app/containers/Authentication/Register';
 import Dashboard from 'app/containers/Dashboard';
 import Leaderboard from 'app/containers/Leaderboard';
+import ProfileUsersStats from 'app/containers/ProfileUsersStats';
 import UserProfileModal from 'app/containers/UserProfileModal';
-import profileUserContainer from 'app/containers/ProfileUsersStats'
 import { Routes } from 'app/routes';
 // @ts-ignore
 import { initializeRendererAssets } from 'codecharacter-renderer';
@@ -25,11 +25,8 @@ export const App = hot(module)(() => (
       <Route exact path={Routes.REGISTER} component={Register} />
       <Route exact path={Routes.LEADERBOARD} component={Leaderboard} />
       <Route exact path={Routes.USER_PROFILE_MODEL} component={UserProfileModal} />
-<<<<<<< HEAD
       <Route path={Routes.USER_ACTIVATION} component={ActivateUser} />
-=======
-      <Route exact path={Routes.PROFILE_USER_STATS} component={profileUserContainer} />
->>>>>>> Add route for /profile/:user and Add the required container
+      <Route exact path={Routes.PROFILE_USER_STATS} component={ProfileUsersStats} />
     </Switch>
     <Sugar background="#484848" color="white" />
   </BrowserRouter>

src/app/routes.ts

@@ -4,11 +4,8 @@ export enum Routes {
   REGISTER = '/register',
   LEADERBOARD = '/leaderboard',
   USER_PROFILE_MODEL = '/profile',
-<<<<<<< HEAD
   GITHUB_OAUTH = '/login/github',
   GOOGLE_OAUTH = '/login/google',
   USER_ACTIVATION = '/user-activate',
-=======
-  PROFILE_USER_STATS = '/profile/:username',
->>>>>>> Add route for /profile/:user and Add the required container
+  PROFILE_USER_STATS = '/:username',
 }