fix: merge dev into ui2cb

src/App.tsx

@@ -1,5 +1,8 @@
 import { useState, useEffect } from 'react'
+import { Routes, Route } from 'react-router'
 import './App.css'
+import TemplatePage from './pages/TemplatePage/Template.tsx'
+import Home from './pages/Home/Home.tsx'
 
 function App() {
   const [message, setMessage] = useState('');
@@ -61,6 +64,15 @@ function App() {
       </div>
     </div>
   );
+/*
+  function App(){
+  
+  return (
+    <Routes>
+      <Route path="/" element={<Home />} />
+      <Route path="/Template" element={<TemplatePage />} />
+    </Routes>
+  )
 }
-
+*/
 export default App