From bac04885b083f8810f626cb45b0ad360d5cf39f1 Mon Sep 17 00:00:00 2001
From: Peter Hoppe <p.hoppe@gmx.de>
Date: Sun, 18 Dec 2022 18:58:54 +0100
Subject: [PATCH] branch setzen

---
 package.json                |  5 +++--
 php/php-dog/login.php       | 28 +++++++++++++-------------
 src/Ap.xxx__tsx             | 40 +++++++++++++++++++++++++++++++++++++
 src/App.tsx                 |  9 ++-------
 src/components/Dog.tsx      |  5 +++--
 src/context/UserContext.tsx |  3 ++-
 6 files changed, 64 insertions(+), 26 deletions(-)
 create mode 100644 src/Ap.xxx__tsx

diff --git a/package.json b/package.json
index 27f53b6..a945972 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
       "last 1 safari version"
     ]
   },
-  "homepage____": "http://localhost:3000/dog",
-  "homepage": "https://hope-fly.de/dog"
+  "xxxhomepage____": "http://localhost:3000/dog",
+  "xxxxhomepage": "https://hope-fly.de/dog",
+  "homepage": "http://localhost/dog"
 }
diff --git a/php/php-dog/login.php b/php/php-dog/login.php
index 1d4ec67..d92e729 100644
--- a/php/php-dog/login.php
+++ b/php/php-dog/login.php
@@ -13,22 +13,22 @@ require __DIR__.'/classes/lib.php';
 $db_connection = new Database();
 $conn = $db_connection->dbConnection();
 
-//$data = json_decode(file_get_contents("php://input"));
-$data = json_decode(
-    '{
-        "email": "a@q.q",
-        "password": "qwertzui"
-    }'
-);
+$data = json_decode(file_get_contents("php://input"));
+// $data = json_decode(
+//     '{
+//         "email": "a@q.q",
+//         "password": "qwertzui"
+//     }'
+// );
 $returnData = new CMsg(0);
 
-// IF REQUEST METHOD IS NOT EQUAL TO POST
-// if($_SERVER["REQUEST_METHOD"] != "POST")
-// {
-//     $returnData = new CMsg(0,404,'Page Not Found!');
-//     echo $returnData->jsonarray();
-//     return;
-// }
+//IF REQUEST METHOD IS NOT EQUAL TO POST
+if($_SERVER["REQUEST_METHOD"] != "POST")
+{
+    $returnData = new CMsg(0,404,'Page Not Found! REQUEST_METHOD');
+    echo $returnData->jsonarray();
+    return;
+}
 
 // CHECKING EMPTY FIELDS
 if(
diff --git a/src/Ap.xxx__tsx b/src/Ap.xxx__tsx
new file mode 100644
index 0000000..1aa1a04
--- /dev/null
+++ b/src/Ap.xxx__tsx
@@ -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;
diff --git a/src/App.tsx b/src/App.tsx
index 2fe1639..ab71f31 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -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>
diff --git a/src/components/Dog.tsx b/src/components/Dog.tsx
index 1755baa..c5d18de 100644
--- a/src/components/Dog.tsx
+++ b/src/components/Dog.tsx
@@ -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>
diff --git a/src/context/UserContext.tsx b/src/context/UserContext.tsx
index 449b278..29b59c0 100644
--- a/src/context/UserContext.tsx
+++ b/src/context/UserContext.tsx
@@ -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);