-
Notifications
You must be signed in to change notification settings - Fork 1
Pantalla login #3
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
vivianachoque
wants to merge
69
commits into
development
Choose a base branch
from
pantalla-login
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
69 commits
Select commit
Hold shift + click to select a range
6a4a3aa
ordene las carpetas de componentes y empece a exportar los assets
vivianachoque b6373d6
cree componente blockimg, que son las imagenes de bloques en el login
vivianachoque b4c2ec3
exporte bloque
vivianachoque 4af33fd
ordené carpetas
vivianachoque f09dfa8
corregí ruteos
vivianachoque c7b9ab5
corregi rutas y carpetas
vivianachoque e878012
modifique rutas y córregí import de violetbutton
vivianachoque e12bbb7
acomadamos archivos y funciones
Ezequiiel98 c48e198
hice formulario de Login
vivianachoque f29148f
hice carpeta para fonts
vivianachoque d9a53e5
agregué fuente montserrat
vivianachoque 2cd344f
corregi algunos error en codigo con min y mayus, también estoy estili…
vivianachoque 863315f
arreglé problema con google fonts, junto a tincho
vivianachoque a0a9024
uní componente Login con componente VioletB
vivianachoque 085825c
agregue divs entre los labels, y separece button con divs
vivianachoque 1249272
mejore algunas cosas del componente form
vivianachoque 7f78f64
Alineé la columna de FormLogin, mejoré en gral. todos los márgenes de…
vivianachoque fef76a2
agregué style al form y al titulo
vivianachoque 6d5b8dc
hice comments para corregir errores a futuro
vivianachoque b1b5aab
modifiqué ancho de botones ya que estaba distinto a invision. Mejore …
vivianachoque a7fd5e6
modificando scroll no deseado de pantalla
vivianachoque 759a73f
mejore ubicación de img y saqué SCROLL no deseado
vivianachoque e325e4e
corregí margin entre form y blockimg
vivianachoque 976d108
agregué distintos tipos de inputs al form, continuaré con issue
vivianachoque 870c7ef
icon login error hice
vivianachoque 5fb821c
corregi el @import de las clases para la clase .error
vivianachoque 3724cd7
faltaba } en css de formLogin
vivianachoque 1b2b108
cambie clase blockchain por title
vivianachoque e550c0d
corregí espacios en clases de formlogin
vivianachoque fb31c1e
agregue img de error a login
vivianachoque 9dcd4e8
corregí errores de anidación en css login form
vivianachoque e2d62cd
hice cambios en .error
vivianachoque 57b11ba
cree state para formLogn (error)
vivianachoque f5fb726
arregle Hover de WhiteButton
vivianachoque 57b7c98
agregue state.error a input de NOMBRE
vivianachoque 1ab903b
agregando states a FormLogin para manejo de errores login, corregí al…
vivianachoque 8f8e772
Agregué función a VioletButton (Disabled) y modifiqué algunas cosas d…
vivianachoque c7667fe
agregué type=submit al componente VioletButton
vivianachoque d03bda3
agregué state.errorName state.errorCode en caso de que ambas estén va…
vivianachoque a8762a9
uni api con login, hice manejo de errores de form
vivianachoque c22b411
hice ruteo de api, modifique ruta
vivianachoque 73bfc84
hice manejo de errores
vivianachoque 2775e66
le di styles a mensajes de error en login y agregué margin-top a cont…
vivianachoque d302a42
agregué archivos a git ignore link API
vivianachoque 8e922d2
Corregí funciones de login error, ya que tenía algunos problemas a la…
vivianachoque 904354f
agregué una última línea vacía a cada archivo del proyecto
vivianachoque 6c56840
edité readme
vivianachoque 88fa781
agregué una linea a VioletButton (styles)
vivianachoque ab441cc
cambié ruta de services por Services y nombre de carpeta
vivianachoque e563bf0
Update src/components/VioletButton/index.js
vivianachoque b064e2d
Update src/screens/LoginScreen/components/FormLogin/index.module.scss
vivianachoque 3eef62d
cambié nombre función violetbutton por WhiteButton ya que el director…
vivianachoque ed33651
Apply suggestions from code review
vivianachoque 12ffb34
modifiqué setState en formLogn/index.js simplifiqué todo en una sola …
vivianachoque 0e0b94b
borré lineas en sass con respecto a font:montserrat ya que por defect…
vivianachoque bcd1d17
agregué & a las propiedades de los estilos de cada clase en sus disti…
vivianachoque c2beb30
agregué & a las propiedades de los estilos de cada clase en sus disti…
vivianachoque f35a990
agregué & a las propiedades de los estilos de cada clase en sus disti…
vivianachoque 8a52823
Corregí código para que quede mas prolijo, uni las clases con sus dif…
vivianachoque 43a41dd
Hice cambios en nombre de componente Blockimg a BlockImg
vivianachoque a2068cd
simplifiqué función handleSubmit
vivianachoque 607e794
modifiqué padre e hijo en los errores de login ya que estaban mal pue…
vivianachoque 168127a
hice cambio en las funciones ya que estaba llamando al evento y era r…
vivianachoque 98aaeff
modifiqué config de identado, y lo apliqué a todos los archivos de sass
vivianachoque 4754498
cambie otra vez el tamaño de ident 2 por defecto
vivianachoque de69291
Cambie nombre de componente Blockimg a BlockImg
vivianachoque d3ccbcf
cambié otra vez de Blockimg a BlockImg, los cambios no se estarían ha…
vivianachoque 253bee8
cambie nombre de Services a services para poder mergear
vivianachoque 80857fd
cambie nombre de Services a services para poder mergear
vivianachoque 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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| REACT_APP_API_URL=http://woloxblockchain.herokuapp.com | ||
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
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,3 @@ | ||
| { | ||
| "files.insertFinalNewline": true | ||
| } |
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,68 +1 @@ | ||
| This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). | ||
|
|
||
| ## Available Scripts | ||
|
|
||
| In the project directory, you can run: | ||
|
|
||
| ### `npm start` | ||
|
|
||
| Runs the app in the development mode.<br /> | ||
| Open [http://localhost:3000](http://localhost:3000) to view it in the browser. | ||
|
|
||
| The page will reload if you make edits.<br /> | ||
| You will also see any lint errors in the console. | ||
|
|
||
| ### `npm test` | ||
|
|
||
| Launches the test runner in the interactive watch mode.<br /> | ||
| See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. | ||
|
|
||
| ### `npm run build` | ||
|
|
||
| Builds the app for production to the `build` folder.<br /> | ||
| It correctly bundles React in production mode and optimizes the build for the best performance. | ||
|
|
||
| The build is minified and the filenames include the hashes.<br /> | ||
| Your app is ready to be deployed! | ||
|
|
||
| See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. | ||
|
|
||
| ### `npm run eject` | ||
|
|
||
| **Note: this is a one-way operation. Once you `eject`, you can’t go back!** | ||
|
|
||
| If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. | ||
|
|
||
| Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. | ||
|
|
||
| You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. | ||
|
|
||
| ## Learn More | ||
|
|
||
| You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). | ||
|
|
||
| To learn React, check out the [React documentation](https://reactjs.org/). | ||
|
|
||
| ### Code Splitting | ||
|
|
||
| This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting | ||
|
|
||
| ### Analyzing the Bundle Size | ||
|
|
||
| This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size | ||
|
|
||
| ### Making a Progressive Web App | ||
|
|
||
| This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app | ||
|
|
||
| ### Advanced Configuration | ||
|
|
||
| This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration | ||
|
|
||
| ### Deployment | ||
|
|
||
| This section has moved here: https://facebook.github.io/create-react-app/docs/deployment | ||
|
|
||
| ### `npm run build` fails to minify | ||
|
|
||
| This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify | ||
| Desarrollo del Login, primer pantalla del proyecto de 'Blockchain' |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
Binary file not shown.
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,14 @@ | ||
| import { create } from 'apisauce'; | ||
|
|
||
| const API_URL = process.env.REACT_APP_API_URL; | ||
|
|
||
| const api = create({ | ||
| baseURL: API_URL, | ||
| headers: { | ||
| Authorization: 'user_token', | ||
| 'Content-Type': 'application/json', | ||
| Accept: 'application/json' | ||
| } | ||
| }); | ||
|
|
||
| export default api; |
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,5 @@ | ||
| import api from './api'; | ||
|
|
||
| export const sendGame = data => api.post('/game/join_game', data); | ||
|
|
||
| /* Here I generate the contact with the API */ |
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 LoginScreen from '../../screens/LoginScreen'; | ||
|
|
||
| function App() { | ||
| return <h1> Proyecto blockchain </h1>; | ||
| return <LoginScreen />; | ||
| } | ||
|
|
||
| export default App; |
Empty file.
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,42 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| import styles from './index.module.scss'; | ||
|
|
||
| function VioletButton({ text, typeButton, disable }) { | ||
| return ( | ||
| <div className={disable ? styles.containerBtnDisabled : styles.containerBtnActive}> | ||
| {typeButton === 'button' ? ( | ||
| <button | ||
| type="button" | ||
| className={disable ? styles.btnDisabled : styles.btnActive} | ||
| disabled={disable.toString()} | ||
| > | ||
| {text} | ||
| </button> | ||
| ) : ( | ||
| <button | ||
| type="submit" | ||
| className={disable ? styles.btnDisabled : styles.btnActive} | ||
| disable={disable.toString()} | ||
| > | ||
| {text} | ||
| </button> | ||
| )} | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| VioletButton.propTypes = { | ||
| disable: PropTypes.bool, | ||
| text: PropTypes.string, | ||
| typeButton: PropTypes.string | ||
| }; | ||
|
|
||
| VioletButton.defaultProps = { | ||
| disable: false, | ||
| text: 'Text Button', | ||
| typeButton: 'button' | ||
| }; | ||
|
|
||
| export default VioletButton; |
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,48 @@ | ||
| .containerBtn { | ||
| width: 240px; | ||
| height: 66px; | ||
| border-radius: 5px; | ||
| margin: 20px auto 0 auto; | ||
| } | ||
|
|
||
| .containerBtnActive { | ||
| @extend .containerBtn; | ||
| background-color: #533D71; | ||
| transition: background-color .1s ease, transform .2s ease; | ||
|
|
||
| &:hover { | ||
| background-color: transparent; | ||
| transform: translateY(8px); | ||
| } | ||
| } | ||
|
|
||
| .containerBtnDisabled { | ||
| @extend .containerBtn; | ||
| background-color: #B5B5B6; | ||
| } | ||
|
|
||
| .btn { | ||
| outline: none; | ||
| border: none; | ||
| width: 100%; | ||
| height: 58px; | ||
| font-size: 18px; | ||
| font-weight: bold; | ||
| border-radius: 5px; | ||
| } | ||
|
|
||
| .btnActive { | ||
| @extend .btn; | ||
| background-color: #7758A2; | ||
| color: white; | ||
|
|
||
| &:hover { | ||
|
vivianachoque marked this conversation as resolved.
|
||
| cursor: pointer; | ||
| } | ||
| } | ||
|
|
||
| .btnDisabled { | ||
| @extend .btn; | ||
| color: #B5B5B6; | ||
| background-color: #E8E8E8; | ||
| } | ||
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,7 +1,7 @@ | ||
| import React from 'react'; | ||
| import ReactDOM from 'react-dom'; | ||
|
|
||
| import './index.css'; | ||
| import './index.scss'; | ||
| import App from './components/App'; | ||
|
|
||
| ReactDOM.render(<App />, document.getElementById('root')); |
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
Large diffs are not rendered by default.
Oops, something went wrong.
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.
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,16 @@ | ||
| import React from './node_modules/react'; | ||
|
|
||
| import img from '../../assets/img/blockimg.svg'; | ||
|
|
||
| import styles from './index.module.scss'; | ||
|
|
||
| function BlockImg() { | ||
| return ( | ||
| <div className={styles.blockImg}> | ||
| <img src={img} className={styles.img} /> | ||
| </div> | ||
| ); | ||
| } | ||
| export default BlockImg; | ||
|
|
||
| /*comment*/ |
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.
Uh oh!
There was an error while loading. Please reload this page.