-
@@ -232,7 +258,20 @@ function Home () {
onClick={ () => setmove(!move)}>
Match History
-
+
null}>
+ {successQr ? (
+
+ ) : ("")}
+
+ {successCrown ? (
+
+ ) : ("")}
+
+ {successSword ? (
+
+ ) : ("")}
+
+
)
}
diff --git a/containers/react/src/styles/App.css b/containers/react/src/styles/App.css
index d2a7c169..d4d7c8c6 100644
--- a/containers/react/src/styles/App.css
+++ b/containers/react/src/styles/App.css
@@ -9,7 +9,7 @@
input.qr{
width: 20%;
border-radius: 5px;
- background-color: rgb(66, 66, 66);
+ background-color: rgb(0, 0, 0);
margin : 1%;
color:white;
}
diff --git a/containers/react/src/styles/Header.css b/containers/react/src/styles/Header.css
index 81f24e09..55a965e2 100644
--- a/containers/react/src/styles/Header.css
+++ b/containers/react/src/styles/Header.css
@@ -89,6 +89,17 @@ span {
border-radius: 50%;
}
+.success {
+ height: 2%;
+ width: 2%;
+ /* border: solid; */
+ margin-top: 1%;
+ margin: 3vh;
+ /* margin-bottom: -12vh; */
+ /* border-color: black; */
+ /* border-radius: 50%; */
+}
+
.header-pic{
text-align: end;
/* id: right; */
diff --git a/containers/react/src/styles/Messages.css b/containers/react/src/styles/Messages.css
index 57bbe076..81d05423 100644
--- a/containers/react/src/styles/Messages.css
+++ b/containers/react/src/styles/Messages.css
@@ -204,6 +204,18 @@ p {
margin: 1%;
}
+.darkSubmit{
+ display: inline-block;
+ color: white;
+ background-color: #282155;
+ border-radius: 10px;
+ padding: 5px;
+ font-size: 1.2rem;
+ text-decoration: none;
+ font-weight:lighter;
+ margin: 1%;
+}
+
.div_submit {
flex-direction: row;
align-items: center;
@@ -276,6 +288,12 @@ p {
background-color: rgba(212, 175, 55, 0.7);
font-size: 25px;
color: rgba(255, 255, 255, 1);
+ flex-wrap: wrap;
+}
+
+.yellowAlert::p {
+ overflow-wrap: break-word;
+ max-width: 1000px;
}
.modalSetting{
@@ -298,7 +316,7 @@ p {
.settingSecondPart{
margin-top: 10%;
- margin-left: 10%;
+ margin-left: 5%;
/* margin-left: 20%; */
}
@@ -315,4 +333,21 @@ input.in{
color: white;
border-radius: 12px;
width: 70%;
-}
\ No newline at end of file
+}
+
+input.in_howLong{
+ margin-top: 14.5%;
+ margin-left: 0px;
+ background-color: black;
+ color: white;
+ border-radius: 12px;
+ width: 15%;
+}
+
+.mdp{
+ background-color : black;
+ border-radius: 8px;
+ color: white;
+ width: 20%;
+}
+
diff --git a/containers/react/src/styles/Profile.css b/containers/react/src/styles/Profile.css
index 6d41023c..9749e86e 100644
--- a/containers/react/src/styles/Profile.css
+++ b/containers/react/src/styles/Profile.css
@@ -61,12 +61,15 @@
.page {
text-align: center;
+ overflow-y: scroll;
/* height: 50vh; */
/* width: 50vh; */
/* background-color: black; */
}
.profile {
+ align-items: center;
+ text-align: center;
flex-direction: row;
color: white;
}
@@ -79,7 +82,7 @@
border-color: red;
/* border-image: linear-gradient(90deg, #5843e4, #5a0760); */
- margin-top: 20px;
+ /* margin-top: 20px; */
}
.home{
@@ -106,7 +109,7 @@
.div_history {
flex-direction: row;
align-items: center;
- margin-top: -80px;
+ /* margin-top: -80px; */
}
.edit_name {
diff --git a/containers/react/src/styles/Win_Loss.css b/containers/react/src/styles/Win_Loss.css
index fdb3df72..1677e6bd 100644
--- a/containers/react/src/styles/Win_Loss.css
+++ b/containers/react/src/styles/Win_Loss.css
@@ -2,7 +2,7 @@
/* display: flex; */
/* flex-direction: column; */
/* background-color: red; */
- height: 70vh;
+ height: 60vh;
/* padding: 15px; */
/* overflow: scroll; */
diff --git a/containers/react/src/styles/field.css b/containers/react/src/styles/field.css
index 27f45d32..07beeba9 100644
--- a/containers/react/src/styles/field.css
+++ b/containers/react/src/styles/field.css
@@ -1,16 +1,21 @@
.playButton {
- background-image: linear-gradient(90deg, #5843e4, #5a0760);;
+ 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 5vw;
+ padding: 2vh 4vw;
height: 10vh;
width: 20vw;
- font-size: 300%;
+ font-size: 250%;
+ text-align: center;
}
+
.field {
background-color: rgb(249, 249, 249);
/* border-radius: 5vh; */
@@ -22,7 +27,7 @@
height: 80%;
width: 80%;
/* font-size: 300%; */
- }
+}
.clicked{
/* justify-content: center; */
@@ -40,6 +45,29 @@
/* padding-top: 25; */
/* padding-top: 177.77% */
}
+@media screen and (max-width: 900px){
+ .playButton{
+ font-size: 200%;
+ }
+}
+
+@media screen and (max-width: 700px){
+ .playButton{
+ font-size: 150%;
+ }
+}
+
+@media screen and (max-width: 530px){
+ .playButton{
+ font-size: 100%;
+ }
+}
+
+@media screen and (max-width: 350px){
+ .playButton{
+ font-size: 50%;
+ }
+}
#myCanvas {
background-color: rgb(124, 47, 47);
diff --git a/docker-compose.yml b/docker-compose.yml
index 04b613cb..46fa1855 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
+ - 8001:8001
volumes:
- ./containers/react:/app
# - ./containers/react:/app