From 0d42eda749ec23a52b8e445c03920924bd4961e3 Mon Sep 17 00:00:00 2001 From: Elisee ADJIGUIDI Date: Fri, 23 Jun 2023 15:38:58 +0200 Subject: [PATCH 1/5] change --- .env | 8 ++++---- conf/init.sql | 2 +- conf/nginx.conf | 4 ++-- containers/api/src/config/config.service.ts | 6 +++--- containers/react/.env | 2 +- containers/react/package.json | 2 +- docker-compose.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.env b/.env index aae0c767..ae4dd442 100644 --- a/.env +++ b/.env @@ -14,15 +14,15 @@ NGINX_ENVSUBST_TEMPLATE_SUFFIX=".conf" # BASE_URL=http://localhost -BASE_URL=localhost -REACT_APP_BASE_URL=localhost -REDIRECT_URI=http://localhost/api/auth/login +BASE_URL=localhost:8080 +REACT_APP_BASE_URL=localhost:8080 +REDIRECT_URI=http://localhost:8080/api/auth/login #postgres var # POSTGRES_HOST=127.0.0.1 # DB_TYPE=postgres POSTGRES_HOST=postgresql POSTGRES_USER=postgres -POSTGRES_PASSWORD=pass +POSTGRES_PASSWORD=postgres POSTGRES_DATABASE=postgres MODE=DEV diff --git a/conf/init.sql b/conf/init.sql index 468babfc..91175420 100644 --- a/conf/init.sql +++ b/conf/init.sql @@ -1 +1 @@ -ALTER USER postgres WITH PASSWORD 'pass'; \ No newline at end of file +ALTER USER postgres WITH PASSWORD 'postgres'; \ No newline at end of file diff --git a/conf/nginx.conf b/conf/nginx.conf index 8af41775..b3bdd0df 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,14 +3,14 @@ server { # listen 80 ssl; # listen 443 ssl; # listen ${NGINX_PORT}; - listen 80; + listen 8080; location /{ proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass http://react_app:8080; + proxy_pass http://react_app:8081; } location /api { diff --git a/containers/api/src/config/config.service.ts b/containers/api/src/config/config.service.ts index efb443aa..3bde107e 100644 --- a/containers/api/src/config/config.service.ts +++ b/containers/api/src/config/config.service.ts @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* config.service.ts :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: apommier +#+ +:+ +#+ */ +/* By: sadjigui +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/09 14:53:49 by apommier #+# #+# */ -/* Updated: 2023/06/12 14:51:44 by apommier ### ########.fr */ +/* Updated: 2023/06/22 21:19:44 by sadjigui ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,7 +17,7 @@ export const getTypeOrmConfig = (): TypeOrmModuleOptions => ({ host: process.env.POSTGRES_HOST || 'postgresql', port: parseInt(process.env.POSTGRES_PORT, 10) || 5432, username: process.env.POSTGRES_USER || 'postgres', - password: process.env.POSTGRES_PASSWORD || 'pass', + password: process.env.POSTGRES_PASSWORD || 'postgres', database: process.env.POSTGRES_DATABASE || 'postgres', entities: ["dist/**/*.entity.js"], // entities: [join(__dirname, '**', '*.entity.{ts,js}')] diff --git a/containers/react/.env b/containers/react/.env index 35542322..d7d79fd5 100644 --- a/containers/react/.env +++ b/containers/react/.env @@ -1,4 +1,4 @@ -REACT_APP_BASE_URL=localhost +REACT_APP_BASE_URL=localhost:8080 REACT_APP_API_SECRET=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 REACT_APP_CLIENT_UID=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41 # REACT_APP_BASE_URL=92.143.191.152 diff --git a/containers/react/package.json b/containers/react/package.json index f0205289..46c0fdf3 100644 --- a/containers/react/package.json +++ b/containers/react/package.json @@ -22,7 +22,7 @@ "web-vitals": "^2.1.4" }, "scripts": { - "start": "HOST=0.0.0.0 PORT=8080 react-scripts start", + "start": "HOST=0.0.0.0 PORT=8081 react-scripts start", "start:dev": "npm run start --watch", "build": "react-scripts build", "test": "react-scripts test", diff --git a/docker-compose.yml b/docker-compose.yml index 04b613cb..0388b159 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: # command: sh -c "envsubst < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'" ports: - - 80:80 + - 8080:8080 volumes: - ./conf/nginx.conf:/etc/nginx/conf.d/default.conf # volumes: @@ -34,7 +34,7 @@ services: # depends_on: # - nginx ports: - - 8080:8080 + - 8081:8081 volumes: - ./containers/react:/app # - ./containers/react:/app From 72a4f42cdb286454e21231660edd6cbc96508d76 Mon Sep 17 00:00:00 2001 From: Elisee ADJIGUIDI Date: Fri, 23 Jun 2023 19:59:07 +0200 Subject: [PATCH 2/5] change design --- .../react/src/components/Alert/RedAlert.tsx | 4 +-- .../react/src/components/Game/PlayButton.tsx | 6 ++-- .../react/src/components/Messages/Message.tsx | 10 +++--- .../react/src/components/Messages/Modal.tsx | 34 +++++++++++-------- containers/react/src/styles/Messages.css | 34 +++++++++++++++---- containers/react/src/styles/Profile.css | 5 +-- containers/react/src/styles/field.css | 10 ++---- 7 files changed, 64 insertions(+), 39 deletions(-) diff --git a/containers/react/src/components/Alert/RedAlert.tsx b/containers/react/src/components/Alert/RedAlert.tsx index 9ec3c4bc..98062543 100644 --- a/containers/react/src/components/Alert/RedAlert.tsx +++ b/containers/react/src/components/Alert/RedAlert.tsx @@ -32,11 +32,11 @@ function RedAlert ({handleClose, text}: AlertProps) { initial="hidden" animate="visible" exit="exit" - > + >

{text}

- {setTimeout(handleClose, 1500)} + {setTimeout(handleClose, 1500)} ) } diff --git a/containers/react/src/components/Game/PlayButton.tsx b/containers/react/src/components/Game/PlayButton.tsx index 7e018a04..c42523c2 100644 --- a/containers/react/src/components/Game/PlayButton.tsx +++ b/containers/react/src/components/Game/PlayButton.tsx @@ -40,9 +40,9 @@ function PlayButton() { {/* !buttonClicked && */}
-

Super Power

-

Obstacle

-

Faster and Faster

+

Super Power

+

Obstacle

+

Faster and Faster

); diff --git a/containers/react/src/components/Messages/Message.tsx b/containers/react/src/components/Messages/Message.tsx index d04e250b..e1c368e7 100644 --- a/containers/react/src/components/Messages/Message.tsx +++ b/containers/react/src/components/Messages/Message.tsx @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* Message.tsx :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: apommier +#+ +:+ +#+ */ +/* By: sadjigui +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/06/01 18:24:46 by apommier #+# #+# */ -/* Updated: 2023/06/20 12:47:33 by apommier ### ########.fr */ +/* Updated: 2023/06/23 19:33:40 by sadjigui ### ########.fr */ /* */ /* ************************************************************************** */ @@ -42,11 +42,13 @@ function MessageMe({message, own}: MessageMeProps){ const [user, setUser] = useState(); const scrollRef = useRef(null); + useEffect(() => { if (scrollRef.current) { - scrollRef.current.scrollIntoView({ behavior: "smooth",}) - } + scrollRef.current.scrollIntoView({ behavior: "smooth"}); + }}) + useEffect(() => { const fetchProfilePicture = async () => { try { // const user = await api.get("/profile"); diff --git a/containers/react/src/components/Messages/Modal.tsx b/containers/react/src/components/Messages/Modal.tsx index 16a50bce..8bb6fc01 100644 --- a/containers/react/src/components/Messages/Modal.tsx +++ b/containers/react/src/components/Messages/Modal.tsx @@ -103,25 +103,26 @@ const Modal = ({handleClose}) => { e.stopPropagation()} - className="modal" + className="modalSetting" variant={dropIn} initial="hidden" animate="visible" exit="exit" > {/*

New Conversation

*/} +
{selectTags.map((selectTag) => ( -
+
setChannel(event.target.value)} - + )} {channel.private ? ( - - ):("")} + + ):("")}
@@ -166,6 +169,7 @@ const Modal = ({handleClose}) => { +
) diff --git a/containers/react/src/styles/Messages.css b/containers/react/src/styles/Messages.css index 81d05423..dead8106 100644 --- a/containers/react/src/styles/Messages.css +++ b/containers/react/src/styles/Messages.css @@ -1,6 +1,6 @@ .home{ background-color: rgb(0, 0, 0); - height: 90vh; + height: 70vh; display: flex; align-items: center; justify-content: center; @@ -202,6 +202,7 @@ p { text-decoration: none; font-weight:lighter; margin: 1%; + height: 25px; } .darkSubmit{ @@ -307,11 +308,17 @@ p { /* flex-direction: column; */ /* align-items: center; */ background-color: #3e3c61; + overflow: scroll; } .settingFirstPart{ margin-top: 10%; - margin-left: 15%; + margin-left: 20%; +} + +.settingFirstPart2{ + margin-top: 10%; + margin-left: 30%; } .settingSecondPart{ @@ -324,6 +331,7 @@ p { .checkbox{ display:flex; flex-direction:row; + margin-left: 60px; } input.in{ @@ -331,17 +339,25 @@ input.in{ margin-left: 0px; background-color: black; color: white; - border-radius: 12px; + border-radius: 4px; width: 70%; + height: 100%; + font-weight:100; + font-size: 20px; + padding: 7px; } input.in_howLong{ - margin-top: 14.5%; + margin-top: 13%; margin-left: 0px; background-color: black; color: white; - border-radius: 12px; - width: 15%; + border-radius: 4px; + width: 10%; + height: 10%; + font-weight:100; + font-size: 20px; + padding: 7px; } .mdp{ @@ -351,3 +367,9 @@ input.in_howLong{ width: 20%; } +.case{ + height: auto; + width: auto; + margin-left: 10px; +} + diff --git a/containers/react/src/styles/Profile.css b/containers/react/src/styles/Profile.css index 9749e86e..e1b76a49 100644 --- a/containers/react/src/styles/Profile.css +++ b/containers/react/src/styles/Profile.css @@ -62,6 +62,7 @@ .page { text-align: center; overflow-y: scroll; + /* height: 80vh; */ /* height: 50vh; */ /* width: 50vh; */ /* background-color: black; */ @@ -96,11 +97,11 @@ } .history{ - display: inline-block; + display:inline-block; color: white; background-color: #5843e4; border-radius: 20px; - padding: 14px; + padding: 20px 500px; font-size: 1.7rem; text-decoration: none; font-weight: bold; diff --git a/containers/react/src/styles/field.css b/containers/react/src/styles/field.css index 07beeba9..bb3ad554 100644 --- a/containers/react/src/styles/field.css +++ b/containers/react/src/styles/field.css @@ -1,18 +1,14 @@ .playButton { background-image: linear-gradient(90deg, #5843e4, #5a0760); - display: flex; - flex-wrap: wrap; - overflow: hidden; border-radius: 5vh; color: white; - /* display: block; */ + display: block; margin: auto; margin-top: 30vh; - padding: 2vh 4vw; + padding: 2vh 5vw; height: 10vh; width: 20vw; - font-size: 250%; - text-align: center; + font-size: 300%; } From de59d21671d3006327cca5f36092b557f5983e21 Mon Sep 17 00:00:00 2001 From: Elisee ADJIGUIDI Date: Sat, 24 Jun 2023 00:37:20 +0200 Subject: [PATCH 3/5] change --- .../react/src/components/Messages/Chats.tsx | 10 ++-- .../react/src/components/Messages/Message.tsx | 6 +-- .../react/src/components/Profile/EditName.tsx | 49 ++++++++++++++----- containers/react/src/pages/Home.tsx | 8 +-- containers/react/src/styles/Messages.css | 9 ++++ containers/react/src/styles/Profile.css | 7 +++ 6 files changed, 64 insertions(+), 25 deletions(-) diff --git a/containers/react/src/components/Messages/Chats.tsx b/containers/react/src/components/Messages/Chats.tsx index 44328f1e..292df894 100644 --- a/containers/react/src/components/Messages/Chats.tsx +++ b/containers/react/src/components/Messages/Chats.tsx @@ -27,6 +27,7 @@ import PartyInvite from "./PartyInvite.tsx"; // import {User, Conv, Message} from "../../../interfaces.tsx" import {User, Conv} from "../../../interfaces.tsx" +import { IoLogoOctocat } from "react-icons/io5"; const TouchDiv = styled.div` margin-left: 10px; @@ -388,12 +389,13 @@ function Chats(){
- profile + {/* profile */} + {isLoading || !user ? (

Loading...

) : ( -

{user.nickname}

+

Chat

)} {/*
@@ -462,7 +464,7 @@ function Chats(){ ))} - + null}> {showAddFriendAlert && addFriend && ( @@ -475,7 +477,7 @@ function Chats(){ - + null}> {showBlockAlert && block && ( diff --git a/containers/react/src/components/Messages/Message.tsx b/containers/react/src/components/Messages/Message.tsx index da8479ad..458453ea 100644 --- a/containers/react/src/components/Messages/Message.tsx +++ b/containers/react/src/components/Messages/Message.tsx @@ -6,11 +6,7 @@ /* By: sadjigui +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/06/01 18:24:46 by apommier #+# #+# */ -<<<<<<< HEAD -/* Updated: 2023/06/23 19:33:40 by sadjigui ### ########.fr */ -======= -/* Updated: 2023/06/20 19:05:10 by apommier ### ########.fr */ ->>>>>>> apommier +/* Updated: 2023/06/23 21:14:59 by sadjigui ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/containers/react/src/components/Profile/EditName.tsx b/containers/react/src/components/Profile/EditName.tsx index 35123169..c3f058f0 100644 --- a/containers/react/src/components/Profile/EditName.tsx +++ b/containers/react/src/components/Profile/EditName.tsx @@ -1,12 +1,13 @@ import {motion} from "framer-motion" // import Backdrop from "../Sidebar/Backdrop" import {Link} from 'react-router-dom'; -import { UserProfile } from "../../DataBase/DataUserProfile"; +// import { UserProfile } from "../../DataBase/DataUserProfile"; import {useState} from 'react'; import "../../styles/Profile.css" import api from '../../script/axiosApi.tsx'; import React from "react"; +import RedAlert from "../Alert/RedAlert.tsx"; const dropIn = { hidden: { @@ -21,14 +22,17 @@ const dropIn = { } // const changeName = ({handleclose, name}) => { -// return ( -// UserProfile.UserName = name + // return ( + // UserProfile.UserName = name // ) // } const ModalEdit = ( handleClose ) => { // let new_name = ""; const [nickname, setNickname] = useState(""); + const [closeModal, setModalClose] = useState(false); + const [err, setErr] = useState(false); + const close = () => setErr(false); const handler = e => { @@ -46,13 +50,29 @@ const ModalEdit = ( handleClose ) => { }; postNickname(); } - + const handlePostNickname = async () => { console.log("nickname=" ,nickname) try{ - await api.post("/nickname", {nickname: nickname}) - window.location.reload(); + const ret = await api.post("/nickname", {nickname: nickname}); + // console.log("cest ici = ",ret); + // if (!ret) + console.log("test ret =",ret.data); + if(ret.data) + { + console.log ("ici error = ", ret.data); + // window.location.reload(); + } + else if (!ret.data) + { + console.log ("nickname already set = ", ret.data); + + setErr(true); + setModalClose(true); + } + + // setUser(tmpUser.data); // setIsLoading(false) } @@ -73,17 +93,22 @@ const ModalEdit = ( handleClose ) => { animate="visible" exit="exit">

Type your new name

- +
-
handlePostNickname()}> +
change {/* change */}
+ { + err ? ( + + ) : ("") + }
+ + ) + } - ) -} - -export default ModalEdit \ No newline at end of file + export default ModalEdit \ No newline at end of file diff --git a/containers/react/src/pages/Home.tsx b/containers/react/src/pages/Home.tsx index ecfbc71e..2e2dba72 100644 --- a/containers/react/src/pages/Home.tsx +++ b/containers/react/src/pages/Home.tsx @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* Home.tsx :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: apommier +#+ +:+ +#+ */ +/* By: sadjigui +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/06/09 08:19:04 by apommier #+# #+# */ -/* Updated: 2023/06/20 15:27:00 by apommier ### ########.fr */ +/* Updated: 2023/06/23 22:46:23 by sadjigui ### ########.fr */ /* */ /* ************************************************************************** */ @@ -178,7 +178,7 @@ function Profile () { {isLoading || !user ? (

Loading...

) : ( -

{user.nickname}

+

{user.nickname}

)} @@ -242,7 +242,7 @@ function Home () { } }; fetchSuccess(); - }) + },[]) return ( Date: Sat, 24 Jun 2023 14:35:50 +0200 Subject: [PATCH 4/5] responsive pages/game nickname already Taken/Nickname too short --- .../react/src/components/Profile/EditName.tsx | 131 +++++++++--------- containers/react/src/pages/Home.tsx | 6 +- containers/react/src/styles/Game.css | 13 +- containers/react/src/styles/field.css | 16 +++ 4 files changed, 99 insertions(+), 67 deletions(-) diff --git a/containers/react/src/components/Profile/EditName.tsx b/containers/react/src/components/Profile/EditName.tsx index c3f058f0..da364971 100644 --- a/containers/react/src/components/Profile/EditName.tsx +++ b/containers/react/src/components/Profile/EditName.tsx @@ -1,8 +1,8 @@ -import {motion} from "framer-motion" +import { AnimatePresence, motion } from "framer-motion" // import Backdrop from "../Sidebar/Backdrop" -import {Link} from 'react-router-dom'; +import { Link } from 'react-router-dom'; // import { UserProfile } from "../../DataBase/DataUserProfile"; -import {useState} from 'react'; +import { useState } from 'react'; import "../../styles/Profile.css" import api from '../../script/axiosApi.tsx'; @@ -22,61 +22,60 @@ const dropIn = { } // const changeName = ({handleclose, name}) => { - // return ( - // UserProfile.UserName = name +// return ( +// UserProfile.UserName = name // ) // } -const ModalEdit = ( handleClose ) => { +const ModalEdit = (handleClose) => { // let new_name = ""; const [nickname, setNickname] = useState(""); - const [closeModal, setModalClose] = useState(false); - const [err, setErr] = useState(false); - const close = () => setErr(false); - - const handler = e => - { + const [errTaken, setErrTaken] = useState(false); + const closeTaken = () => setErrTaken(false); + const [errTooShort, setErrTooShort] = useState(false); + const closeTooShort = () => setErrTooShort(false); + + const handler = e => { setNickname(e.target.value); console.log("testeeeee") - const postNickname = async ()=>{ - try{ - await api.post("/nickname", {nickname: nickname}) - // setUser(tmpUser.data); - // setIsLoading(false) - } - catch(err){ - console.log(err); - } + const postNickname = async () => { + // try{ + // await api.post("/nickname", {nickname: nickname}) + // // setUser(tmpUser.data); + // // setIsLoading(false) + // } + // catch(err){ + // console.log(err); + // } }; postNickname(); } - - const handlePostNickname = async () => - { - console.log("nickname=" ,nickname) - try{ - const ret = await api.post("/nickname", {nickname: nickname}); + + const handlePostNickname = async () => { + console.log("nickname=", nickname) + try { + const ret = await api.post("/nickname", { nickname: nickname }); // console.log("cest ici = ",ret); // if (!ret) - console.log("test ret =",ret.data); - if(ret.data) - { - console.log ("ici error = ", ret.data); - // window.location.reload(); + console.log("test ret =", ret.data); + if (nickname.length < 3) { + setErrTooShort(true); } - else if (!ret.data) - { - console.log ("nickname already set = ", ret.data); + else if (ret.data) { + console.log("ici error = ", ret.data); + window.location.reload(); + } + else { + console.log("nickname already set = ", ret.data); - setErr(true); - setModalClose(true); + setErrTaken(true); } - - + + // setUser(tmpUser.data); // setIsLoading(false) } - catch(err){ + catch (err) { console.log(err); } } @@ -86,29 +85,35 @@ const ModalEdit = ( handleClose ) => { // //do nothing // } return ( - -

Type your new name

- -
-
- change - {/* change */} -
+ +

Type your new name

+ +
+
+ change + {/* change */} +
+ null}> { - err ? ( - + errTaken ? ( + ) : ("") } -
- - - - ) - } - - export default ModalEdit \ No newline at end of file + { + errTooShort ? ( + + ) : ("") + } + + +
+ + ) +} + +export default ModalEdit \ No newline at end of file diff --git a/containers/react/src/pages/Home.tsx b/containers/react/src/pages/Home.tsx index 2e2dba72..cd381f6e 100644 --- a/containers/react/src/pages/Home.tsx +++ b/containers/react/src/pages/Home.tsx @@ -6,7 +6,7 @@ /* By: sadjigui +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/06/09 08:19:04 by apommier #+# #+# */ -/* Updated: 2023/06/23 22:46:23 by sadjigui ### ########.fr */ +/* Updated: 2023/06/24 14:31:22 by sadjigui ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,7 +20,7 @@ import { motion, AnimatePresence } from 'framer-motion' // import { GrClose } from 'react-icons/gr' import { Link } from "react-router-dom"; import ModalEdit from "../components/Profile/EditName.tsx"; -import {AiOutlineHistory} from 'react-icons/ai' +import {AiOutlineCloseCircle, AiOutlineHistory} from 'react-icons/ai' import { MdQrCodeScanner, MdOutlinePhotoLibrary } from 'react-icons/md'; import { GiWingedSword, GiCrownedSkull } from 'react-icons/gi'; @@ -274,7 +274,7 @@ function Home () { className="div_history" // className="history" onClick={ () => setmove(!move)}> - Match History + {move ? ():()} Match History null}> {successQr ? ( diff --git a/containers/react/src/styles/Game.css b/containers/react/src/styles/Game.css index 28cc1795..94adce85 100644 --- a/containers/react/src/styles/Game.css +++ b/containers/react/src/styles/Game.css @@ -3,6 +3,7 @@ margin: 50px; } + .rank_elements { border-width:1px; border-style:solid; @@ -25,4 +26,14 @@ height: 30px; width: 30px; border-radius: 50%; -} \ No newline at end of file +} + +@media screen and (max-width: 755px){ + .game{ + display: grid; + height: 20vh; + } + .scroll{ + height: 20vh; + } + } \ No newline at end of file diff --git a/containers/react/src/styles/field.css b/containers/react/src/styles/field.css index bb3ad554..828dddc0 100644 --- a/containers/react/src/styles/field.css +++ b/containers/react/src/styles/field.css @@ -11,6 +11,10 @@ font-size: 300%; } + .inside_checkbox{ + height : 70%; + width: 70%; + } .field { background-color: rgb(249, 249, 249); @@ -65,6 +69,18 @@ } } +.responsive{ + display: flex; + flex-direction: column; +} + +/* @media screen and (max-width: 350px){ + .responsive{ + display:list-item; + flex-direction: column; + } + } */ + #myCanvas { background-color: rgb(124, 47, 47); /* position: absolute; */ From c011ea2b04f74fab41a51e77ec6f5a378619f809 Mon Sep 17 00:00:00 2001 From: Lara REALI Date: Sat, 24 Jun 2023 15:50:10 +0200 Subject: [PATCH 5/5] merge --- containers/react/src/pages/Home.tsx | 16 ++++++---------- docker-compose.yml | 8 ++------ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/containers/react/src/pages/Home.tsx b/containers/react/src/pages/Home.tsx index 02a10663..ce0bf72d 100644 --- a/containers/react/src/pages/Home.tsx +++ b/containers/react/src/pages/Home.tsx @@ -6,11 +6,7 @@ /* By: sadjigui +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ ->>>>>>> origin/ereali /* */ /* ************************************************************************** */ @@ -82,7 +78,7 @@ function Profile () { } catch (error) { console.error('Error uploading file:', error); } - } + } // } }; @@ -153,7 +149,7 @@ function Profile () { )} - + {/*
*/} {/* */} {/* */} @@ -208,13 +204,13 @@ function Home () {
{user && user.otp_verified ? ( setSuccessQr(true)}/> - ):("")} + ):("")} {user && user.win >= 2 ? ( setSuccessSword(true)}/> ):("")} {user && user.win >= 5 ? ( setSuccessCrown(true)}/> - ):("")} + ):("")}
) : ("")} - + ) } -export default Home \ No newline at end of file +export default Home diff --git a/docker-compose.yml b/docker-compose.yml index fdde8234..e88a66b0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.3" +version: "3.3" services: @@ -24,11 +24,7 @@ services: # depends_on: # - nginx ports: -<<<<<<< HEAD - 8081:8081 -======= - - 8001:8001 ->>>>>>> origin/ereali volumes: - ./containers/react:/app # - ./containers/react:/app @@ -119,4 +115,4 @@ volumes: # o: 'bind' # device: '/backend' db: - driver: local \ No newline at end of file + driver: local