Merge branches 'main' and 'functional_board' of https://github.com/https-sam/algorithm-visualizer

mime9599 · mime9599 · commit 23b01fd0f611 · 2022-07-17T23:57:51.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,5 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-.idea
+.idea
+/package-lock.json
diff --git a/src/App.js b/src/App.js
@@ -1,7 +1,7 @@
 import './App.css';
-import React      from 'react';
-import Display    from './components/Algorithms/Display';
-import AppRouter  from './AppRouter';
+import React     from 'react';
+import Display   from './components/BoardCanvas/Display';
+import AppRouter from './AppRouter';
 import Navigation from './components/Page/partial/Navbar/Navigation';
 
 
diff --git a/src/AppRouter.js b/src/AppRouter.js
@@ -7,8 +7,8 @@ import {
 import SplashScreen      from './components/Page/Splash/SplashScreen';
 import MainSortingCanvas from './components/Canvas/MainSortingCanvas';
 import AboutScreen       from './components/Page/About/AboutScreen';
-import ContactScreen     from './components/Page/Contact/ContactScreen';
-import Display           from './components/Algorithms/Display';
+import ContactScreen from './components/Page/Contact/ContactScreen';
+import Display       from './components/BoardCanvas/Display';
 
 
 
diff --git a/src/components/BoardCanvas/Display.js b/src/components/BoardCanvas/Display.js
@@ -1,9 +1,9 @@
 import React, {Component, useState, useRef, useEffect} from 'react';
-import Board                                from '../BoardCanvas/Board';
-import Navigation                           from '../Page/partial/Navbar/Navigation';
+import Board                                           from './Board';
+import Navigation                                      from '../Page/partial/Navbar/Navigation';
 import './display.css';
-import {useBinaryTreeCreation}              from './Maze/Generation/BinaryTreeCreation';
-import {Strategy}                           from '../Strategy/Strategy';
+// import {useBinaryTreeCreation}                         from '../Algorithms/Maze/Generation/BinaryTreeCreation';
+import {Strategy}                                      from '../Strategy/Strategy';
 
 /*
 
diff --git a/src/components/BoardCanvas/Layouts.js b/src/components/BoardCanvas/Layouts.js
@@ -18,18 +18,17 @@ import {_FindCell}                   from '../Algorithms/Maze/Generation/Tools';
  */
 export const useLayoutHook = ({board, layoutType, mazeType}) => {
   useEffect(() => {
-    if (mazeType === "none") {
-      switch (layoutType) {
-        case 'circular':
-          circularLayout(board);
-          break;
-        case 'standard':
-        default: {
-          standardLayout(board);
-        }
+    // if (mazeType === "none") {
+    switch (layoutType) {
+      case 'circular':
+        circularLayout(board);
+        break;
+      case 'standard':
+      default: {
+        standardLayout(board);
       }
+        // }
     }
-    // GridState.setGrid(layoutType);
   }, [board, layoutType]);
 
   useEffect(() => {
diff --git a/src/components/BoardCanvas/display.css b/src/components/BoardCanvas/display.css
