Kinou/ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ereali' into apommier

Browse Source
This commit is contained in:
Alexandre POMMIER 2023-06-23 20:21:36 +02:00
commit 6d1cd933e2
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
containers/react/src/pages/QrCode.tsx
View File

@ -85,7 +85,7 @@ function QrCode () {
console.log("registered") console.log("registered")
// history.push('/login') // history.push('/login')
const path = 'http://' + process.env.REACT_APP_BASE_URL + '/'; const path = 'http://' + process.env.REACT_APP_BASE_URL + '/';
window.history.pushState({}, '', path); window.history.pushState({}, '', path);
window.location.reload(); window.location.reload();
@ -96,7 +96,7 @@ function QrCode () {
//alert ?? retry //alert ?? retry
} }
// redirect('/test') // redirect('/test')
} }
catch(err){ catch(err){
console.log(err) console.log(err)
} }
@ -105,7 +105,7 @@ function QrCode () {
const handleDesactivate = async () => { const handleDesactivate = async () => {
try { try {
await api.post("/deleteOtp") await api.post("/deleteOtp")
// const path = 'http://' + process.env.REACT_APP_BASE_URL + '/'; // const path = 'http://' + process.env.REACT_APP_BASE_URL + '/';
// window.history.pushState({}, '', path); // window.history.pushState({}, '', path);
window.location.reload(); window.location.reload();
} catch(err) { } catch(err) {
@ -148,7 +148,7 @@ function QrCode () {
<h1>Double Auth Validation</h1> <h1>Double Auth Validation</h1>
<input <input
onKeyDown={handleKeyPress} onKeyDown={handleKeyPress}
type="text" type="number"
className="qr" className="qr"
placeholder="6 Digits Code" placeholder="6 Digits Code"
value={code} value={code}
@ -164,8 +164,8 @@ function QrCode () {
<> <>
<h1>Double Auth</h1> <h1>Double Auth</h1>
<input onKeyDown={handleKeyPress} <input onKeyDown={handleKeyPress}
type="text" type="text"
className="qr" className="qr"
placeholder="6 Digits Code" placeholder="6 Digits Code"
onChange={(e) => setCode(e.target.value)} onChange={(e) => setCode(e.target.value)}
/> />
@ -179,4 +179,4 @@ function QrCode () {
) )
} }
export default QrCode export default QrCode

8
containers/react/src/styles/App.css
View File

@ -5,9 +5,13 @@
background-color: black; background-color: black;
height: 100%; height: 100%;
} }
input.qr::-webkit-outer-spin-button,
input.qr::-webkit-inner-spin-button {
-webkit-appearance: none;
margin: 0;
}
input.qr{ input.qr{
width: 20%; width: auto;
border-radius: 5px; border-radius: 5px;
background-color: rgb(0, 0, 0); background-color: rgb(0, 0, 0);
margin : 1%; margin : 1%;

5
containers/react/src/styles/Profile.css
View File

@ -54,7 +54,7 @@
@ -80,6 +80,7 @@
border-radius: 50%; border-radius: 50%;
border: thick; border: thick;
border-color: red; border-color: red;
margin-left: 10px;
/* border-image: linear-gradient(90deg, #5843e4, #5a0760); */ /* border-image: linear-gradient(90deg, #5843e4, #5a0760); */
/* margin-top: 20px; */ /* margin-top: 20px; */
@ -158,4 +159,4 @@
border: solid 0px #ccc; border: solid 0px #ccc;
background-color: #000; background-color: #000;
border-radius: 3%; border-radius: 3%;
} */ } */