branch setzen

This commit is contained in:
2022-12-18 18:58:54 +01:00
parent 87c4224271
commit bac04885b0
6 changed files with 64 additions and 26 deletions

40
src/Ap.xxx__tsx Normal file
View File

@ -0,0 +1,40 @@
import React from 'react';
import {useContext} from 'react'
import './App.css';
import { BrowserRouter, Routes, Route, Navigate} from 'react-router-dom';
import "./App.css";
import Login from './components/Login';
import Register from './components/Register';
import Home from './components/Home';
import Dog from './components/Dog';
import {UserCtx, UserCtxT} from './context/UserContext';
function App()
{
const {user} = useContext<UserCtxT | null>(UserCtx) as UserCtxT;
return (
<div className="App">
<div className="col middle">
<BrowserRouter basename='/dog'>
<Routes>
{ user && <Route path="/" element={<Home/>} /> }
{ (
<>
{/* <Route path="/:qr_id" element={<Dog/>} /> */}
<Route path="/" element={<Home/>} />
<Route path="/d" element={<Dog/>} />
<Route path="/login" element={<Login/>} />
<Route path="/reg" element={<Register/>} />
</>
)}
{/* <Route path="*" element={<Navigate to={user ? '/':'/login'} />} /> */}
</Routes>
</BrowserRouter>
</div>
</div>
);
}
export default App;

View File

@ -19,15 +19,10 @@ function App()
<div className="col middle">
<BrowserRouter basename='/dog'>
<Routes>
{ user && <Route path="/" element={<Home/>} /> }
{ (
<>
<Route path="/:qr_id" element={<Dog/>} />
<Route path="/" element={<Home/>} />
<Route path="/d" element={<Dog/>} />
<Route path="/login" element={<Login/>} />
<Route path="/reg" element={<Register/>} />
</>
)}
<Route path="*" element={<Navigate to={user ? '/':'/login'} />} />
</Routes>
</BrowserRouter>
</div>

View File

@ -1,9 +1,10 @@
import React from 'react'
import { useParams } from "react-router-dom";
import { useParams, useSearchParams } from "react-router-dom";
export default function Dog()
{
const params = useParams();
const params = useParams();
const searchParams = useSearchParams();
return (
<div>
<h1>Dog</h1>

View File

@ -129,7 +129,8 @@ export const UserCtxProvider = ({children}:TUserContextProviderProps) => {
}
else
{
const {data} = await Axios.get('session.php');
const session = await Axios.get('session.php');
const {data} = session;
if(data.success && data.user)
{
setUser(data.user);