Skip to content

Commit

Permalink
renamed NavBar to TopBar to avoid conflicts with Bootstrap's Navbar
Browse files Browse the repository at this point in the history
  • Loading branch information
hamza-tilak-io committed Dec 5, 2022
1 parent 0897f95 commit 1751169
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 2 deletions.
2 changes: 2 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
7 changes: 7 additions & 0 deletions src/components/Settings.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import TopBar from "./TopBar";

function Settings() {
return <></>;
}

export default Settings;
File renamed without changes.

0 comments on commit 1751169

Please sign in to comment.