Fix master to have linear history and be same as production branch

Author: ram2091999

__tests__/app/components/EditPassword.test.tsx

@@ -18,16 +18,22 @@ describe('EditPassword Component', () => {
       password={'password'}
       repeatPassword={'repeatPassword'}
       userDetails={{
-        avatar: 'CRUNCH',
+        avatar: '',
         college: '',
         country: 'IN',
         email: '',
         errorMessage: '',
         fullName: '',
         isAuthenticationOpen: true,
-        isLoggedIn: true,
+        isFirstLogin: true,
+        isLoggedIn: false,
         isLoginLoading: false,
+        isNotificationPresent: false,
+        isSocketPresent: false,
         isUserProfileModalOpen: false,
+        notification: '',
+        socketMessage: '',
+        userId: 0,
         userType: UserType.STUDENT,
         username: '',
       }}

__tests__/app/components/__snapshots__/EditPassword.test.tsx.snap

@@ -137,16 +137,22 @@ exports[`EditPassword Component Should render 1`] = `
   repeatPassword="repeatPassword"
   userDetails={
     Object {
-      "avatar": "CRUNCH",
+      "avatar": "",
       "college": "",
       "country": "IN",
       "email": "",
       "errorMessage": "",
       "fullName": "",
       "isAuthenticationOpen": true,
-      "isLoggedIn": true,
+      "isFirstLogin": true,
+      "isLoggedIn": false,
       "isLoginLoading": false,
+      "isNotificationPresent": false,
+      "isSocketPresent": false,
       "isUserProfileModalOpen": false,
+      "notification": "",
+      "socketMessage": "",
+      "userId": 0,
       "userType": "STUDENT",
       "username": "",
     }

__tests__/app/containers/EditorSettings.test.tsx

@@ -34,7 +34,7 @@ describe('EditorSettings Container', () => {
       },
     });
 
-    expect(wrapper.find('select.theme-control').props().value).toBe('solarized_light');
+    expect(wrapper.find('select.theme-control').props().value).toBe('monokai');
     wrapper.find('select.theme-control').simulate('change', { target: { value: 'github' } });
     expect(wrapper.find('select.theme-control').props().value).toBe('github');
   });

__tests__/app/containers/SideBar.test.tsx

@@ -49,10 +49,11 @@ describe('SideBar Container', () => {
   });
 
   it('Should Dispatch setSidePanelTab Notification or None', () => {
-    const button = wrapper.find('.notification-btn-ctrl').at(1);
-    button.simulate('click');
-    expect(wrapper.find(Sidebar).props().sidePanelTab).toBe(SidePanelTab.NOTIFICATION);
-    button.simulate('click');
-    expect(wrapper.find(Sidebar).props().sidePanelTab).toBe(SidePanelTab.NONE);
+    // const button = wrapper.find('.notification-btn-ctrl').at(1);
+    // button.simulate('click');
+    // TODO: Remove this.
+    // expect(wrapper.find(Sidebar).props().sidePanelTab).toBe(SidePanelTab.NOTIFICATION);
+    // button.simulate('click');
+    // expect(wrapper.find(Sidebar).props().sidePanelTab).toBe(SidePanelTab.NONE);
   });
 });

__tests__/app/containers/__snapshots__/Editor.test.tsx.snap

@@ -35,17 +35,20 @@ exports[`Editor Container Should render Editor 1`] = `
 	  // Bots can move to any reachable location on the map.
 	  // Let's make bots move to all flag locations
   
-	  // You can use auto instead of an explicit type
 	  size_t used_bots = 0;
   
 	  // Range based loops are convenient to use. We use a reference to
 	  // ensure that our changes are reflected and not made on a copy!
+	  // You can use auto instead of an explicit type
 	  for (auto &bot : state.bots) {
-		  // Let's not use up all our bots just for this operation. So, we will
-		  // only use a maximum of 18 bots here.
-		  if (used_bots >= state.flag_offsets.size() || used_bots >= 18)
+		  // Let's not use up all our bots just for these. So, we will only use a
+		  // maximum of 18 bots here.
+		  if (used_bots > state.flag_offsets.size() || used_bots >= 18)
 			  break;
   
+		  // Make sure that you do not access a vector beyond it's size or else,
+		  // you'll get a segmentation fault and cost you the entire game
+  
 		  // State has a vector that has the locations of flag locations on the
 		  // map. A bot asked to move to a location will automatically go
 		  // there using the shortest path found and start mining for gold.
@@ -58,19 +61,27 @@ exports[`Editor Container Should render Editor 1`] = `
   
 	  // Before that we ensure that we have atleast one extra bot left
 	  if (state.bots.size() > used_bots) {
-		  // See the usage of constant value PLAYER2_BASE_POSITION
-		  state.bots[used_bots].blast(PLAYER2_BASE_POSITION);
+		  // See the usage of constant value PLAYER_BASE_POSITIONS
+		  state.bots[used_bots].blast(PLAYER_BASE_POSITIONS[1]);
 		  used_bots++;
 	  }
   
 	  // Other than blasting and moving, bots can also transform into towers
-	  // Let's try to transform one of the bots near the other end of
-	  // the map i.e., (MAP_SIZE - 2, MAP_SIZE - 2) Note that you cannot construct
-	  // or move to coordinates where either x = MAP_SIZE or y = MAP_SIZE
+	  // Let's try to transform all of the remaining bots near the other end of
+	  // the map i.e., (MAP_SIZE - 1, MAP_SIZE - 1) Note that you cannot construct
+	  // / move to coordinates where either x = MAP_SIZE or y = MAP_SIZE
+	  int x = MAP_SIZE - 2, y = MAP_SIZE - 2;
   
 	  // The bots can also be traversed like a usual array using an index
-	  for (size_t i = used_bots; i < used_bots + 1; i++) {
-		  state.bots[i].transform(DoubleVec2D(MAP_SIZE - 2, MAP_SIZE - 2));
+	  for (size_t i = used_bots; i < state.bots.size(); i++) {
+		  if (y != (MAP_SIZE - 1)) {
+  
+			  // You can use the DoubleVec2D class to define positions and
+			  // distances
+			  state.bots[i].transform(DoubleVec2D(x, y));
+			  x--;
+			  y++;
+		  }
 	  }
   
 	  // State also has the vector of player towers
@@ -91,15 +102,10 @@ exports[`Editor Container Should render Editor 1`] = `
 	  // all there is to State and we have some helper snippets and methods
 	  // so you start competing right away!
   
-	  for (auto &bot : state.bots) {
-		  logr << bot.position << endl;
-	  }
-  
 	  return state;
   }
   
-  } // namespace player_code
-  "
+  }"
   editorWidth={400}
   enableBasicAutoCompletion={true}
   enableSnippets={true}
@@ -109,7 +115,7 @@ exports[`Editor Container Should render Editor 1`] = `
   isLoggedIn={false}
   keyboardHandler="default"
   save={[Function]}
-  theme="solarized_light"
+  theme="monokai"
   updateCode={[Function]}
   viewOnly={false}
 />

__tests__/app/containers/__snapshots__/EditorSettings.test.tsx.snap

@@ -10,7 +10,7 @@ exports[`EditorSettings Container Should render EditorSettings 1`] = `
     enableSnippets={true}
     fontSize={16}
     keyboardHandler="default"
-    theme="solarized_light"
+    theme="monokai"
     toggleBasicAutoCompletion={[Function]}
     toggleSnippets={[Function]}
   >
@@ -208,7 +208,7 @@ exports[`EditorSettings Container Should render EditorSettings 1`] = `
                     <select
                       className="form-control theme-control"
                       onChange={[Function]}
-                      value="solarized_light"
+                      value="monokai"
                     >
                       <option
                         key="monokai"