Merge branch 'main' of github.com:Allegheny-CMPSC-summer-2023/Advise-…

…A-Gator
Allegheny-CMPSC-summer-2023 · Aug 23, 2023 · 78911ef · 78911ef
2 parents 5252284 + 26f3fce
commit 78911ef
Show file tree

Hide file tree

Showing 18 changed files with 874 additions and 191 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,11 +4,20 @@
   "version": "1.0.0",
   "private": false,
   "dependencies": {
+<<<<<<< HEAD
 <<<<<<< HEAD
     "@popperjs/core": "^2.11.8",
 =======
     "bootstrap": "^5.3.1",
 >>>>>>> bdea8bfa8237591a0becd4acd87b27922dc54aba
+=======
+    "@fortawesome/fontawesome-free": "^6.4.2",
+    "@fortawesome/fontawesome-svg-core": "^6.4.2",
+    "@fortawesome/free-solid-svg-icons": "^6.4.2",
+    "@fortawesome/react-fontawesome": "^0.2.0",
+    "bootstrap": "^5.3.1",
+    "mdb-react-ui-kit": "^6.2.0",
+>>>>>>> 26f3fce2d95d302e4d9b20366859c48730105aaf
     "react": "^18.2.0",
     "react-bootstrap": "^2.8.0",
     "react-dom": "^18.2.0",

diff --git a/src/App.js b/src/App.js
@@ -6,6 +6,7 @@ import CartContext from "./components/Roadmap/modal/modalContext";
 import contentData from "./components/Roadmap/contentData";
 import Loader from "./components/Roadmap/layout/Loader";
 import Footer from "./components/Roadmap/layout/Footer";
+import "@fortawesome/fontawesome-free/css/all.min.css";
 
 function App() {
   const { currentTopicTitle } = useContext(CartContext);

diff --git a/src/MyRouter.js b/src/MyRouter.js
@@ -19,12 +19,15 @@ export default function MyRouter() {
         <Route index element={<Home />} />
         <Route path="computersciencemajor" element={<CsMajor />} />
         <Route path="datasciencemajor" element={<DsMajor />} />
-        <Route path="softwaremajor" element={<Software />} />
+        <Route path="softwareengineeringmajor" element={<Software />} />
         <Route path="informaticsmajor" element={<InfMajor />} />
         <Route path="dashboard/computersciencemajor" element={<BoardCS />} />
         <Route path="dashboard/datasciencemajor" element={<BoardDS />} />
         <Route path="dashboard/informaticsmajor" element={<BoardINF />} />
-        <Route path="dashboard/softwaremajor" element={<BoardSE />} />
+        <Route
+          path="dashboard/softwareengineeringmajor"
+          element={<BoardSE />}
+        />
       </Route>
     </Routes>
   );