diff --git a/php/php-dog/AuthMiddleware.php b/php/php-dog/AuthMiddleware.php
index 0a3c4bb..9f2b1f6 100644
--- a/php/php-dog/AuthMiddleware.php
+++ b/php/php-dog/AuthMiddleware.php
@@ -49,10 +49,9 @@ class Auth
if(isset($_SESSION['user']))
{
$data = $_SESSION['user'];
-
if (
- isset($data['data']->id) &&
- $user = $this->fetchUser($data['data']->id)
+ isset($data['id']) &&
+ $user = $this->fetchUser($data['id'])
) :
$retVal = new CMsg(1, 200, "User found", null, $user);
return $retVal->jsonarray();
diff --git a/php/php-dog/login.php b/php/php-dog/login.php
index 299dd51..4403dbd 100644
--- a/php/php-dog/login.php
+++ b/php/php-dog/login.php
@@ -91,6 +91,9 @@ try
);
// $_SESSION['user'] = $user;
$_SESSION['user'] = $user->phparray();
+
+ var_dump($_SESSION['user']);
+
$returnData = new CMsg(
1,
diff --git a/src/App.tsx b/src/App.tsx
index 23c9b41..1365bf5 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,5 +1,4 @@
import React from 'react';
-import {useContext} from 'react'
import './App.css';
import { BrowserRouter, Routes, Route } from 'react-router-dom';
import Login from './components/Login';
@@ -15,11 +14,32 @@ import FileUpload from './components/FileUpload';
import Profil from './components/Profil';
import useSWR from 'swr';
import {getUser} from './services/PhpApi'
+import toast, { Toaster } from 'react-hot-toast';
+import { TUser } from './context/UserContext';
const App: React.FC = () =>
{
- const {data} = useSWR("user", getUser);
- const user = data.user;
+ const {data, error, isLoading} = useSWR("/user", getUser);
+ if (error)
+ {
+ toast.error(error.message);
+ return (
+ <>
+
+
failed to load
+ >);
+ }
+ if (isLoading) return (loading...
);
+
+ let user: TUser | null;
+ if(data.success)
+ {
+ user = data.data;
+ }
+ else
+ {
+ user = null;
+ }
return (
diff --git a/src/components/Home.tsx b/src/components/Home.tsx
index 4e94dbc..6423892 100644
--- a/src/components/Home.tsx
+++ b/src/components/Home.tsx
@@ -1,14 +1,14 @@
-import React, { useContext } from 'react'
-import { UserCtx, UserCtxT } from '../context/UserContext';
+// import React, { useContext } from 'react'
+// import { UserCtx, UserCtxT } from '../context/UserContext';
export default function Home() {
- const {user} = useContext
(UserCtx) as UserCtxT;
- return (
-
-
Home
-
Logged in als:
-
{user?.email}
+// const {user} = useContext
(UserCtx) as UserCtxT;
+// return (
+//
+//
Home
+//
Logged in als:
+//
{user?.email}
-
- )
+//
+// )
}
diff --git a/src/components/Login.tsx b/src/components/Login.tsx
index 0b50a95..c52f6f5 100644
--- a/src/components/Login.tsx
+++ b/src/components/Login.tsx
@@ -1,17 +1,32 @@
-import {useState,useContext} from 'react';
+import {useState} from 'react';
+import useSWR from 'swr';
import { Link, useNavigate } from 'react-router-dom';
import './Login.css';
-import {loginUser} from '../services/PhpApi'
+import {getUser, loginUser} from '../services/PhpApi'
+import { toast } from 'react-hot-toast';
+import { TUser } from '../context/UserContext';
const Login = () =>
{
- const [redirect, setRedirect] = useState("false");
const [formData, setFormData] = useState({
email:'',
password:''
});
+
+ const {data, error, isLoading, mutate} = useSWR('Login', getUser);
const navigate = useNavigate();
+ if (error) return (failed to load
);
+ if (isLoading) return (loading...
);
+
+
+ let user: TUser | null;
+ if(data.success)
+ {
+ user = data.user;
+ formData.email = user!.email;
+ }
+
const onChangeInput = (e: React.FormEvent) =>
{
if(e.currentTarget.type === 'email' || e.currentTarget.type === 'password')
@@ -29,20 +44,10 @@ const Login = () =>
if(!Object.values(formData).every(val => val.trim() !== ''))
{
- setErrMsg('Please Fill in all Required Fields!');
+ toast.error('Please Fill in all Required Fields!');
return;
}
-
- const data = await loginUser(formData);
- if(data.success)
- {
- setRedirect('Redirecting...');
- setErrMsg(data.message!);
- await getUser();
- navigate('/profil');
- return;
- }
- setErrMsg(data.message!);
+ mutate(loginUser, formData)
}
return (
@@ -64,8 +69,7 @@ const Login = () =>
- {errMsg !== "false" && {errMsg}
}
- {redirect !== "false" ? redirect : }
+
Register
}
diff --git a/src/components/PreviewUpload.tsx b/src/components/PreviewUpload.tsx
index e922bdb..def4644 100644
--- a/src/components/PreviewUpload.tsx
+++ b/src/components/PreviewUpload.tsx
@@ -1,94 +1,94 @@
-import React, { useContext, useState } from 'react';
-import { ResponseT, UserCtx, UserCtxT } from '../context/UserContext';
-import {Axios} from '../services/PhpApi';
+// import React, { useContext, useState } from 'react';
+// import { ResponseT, UserCtx, UserCtxT } from '../context/UserContext';
+// import {Axios} from '../services/PhpApi';
function PreviewUpload({chgFile}:{chgFile: any}) {
- const [file, setFile] = useState(undefined);
- const [dimensionWidth, setDimensionWidth] = useState(0);
- const [dimensionHeight, setDimensionHeight] = useState(0);
+// const [file, setFile] = useState(undefined);
+// const [dimensionWidth, setDimensionWidth] = useState(0);
+// const [dimensionHeight, setDimensionHeight] = useState(0);
- const { user } = useContext(UserCtx) as UserCtxT;
- const [dog, setDog] = useState({}); // local dog not the dog in UserContext
+// const { user } = useContext(UserCtx) as UserCtxT;
+// const [dog, setDog] = useState({}); // local dog not the dog in UserContext
- if(user && (dog === undefined || dog.success === undefined))
- {
- Axios.post('getDog.php',
- {
- qr_id: user.qr_id
- })
- .then((resDog) =>
- {
- setDog(resDog.data);
- setFile("./uploads"+resDog.data.data.picture);
- })
- .catch((err) => console.error(err));
- }
+// if(user && (dog === undefined || dog.success === undefined))
+// {
+// Axios.post('getDog.php',
+// {
+// qr_id: user.qr_id
+// })
+// .then((resDog) =>
+// {
+// setDog(resDog.data);
+// setFile("./uploads"+resDog.data.data.picture);
+// })
+// .catch((err) => console.error(err));
+// }
- const handleChange = async (
- event: React.ChangeEvent
- ): Promise => {
- // const { target } = event;
- // const img = new Image();
- const ImageName = event.target.value.split('\\')[2];
- const Image = event.target.value;
- console.log('Imageon Kevel: ', Image); // Image on Kevel
- console.log('ImageName on Kevel: ', ImageName); // ImageName on Kevel
- console.log('ImageLink on Kevel: ', event.target.value); // ImageLink on Kevel
- console.log('event current Target files: ', event.target.files![0]);
+// const handleChange = async (
+// event: React.ChangeEvent
+// ): Promise => {
+// // const { target } = event;
+// // const img = new Image();
+// const ImageName = event.target.value.split('\\')[2];
+// const Image = event.target.value;
+// console.log('Imageon Kevel: ', Image); // Image on Kevel
+// console.log('ImageName on Kevel: ', ImageName); // ImageName on Kevel
+// console.log('ImageLink on Kevel: ', event.target.value); // ImageLink on Kevel
+// console.log('event current Target files: ', event.target.files![0]);
- const fileLoaded = URL.createObjectURL(event.target.files![0]);
- const files = event.target.files;
+// const fileLoaded = URL.createObjectURL(event.target.files![0]);
+// const files = event.target.files;
- console.log('files: ', files);
- const dimensions = await someFunction(fileLoaded);
- setDimensionWidth(dimensions.width);
- setDimensionHeight(dimensions.height);
- console.log('dimensions: ', dimensions);
- console.log('dimensions width: ', dimensions.width);
- console.log('dimensions height: ', dimensions.height);
- setFile(fileLoaded);
+// console.log('files: ', files);
+// const dimensions = await someFunction(fileLoaded);
+// setDimensionWidth(dimensions.width);
+// setDimensionHeight(dimensions.height);
+// console.log('dimensions: ', dimensions);
+// console.log('dimensions width: ', dimensions.width);
+// console.log('dimensions height: ', dimensions.height);
+// setFile(fileLoaded);
- chgFile(event);
- };
- const getHeightAndWidthFromDataUrl = (dataURL: string) =>
- new Promise<{height: number, width: number}>((resolve) => {
- const img = new Image();
- img.onload = () => {
- resolve({
- height: img.height,
- width: img.width,
- });
- };
- img.src = dataURL;
- });
- // Get dimensions
- const someFunction = async (file: any) => {
- console.log('file: ', file);
- const dimensions = await getHeightAndWidthFromDataUrl(file);
- return dimensions;
- };
+// chgFile(event);
+// };
+// const getHeightAndWidthFromDataUrl = (dataURL: string) =>
+// new Promise<{height: number, width: number}>((resolve) => {
+// const img = new Image();
+// img.onload = () => {
+// resolve({
+// height: img.height,
+// width: img.width,
+// });
+// };
+// img.src = dataURL;
+// });
+// // Get dimensions
+// const someFunction = async (file: any) => {
+// console.log('file: ', file);
+// const dimensions = await getHeightAndWidthFromDataUrl(file);
+// return dimensions;
+// };
- return (
-
-
-
-

-
- {file &&
Dimensions: {`${dimensionWidth} x ${dimensionHeight}`}
}
-
- );
+ return ( <>> );
+//
+//
+//
+//

+//
+// {file &&
Dimensions: {`${dimensionWidth} x ${dimensionHeight}`}
}
+//
+// );
}
export default PreviewUpload;
diff --git a/src/components/Profil.tsx b/src/components/Profil.tsx
index e4786c3..96a9b9b 100644
--- a/src/components/Profil.tsx
+++ b/src/components/Profil.tsx
@@ -1,8 +1,8 @@
-import React, { useContext, useState } from 'react';
+import React, { useState } from 'react';
import useSWR from 'swr';
import { Link } from 'react-router-dom';
import toast, { Toaster } from 'react-hot-toast';
-import { ResponseT} from '../context/UserContext';
+import { ResponseT, TUser} from '../context/UserContext';
import {getProfilData} from '../services/PhpApi';
import CreateQr from '../services/CreateQr';
import Img from './Img';
@@ -17,17 +17,20 @@ function Profil()
qr_code: null
});
- const fetcher = () =>
- {
-
- }
-
// const { data, error, isLoading } = useSWR( user?.qr_id, getDog);
const { data, error, isLoading } = useSWR( "profilData", getProfilData);
-// data ist dogdata und logindata
+// data ist dogdata, logindata holt sich getProfilData.php aus $_SESSION
if (error) return (failed to load
);
if (isLoading) return (loading...
);
+ const user: TUser =
+ {
+ id: data.id,
+ qr_id: data.qr_id,
+ email: data.email,
+ name: data.name
+ };
+
console.log(data);
console.log(user);
diff --git a/src/components/Qr.tsx b/src/components/Qr.tsx
index 295f3db..69a7aa6 100644
--- a/src/components/Qr.tsx
+++ b/src/components/Qr.tsx
@@ -1,352 +1,352 @@
-import React, { ChangeEvent, MouseEventHandler, useContext, useState } from 'react'
-import { Link } from 'react-router-dom';
-import { UserCtx, UserCtxT, DogT, ResponseT, TUser } from '../context/UserContext';
-import {Axios, updateQR} from '../services/PhpApi';
-import Checkbox from './Checkbox';
-import Img from './Img';
-import './Qr.css';
+// import React, { ChangeEvent, MouseEventHandler, useContext, useState } from 'react'
+// import { Link } from 'react-router-dom';
+// import { UserCtx, UserCtxT, DogT, ResponseT, TUser } from '../context/UserContext';
+// import {Axios, updateQR} from '../services/PhpApi';
+// import Checkbox from './Checkbox';
+// import Img from './Img';
+// import './Qr.css';
-type ListItemT =
-{
- name: string;
- ordernum: number;
-}
+// type ListItemT =
+// {
+// name: string;
+// ordernum: number;
+// }
export default function Qr()
{
- const { user } = useContext(UserCtx) as UserCtxT;
- const [dog, setDog] = useState({}); // local dog not the dog in UserContext
- const [width, setWidth] = useState(2.4);
- const [height, setHeight] = useState(3.7);
- const [fontSize, setFontSize] = useState(100);
- const [visibleItem, setVisibleItem] = useState(0b111); // 100 name, 10 phone, 1 email
- const [itemOrder, setItemOrder] = useState(123); // name first, phone second, email third
- const [errMsg, setErrMsg] = useState("false");
- const [successMsg, setSuccessMsg] = useState("false");
- const [itemList, setItemList] = useState([
- {id: '0', name:'Name', ordernum: 1},
- {id: '1', name:'Telefon', ordernum: 2},
- {id: '2', name:'Email', ordernum: 3}
- ]);
+// const { user } = useContext(UserCtx) as UserCtxT;
+// const [dog, setDog] = useState({}); // local dog not the dog in UserContext
+// const [width, setWidth] = useState(2.4);
+// const [height, setHeight] = useState(3.7);
+// const [fontSize, setFontSize] = useState(100);
+// const [visibleItem, setVisibleItem] = useState(0b111); // 100 name, 10 phone, 1 email
+// const [itemOrder, setItemOrder] = useState(123); // name first, phone second, email third
+// const [errMsg, setErrMsg] = useState("false");
+// const [successMsg, setSuccessMsg] = useState("false");
+// const [itemList, setItemList] = useState([
+// {id: '0', name:'Name', ordernum: 1},
+// {id: '1', name:'Telefon', ordernum: 2},
+// {id: '2', name:'Email', ordernum: 3}
+// ]);
- //save reference for dragItem and dragOverItem
- const dragItem = React.useRef(null);
- const dragOverItem = React.useRef(null);
+// //save reference for dragItem and dragOverItem
+// const dragItem = React.useRef(null);
+// const dragOverItem = React.useRef(null);
- // const incrementFontSize = ((event: React.MouseEvent): MouseEventHandler | undefined =>
- // {
- // event.preventDefault();
- // if(fontSize < 200)
- // {
- // setFontSize(fontSize + 1);
- // }
+// // const incrementFontSize = ((event: React.MouseEvent): MouseEventHandler | undefined =>
+// // {
+// // event.preventDefault();
+// // if(fontSize < 200)
+// // {
+// // setFontSize(fontSize + 1);
+// // }
- // console.log("\nincrementFontSize " + fontSize);
- // return;
- // });
+// // console.log("\nincrementFontSize " + fontSize);
+// // return;
+// // });
- // const decrementFontSize = ((event: React.MouseEvent): MouseEventHandler | undefined =>
- // {
- // event.preventDefault();
- // if(fontSize > 1)
- // {
- // setFontSize(fontSize -1);
- // }
- // console.log("\ndecrementFontSize " + fontSize);
- // return;
- // });
+// // const decrementFontSize = ((event: React.MouseEvent): MouseEventHandler | undefined =>
+// // {
+// // event.preventDefault();
+// // if(fontSize > 1)
+// // {
+// // setFontSize(fontSize -1);
+// // }
+// // console.log("\ndecrementFontSize " + fontSize);
+// // return;
+// // });
- function setBitField(val: number, checked: boolean, bit: number) : number
- {
- if(checked)
- {
- val |= bit;
- }
- else
- {
- val ^= bit;
- }
- return val;
- }
+// function setBitField(val: number, checked: boolean, bit: number) : number
+// {
+// if(checked)
+// {
+// val |= bit;
+// }
+// else
+// {
+// val ^= bit;
+// }
+// return val;
+// }
- function checkBoxChange(id: string, checked: boolean) : void
- {
- let value = visibleItem;
- if(id==="name")
- {
- value = setBitField(value, checked, 0b100);
- }
- if(id==="phone")
- {
- value = setBitField(value, checked, 0b010);
- }
- if(id==="email")
- {
- value = setBitField(value, checked, 0b001);
- }
- setVisibleItem(value);
- }
+// function checkBoxChange(id: string, checked: boolean) : void
+// {
+// let value = visibleItem;
+// if(id==="name")
+// {
+// value = setBitField(value, checked, 0b100);
+// }
+// if(id==="phone")
+// {
+// value = setBitField(value, checked, 0b010);
+// }
+// if(id==="email")
+// {
+// value = setBitField(value, checked, 0b001);
+// }
+// setVisibleItem(value);
+// }
- function getItemOrderNumber(digit: number)
- {
- let ordernum = itemOrder; // 123
- ordernum = ordernum % (digit*10); // 123
- ordernum = Math.trunc(ordernum / digit);
+// function getItemOrderNumber(digit: number)
+// {
+// let ordernum = itemOrder; // 123
+// ordernum = ordernum % (digit*10); // 123
+// ordernum = Math.trunc(ordernum / digit);
- return ordernum;
- }
+// return ordernum;
+// }
- function getItemOrderNumber_(order: number, digit: number)
- {
- let ordernum = order; // 123
- ordernum = ordernum % (digit*10); // 123
- ordernum = Math.trunc(ordernum / digit);
+// function getItemOrderNumber_(order: number, digit: number)
+// {
+// let ordernum = order; // 123
+// ordernum = ordernum % (digit*10); // 123
+// ordernum = Math.trunc(ordernum / digit);
- return ordernum;
- }
+// return ordernum;
+// }
- //const handle drag sorting
- function handleSort()
- {
-// console.log('handleSort current:' + dragItem.current);
- //duplicate items
- let _itemList = [...itemList];
+// //const handle drag sorting
+// function handleSort()
+// {
+// // console.log('handleSort current:' + dragItem.current);
+// //duplicate items
+// let _itemList = [...itemList];
- //remove and save the dragged item content
- const draggedItemContent = _itemList.splice(dragItem.current, 1)[0];
+// //remove and save the dragged item content
+// const draggedItemContent = _itemList.splice(dragItem.current, 1)[0];
- //switch the position
- _itemList.splice(dragOverItem.current, 0, draggedItemContent);
+// //switch the position
+// _itemList.splice(dragOverItem.current, 0, draggedItemContent);
- //reset the position ref
- dragItem.current = null;
- dragOverItem.current = null;
+// //reset the position ref
+// dragItem.current = null;
+// dragOverItem.current = null;
- //update the actual array
- setItemList(_itemList);
+// //update the actual array
+// setItemList(_itemList);
- // set new itemorder
- let newItemOrder = 0;
- let digit = 100;
+// // set new itemorder
+// let newItemOrder = 0;
+// let digit = 100;
-// name 1
-// telefon 2
-// email 3
+// // name 1
+// // telefon 2
+// // email 3
-// email
-// name
-// telefon
+// // email
+// // name
+// // telefon
-// email is first 1 -> 3
-// name is second 2 -> 1
-// telefon third 3 -> 2
+// // email is first 1 -> 3
+// // name is second 2 -> 1
+// // telefon third 3 -> 2
-// 231
+// // 231
-// console.log('handleSort itemList:');
-// console.log(_itemList);
+// // console.log('handleSort itemList:');
+// // console.log(_itemList);
- _itemList.map((item, index) =>
- {
- digit = 10**(3-item.ordernum);
- newItemOrder += (index+1) * digit;
- });
- setItemOrder(newItemOrder);
-// console.log('handleSort newItemOrder:' + newItemOrder);
- }
+// _itemList.map((item, index) =>
+// {
+// digit = 10**(3-item.ordernum);
+// newItemOrder += (index+1) * digit;
+// });
+// setItemOrder(newItemOrder);
+// // console.log('handleSort newItemOrder:' + newItemOrder);
+// }
- function oneQrBlock()
- {
- return(
-
-
-
SCAN ME
-
![]()
-
-
- {((visibleItem & 0b100) > 0) &&
{dog.data.name}
}
- {((visibleItem & 0b010) > 0) &&
{dog.data.phone}
}
- {((visibleItem & 0b001) > 0) &&
{dog.data.email}
}
-
-
);
- }
+// function oneQrBlock()
+// {
+// return(
+//
+//
+//
SCAN ME
+//
![]()
+//
+//
+// {((visibleItem & 0b100) > 0) &&
{dog.data.name}
}
+// {((visibleItem & 0b010) > 0) &&
{dog.data.phone}
}
+// {((visibleItem & 0b001) > 0) &&
{dog.data.email}
}
+//
+//
);
+// }
- const saveHandler = (event: React.MouseEvent): MouseEventHandler | undefined =>
- {
- event.preventDefault();
- console.log("saveHandler \n");
- console.log(event);
- updateQR(
- {
- qr_width_cm: width,
- qr_height_cm: height,
- qr_fontsize: fontSize,
- qr_visible_items: visibleItem,
- qr_item_sequence: itemOrder
- }
- ).then((resQR) =>
- {
- if(resQR.success)
- {
- setSuccessMsg('Daten gesichert!');
- setErrMsg("false");
- }
- else if(!resQR.success && resQR.message)
- {
- setSuccessMsg("false");
- setErrMsg(resQR.message);
- }
- })
- .catch((err) => console.error(err));
- return;
- }
+// const saveHandler = (event: React.MouseEvent): MouseEventHandler | undefined =>
+// {
+// event.preventDefault();
+// console.log("saveHandler \n");
+// console.log(event);
+// updateQR(
+// {
+// qr_width_cm: width,
+// qr_height_cm: height,
+// qr_fontsize: fontSize,
+// qr_visible_items: visibleItem,
+// qr_item_sequence: itemOrder
+// }
+// ).then((resQR) =>
+// {
+// if(resQR.success)
+// {
+// setSuccessMsg('Daten gesichert!');
+// setErrMsg("false");
+// }
+// else if(!resQR.success && resQR.message)
+// {
+// setSuccessMsg("false");
+// setErrMsg(resQR.message);
+// }
+// })
+// .catch((err) => console.error(err));
+// return;
+// }
- const printHandler = (event: React.MouseEvent): MouseEventHandler | undefined =>
- {
- event.preventDefault();
- console.log("printHandler \n");
- console.log(event);
- window.print();
- return;
- }
+// const printHandler = (event: React.MouseEvent): MouseEventHandler | undefined =>
+// {
+// event.preventDefault();
+// console.log("printHandler \n");
+// console.log(event);
+// window.print();
+// return;
+// }
- function OrderItemList(order: number)
- {
- let _itemList: {id: string; name: string; ordernum: number}[] = [];
- let oNum = getItemOrderNumber_(order, 100);
- let item = itemList.find( x => x.ordernum === oNum);
- _itemList.push(item!);
- oNum = getItemOrderNumber_(order, 10);
- item = itemList.find( x => x.ordernum === oNum);
- _itemList.push(item!);
- oNum = getItemOrderNumber_(order, 1);
- item = itemList.find( x => x.ordernum === oNum);
- _itemList.push(item!);
- setItemList(_itemList);
- }
- const onChangeWidth = (e: ChangeEvent ) =>
- {
- setWidth(parseInt(e.target.value)/10 ? parseInt(e.target.value)/10 : 0);
- }
+// function OrderItemList(order: number)
+// {
+// let _itemList: {id: string; name: string; ordernum: number}[] = [];
+// let oNum = getItemOrderNumber_(order, 100);
+// let item = itemList.find( x => x.ordernum === oNum);
+// _itemList.push(item!);
+// oNum = getItemOrderNumber_(order, 10);
+// item = itemList.find( x => x.ordernum === oNum);
+// _itemList.push(item!);
+// oNum = getItemOrderNumber_(order, 1);
+// item = itemList.find( x => x.ordernum === oNum);
+// _itemList.push(item!);
+// setItemList(_itemList);
+// }
+// const onChangeWidth = (e: ChangeEvent ) =>
+// {
+// setWidth(parseInt(e.target.value)/10 ? parseInt(e.target.value)/10 : 0);
+// }
- const onChangeHeight = (e: ChangeEvent ) =>
- {
- setHeight(parseInt(e.target.value)/10 ? parseInt(e.target.value)/10 : 0);
- }
+// const onChangeHeight = (e: ChangeEvent ) =>
+// {
+// setHeight(parseInt(e.target.value)/10 ? parseInt(e.target.value)/10 : 0);
+// }
- const onChangeFontSize = (e: ChangeEvent ) =>
- {
- setFontSize(parseInt(e.target.value) ? parseInt(e.target.value) : 0);
- }
+// const onChangeFontSize = (e: ChangeEvent ) =>
+// {
+// setFontSize(parseInt(e.target.value) ? parseInt(e.target.value) : 0);
+// }
- if(user && dog.success === undefined)
- {
- Axios.post('getDog.php',
- {
- qr_id: user.qr_id
- })
- .then((resDog) =>
- {
- let locDog: DogT = resDog.data.data;
- setDog(resDog.data); // ResponseT
- setWidth(locDog.qr_width_cm);
- setHeight(locDog.qr_height_cm);
- setFontSize(locDog.qr_fontsize);
- setVisibleItem(locDog.qr_visible_items);
- setItemOrder(locDog.qr_item_sequence);
- OrderItemList(locDog.qr_item_sequence);
- })
- .catch((err) => console.error(err));
- }
+// if(user && dog.success === undefined)
+// {
+// Axios.post('getDog.php',
+// {
+// qr_id: user.qr_id
+// })
+// .then((resDog) =>
+// {
+// let locDog: DogT = resDog.data.data;
+// setDog(resDog.data); // ResponseT
+// setWidth(locDog.qr_width_cm);
+// setHeight(locDog.qr_height_cm);
+// setFontSize(locDog.qr_fontsize);
+// setVisibleItem(locDog.qr_visible_items);
+// setItemOrder(locDog.qr_item_sequence);
+// OrderItemList(locDog.qr_item_sequence);
+// })
+// .catch((err) => console.error(err));
+// }
- return (
- <>
- {user && dog.data &&
-
-
Qr-Code Druck
-
Zurück zum Profil
-
-
-
-
Anhänger
-
-
-
-
-
-
-
-
-
-
-
Sichtbare Elemente
-
0}
- changeEvent={checkBoxChange}
- />
- 0}
- changeEvent={checkBoxChange}
- />
- 0}
- changeEvent={checkBoxChange}
- />
-
-
-
Reihenfolge
-
Ändern durch Drag'n Drop
-
- {itemList.map((item, index) => (
-
{dragItem.current = index; /* console.log('onDragStart index: ' + index); */}}
- onDragEnter={(e) => {dragOverItem.current = index; /* console.log('onDragEnter index: ' + index); */}}
- onDragEnd={handleSort}
- onDragOver={(e) => {e.preventDefault(); /* console.log('onDragEnter index: ' + index); */}}
- >
-
{item.name}
-
- ))}
-
-
-
-
-
-
- {successMsg !== "false" &&
{successMsg}
}
- {errMsg !== "false" &&
{errMsg}
}
-
-
-
- {oneQrBlock()}
- {oneQrBlock()}
- {oneQrBlock()}
- {oneQrBlock()}
- {oneQrBlock()}
- {oneQrBlock()}
-
-
}
- { !dog.data && !user &&
- <>
- Qr-Code Druck
- nothing
- >
- }
- >
- )
+ return (
+ <>
+ {/* {user && dog.data &&
+
+
Qr-Code Druck
+
Zurück zum Profil
+
+
+
+
Anhänger
+
+
+
+
+
+
+
+
+
+
+
Sichtbare Elemente
+
0}
+ changeEvent={checkBoxChange}
+ />
+ 0}
+ changeEvent={checkBoxChange}
+ />
+ 0}
+ changeEvent={checkBoxChange}
+ />
+
+
+
Reihenfolge
+
Ändern durch Drag'n Drop
+
+ {itemList.map((item, index) => (
+
{dragItem.current = index; }}
+ onDragEnter={(e) => {dragOverItem.current = index; }}
+ onDragEnd={handleSort}
+ onDragOver={(e) => {e.preventDefault(); }}
+ >
+
{item.name}
+
+ ))}
+
+
+
+
+
+
+ {successMsg !== "false" &&
{successMsg}
}
+ {errMsg !== "false" &&
{errMsg}
}
+
+
+
+ {oneQrBlock()}
+ {oneQrBlock()}
+ {oneQrBlock()}
+ {oneQrBlock()}
+ {oneQrBlock()}
+ {oneQrBlock()}
+
+
}
+ { !dog.data && !user &&
+ <>
+ Qr-Code Druck
+ nothing
+ >
+ } */}
+ >
+ );
}
diff --git a/src/components/Register.tsx b/src/components/Register.tsx
index 7b5756b..f61bb59 100644
--- a/src/components/Register.tsx
+++ b/src/components/Register.tsx
@@ -1,78 +1,78 @@
-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';
+// 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 {wait} = useContext(UserCtx) as UserCtxT;
- const [errMsg, setErrMsg] = useState("false");
- const [successMsg, setSuccessMsg] = useState("false");
- const [formData, setFormData] = useState({
- email:'',
- password:'',
- password2:''
- });
+// const {wait} = useContext(UserCtx) as UserCtxT;
+// const [errMsg, setErrMsg] = useState("false");
+// const [successMsg, setSuccessMsg] = useState("false");
+// const [formData, setFormData] = useState({
+// email:'',
+// password:'',
+// password2:''
+// });
- const onChangeInput = (e: React.FormEvent ) => {
- setFormData({
- ...formData,
- [e.currentTarget.name]:e.currentTarget.value
- })
- }
+// const onChangeInput = (e: React.FormEvent ) => {
+// setFormData({
+// ...formData,
+// [e.currentTarget.name]:e.currentTarget.value
+// })
+// }
- const submitForm = async (e: React.FormEvent) =>
- {
- e.preventDefault();
+// const submitForm = async (e: React.FormEvent) =>
+// {
+// e.preventDefault();
- if(!Object.values(formData).every(val => val.trim() !== '')){
- setSuccessMsg("false");
- setErrMsg('Bitte alle Felder ausfüllen!');
- return;
- }
+// if(!Object.values(formData).every(val => val.trim() !== '')){
+// setSuccessMsg("false");
+// setErrMsg('Bitte alle Felder ausfüllen!');
+// return;
+// }
- if(formData.password !== formData.password2)
- {
- setSuccessMsg("false");
- setErrMsg('Bitte 2mal das gleiche Passwort eingeben!');
- return;
+// if(formData.password !== formData.password2)
+// {
+// setSuccessMsg("false");
+// setErrMsg('Bitte 2mal das gleiche Passwort eingeben!');
+// return;
- }
+// }
- const data = await registerUser(formData);
- if(data.success){
- setSuccessMsg('Erfolgreich Registriert!');
- setErrMsg("false");
- e.currentTarget.reset();
- }
- else if(!data.success && data.message){
- setSuccessMsg("false");
- setErrMsg(data.message);
- }
- }
+// const data = await registerUser(formData);
+// if(data.success){
+// setSuccessMsg('Erfolgreich Registriert!');
+// setErrMsg("false");
+// e.currentTarget.reset();
+// }
+// else if(!data.success && data.message){
+// setSuccessMsg("false");
+// setErrMsg(data.message);
+// }
+// }
- return (
-
- )
+ return ( <>> );
+//
+// )
}
export default Register;
\ No newline at end of file
diff --git a/src/components/dog.code-workspace b/src/components/dog.code-workspace
new file mode 100644
index 0000000..5f503bb
--- /dev/null
+++ b/src/components/dog.code-workspace
@@ -0,0 +1,11 @@
+{
+ "folders": [
+ {
+ "path": "../.."
+ },
+ {
+ "path": "../../../../../../../../../opt/lampp/htdocs/dog/php-dog"
+ }
+ ],
+ "settings": {}
+}
\ No newline at end of file
diff --git a/src/services/PhpApi.ts b/src/services/PhpApi.ts
index b8a7634..9eec3f8 100644
--- a/src/services/PhpApi.ts
+++ b/src/services/PhpApi.ts
@@ -127,7 +127,7 @@ export const getProfilData = async () =>
{
const profilData = await Axios.post('getProfilData.php');
const {data} = profilData;
- if(data.success && data.user)
+ if(data.success && data.data)
{
return data;
}
@@ -138,15 +138,9 @@ export const getProfilData = async () =>
}
export const getUser = async () =>
{
- const {data} = await Axios.get('getUser.php');
- if(data.success && data.user)
- {
- return data;
- }
- else
- {
- return null;
- }
+ const res = await Axios.get('getUser.php');
+ const {data} = res;
+ return data;
}