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

merge

Browse Source
This commit is contained in:
Lara REALI 2023-06-24 15:50:10 +02:00
parent a84b932355
commit c011ea2b04
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
containers/react/src/pages/Home.tsx
View File

@ -6,11 +6,7 @@
/* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */ /* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/06/09 08:19:04 by apommier #+# #+# */ /* Created: 2023/06/09 08:19:04 by apommier #+# #+# */
<<<<<<< HEAD
/* Updated: 2023/06/24 14:31:22 by sadjigui ### ########.fr */
=======
/* Updated: 2023/06/23 17:33:51 by apommier ### ########.fr */ /* Updated: 2023/06/23 17:33:51 by apommier ### ########.fr */
>>>>>>> origin/ereali
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -82,7 +78,7 @@ function Profile () {
} catch (error) { } catch (error) {
console.error('Error uploading file:', error); console.error('Error uploading file:', error);
} }
} }
// } // }
}; };
@ -153,7 +149,7 @@ function Profile () {
</> </>
)} )}
</motion.div> </motion.div>
{/* <div className="file-upload-container"> */} {/* <div className="file-upload-container"> */}
{/* <button onClick={handleUpload} className="upload-button">Upload</button> */} {/* <button onClick={handleUpload} className="upload-button">Upload</button> */}
{/* <button onClick={handleUpload} className="upload-button">Upload</button> */} {/* <button onClick={handleUpload} className="upload-button">Upload</button> */}
@ -208,13 +204,13 @@ function Home () {
<div> <div>
{user && user.otp_verified ? ( {user && user.otp_verified ? (
<MdQrCodeScanner className='success' onClick={() => setSuccessQr(true)}/> <MdQrCodeScanner className='success' onClick={() => setSuccessQr(true)}/>
):("")} ):("")}
{user && user.win >= 2 ? ( {user && user.win >= 2 ? (
<GiWingedSword className="success" onClick={() => setSuccessSword(true)}/> <GiWingedSword className="success" onClick={() => setSuccessSword(true)}/>
):("")} ):("")}
{user && user.win >= 5 ? ( {user && user.win >= 5 ? (
<GiCrownedSkull className="success" onClick={() => setSuccessCrown(true)}/> <GiCrownedSkull className="success" onClick={() => setSuccessCrown(true)}/>
):("")} ):("")}
</div> </div>
<div className="home"> <div className="home">
<motion.div animate={{x: move ? -200: 120}} <motion.div animate={{x: move ? -200: 120}}
@ -244,8 +240,8 @@ function Home () {
<YellowAlert handleClose={closeSword} text={"Success: 2 victory ? You won the noobi warrior success!"} icon={3}/> <YellowAlert handleClose={closeSword} text={"Success: 2 victory ? You won the noobi warrior success!"} icon={3}/>
) : ("")} ) : ("")}
</AnimatePresence> </AnimatePresence>
</motion.div> </motion.div>
) )
} }
export default Home export default Home

8
docker-compose.yml
View File

@ -1,4 +1,4 @@
version: "3.3" version: "3.3"
services: services:
@ -24,11 +24,7 @@ services:
# depends_on: # depends_on:
# - nginx # - nginx
ports: ports:
<<<<<<< HEAD
- 8081:8081 - 8081:8081
=======
- 8001:8001
>>>>>>> origin/ereali
volumes: volumes:
- ./containers/react:/app - ./containers/react:/app
# - ./containers/react:/app # - ./containers/react:/app
@ -119,4 +115,4 @@ volumes:
# o: 'bind' # o: 'bind'
# device: '/backend' # device: '/backend'
db: db:
driver: local driver: local