deploy

Author: devvsakib

src/App.jsx

@@ -1,29 +1,14 @@
 import { useState } from "react";
 import "./index.css";
-<<<<<<< HEAD
-import {
-  Routes,
-  Route
-} from "react-router-dom";
-import Doc from "./pages/Doc";
-import Home from "./pages/Home";
-=======
 import Error from "./components/Error/Error";
-import Header from "./components/Header/Header";
 import SearchInput from "./components/Search/SearchInput";
 import Layout from "./components/Layout/Layout";
->>>>>>> parent of 8d9c392 (pages created)
 
 function App() {
   const [search, setSearch] = useState('')
   const [type, setType] = useState('')
   return (
-<<<<<<< HEAD
-    <Routes>
-      <Route path="/" element={<Home />} />
-      <Route path="/Doc" element={<Doc />} />
-    </Routes>
-=======
+
     <>
       <Layout>
         <SearchInput
@@ -38,7 +23,6 @@ function App() {
       </Layout>
 
     </>
->>>>>>> parent of 8d9c392 (pages created)
   );
 }
 

src/components/Docs/DocCard.jsx src/components/Doc/Doc.jsxsrc/components/Docs/DocCard.jsx renamed to src/components/Doc/Doc.jsx

@@ -1,9 +1,8 @@
 import React from 'react';
-import Header from '../Header/Header';
 import Layout from '../Layout/Layout';
 import DocItem from './DocItem';
 
-const DocCard = () => {
+const Doc = () => {
     return (
           <div className='w-full md:w-5/6 mx-auto px-4 py-8'>
             <div className="grid grid-cols-1 md:grid-cols-2 gap-8">
@@ -67,4 +66,4 @@ const DocCard = () => {
     );
 };
 
-export default DocCard;
+export default Doc;

src/components/Docs/DocItem.jsx src/components/Doc/DocItem.jsxsrc/components/Docs/DocItem.jsx renamed to src/components/Doc/DocItem.jsx

@@ -1,9 +1,6 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
 import App from "./App";
-<<<<<<< HEAD
-import { BrowserRouter } from "react-router-dom";
-=======
 import {
   createBrowserRouter,
   RouterProvider,
@@ -23,12 +20,9 @@ const router = createBrowserRouter(
     }
   ]
 );
->>>>>>> parent of 8d9c392 (pages created)
 
 ReactDOM.createRoot(document.getElementById("root")).render(
-  <BrowserRouter>
-    <React.StrictMode>
-      <App />
-    </React.StrictMode>
-  </BrowserRouter>
+  <React.StrictMode>
+    <RouterProvider router={router} />
+  </React.StrictMode>
 );

src/components/Docs/css/style.css src/components/Doc/css/style.csssrc/components/Docs/css/style.css renamed to src/components/Doc/css/style.css

@@ -1,15 +1 @@
-<<<<<<< HEAD
-import React from 'react'
-import Layout from '../components/Layout/Layout'
-import DocCard from '../components/Docs/DocCard'
-const Doc = () => {
-  return (
-    <Layout>
-      <DocCard />
-    </Layout>
-  )
-}
 
-export default Doc
-=======
->>>>>>> parent of 8d9c392 (pages created)