resolved conflicts

Author: Shawn Toubeau

package-lock.json

@@ -20,10 +20,12 @@
     "fs": "^0.0.1-security",
     "history": "^4.10.1",
     "lodash": "^4.17.15",
+    "moment": "^2.24.0",
     "node-sass": "^4.13.1",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-markdown": "^4.3.1",
+    "react-moment": "^0.9.7",
     "react-redux": "^7.1.3",
     "react-router": "^5.1.2",
     "react-router-dom": "^5.1.2",
@@ -64,6 +66,9 @@
     "transform": {
       "^.+\\.(ts|tsx)$": "ts-jest"
     },
+    "transformIgnorePatterns": [
+      "/node_modules/(?!three)"
+    ],
     "moduleNameMapper": {
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/tests/setup/fileMock.js",
       "\\.(css|less)$": "<rootDir>/tests/setup/styleMock.js"

package.json

@@ -5,15 +5,11 @@ import {
   makeWall,
   makeEmpty,
   loadMaze,
-  setPath,
-  setVisited,
   CHANGE_START,
   CHANGE_END,
   MAKE_WALL,
   MAKE_EMPTY,
   LOAD_MAZE,
-  SET_PATH,
-  SET_VISITED,
   STOP_VISUALIZATION,
   handleStopVisualization,
 } from "./mazeActions";
@@ -95,44 +91,14 @@ describe("Maze Action Tests", () => {
       const expectedActions = [
         {
           type: LOAD_MAZE,
-          payload: { mazeInfo: maze, clearMaze: generateMaze(5, 5, true) },
+          payload: { mazeInfo: maze },
         },
       ];
       reduxStore.dispatch(loadMaze(maze));
       expect(reduxStore.getActions()).toEqual(expectedActions);
     });
   });
 
-  describe("Set Path Test", () => {
-    it("Should call SET_PATH action", () => {
-      const coord = { x: 2, y: 2 };
-      const expectedActions = [
-        {
-          type: SET_PATH,
-          payload: coord,
-        },
-      ];
-
-      reduxStore.dispatch(setPath(coord));
-      expect(reduxStore.getActions()).toEqual(expectedActions);
-    });
-  });
-
-  describe("Set Visited Test", () => {
-    it("Should call SET_VISITED action", () => {
-      const coord = { x: 2, y: 2 };
-      const expectedActions = [
-        {
-          type: SET_VISITED,
-          payload: coord,
-        },
-      ];
-
-      reduxStore.dispatch(setVisited(coord));
-      expect(reduxStore.getActions()).toEqual(expectedActions);
-    });
-  });
-
   describe("Stop Visualization Test", () => {
     it("Should dispatch correct action", () => {
       const expectedActions = [

public/empty.png

@@ -2,14 +2,21 @@ import { AnyAction } from "redux";
 import { Coord, MazeInfo, Maze } from "../../models/maze";
 import { generateMaze } from "../../models/maze/initialState";
 import { ButtonProps } from "semantic-ui-react";
+import { PAUSE_VISUALIZATION } from "../menuActions/menuActions";
 export const CHANGE_START = "CHANGE_START";
 export const CHANGE_END = "CHANGE_END";
 export const MAKE_WALL = "MAKE_WALL";
 export const MAKE_EMPTY = "MAKE_EMPTY";
+export const MAKE_VISITED = "MAKE_VISITED";
 export const LOAD_MAZE = "LOAD_MAZE";
-export const SET_PATH = "SET_PATH";
-export const SET_VISITED = "SET_VISITED";
 export const STOP_VISUALIZATION = "STOP_VISUALIZATION";
+export const PROGRESS_BFS = "PROGRESS_BFS";
+export const UPDATE_GRID_SIZE = "UPDATE_GRID_SIZE";
+export const PROGRESS_DFS = "PROGRESS_DFS";
+export const PROGRESS_ASTAR = "PROGRESS_ASTAR";
+export const UPDATE_OPEN_SET = "UPDATE_OPEN_SET";
+export const UPDATE_CLOSED_SET = "UPDATE_CLOSED_SET";
+export const RANDOMIZE_WALLS = "RANDOMIZE_WALLS";
 
 export const handleChangeStart = (newPos: Coord): AnyAction => {
   return {
@@ -39,33 +46,113 @@ export const makeEmpty = (coord: Coord): AnyAction => {
   };
 };
 
-export const loadMaze = (maze: MazeInfo): AnyAction => {
+export const makeVisited = (coord: Coord): AnyAction => {
   return {
-    type: LOAD_MAZE,
-    payload: { mazeInfo: maze, clearMaze: generateMaze(5, 5, true) } as Maze,
+    type: MAKE_VISITED,
+    payload: coord,
   };
 };
 
-export const setPath = (coord: Coord): AnyAction => {
+export const loadMaze = (mazeInfo: MazeInfo): AnyAction => {
   return {
-    type: SET_PATH,
-    payload: coord,
+    type: LOAD_MAZE,
+    payload: { mazeInfo: mazeInfo },
   };
 };
 
-export const setVisited = (coord: Coord): AnyAction => {
+export const handlePauseVisualization = (
+  _?: React.MouseEvent<HTMLButtonElement, MouseEvent>,
+  data?: ButtonProps
+) => {
   return {
-    type: SET_VISITED,
-    payload: coord,
+    type: PAUSE_VISUALIZATION,
+    payload: null,
   };
 };
 
 export const handleStopVisualization = (
-  _: React.MouseEvent<HTMLButtonElement, MouseEvent>,
-  data: ButtonProps
+  _?: React.MouseEvent<HTMLButtonElement, MouseEvent>,
+  data?: ButtonProps
 ) => {
   return {
     type: STOP_VISUALIZATION,
     payload: null,
   };
 };
+
+export const progressBFS = (
+  queue: Coord[],
+  coord: Coord,
+  neighbors: Coord[] | Coord
+) => {
+  return {
+    type: PROGRESS_BFS,
+    payload: {
+      queue: queue,
+      coord: coord,
+      neighbors: neighbors,
+    },
+  };
+};
+
+export const progressDFS = (
+  stack: Coord[],
+  coord: Coord,
+  neighbors: Coord[] | Coord
+) => {
+  return {
+    type: PROGRESS_DFS,
+    payload: {
+      stack: stack,
+      coord: coord,
+      neighbors: neighbors,
+    },
+  };
+};
+
+export const updateGridSize = (cols: number, rows: number) => {
+  return {
+    type: UPDATE_GRID_SIZE,
+    payload: {
+      cols: cols,
+      rows: rows,
+    },
+  };
+};
+export const progressAstar = (
+  openSet: Coord[],
+  closedSet: Coord[],
+  newMazeInfo: MazeInfo,
+  end: Coord
+) => {
+  return {
+    type: PROGRESS_ASTAR,
+    payload: {
+      openSet,
+      closedSet,
+      newMazeInfo,
+      end,
+    },
+  };
+};
+
+export const handleUpdateOpenSet = (openSet: Coord[]) => {
+  return {
+    type: UPDATE_OPEN_SET,
+    payload: openSet,
+  };
+};
+
+export const handleUpdateClosedSet = (closedSet: Coord[]) => {
+  return {
+    type: UPDATE_CLOSED_SET,
+    payload: closedSet,
+  };
+};
+
+export const randomizeWalls = () => {
+  return {
+    type: RANDOMIZE_WALLS,
+    payload: null,
+  };
+};

public/lava.png

@@ -9,6 +9,7 @@ export const TOGGLE_MOVE_START = "TOGGLE_MOVE_START";
 export const TOGGLE_MOVE_END = "TOGGLE_MOVE_END";
 export const LOAD_MAZE = "LOAD_MAZE";
 export const SAVE_MAZE = "SAVE_MAZE";
+export const CHANGE_SPEED = "CHANGE_SPEED";
 
 export const handleDropdownChange = (
   _: React.SyntheticEvent<HTMLElement, Event>,
@@ -20,10 +21,21 @@ export const handleDropdownChange = (
   };
 };
 
+export const handleDropdownSpeed = (
+  _: React.SyntheticEvent<HTMLElement, Event>,
+  data: DropdownProps
+) => {
+  return {
+    type: CHANGE_SPEED,
+    payload: data.value,
+  };
+};
+
 export const handleStartVisualization = (
   _: React.MouseEvent<HTMLButtonElement, MouseEvent>,
   data: ButtonProps
 ) => {
+  console.log('starting visualization');
   return {
     type: START_VISUALIZATION,
     payload: null,

public/path.png

@@ -1,5 +1,4 @@
 .Maze {
-  height: 90vh !important;
+  height: calc(100vh - 119px) !important;
   // Tempt style for debugging
-  border: 1px solid orangered;
 }