From 17511691bb9a33903f78d403aa51373eb2ed4e6b Mon Sep 17 00:00:00 2001
From: Hamza ZOGHMAR <hamza@tilak.io>
Date: Mon, 5 Dec 2022 11:19:45 +0100
Subject: [PATCH] renamed NavBar to TopBar to avoid conflicts with Bootstrap's
 Navbar

---
 src/App.js                              | 2 ++
 src/components/Layout.js                | 2 +-
 src/components/Loader.js                | 2 +-
 src/components/Settings.js              | 7 +++++++
 src/components/{Navbar.js => TopBar.js} | 0
 5 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 src/components/Settings.js
 rename src/components/{Navbar.js => TopBar.js} (100%)

diff --git a/src/App.js b/src/App.js
index 3490c67..fb3e917 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,6 +1,7 @@
 import "./css/overlay.css";
 import Layout from "./components/Layout";
 import Loader from "./components/Loader";
+import Settings from "./components/Settings";
 // import Test from "./components/Test";
 import React, { useState, useEffect } from "react";
 import { io } from "socket.io-client";
@@ -50,6 +51,7 @@ function App() {
               path="/home"
               element={<Layout socket={socketInstance} />}
             />
+            <Route exact path="/settings" element={<Settings />} />
             <Route path="*" element={"not found"} />
           </Routes>
         </Router>
diff --git a/src/components/Layout.js b/src/components/Layout.js
index 37cd3dd..7dea8d8 100644
--- a/src/components/Layout.js
+++ b/src/components/Layout.js
@@ -2,7 +2,7 @@ import "../css/layout.css";
 import { useState, useEffect } from "react";
 import Paper from "./Paper";
 import View3D from "./View3D";
-import TopBar from "./Navbar";
+import TopBar from "./TopBar";
 import SplitPane from "react-split-pane";
 
 function Layout({ socket }) {
diff --git a/src/components/Loader.js b/src/components/Loader.js
index e4c37ea..31a754e 100644
--- a/src/components/Loader.js
+++ b/src/components/Loader.js
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import { FcOpenedFolder, FcFile } from "react-icons/fc";
 import { useNavigate } from "react-router-dom";
 import { Table } from "react-bootstrap";
-import TopBar from "./Navbar";
+import TopBar from "./TopBar";
 import "../css/loader.css";
 import "../css/overlay.css";
 
diff --git a/src/components/Settings.js b/src/components/Settings.js
new file mode 100644
index 0000000..69d1afe
--- /dev/null
+++ b/src/components/Settings.js
@@ -0,0 +1,7 @@
+import TopBar from "./TopBar";
+
+function Settings() {
+  return <></>;
+}
+
+export default Settings;
diff --git a/src/components/Navbar.js b/src/components/TopBar.js
similarity index 100%
rename from src/components/Navbar.js
rename to src/components/TopBar.js