From 798844f5bd846072e32a0dc8d48ebfde785d9c42 Mon Sep 17 00:00:00 2001 From: CANCI0 Date: Mon, 1 Apr 2024 19:01:16 +0200 Subject: [PATCH 1/6] =?UTF-8?q?A=C3=B1adidos=20m=C3=A1rgenes=20a=20varios?= =?UTF-8?q?=20componentes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/src/components/Footer/Footer.css | 4 - webapp/src/components/Login/Login.css | 19 --- webapp/src/components/Login/Login.js | 6 +- webapp/src/components/Nav/Nav.css | 42 ----- webapp/src/components/Register/Register.css | 15 -- webapp/src/components/Register/Register.js | 6 +- webapp/src/pages/Bateria/Bateria.css | 85 ---------- webapp/src/pages/Clasico/Clasico.css | 139 --------------- webapp/src/pages/Config/Config.css | 22 --- webapp/src/pages/Home/Home.css | 35 ---- webapp/src/pages/Ranking/Ranking.css | 0 webapp/src/pages/Ranking/Ranking.js | 6 +- webapp/src/pages/Sobre/Sobre.css | 47 ------ webapp/src/pages/Sobre/Sobre.js | 6 +- webapp/src/pages/Stats/Stats.css | 53 ------ webapp/src/pages/Stats/Stats.js | 177 ++++++++++++-------- 16 files changed, 117 insertions(+), 545 deletions(-) delete mode 100644 webapp/src/components/Footer/Footer.css delete mode 100644 webapp/src/components/Login/Login.css delete mode 100644 webapp/src/components/Nav/Nav.css delete mode 100644 webapp/src/components/Register/Register.css delete mode 100644 webapp/src/pages/Bateria/Bateria.css delete mode 100644 webapp/src/pages/Clasico/Clasico.css delete mode 100644 webapp/src/pages/Config/Config.css delete mode 100644 webapp/src/pages/Home/Home.css delete mode 100644 webapp/src/pages/Ranking/Ranking.css delete mode 100644 webapp/src/pages/Sobre/Sobre.css delete mode 100644 webapp/src/pages/Stats/Stats.css diff --git a/webapp/src/components/Footer/Footer.css b/webapp/src/components/Footer/Footer.css deleted file mode 100644 index 70abad02..00000000 --- a/webapp/src/components/Footer/Footer.css +++ /dev/null @@ -1,4 +0,0 @@ -.footer{ - border-top: 3px solid var(--borders); - width: 100%; -} \ No newline at end of file diff --git a/webapp/src/components/Login/Login.css b/webapp/src/components/Login/Login.css deleted file mode 100644 index b0942aff..00000000 --- a/webapp/src/components/Login/Login.css +++ /dev/null @@ -1,19 +0,0 @@ -.main .logo{ - margin-top: 3rem; -} - -.login-container { - display: grid; - grid-template-columns: 1fr; - gap: 1rem; - justify-content: center; - margin: auto 0; -} - -.login-container h1{ - text-align: center; -} - -a{ - box-shadow: none; -} \ No newline at end of file diff --git a/webapp/src/components/Login/Login.js b/webapp/src/components/Login/Login.js index f8fd7df6..2385118d 100644 --- a/webapp/src/components/Login/Login.js +++ b/webapp/src/components/Login/Login.js @@ -52,8 +52,10 @@ const Login = () => { return ( <> - - + + + + WIQ diff --git a/webapp/src/components/Nav/Nav.css b/webapp/src/components/Nav/Nav.css deleted file mode 100644 index 8f00fcb1..00000000 --- a/webapp/src/components/Nav/Nav.css +++ /dev/null @@ -1,42 +0,0 @@ -nav .logo{ - margin-left: 3rem; -} - -nav { - width: 100%; - display: grid; - grid-auto-flow: column; - border-bottom: 3px solid var(--borders); - justify-content: space-between; - align-items: center; -} - -nav * { - margin: 1rem; -} - -.menuItems *, .rightItems * { - height: 100%; -} - -.rightItems{ - display: grid; - grid-auto-flow: column; - column-gap: 2rem; - align-items: center; -} - -.disconnect{ - margin-left: auto; -} - -.theme-toggle{ - background-size: contain; -} - -.progressBar{ - background-color: var(--shadow); - height: 1rem; - border-radius: 1rem; - margin-top: 0.5rem; -} \ No newline at end of file diff --git a/webapp/src/components/Register/Register.css b/webapp/src/components/Register/Register.css deleted file mode 100644 index ee1f0322..00000000 --- a/webapp/src/components/Register/Register.css +++ /dev/null @@ -1,15 +0,0 @@ -.register-container{ - display: grid; - grid-template-columns: 1fr; - gap: 1rem; - justify-content: center; - align-items: center; -} - -.register-container label{ - margin-top: 1rem; -} - -.register-button{ - box-shadow: none; -} \ No newline at end of file diff --git a/webapp/src/components/Register/Register.js b/webapp/src/components/Register/Register.js index f5ee9695..f338735a 100644 --- a/webapp/src/components/Register/Register.js +++ b/webapp/src/components/Register/Register.js @@ -43,8 +43,10 @@ const AddUser = () => { return ( <> - - + + + + WIQ diff --git a/webapp/src/pages/Bateria/Bateria.css b/webapp/src/pages/Bateria/Bateria.css deleted file mode 100644 index f32898ad..00000000 --- a/webapp/src/pages/Bateria/Bateria.css +++ /dev/null @@ -1,85 +0,0 @@ -body { - font-family: "Consolas", sans-serif; -} - -.menuContainer{ - display: flex; - flex-direction: column; - justify-content: center; - border: 3px solid var(--borders); - padding: 1rem; - -webkit-box-shadow: 10px 10px 6px 0px var(--shadow); - -moz-box-shadow: 10px 10px 6px 0px var(--shadow); - box-shadow: 10px 10px 5px 0px var(--shadow); - border-radius: 1rem; -} - -.menuContainer > *{ - text-align: center; - margin: 1rem 0; - -} - -.container h1 { - text-align: center; -} - -.questionContainer { - display: grid; - justify-content: center; - align-items: center; - border: 3px solid var(--borders); - border-radius: 1rem; - padding: 1rem; - -webkit-box-shadow: 10px 10px 6px 0px var(--shadow); - -moz-box-shadow: 10px 10px 6px 0px var(--shadow); - box-shadow: 10px 10px 5px 0px var(--shadow); -} - -.responsesContainer { - display: grid; - justify-content: center; - grid-template-columns: repeat(2, 1fr); - grid-template-rows: repeat(2, 1fr); - gap: 1rem; - margin-bottom: 1rem; -} - -button{ - margin: 0.25rem; -} - -/* CSS */ -.responsesContainer button { - appearance: none; - background-color: transparent; - border: 0.13rem solid var(--borders); - border-radius: 15px; - padding: 1rem; - text-align: center; - text-decoration: none; - transition: all 300ms cubic-bezier(0.23, 1, 0.32, 1); - user-select: none; - -webkit-user-select: none; - touch-action: manipulation; - width: 100%; - will-change: transform; - margin: 0; -} -/* HTML:
*/ -.loader { - width: 50px; - padding: 8px; - aspect-ratio: 1; - border-radius: 50%; - background: var(--shadow); - --_m: - conic-gradient(#0000 10%,#000), - linear-gradient(#000 0 0) content-box; - -webkit-mask: var(--_m); - mask: var(--_m); - -webkit-mask-composite: source-out; - mask-composite: subtract; - animation: l3 1s infinite linear; -} -@keyframes l3 {to{transform: rotate(1turn)}} diff --git a/webapp/src/pages/Clasico/Clasico.css b/webapp/src/pages/Clasico/Clasico.css deleted file mode 100644 index 492466bb..00000000 --- a/webapp/src/pages/Clasico/Clasico.css +++ /dev/null @@ -1,139 +0,0 @@ -body { - font-family: "Consolas", sans-serif; -} - -.menuContainer{ - display: flex; - flex-direction: column; - justify-content: center; - border: 3px solid var(--borders); - padding: 1rem; - -webkit-box-shadow: 10px 10px 6px 0px var(--shadow); - -moz-box-shadow: 10px 10px 6px 0px var(--shadow); - box-shadow: 10px 10px 5px 0px var(--shadow); - border-radius: 1rem; -} - -.menuContainer > *{ - text-align: center; - margin: 1rem 0; - -} - -.container h1 { - text-align: center; -} - -.questionContainer { - display: grid; - justify-content: center; - align-items: center; - border: 3px solid var(--borders); - border-radius: 1rem; - padding: 1rem; - -webkit-box-shadow: 10px 10px 6px 0px var(--shadow); - -moz-box-shadow: 10px 10px 6px 0px var(--shadow); - box-shadow: 10px 10px 5px 0px var(--shadow); -} - -.responsesContainer { - display: grid; - justify-content: center; - grid-template-columns: repeat(2, 1fr); - grid-template-rows: repeat(2, 1fr); - gap: 1rem; - margin-bottom: 1rem; -} - -button{ - margin: 0.25rem; -} - -/* CSS */ -.responsesContainer button { - appearance: none; - background-color: transparent; - border: 0.13rem solid var(--borders); - border-radius: 15px; - padding: 1rem; - text-align: center; - text-decoration: none; - transition: all 300ms cubic-bezier(0.23, 1, 0.32, 1); - user-select: none; - -webkit-user-select: none; - touch-action: manipulation; - width: 100%; - will-change: transform; - margin: 0; -} - -/* HTML:
*/ -.loader { - width: 50px; - padding: 8px; - aspect-ratio: 1; - border-radius: 50%; - background: var(--shadow); - --_m: - conic-gradient(#0000 10%,#000), - linear-gradient(#000 0 0) content-box; - -webkit-mask: var(--_m); - mask: var(--_m); - -webkit-mask-composite: source-out; - mask-composite: subtract; - animation: l3 1s infinite linear; -} -@keyframes l3 {to{transform: rotate(1turn)}} - -.loader { - border: 8px solid #f3f3f3; /* Light grey */ - border-top: 8px solid #3498db; /* Blue */ - border-radius: 50%; - width: 50px; - height: 50px; - animation: spin 2s linear infinite; - margin: 50px auto; -} - -@keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(360deg); } -} - -.questionContainer { - text-align: center; - margin: 50px auto; -} - -.questionContainer h2 { - font-size: 2em; -} - -.questionContainer p { - font-size: 1.5em; - margin-bottom: 30px; -} - -.responsesContainer { - display: flex; - justify-content: center; - flex-wrap: wrap; -} - -.responsesContainer button { - margin: 10px; - padding: 10px 20px; - background-color: #007bff; - color: white; - border: none; - cursor: pointer; -} - -.responsesContainer button:hover { - background-color: #0056b3; -} - -.timer, .points { - font-size: 1.5em; - margin-top: 20px; -} diff --git a/webapp/src/pages/Config/Config.css b/webapp/src/pages/Config/Config.css deleted file mode 100644 index a130ca7c..00000000 --- a/webapp/src/pages/Config/Config.css +++ /dev/null @@ -1,22 +0,0 @@ -.topicCheckboxes { - display: grid; - grid-template-columns: 1fr 1fr; - justify-items: end; -} - -.topicCheckboxes label{ - color: var(--text); -} - -.configContainer div{ - display: grid; - grid-template-columns: 1fr 1fr; - justify-items: end; - align-items: center; -} - -.configContainer input{ - appearance: auto; - box-shadow: none; - width: 7rem; -} \ No newline at end of file diff --git a/webapp/src/pages/Home/Home.css b/webapp/src/pages/Home/Home.css deleted file mode 100644 index f4436382..00000000 --- a/webapp/src/pages/Home/Home.css +++ /dev/null @@ -1,35 +0,0 @@ -.games-container { - text-align: center; - margin: 50px auto; - } - - .games-container h1 { - font-size: 2.5em; - } - - .games-container h2 { - font-size: 1.5em; - margin-bottom: 30px; - } - - .games-container ul { - list-style: none; - padding: 0; - } - - .games-container ul li { - margin-bottom: 10px; - } - - .games-container ul li a { - display: inline-block; - padding: 10px 20px; - background-color: #007bff; - color: white; - text-decoration: none; - } - - .games-container ul li a:hover { - background-color: #0056b3; - } - \ No newline at end of file diff --git a/webapp/src/pages/Ranking/Ranking.css b/webapp/src/pages/Ranking/Ranking.css deleted file mode 100644 index e69de29b..00000000 diff --git a/webapp/src/pages/Ranking/Ranking.js b/webapp/src/pages/Ranking/Ranking.js index 3b9e8eeb..098faa77 100644 --- a/webapp/src/pages/Ranking/Ranking.js +++ b/webapp/src/pages/Ranking/Ranking.js @@ -1,5 +1,5 @@ import React, { useState, useEffect } from "react"; -import { Select, Button, Heading, Table, Thead, Tbody, Tr, Th, Td } from "@chakra-ui/react"; +import { Select, Button, Heading, Table, Thead, Tbody, Tr, Th, Td, Flex } from "@chakra-ui/react"; import Nav from "../../components/Nav/Nav.js"; import Footer from "../../components/Footer/Footer.js"; @@ -107,7 +107,7 @@ const Ranking = () => { return ( <>