ok

src/App.js

@@ -1,16 +1,10 @@
-<<<<<<< HEAD
-import { Routes, Route } from "react-router-dom";
-=======
 import "./App.css";
 
 import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom";
 
 import Dashboard from "./Dashboard";
-
 import Login from "./Login";
->>>>>>> b9b4e4c859bd8face05c8d89d7f0c914d9e84a04
 import CameraKtp from "./KTPScanner";
-import Dashboard from "./Dashboard";
 
 import "./App.css";
 
@@ -23,23 +17,11 @@ const ProtectedRoute = ({ element }) => {
 function App() {
   return (
     <div className="App">
-<<<<<<< HEAD
       <Routes>
-        <Route path="/" element={<Dashboard />} />
+        <Route path="/login" element={<Login />} />
         <Route path="/scan" element={<CameraKtp />} />
+        <Route path="/" element={<ProtectedRoute element={<Dashboard />} />} />
       </Routes>
-=======
-      <BrowserRouter>
-        <Routes>
-          <Route path="/login" element={<Login />} />
-          <Route path="/" element={<CameraKtp />} />
-          <Route
-            path="/dashboard"
-            element={<ProtectedRoute element={<Dashboard />} />}
-          />
-        </Routes>
-      </BrowserRouter>
->>>>>>> b9b4e4c859bd8face05c8d89d7f0c914d9e84a04
     </div>
   );
 }