-
Notifications
You must be signed in to change notification settings - Fork 1
Pantalla validacion #4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
brankitoCruz17
wants to merge
35
commits into
development
Choose a base branch
from
pantalla-validacion
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
35 commits
Select commit
Hold shift + click to select a range
973655e
coloque la imagene superior
brankitoCruz17 6ba050e
centre la imagen superior
brankitoCruz17 b6b03ff
ubique el h1 y le agregue sus styles
brankitoCruz17 ff53149
puse la revision y su styles
brankitoCruz17 9e4e79b
rectangulo de puntaje
brankitoCruz17 548e178
texto listo falta las posicion
brankitoCruz17 5abb27c
eze fijate jaja
brankitoCruz17 dce86d8
resolucion lista falta ubicarlo
brankitoCruz17 f45a312
solo la imagen pude poner ahora voy por lo demas
brankitoCruz17 58c5d14
imagen lista
brankitoCruz17 26ae808
agrego comentarios al codigo señalando errores
7053ade
corrijo estilo de pantalla resolucion
d11a30f
pude solucionar algunos problemas
brankitoCruz17 31ecd67
pushssss jajaj
brankitoCruz17 a35de98
puede colocar boton rojo faltaria posicionar la parte bordo que no se…
brankitoCruz17 e718b6f
boton rojo no toma los colores
brankitoCruz17 18f1850
los botones estan terminados, arregle los colores y centre los iconos
brankitoCruz17 b21302d
el elemento board: casi terminado, faltaria centrar el numero 24
brankitoCruz17 01dd426
Board: faltaria modificar el 4 por el que esta en el invision y el es…
brankitoCruz17 210b738
arreglo ruta de img
brankitoCruz17 8dca386
faltaria ordenar bien todos los elementos con flexbox
brankitoCruz17 21510e9
faltaria detallar bien las posiciones
brankitoCruz17 e2611aa
falta posicionar la resolucion y los botones
brankitoCruz17 fb5791f
detalles: puntaje subir un poco hasta el punto gris - la separacion e…
brankitoCruz17 ac3dade
corregimos todas las detalles anteriores, faltaria solo cambiar span …
brankitoCruz17 410cb8d
botones y tipografia cambiar
brankitoCruz17 cb3f826
faltaria arreglar los botones
brankitoCruz17 88838ff
corregi el error de la imagen superior
brankitoCruz17 8b742a8
coloque los botones en sus posiciones y tienen hover - faltaria coloc…
brankitoCruz17 5f63bd6
los botones estan listos y funcionados - las imagenes estan en sus po…
brankitoCruz17 d2edf95
corregi y acepte las sugerencias de martin
brankitoCruz17 fd5aac1
agregue componete button
brankitoCruz17 ce18abb
corregi los botones y las imagenes de las lineas grises
brankitoCruz17 ad02bb7
acomode los componetes
brankitoCruz17 45b11a5
corregui los errores que me marcaron
brankitoCruz17 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| import React from 'react'; | ||
|
|
||
| import styles from './index.module.scss'; | ||
| import PantallaValidacion from '../screens/Validacion/components'; | ||
|
|
||
| function App() { | ||
| return <h1> Proyecto blockchain </h1>; | ||
| return <PantallaValidacion />; | ||
| } | ||
|
|
||
| export default App; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import React from 'react'; | ||
|
|
||
| import styles from './index.module.scss'; | ||
|
|
||
| function BoardResolution() { | ||
| const CELL_NUMBERS = 16; | ||
| const renderCells = () => [...Array(CELL_NUMBERS)].map(() => <div className={styles.cell} />); | ||
|
|
||
| return ( | ||
| <div className={styles.containerBoard}> | ||
| <h2 className={styles.legend}>Resolución</h2> | ||
| <div className={styles.board}>{renderCells()}</div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default BoardResolution; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| .containerBoard { | ||
| padding: 31.5px 42.5px; | ||
| border: 1px solid #E1E1E2; | ||
| position: relative; | ||
| border-radius: 4px; | ||
| max-height: 374px; | ||
| max-width: 395px; | ||
| margin-top: 10px; | ||
| margin-bottom: 23.5px; | ||
| } | ||
|
|
||
| .legend { | ||
| position: absolute; | ||
| top: -35px; | ||
| left: 10px; | ||
| background-color: white; | ||
| padding: 0 5px; | ||
| color: #525256; | ||
| font-size: 24px; | ||
| font-weight: lighter; | ||
| } | ||
|
|
||
| .board { | ||
| background-color: #173040; | ||
| height: 311px; | ||
| width: 311px; | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| align-content: center; | ||
| justify-content: center; | ||
| padding: 15px 14px; | ||
| border-radius: 3.66px; | ||
| } | ||
|
|
||
| .cell { | ||
| width: 25%; | ||
| height: 25%; | ||
| } | ||
|
|
||
| .cell:nth-child(odd) { | ||
| background-color: #FEC34D; | ||
| } | ||
|
|
||
| .cell:nth-child(9) { | ||
| background-color: #F2754C; | ||
| } | ||
|
|
||
| .cell:nth-child(7) { | ||
| background-color: #F2754C; | ||
| } | ||
|
|
||
| .cell:nth-child(10) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(16) { | ||
| background-color: #33BFC6; | ||
| } | ||
|
|
||
| .cell:nth-child(1) { | ||
| background-color: #AED750; | ||
| } | ||
|
|
||
| .cell:nth-child(2) { | ||
| background-color: #33BFC6; | ||
| } | ||
|
|
||
| .cell:nth-child(3) { | ||
| background-color: #AED750; | ||
| } | ||
|
|
||
| .cell:nth-child(4) { | ||
| background-color: #F2754C; | ||
| } | ||
|
|
||
| .cell:nth-child(5) { | ||
| background-color: #F2754C; | ||
| } | ||
|
|
||
| .cell:nth-child(6) { | ||
| background-color: #AED750; | ||
| } | ||
|
|
||
| .cell:nth-child(7) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(8) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(9) { | ||
| background-color: #FEC34D; | ||
| } | ||
|
|
||
| .cell:nth-child(10) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(11) { | ||
| background-color: #F2754C; | ||
| } | ||
|
|
||
| .cell:nth-child(12) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(13) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(14) { | ||
| background-color: #FEC34D; | ||
| } | ||
|
|
||
| .cell:nth-child(15) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(16) { | ||
| background-color: #FEC34D; | ||
| } | ||
|
|
||
|
|
||
| .cell:nth-child(1) { | ||
| border-top-left-radius: 3.66px; | ||
| } | ||
|
|
||
| .cell:nth-child(4) { | ||
| border-top-right-radius: 3.66px; | ||
| } | ||
|
|
||
| .cell:nth-child(13) { | ||
| border-bottom-left-radius: 3.66px; | ||
| } | ||
|
|
||
|
|
||
| .cell:nth-child(16) { | ||
| border-bottom-right-radius: 3.66px; | ||
| } | ||
|
|
||
| .cell:nth-child(-n+4) { | ||
| border-top: 4px solid white; | ||
| } | ||
|
|
||
| .cell:nth-child(1n) { | ||
| border-bottom: 4px solid white; | ||
| border-left: 4px solid white; | ||
| } | ||
|
|
||
| .cell:nth-child(4n) { | ||
| border-right: 4px solid white; | ||
| } | ||
|
|
||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import React from 'react'; | ||
|
|
||
| import styles from './index.module.scss'; | ||
|
|
||
| function Score() { | ||
| return ( | ||
| <div className={styles.container}> | ||
| <div className={styles.containerScore}> | ||
| <span className={styles.textScore}>Tu Puntaje</span> | ||
| <span className={styles.iconContainer}>+</span> | ||
| <span className={styles.score}>2175</span> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default Score; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| .container { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| margin-bottom: 36px; | ||
| } | ||
|
|
||
| .containerScore { | ||
| background-color: #E8E8E8; | ||
| display: flex; | ||
| align-items: center; | ||
| width: 196px; | ||
| height: 53px; | ||
| padding: 10px; | ||
| border-radius: 5px; | ||
| } | ||
|
|
||
| .textScore { | ||
| margin: 0 5px; | ||
| font-weight: lighter; | ||
| } | ||
|
|
||
| .iconContainer { | ||
| margin: 0 8px; | ||
| background-color: #44B449; | ||
| width: 18px; | ||
| height: 16px; | ||
| color: white; | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| border-radius: 50%; | ||
| padding-bottom: 1px; | ||
| } | ||
|
|
||
| .score { | ||
| font-size: 29px; | ||
| font-weight: bold; | ||
| color: #525256; | ||
| } | ||
|
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
src/components/screens/Validacion/components/Board/index.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import React from 'react'; | ||
|
|
||
| import styles from './index.module.scss'; | ||
|
|
||
| function Board() { | ||
| const CELL_NUMBERS = 16; | ||
| const renderCells = () => | ||
| [...Array(CELL_NUMBERS)].map(() => ( | ||
| <div className={styles.cell}> | ||
| <span className={styles.number}>24</span> | ||
| </div> | ||
| )); | ||
|
|
||
| return ( | ||
| <div className={styles.containerBoard}> | ||
| <div className={styles.board}>{renderCells()}</div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default Board; |
127 changes: 127 additions & 0 deletions
127
src/components/screens/Validacion/components/Board/index.module.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| .containerBoard { | ||
| box-sizing: border-box; | ||
| height: 481px; | ||
| width: 481px; | ||
| border: 1px solid #E1E1E2; | ||
| border-radius: 4px; | ||
| background-color: #FFFFFF; | ||
| margin-right: 21px; | ||
| margin-bottom: 108.5px; | ||
| } | ||
|
|
||
| .board { | ||
| height: 481px; | ||
| width: 481px; | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| align-content: center; | ||
| justify-content: center; | ||
| border-radius: 8px; | ||
| padding: 8px; | ||
| } | ||
|
|
||
| .number { | ||
| color: #FFFFFF; | ||
| font-family: 'Montserrat', sans-serif; | ||
| font-size: 48px; | ||
| font-weight: bold; | ||
| letter-spacing: 0; | ||
| line-height: 58px; | ||
| } | ||
|
|
||
| .cell { | ||
| min-width: 25%; | ||
| min-height: 25%; | ||
| text-align: center; | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .cell:nth-child(odd) { | ||
| background-color: #FEC34D; | ||
| } | ||
|
|
||
| .cell:nth-child(9) { | ||
| background-color: #F2754C; | ||
| } | ||
|
|
||
| .cell:nth-child(7) { | ||
| background-color: #F2754C; | ||
| } | ||
|
|
||
| .cell:nth-child(10) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(16) { | ||
| background-color: #33BFC6; | ||
| } | ||
|
|
||
| .cell:nth-child(1) { | ||
| background-color: #AED750; | ||
| } | ||
|
|
||
| .cell:nth-child(2) { | ||
| background-color: #33BFC6; | ||
| } | ||
|
|
||
| .cell:nth-child(3) { | ||
| background-color: #AED750; | ||
| } | ||
|
|
||
| .cell:nth-child(4) { | ||
| background-color: #F2754C; | ||
| } | ||
|
|
||
| .cell:nth-child(5) { | ||
| background-color: #F2754C; | ||
| } | ||
|
|
||
| .cell:nth-child(6) { | ||
| background-color: #AED750; | ||
| } | ||
|
|
||
| .cell:nth-child(7) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(8) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(9) { | ||
| background-color: #FEC34D; | ||
| } | ||
|
|
||
| .cell:nth-child(10) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(11) { | ||
| background-color: #F2754C; | ||
| } | ||
|
|
||
| .cell:nth-child(12) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(13) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(14) { | ||
| background-color: #FEC34D; | ||
| } | ||
|
|
||
| .cell:nth-child(15) { | ||
| background-color: #22465C; | ||
| } | ||
|
|
||
| .cell:nth-child(16) { | ||
| background-color: #FEC34D; | ||
| } | ||
|
|
||
| .cell{ | ||
| border: 4px solid white; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fijate que nth-child(1n) en realidad terminaría aplicando a todos los hijos, asi que podés redefinir esto usando el selector hijo:
Suponiendo que cell es el padre de un div que usa la clase .block