From 4537ffa3ae9a9f216390ccdea42a10d0e4d48e8c Mon Sep 17 00:00:00 2001
From: Bestin B Thomas <bestinbthomas@gmail.com>
Date: Tue, 30 Mar 2021 20:53:46 +0530
Subject: [PATCH 1/3] fix(deployment): fix server deployment bugs

---
 Dockerfile                                    |   2 +-
 __tests__/app/containers/SideBar.test.tsx     |   2 +
 .../__snapshots__/SideBar.test.tsx.snap       | 287 +++++++++++-------
 package.json                                  |   1 +
 server/app.js                                 |   2 +-
 src/app/components/Dashboard.tsx              |   2 -
 src/app/components/Leaderboard/index.tsx      |   2 -
 src/app/components/SideBar.tsx                |  19 +-
 src/app/components/SocketHandlerWrapper.tsx   |   8 +
 src/app/containers/SocketHandlerWrapper.ts    |  13 +
 src/app/index.tsx                             |  26 +-
 11 files changed, 221 insertions(+), 143 deletions(-)
 create mode 100644 src/app/components/SocketHandlerWrapper.tsx
 create mode 100644 src/app/containers/SocketHandlerWrapper.ts

diff --git a/Dockerfile b/Dockerfile
index c401382b..aa5e788d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ COPY src/config/config.example.ts src/config/config.ts
 
 COPY . .
 
-RUN npm run build
+RUN mkdir -p build && npm run build
 
 WORKDIR /usr/src/app/server
 
diff --git a/__tests__/app/containers/SideBar.test.tsx b/__tests__/app/containers/SideBar.test.tsx
index 94e1c099..481b14ad 100644
--- a/__tests__/app/containers/SideBar.test.tsx
+++ b/__tests__/app/containers/SideBar.test.tsx
@@ -5,6 +5,7 @@ import { SidePanelTab } from 'app/reducers/Dashboard';
 import { configureStore } from 'app/store';
 import { mount } from 'enzyme';
 import * as React from 'react';
+import { BrowserRouter } from 'react-router-dom';
 
 describe('SideBar Container', () => {
   const { store } = configureStore();
@@ -17,6 +18,7 @@ describe('SideBar Container', () => {
       context: {
         store,
       },
+      wrappingComponent: BrowserRouter,
     },
   );
 
diff --git a/__tests__/app/containers/__snapshots__/SideBar.test.tsx.snap b/__tests__/app/containers/__snapshots__/SideBar.test.tsx.snap
index 1924aa9b..692801f7 100644
--- a/__tests__/app/containers/__snapshots__/SideBar.test.tsx.snap
+++ b/__tests__/app/containers/__snapshots__/SideBar.test.tsx.snap
@@ -491,10 +491,9 @@ exports[`SideBar Container Should render 1`] = `
               placement="right"
               title="Leaderboard"
             >
-              <a
+              <Link
                 aria-describedby={null}
                 className="py-2 px-auto leaderboard-btn-ctrl"
-                href="./leaderboard"
                 id="leaderboard_button"
                 onBlur={[Function]}
                 onClick={[Function]}
@@ -504,60 +503,92 @@ exports[`SideBar Container Should render 1`] = `
                 onTouchEnd={[Function]}
                 onTouchStart={[Function]}
                 title="Leaderboard"
+                to="/leaderboard"
               >
-                <FontAwesomeIcon
-                  border={false}
-                  className=""
-                  fixedWidth={false}
-                  flip={null}
-                  icon={
-                    Object {
-                      "icon": Array [
-                        576,
-                        512,
-                        Array [],
-                        "f091",
-                        "M552 64H448V24c0-13.3-10.7-24-24-24H152c-13.3 0-24 10.7-24 24v40H24C10.7 64 0 74.7 0 88v56c0 35.7 22.5 72.4 61.9 100.7 31.5 22.7 69.8 37.1 110 41.7C203.3 338.5 240 360 240 360v72h-48c-35.3 0-64 20.7-64 56v12c0 6.6 5.4 12 12 12h296c6.6 0 12-5.4 12-12v-12c0-35.3-28.7-56-64-56h-48v-72s36.7-21.5 68.1-73.6c40.3-4.6 78.6-19 110-41.7 39.3-28.3 61.9-65 61.9-100.7V88c0-13.3-10.7-24-24-24zM99.3 192.8C74.9 175.2 64 155.6 64 144v-16h64.2c1 32.6 5.8 61.2 12.8 86.2-15.1-5.2-29.2-12.4-41.7-21.4zM512 144c0 16.1-17.7 36.1-35.3 48.8-12.5 9-26.7 16.2-41.8 21.4 7-25 11.8-53.6 12.8-86.2H512v16z",
-                      ],
-                      "iconName": "trophy",
-                      "prefix": "fas",
-                    }
-                  }
-                  inverse={false}
-                  listItem={false}
-                  mask={null}
-                  pull={null}
-                  pulse={false}
-                  rotation={null}
-                  size={null}
-                  spin={false}
-                  symbol={false}
-                  title=""
-                  transform={null}
+                <LinkAnchor
+                  aria-describedby={null}
+                  className="py-2 px-auto leaderboard-btn-ctrl"
+                  href="/leaderboard"
+                  id="leaderboard_button"
+                  navigate={[Function]}
+                  onBlur={[Function]}
+                  onClick={[Function]}
+                  onFocus={[Function]}
+                  onMouseLeave={[Function]}
+                  onMouseOver={[Function]}
+                  onTouchEnd={[Function]}
+                  onTouchStart={[Function]}
+                  title="Leaderboard"
                 >
-                  <svg
-                    aria-hidden="true"
-                    className="svg-inline--fa fa-trophy fa-w-18 "
-                    data-icon="trophy"
-                    data-prefix="fas"
-                    role="img"
-                    style={Object {}}
-                    viewBox="0 0 576 512"
-                    xmlns="http://www.w3.org/2000/svg"
+                  <a
+                    aria-describedby={null}
+                    className="py-2 px-auto leaderboard-btn-ctrl"
+                    href="/leaderboard"
+                    id="leaderboard_button"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseLeave={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    onTouchStart={[Function]}
+                    title="Leaderboard"
                   >
-                    <path
-                      d="M552 64H448V24c0-13.3-10.7-24-24-24H152c-13.3 0-24 10.7-24 24v40H24C10.7 64 0 74.7 0 88v56c0 35.7 22.5 72.4 61.9 100.7 31.5 22.7 69.8 37.1 110 41.7C203.3 338.5 240 360 240 360v72h-48c-35.3 0-64 20.7-64 56v12c0 6.6 5.4 12 12 12h296c6.6 0 12-5.4 12-12v-12c0-35.3-28.7-56-64-56h-48v-72s36.7-21.5 68.1-73.6c40.3-4.6 78.6-19 110-41.7 39.3-28.3 61.9-65 61.9-100.7V88c0-13.3-10.7-24-24-24zM99.3 192.8C74.9 175.2 64 155.6 64 144v-16h64.2c1 32.6 5.8 61.2 12.8 86.2-15.1-5.2-29.2-12.4-41.7-21.4zM512 144c0 16.1-17.7 36.1-35.3 48.8-12.5 9-26.7 16.2-41.8 21.4 7-25 11.8-53.6 12.8-86.2H512v16z"
-                      fill="currentColor"
-                      style={Object {}}
-                    />
-                  </svg>
-                </FontAwesomeIcon>
-              </a>
+                    <FontAwesomeIcon
+                      border={false}
+                      className=""
+                      fixedWidth={false}
+                      flip={null}
+                      icon={
+                        Object {
+                          "icon": Array [
+                            576,
+                            512,
+                            Array [],
+                            "f091",
+                            "M552 64H448V24c0-13.3-10.7-24-24-24H152c-13.3 0-24 10.7-24 24v40H24C10.7 64 0 74.7 0 88v56c0 35.7 22.5 72.4 61.9 100.7 31.5 22.7 69.8 37.1 110 41.7C203.3 338.5 240 360 240 360v72h-48c-35.3 0-64 20.7-64 56v12c0 6.6 5.4 12 12 12h296c6.6 0 12-5.4 12-12v-12c0-35.3-28.7-56-64-56h-48v-72s36.7-21.5 68.1-73.6c40.3-4.6 78.6-19 110-41.7 39.3-28.3 61.9-65 61.9-100.7V88c0-13.3-10.7-24-24-24zM99.3 192.8C74.9 175.2 64 155.6 64 144v-16h64.2c1 32.6 5.8 61.2 12.8 86.2-15.1-5.2-29.2-12.4-41.7-21.4zM512 144c0 16.1-17.7 36.1-35.3 48.8-12.5 9-26.7 16.2-41.8 21.4 7-25 11.8-53.6 12.8-86.2H512v16z",
+                          ],
+                          "iconName": "trophy",
+                          "prefix": "fas",
+                        }
+                      }
+                      inverse={false}
+                      listItem={false}
+                      mask={null}
+                      pull={null}
+                      pulse={false}
+                      rotation={null}
+                      size={null}
+                      spin={false}
+                      symbol={false}
+                      title=""
+                      transform={null}
+                    >
+                      <svg
+                        aria-hidden="true"
+                        className="svg-inline--fa fa-trophy fa-w-18 "
+                        data-icon="trophy"
+                        data-prefix="fas"
+                        role="img"
+                        style={Object {}}
+                        viewBox="0 0 576 512"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M552 64H448V24c0-13.3-10.7-24-24-24H152c-13.3 0-24 10.7-24 24v40H24C10.7 64 0 74.7 0 88v56c0 35.7 22.5 72.4 61.9 100.7 31.5 22.7 69.8 37.1 110 41.7C203.3 338.5 240 360 240 360v72h-48c-35.3 0-64 20.7-64 56v12c0 6.6 5.4 12 12 12h296c6.6 0 12-5.4 12-12v-12c0-35.3-28.7-56-64-56h-48v-72s36.7-21.5 68.1-73.6c40.3-4.6 78.6-19 110-41.7 39.3-28.3 61.9-65 61.9-100.7V88c0-13.3-10.7-24-24-24zM99.3 192.8C74.9 175.2 64 155.6 64 144v-16h64.2c1 32.6 5.8 61.2 12.8 86.2-15.1-5.2-29.2-12.4-41.7-21.4zM512 144c0 16.1-17.7 36.1-35.3 48.8-12.5 9-26.7 16.2-41.8 21.4 7-25 11.8-53.6 12.8-86.2H512v16z"
+                          fill="currentColor"
+                          style={Object {}}
+                        />
+                      </svg>
+                    </FontAwesomeIcon>
+                  </a>
+                </LinkAnchor>
+              </Link>
               <ForwardRef(Popper)
                 anchorEl={
                   <a
                     class="py-2 px-auto leaderboard-btn-ctrl"
-                    href="./leaderboard"
+                    href="/leaderboard"
                     id="leaderboard_button"
                     title="Leaderboard"
                   >
@@ -765,15 +796,9 @@ exports[`SideBar Container Should render 1`] = `
               placement="right"
               title="Login"
             >
-              <Button
-                active={false}
+              <Link
                 aria-describedby={null}
-                block={false}
-                bsClass="btn"
-                bsStyle="default"
                 className="py-2 px-auto"
-                disabled={false}
-                href="./profile"
                 id="user_profile_button"
                 onBlur={[Function]}
                 onClick={[Function]}
@@ -783,14 +808,14 @@ exports[`SideBar Container Should render 1`] = `
                 onTouchEnd={[Function]}
                 onTouchStart={[Function]}
                 title="Login"
+                to="/profile"
               >
-                <SafeAnchor
+                <LinkAnchor
                   aria-describedby={null}
-                  className="py-2 px-auto btn btn-default"
-                  componentClass="a"
-                  disabled={false}
-                  href="./profile"
+                  className="py-2 px-auto"
+                  href="/profile"
                   id="user_profile_button"
+                  navigate={[Function]}
                   onBlur={[Function]}
                   onClick={[Function]}
                   onFocus={[Function]}
@@ -802,13 +827,12 @@ exports[`SideBar Container Should render 1`] = `
                 >
                   <a
                     aria-describedby={null}
-                    className="py-2 px-auto btn btn-default"
-                    href="./profile"
+                    className="py-2 px-auto"
+                    href="/profile"
                     id="user_profile_button"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
-                    onKeyDown={[Function]}
                     onMouseLeave={[Function]}
                     onMouseOver={[Function]}
                     onTouchEnd={[Function]}
@@ -863,13 +887,13 @@ exports[`SideBar Container Should render 1`] = `
                       </svg>
                     </FontAwesomeIcon>
                   </a>
-                </SafeAnchor>
-              </Button>
+                </LinkAnchor>
+              </Link>
               <ForwardRef(Popper)
                 anchorEl={
                   <a
-                    class="py-2 px-auto btn btn-default"
-                    href="./profile"
+                    class="py-2 px-auto"
+                    href="/profile"
                     id="user_profile_button"
                     title="Login"
                   >
@@ -930,10 +954,9 @@ exports[`SideBar Container Should render 1`] = `
               placement="right"
               title="Home"
             >
-              <a
+              <Link
                 aria-describedby={null}
                 className="py-2 px-auto notification-btn-ctrl"
-                href="./home"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -942,60 +965,90 @@ exports[`SideBar Container Should render 1`] = `
                 onTouchEnd={[Function]}
                 onTouchStart={[Function]}
                 title="Home"
+                to="/home"
               >
-                <FontAwesomeIcon
-                  border={false}
-                  className=""
-                  fixedWidth={false}
-                  flip={null}
-                  icon={
-                    Object {
-                      "icon": Array [
-                        512,
-                        512,
-                        Array [],
-                        "f05a",
-                        "M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z",
-                      ],
-                      "iconName": "info-circle",
-                      "prefix": "fas",
-                    }
-                  }
-                  inverse={false}
-                  listItem={false}
-                  mask={null}
-                  pull={null}
-                  pulse={false}
-                  rotation={null}
-                  size={null}
-                  spin={false}
-                  symbol={false}
-                  title=""
-                  transform={null}
+                <LinkAnchor
+                  aria-describedby={null}
+                  className="py-2 px-auto notification-btn-ctrl"
+                  href="/home"
+                  navigate={[Function]}
+                  onBlur={[Function]}
+                  onClick={[Function]}
+                  onFocus={[Function]}
+                  onMouseLeave={[Function]}
+                  onMouseOver={[Function]}
+                  onTouchEnd={[Function]}
+                  onTouchStart={[Function]}
+                  title="Home"
                 >
-                  <svg
-                    aria-hidden="true"
-                    className="svg-inline--fa fa-info-circle fa-w-16 "
-                    data-icon="info-circle"
-                    data-prefix="fas"
-                    role="img"
-                    style={Object {}}
-                    viewBox="0 0 512 512"
-                    xmlns="http://www.w3.org/2000/svg"
+                  <a
+                    aria-describedby={null}
+                    className="py-2 px-auto notification-btn-ctrl"
+                    href="/home"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseLeave={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    onTouchStart={[Function]}
+                    title="Home"
                   >
-                    <path
-                      d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z"
-                      fill="currentColor"
-                      style={Object {}}
-                    />
-                  </svg>
-                </FontAwesomeIcon>
-              </a>
+                    <FontAwesomeIcon
+                      border={false}
+                      className=""
+                      fixedWidth={false}
+                      flip={null}
+                      icon={
+                        Object {
+                          "icon": Array [
+                            512,
+                            512,
+                            Array [],
+                            "f05a",
+                            "M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z",
+                          ],
+                          "iconName": "info-circle",
+                          "prefix": "fas",
+                        }
+                      }
+                      inverse={false}
+                      listItem={false}
+                      mask={null}
+                      pull={null}
+                      pulse={false}
+                      rotation={null}
+                      size={null}
+                      spin={false}
+                      symbol={false}
+                      title=""
+                      transform={null}
+                    >
+                      <svg
+                        aria-hidden="true"
+                        className="svg-inline--fa fa-info-circle fa-w-16 "
+                        data-icon="info-circle"
+                        data-prefix="fas"
+                        role="img"
+                        style={Object {}}
+                        viewBox="0 0 512 512"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z"
+                          fill="currentColor"
+                          style={Object {}}
+                        />
+                      </svg>
+                    </FontAwesomeIcon>
+                  </a>
+                </LinkAnchor>
+              </Link>
               <ForwardRef(Popper)
                 anchorEl={
                   <a
                     class="py-2 px-auto notification-btn-ctrl"
-                    href="./home"
+                    href="/home"
                     title="Home"
                   >
                     <svg
diff --git a/package.json b/package.json
index 8fa57408..a07e031a 100644
--- a/package.json
+++ b/package.json
@@ -114,6 +114,7 @@
     "postcss-url": "^8.0.0",
     "prettier": "^1.14.3",
     "react-hot-loader": "^4.3.11",
+    "react-router-enzyme-context": "^1.2.0",
     "redux-devtools-extension": "^2.13.5",
     "regenerator-runtime": "^0.13.1",
     "style-loader": "^0.23.1",
diff --git a/server/app.js b/server/app.js
index 491b7669..bba6519d 100644
--- a/server/app.js
+++ b/server/app.js
@@ -9,4 +9,4 @@ app.get('/*', (req, res) => {
 });
 
 app.listen(5000);
-console.log('Server is listening on http://localhost:5000');
\ No newline at end of file
+console.log('Server is listening on http://localhost:5000');
diff --git a/src/app/components/Dashboard.tsx b/src/app/components/Dashboard.tsx
index d12e4074..ef70bb8e 100644
--- a/src/app/components/Dashboard.tsx
+++ b/src/app/components/Dashboard.tsx
@@ -6,7 +6,6 @@ import GameLog from 'app/containers/GameLog';
 import Renderer from 'app/containers/Renderer';
 import SideBar from 'app/containers/SideBar';
 import SidePanel from 'app/containers/SidePanel';
-import SocketHandler from 'app/containers/SocketHandler';
 import SubmitBar from 'app/containers/SubmitBar';
 import { Routes } from 'app/routes';
 import * as style from 'app/styles/Dashboard.css';
@@ -118,7 +117,6 @@ export class Dashboard extends React.Component<
         {isLoggedIn && isReactTourActive && !isWelcomeModalOpen ? (
           <ReactTour toggleReactTour={this.onToggleReactTour} />
         ) : null}
-        {isLoggedIn ? <SocketHandler /> : null}
         <SplitPane
           style={{
             filter: `blur(${isAuthenticationOpen || isWelcomeModalOpen ? 2 : 0}px)`,
diff --git a/src/app/components/Leaderboard/index.tsx b/src/app/components/Leaderboard/index.tsx
index 12dda6d7..8ee2428d 100644
--- a/src/app/components/Leaderboard/index.tsx
+++ b/src/app/components/Leaderboard/index.tsx
@@ -13,7 +13,6 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { NavBar, NavPage } from 'app/components/home/Navbar';
 import { LeaderboardElement } from 'app/components/Leaderboard/LeaderboardElement';
 import { Timer } from 'app/components/Leaderboard/Timer';
-import SocketHandler from 'app/containers/SocketHandler';
 import { Routes } from 'app/routes';
 import * as styles from 'app/styles/Leaderboard.module.css';
 import * as LeaderboardInterfaces from 'app/types/Leaderboard';
@@ -94,7 +93,6 @@ export class Leaderboard extends React.Component<
       <>
         <NavBar isLoggedIn={isLoggedIn} page={NavPage.LEADERBOARD} />
         <Grid fluid={true} className={classnames(styles.Leaderboard)}>
-          {isLoggedIn ? <SocketHandler /> : null}
           <Row className={classnames('py-4 pl-3')}>
             <Col
               sm={9}
diff --git a/src/app/components/SideBar.tsx b/src/app/components/SideBar.tsx
index afd60687..ea14c3a5 100644
--- a/src/app/components/SideBar.tsx
+++ b/src/app/components/SideBar.tsx
@@ -23,6 +23,7 @@ import * as React from 'react';
 import { Button, ButtonGroup } from 'react-bootstrap';
 
 import Tooltip from '@material-ui/core/Tooltip';
+import { Link } from 'react-router-dom';
 
 export class Sidebar extends React.Component<SideBarInterfaces.Props, {}> {
   public render() {
@@ -84,8 +85,8 @@ export class Sidebar extends React.Component<SideBarInterfaces.Props, {}> {
             </Button>
           </Tooltip>
           <Tooltip title="Leaderboard" placement="right">
-            <a
-              href="./leaderboard"
+            <Link
+              to="/leaderboard"
               className={classnames('py-2 px-auto leaderboard-btn-ctrl', styles.customBtn, {
                 [`${styles.customBtnActive}`]: sidePanelTab === SidePanelTab.LEADERBOARD,
               })}
@@ -93,7 +94,7 @@ export class Sidebar extends React.Component<SideBarInterfaces.Props, {}> {
               onClick={() => clearAllLogs()}
             >
               <FontAwesomeIcon icon={faTrophy} />
-            </a>
+            </Link>
           </Tooltip>
           {isLoggedIn ? (
             <Tooltip title="Commit Log" placement="right">
@@ -145,8 +146,8 @@ export class Sidebar extends React.Component<SideBarInterfaces.Props, {}> {
             </Button>
           </Tooltip>
           <Tooltip title={isLoggedIn ? 'Profile' : 'Login'} placement="right">
-            <Button
-              href={'./profile'}
+            <Link
+              to="/profile"
               className={classnames('py-2 px-auto', styles.customBtn)}
               id="user_profile_button"
               onClick={() => {
@@ -158,7 +159,7 @@ export class Sidebar extends React.Component<SideBarInterfaces.Props, {}> {
               }}
             >
               <FontAwesomeIcon icon={isLoggedIn ? faUser : faSignInAlt} />
-            </Button>
+            </Link>
           </Tooltip>
           {isLoggedIn ? (
             <Tooltip title="Logout" placement="right">
@@ -175,17 +176,17 @@ export class Sidebar extends React.Component<SideBarInterfaces.Props, {}> {
             </Tooltip>
           ) : null}
           <Tooltip title="Home" placement="right">
-            <a
+            <Link
               className={classnames(
                 'py-2 px-auto notification-btn-ctrl',
                 styles.customBtn,
                 styles.infoCircle,
               )}
-              href="./home"
+              to="/home"
               onClick={() => clearAllLogs()}
             >
               <FontAwesomeIcon icon={faInfoCircle} />
-            </a>
+            </Link>
           </Tooltip>
           <Tooltip title="Take a tour" placement="right">
             <Button
diff --git a/src/app/components/SocketHandlerWrapper.tsx b/src/app/components/SocketHandlerWrapper.tsx
new file mode 100644
index 00000000..74b2ce5b
--- /dev/null
+++ b/src/app/components/SocketHandlerWrapper.tsx
@@ -0,0 +1,8 @@
+import SocketHandler from 'app/containers/SocketHandler';
+import * as React from 'react';
+
+export class SocketHandlerWrapper extends React.Component<{ isLoggedIn: boolean }> {
+  public render() {
+    return this.props.isLoggedIn ? <SocketHandler /> : null;
+  }
+}
diff --git a/src/app/containers/SocketHandlerWrapper.ts b/src/app/containers/SocketHandlerWrapper.ts
new file mode 100644
index 00000000..a17b70c3
--- /dev/null
+++ b/src/app/containers/SocketHandlerWrapper.ts
@@ -0,0 +1,13 @@
+import { SocketHandlerWrapper } from 'app/components/SocketHandlerWrapper';
+import { RootState } from 'app/reducers';
+import { connect } from 'react-redux';
+
+const mapStateToProps = (rootState: RootState) => {
+  return {
+    isLoggedIn: rootState.user.isLoggedIn,
+  };
+};
+
+const socketHandlerWrapperContainer = connect(mapStateToProps)(SocketHandlerWrapper);
+
+export default socketHandlerWrapperContainer;
diff --git a/src/app/index.tsx b/src/app/index.tsx
index a309b918..a76c7ba9 100644
--- a/src/app/index.tsx
+++ b/src/app/index.tsx
@@ -4,6 +4,7 @@ import Register from 'app/containers/Authentication/Register';
 import Dashboard from 'app/containers/Dashboard';
 import LandingPage from 'app/containers/LandingPage';
 import Leaderboard from 'app/containers/Leaderboard';
+import SocketHandlerWrapper from 'app/containers/SocketHandlerWrapper';
 import UserProfileModal from 'app/containers/UserProfileModal';
 import { Routes } from 'app/routes';
 // @ts-ignore
@@ -17,15 +18,18 @@ initializeRendererAssets();
 
 /* tslint:disable-next-line:variable-name */
 export const App = hot(module)(() => (
-  <BrowserRouter>
-    <Switch>
-      <Route exact path={Routes.ROOT} component={Dashboard} />
-      <Route exact path={Routes.LOGIN} component={Login} />
-      <Route exact path={Routes.REGISTER} component={Register} />
-      <Route exact path={Routes.LEADERBOARD} component={Leaderboard} />
-      <Route exact path={Routes.USER_PROFILE_MODEL} component={UserProfileModal} />
-      <Route path={Routes.USER_ACTIVATION} component={ActivateUser} />
-      <Route exact path={Routes.HOME} component={LandingPage} />
-    </Switch>
-  </BrowserRouter>
+  <React.Fragment>
+    <SocketHandlerWrapper />
+    <BrowserRouter>
+      <Switch>
+        <Route exact path={Routes.ROOT} component={Dashboard} />
+        <Route exact path={Routes.LOGIN} component={Login} />
+        <Route exact path={Routes.REGISTER} component={Register} />
+        <Route exact path={Routes.LEADERBOARD} component={Leaderboard} />
+        <Route exact path={Routes.USER_PROFILE_MODEL} component={UserProfileModal} />
+        <Route path={Routes.USER_ACTIVATION} component={ActivateUser} />
+        <Route exact path={Routes.HOME} component={LandingPage} />
+      </Switch>
+    </BrowserRouter>
+  </React.Fragment>
 ));

From ec49d408a5a9ecec526ffac993139f1d0f8f3b25 Mon Sep 17 00:00:00 2001
From: Bestin <bestinbthomas@gmail.com>
Date: Wed, 31 Mar 2021 00:43:38 +0530
Subject: [PATCH 2/3] fix(leaderboard): remove student dropdown

---
 package.json                             |  1 -
 src/app/components/Leaderboard/index.tsx | 53 ------------------------
 2 files changed, 54 deletions(-)

diff --git a/package.json b/package.json
index a07e031a..8fa57408 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,6 @@
     "postcss-url": "^8.0.0",
     "prettier": "^1.14.3",
     "react-hot-loader": "^4.3.11",
-    "react-router-enzyme-context": "^1.2.0",
     "redux-devtools-extension": "^2.13.5",
     "regenerator-runtime": "^0.13.1",
     "style-loader": "^0.23.1",
diff --git a/src/app/components/Leaderboard/index.tsx b/src/app/components/Leaderboard/index.tsx
index 8ee2428d..d6944dac 100644
--- a/src/app/components/Leaderboard/index.tsx
+++ b/src/app/components/Leaderboard/index.tsx
@@ -183,59 +183,6 @@ export class Leaderboard extends React.Component<
                     </div>
                   </div>
                 </Col>
-                <Col>
-                  <div className={styles.dropdown}>
-                    <button className={styles.dropbtn}>
-                      {LeaderboardInterfaces.UserTypeName[this.state.currentUserType]}
-                    </button>
-                    <FontAwesomeIcon style={{ color: 'white' }} icon={faCaretDown} />
-                    <div className={styles['dropdown-content']}>
-                      <a
-                        style={{ cursor: 'pointer' }}
-                        onClick={() => {
-                          this.setState({
-                            currentUserType: LeaderboardInterfaces.UserType.STUDENT,
-                          });
-                        }}
-                        className={
-                          this.state.currentUserType === LeaderboardInterfaces.UserType.STUDENT
-                            ? classnames(styles.dropDownMenuActive, styles.dropDownMenuActive)
-                            : classnames(styles.dropDownMenu)
-                        }
-                      >
-                        {LeaderboardInterfaces.UserTypeName.STUDENT}
-                      </a>
-                      <a
-                        style={{ cursor: 'pointer' }}
-                        onClick={() => {
-                          this.setState({
-                            currentUserType: LeaderboardInterfaces.UserType.PROFESSIONAL,
-                          });
-                        }}
-                        className={
-                          this.state.currentUserType === LeaderboardInterfaces.UserType.PROFESSIONAL
-                            ? classnames(styles.dropDownMenuActive, styles.dropDownMenuActive)
-                            : classnames(styles.dropDownMenu)
-                        }
-                      >
-                        {LeaderboardInterfaces.UserTypeName.PROFESSIONAL}
-                      </a>
-                      <a
-                        style={{ cursor: 'pointer' }}
-                        onClick={() => {
-                          this.setState({ currentUserType: LeaderboardInterfaces.UserType.ALL });
-                        }}
-                        className={
-                          this.state.currentUserType === LeaderboardInterfaces.UserType.ALL
-                            ? classnames(styles.dropDownMenuActive, styles.dropDownMenuActive)
-                            : classnames(styles.dropDownMenu)
-                        }
-                      >
-                        {LeaderboardInterfaces.UserTypeName.All}
-                      </a>
-                    </div>
-                  </div>
-                </Col>
                 <Col style={{ position: 'absolute', left: '96.5%' }}>
                   <button
                     className={styles.button}

From e7da1071453abaf7b1986ff49ce495e3d655d05c Mon Sep 17 00:00:00 2001
From: ElzaCS <anuejohn@gmail.com>
Date: Mon, 21 Feb 2022 14:25:16 +0530
Subject: [PATCH 3/3] Modify submit notification and update event info

---
 src/app/components/Docs.tsx             |  4 ++--
 src/app/components/home/Footer.tsx      | 10 +++++-----
 src/app/components/home/LandingPage.tsx | 10 +++++-----
 src/app/sagas/Submission.ts             |  2 +-
 src/app/styles/StoryModeModal.css       |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/app/components/Docs.tsx b/src/app/components/Docs.tsx
index 1b5aef49..f30a75d3 100644
--- a/src/app/components/Docs.tsx
+++ b/src/app/components/Docs.tsx
@@ -20,12 +20,12 @@ export class Docs extends React.Component<{}, {}> {
             zIndex: 1000,
           }}
           target="_blank"
-          href="https://code.pragyan.org/docs/"
+          href="https://delta.nitt.edu/codecharacter-docs/"
         >
           <FontAwesomeIcon icon={faExternalLinkAlt} />
         </a>
         <iframe
-          src="https://code.pragyan.org/docs/overview.html"
+          src="https://delta.nitt.edu/codecharacter-docs/overview.html"
           style={{
             border: 0,
             height: '100%',
diff --git a/src/app/components/home/Footer.tsx b/src/app/components/home/Footer.tsx
index e5234a59..5ac0a7a2 100644
--- a/src/app/components/home/Footer.tsx
+++ b/src/app/components/home/Footer.tsx
@@ -27,12 +27,12 @@ export const Footer: React.FunctionComponent = () => {
                 <Table>
                   <tbody>
                     <tr onClick={() => copyToClipboard('9994479069')}>
-                      <td>Mandeep</td>
-                      <td>9994479069</td>
+                      <td>Bestin</td>
+                      <td>8111931125</td>
                     </tr>
                     <tr onClick={() => copyToClipboard('9566541342')}>
-                      <td>Kumaran</td>
-                      <td>9566541342</td>
+                      <td>Anirudh</td>
+                      <td>8870888215</td>
                     </tr>
                   </tbody>
                 </Table>
@@ -45,7 +45,7 @@ export const Footer: React.FunctionComponent = () => {
                   <Link to="/">Home</Link>
                 </li>
                 <li>
-                  <a href="https://code.pragyan.org/docs">Documentation</a>
+                  <a href="https://delta.nitt.edu/codecharacter-docs/">Documentation</a>
                 </li>
                 <li>
                   <a href="https://www.pragyan.org/21/home/events/bytehoc/code_character/">
diff --git a/src/app/components/home/LandingPage.tsx b/src/app/components/home/LandingPage.tsx
index a34c586f..b2242718 100644
--- a/src/app/components/home/LandingPage.tsx
+++ b/src/app/components/home/LandingPage.tsx
@@ -74,7 +74,7 @@ export class LandingPage extends React.Component<LandingPageInterfaces.Props, {}
               </ul>
               <p>
                 Go through the{' '}
-                <a href="https://code.pragyan.org/docs" target="_blank">
+                <a href="https://delta.nitt.edu/codecharacter-docs/" target="_blank">
                   docs
                 </a>{' '}
                 and start playing!
@@ -90,11 +90,11 @@ export class LandingPage extends React.Component<LandingPageInterfaces.Props, {}
                 .
               </p>
               <h1>Prizes</h1>
-              <p>A total of 15K INR up for grabs for acing the leaderboard.</p>
+              <p>A total of 10K INR up for grabs for acing the leaderboard.</p>
               <ul>
-                <li>First Place - 7.5K INR</li>
-                <li>Second Place - 4.5K INR</li>
-                <li>Third Place - 3K INR</li>
+                <li>First Place - 5K INR</li>
+                <li>Second Place - 3K INR</li>
+                <li>Third Place - 2K INR</li>
               </ul>
             </div>
             <div className={classnames(styles['codechar-video'], 'col-lg-5')}>
diff --git a/src/app/sagas/Submission.ts b/src/app/sagas/Submission.ts
index 1a072ed8..bf5e9967 100644
--- a/src/app/sagas/Submission.ts
+++ b/src/app/sagas/Submission.ts
@@ -13,7 +13,7 @@ export const getUserLatestCode = (state: RootState) => state.code.code;
 export function* lockCode(action: ActionType<typeof SubmissionActions.lockCode>) {
   try {
     yield call(SubmissionFetch.lockCode);
-    yield put(NotificationActions.success('Code Locked'));
+    yield put(NotificationActions.success('Testing Code for Submission'));
     yield put(SubmissionActions.toggleLockCode());
     yield put(GameLogActions.clearAllLogs());
   } catch (err) {
diff --git a/src/app/styles/StoryModeModal.css b/src/app/styles/StoryModeModal.css
index 8628db46..4f93854d 100644
--- a/src/app/styles/StoryModeModal.css
+++ b/src/app/styles/StoryModeModal.css
@@ -28,4 +28,4 @@ code {
 
 .story-modal .modal-dialog {
   height: 100%;
-}
\ No newline at end of file
+}