diff --git a/src/components/layout.js b/src/components/layout.js index f298610..efa5a06 100644 --- a/src/components/layout.js +++ b/src/components/layout.js @@ -58,7 +58,7 @@ export default function Layout(props) { ) })} - + Donate diff --git a/src/pages/pwRequest.js b/src/pages/pwRequest.js index cb1f8ba..f833615 100644 --- a/src/pages/pwRequest.js +++ b/src/pages/pwRequest.js @@ -4,32 +4,37 @@ import fetch from 'unfetch' import styles from './pwRequest.module.css' import constants from '../constants.json' -export default function PwRequest (props) { +export default function PwRequest(props) { const [result, setResult] = useState([]) const [remaining, setRemaining] = useState() const [requestedPWS, setRequestedPWS] = useState() const [createDate, setCreateDate] = useState() - const [addPwPerDay, setAddPwPerDay] = useState() - // const [daysAfterUserGetsPWs, setDaysAfterUserGetsPWs] = useState() - const [maxPWCount, setMaxPWCount] = useState() + const [addPwPerDay, setAddPwPerDay] = useState('...') + const [daysAfterUserGetsPWs, setDaysAfterUserGetsPWs] = useState('...') + const [maxPWCount, setMaxPWCount] = useState('...') + const [addPWCount, setAddPWCount] = useState('...') + const [dayDiff, setDayDiff] = useState('...') useEffect(() => { console.info('Fetching avaible pws') fetch(`${constants.apiUrl}avaiblePWS`, { - credentials: 'include' + credentials: 'include', }) .then((resp) => { return resp.json() }) .then((data) => { + console.log(data) setRemaining(data.avaiblePWS) setCreateDate(data.userCreated) setRequestedPWS(data.requestedPWS) setAddPwPerDay(data.addPWPerDay) - // setDaysAfterUserGetsPWs(data.daysAfterUserGetsPWs) + setAddPWCount(data.addPWCount) + setDaysAfterUserGetsPWs(data.daysAfterUserGetsPWs) setMaxPWCount(data.maxPWCount) + setDayDiff(data.dayDiff) }) }, []) @@ -38,22 +43,26 @@ export default function PwRequest (props) { method: 'POST', credentials: 'include', headers: { - 'Accept': 'application/json', - 'Content-Type': 'application/json' + Accept: 'application/json', + 'Content-Type': 'application/json', }, - body: JSON.stringify({}) + body: JSON.stringify({}), }) try { - rawResponse.json() + rawResponse + .json() .then((resp) => { if (resp.result === 'success') { setResult([...result, resp.pw]) setRemaining(resp.remaining) setRequestedPWS(resp.requestedPWS) } else if (resp.result === 'success') { - setResult([ 'Nem vagy bejelentkezve!' ]) // this should never happpen + setResult(['Nem vagy bejelentkezve!']) // this should never happpen } else { - setResult([...result, 'Jelszó kérési lehetőségeid elfogytak, nézz vissza később']) + setResult([ + ...result, + 'Jelszó kérési lehetőségeid elfogytak, nézz vissza később', + ]) setRemaining(0) } }) @@ -70,53 +79,52 @@ export default function PwRequest (props) { return ( // TODO: újrafogalmazás, remove hány nap után kapnak új jelszót először