From 39921148ba1523d04e2ba9c4710214e9a7390792 Mon Sep 17 00:00:00 2001 From: Peter Hoppe Date: Tue, 24 Jan 2023 17:50:55 +0100 Subject: [PATCH] last master commit --- php/php-dog/classes/lib.php | 2 +- src/components/Dog.tsx | 33 +++++++------ src/components/Home.tsx | 2 +- src/components/Login.tsx | 9 ++-- src/components/Register.tsx | 4 +- src/services/PhpApi.ts | 97 +++++++++++++++++++++---------------- 6 files changed, 82 insertions(+), 65 deletions(-) diff --git a/php/php-dog/classes/lib.php b/php/php-dog/classes/lib.php index c319d6c..e3c9bfe 100644 --- a/php/php-dog/classes/lib.php +++ b/php/php-dog/classes/lib.php @@ -28,7 +28,7 @@ class CMsg 'success' => $this->success, 'status' => $this->status, 'message' => $this->message, - 'fields' => $this->message, + 'fields' => $this->fields, 'data' => $this->data ]); } diff --git a/src/components/Dog.tsx b/src/components/Dog.tsx index 12050f1..5c96515 100644 --- a/src/components/Dog.tsx +++ b/src/components/Dog.tsx @@ -1,37 +1,42 @@ -import { UserCtx, UserCtxT } from '../context/UserContext'; -import { useContext, ReactNode } from 'react' +import { ResponseT, DogT} from '../context/UserContext'; +import { ReactNode, useState } from 'react' import { useParams } from "react-router-dom"; import Img from './Img'; import DogNameTxt from './DogNameTxt'; import './Dog.css'; +import {getDog} from '../services/PhpApi' const Dog = () => { - const {getDog, dog} = useContext(UserCtx) as UserCtxT; - + const [success, setSuccess] = useState(0); // m7MdMK const params = useParams(); const qr_id = Object.values(params)[0]; - var needData = dog.success === undefined; - if(needData) + var dogRes : ResponseT = {}; + var dog: DogT = dogRes.data; + + getDog(qr_id).then((resDog) => { - getDog(qr_id); // await not allowed?! => workaraound - } + dogRes = Object.assign({},resDog); + dog = Object.assign({},resDog.data); + setSuccess(dogRes.success); + }); + var email = "nicht definiert;" var phone = "nicht definiert;" var picPath = "nicht definiert;" //var qrPath = "nicht definiert;" var name = "nicht definiert;" - if(dog.success === 1) + if(success === 1) { - name = dog.data.name; + name = dog.name; //qrPath = dog.data.qr_code; - picPath = dog.data.picture; - email = dog.data.email; - phone = dog.data.phone; + picPath = dog.picture; + email = dog.email; + phone = dog.phone; } - const content: ReactNode = dog.success === 1 ? + const content: ReactNode = success === 1 ?

Hast Du mich gefunden?

{/*

name: {name}

diff --git a/src/components/Home.tsx b/src/components/Home.tsx index b6332e7..4e94dbc 100644 --- a/src/components/Home.tsx +++ b/src/components/Home.tsx @@ -2,7 +2,7 @@ import React, { useContext } from 'react' import { UserCtx, UserCtxT } from '../context/UserContext'; export default function Home() { - const {loginUser, wait, getUser, user} = useContext(UserCtx) as UserCtxT; + const {user} = useContext(UserCtx) as UserCtxT; return (

Home

diff --git a/src/components/Login.tsx b/src/components/Login.tsx index f07fa88..6983ec6 100644 --- a/src/components/Login.tsx +++ b/src/components/Login.tsx @@ -1,11 +1,12 @@ import {useState,useContext} from 'react'; import { Link, useNavigate } from 'react-router-dom'; import {UserCtx, UserCtxT} from '../context/UserContext'; -import './Login.css' +import './Login.css'; +import {loginUser} from '../services/PhpApi' const Login = () => { - const {loginUser, wait, getUser, user} = useContext(UserCtx) as UserCtxT; + const {wait, getUser, user} = useContext(UserCtx) as UserCtxT; const [redirect, setRedirect] = useState("false"); const [errMsg, setErrMsg] = useState("false"); const [formData, setFormData] = useState({ @@ -39,12 +40,12 @@ const Login = () => if(data.success) { setRedirect('Redirecting...'); - setErrMsg(data.message); + setErrMsg(data.message!); await getUser(); navigate('/profil'); return; } - setErrMsg(data.message); + setErrMsg(data.message!); } return ( diff --git a/src/components/Register.tsx b/src/components/Register.tsx index f2e2f01..7b5756b 100644 --- a/src/components/Register.tsx +++ b/src/components/Register.tsx @@ -2,10 +2,10 @@ import {useContext, useState} from 'react' import {Link} from 'react-router-dom' import {UserCtx, UserCtxT} from '../context/UserContext'; import './Register.css'; - +import {registerUser} from '../services/PhpApi'; const Register = () => { - const {registerUser, wait} = useContext(UserCtx) as UserCtxT; + const {wait} = useContext(UserCtx) as UserCtxT; const [errMsg, setErrMsg] = useState("false"); const [successMsg, setSuccessMsg] = useState("false"); const [formData, setFormData] = useState({ diff --git a/src/services/PhpApi.ts b/src/services/PhpApi.ts index 4f28a8d..a74c7c4 100644 --- a/src/services/PhpApi.ts +++ b/src/services/PhpApi.ts @@ -12,29 +12,27 @@ export const Axios = axios.create({ export const updateDog = async ({email, name, phone}: {email: string, name: string, phone: string}) => { - const { setWait } = useContext(UserCtx) as UserCtxT; - setWait(true); +// const { setWait } = useContext(UserCtx) as UserCtxT; +// setWait(true); try{ const {data} = await Axios.post('updateDog.php',{ email, name, phone }); - setWait(false); +// setWait(false); return data; } catch(err){ - setWait(false); +// setWait(false); return {success:0, message:'Server Error!'}; } } -export const getDog = async ( str: string | undefined) => +export const getDog = async ( str: string | undefined) : Promise => { - const { setWait, setDog } = useContext(UserCtx) as UserCtxT; - var ret: ResponseT = {}; - setWait(true); +// setWait(true); try { @@ -42,33 +40,43 @@ export const getDog = async ( str: string | undefined) => { qr_id: str }); - setDog(ret.data as ResponseT); - setWait(false); - return; + // setDog(ret.data as ResponseT); + // setWait(false); + return ret.data as ResponseT; } catch (error:any) { console.log('error message: ', error.message); - setWait(false); - return; +// setWait(false); + ret = + { + success: 0, + status: 500, + message: error.message, + fields: null, + data: null + }; + return ret; } } export const registerUser = async ({email,password}: {email: string, password: string}) => { - const { setWait } = useContext(UserCtx) as UserCtxT; - setWait(true); +// const { setWait } = useContext(UserCtx) as UserCtxT; +// setWait(true); try{ - const {data} = await Axios.post('register.php',{ + const {data} = await Axios.post('register.php', + { email, password }); - setWait(false); +// setWait(false); return data; } - catch(err){ - setWait(false); + catch(err) + { +// setWait(false); return {success:0, message:'Server Error!'}; } } @@ -76,30 +84,33 @@ export const registerUser = async ({email,password}: export const updateQR = async ({qr_width_cm, qr_height_cm, qr_fontsize, qr_visible_items, qr_item_sequence}: {qr_width_cm: number, qr_height_cm: number, qr_fontsize: number, qr_visible_items: number, qr_item_sequence: number}) => { - const { setWait } = useContext(UserCtx) as UserCtxT; +// const { setWait } = useContext(UserCtx) as UserCtxT; - setWait(true); - try{ - const {data} = await Axios.post('updateQR.php',{ +// setWait(true); + try + { + const {data} = await Axios.post('updateQR.php', + { qr_width_cm, qr_height_cm, qr_fontsize, qr_visible_items, qr_item_sequence }); - setWait(false); +// setWait(false); return data; } - catch(err){ - setWait(false); + catch(err) + { +// setWait(false); return {success:0, message:'Server Error!'}; } } export const loginUser = async ({email,password}:{email: string, password: string}) => { - const { setWait } = useContext(UserCtx) as UserCtxT; - setWait(true); + // const { setWait } = useContext(UserCtx) as UserCtxT; + // setWait(true); try { var postReturn: @@ -113,32 +124,32 @@ export const loginUser = async ({email,password}:{email: string, password: strin } = { data : {success: 0, message: '', data: null } }; - postReturn = await Axios.post('login.php',{ - email, - password - }); + postReturn = await Axios.post('login.php', + { + email, + password + }); const {data} = postReturn; if(data.success && data.data) { - setUser(data.data); - setWait(false); + // setUser(data.data); + // setWait(false); return {success:1}; } - setWait(false); + // setWait(false); return {success:0, message:data.message}; } - catch(err){ - setWait(false); + catch(err) + { +// setWait(false); return {success:0, message:'Server Error!'}; } } -export const logout = async () => -{ - const { setUser } = useContext(UserCtx) as UserCtxT; - await Axios.get('logout.php'); - setUser(null); -} +// export const logout = async () => +// { +// await Axios.get('logout.php'); +// }