From b64cf896e3d2b0e9f95b45b4c88d9707441df13c Mon Sep 17 00:00:00 2001 From: Diego Rosas Date: Sat, 4 Apr 2020 17:57:19 -0600 Subject: [PATCH 01/13] change to readme --- README.md | 69 +------------------------------------------------------ 1 file changed, 1 insertion(+), 68 deletions(-) diff --git a/README.md b/README.md index 9d9614c..fa97632 100644 --- a/README.md +++ b/README.md @@ -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.
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser. - -The page will reload if you make edits.
-You will also see any lint errors in the console. - -### `npm test` - -Launches the test runner in the interactive watch mode.
-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.
-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.
-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 +## You are in the development branch \ No newline at end of file From 746d0b9313326f2e4e6be71edce5afbe1bb4196a Mon Sep 17 00:00:00 2001 From: Diego Rosas Date: Sat, 4 Apr 2020 18:04:48 -0600 Subject: [PATCH 02/13] cambios a travis ci para seguir solo la rama master --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8fcfd1a..d00a6ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,9 @@ node_js: cache: directories: - node_modules +branches: + only: + - master script: - echo "Deploying!" - npm test From 4935c2731395ab9dcd3cd02deba2f679d3e33790 Mon Sep 17 00:00:00 2001 From: Alan Alvarez Date: Sat, 4 Apr 2020 18:17:07 -0600 Subject: [PATCH 03/13] Testing new branch --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fa97632..84f44bc 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -## You are in the development branch \ No newline at end of file +## You are in the development branch + +Diego \ No newline at end of file From ce427766ca6ee1832582acd7ad304b52fa8b6f3e Mon Sep 17 00:00:00 2001 From: Alan Alvarez Date: Sat, 4 Apr 2020 20:01:10 -0600 Subject: [PATCH 04/13] =?UTF-8?q?Test=20de=20ruta=20din=C3=A1mica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Devteam.js | 26 +++++++++++++ src/components/Header.js | 2 +- src/components/Integrante.js | 71 ++++++++++++++++++++++++++++++++++++ src/components/Router.js | 8 +++- 4 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 src/components/Devteam.js create mode 100644 src/components/Integrante.js diff --git a/src/components/Devteam.js b/src/components/Devteam.js new file mode 100644 index 0000000..4f6dbbc --- /dev/null +++ b/src/components/Devteam.js @@ -0,0 +1,26 @@ +import React, { Component } from 'react'; +import { Link } from 'react-router-dom'; + +import Titulo from "./Titulo"; +// import styles from './css/titulo.module.css'; + +export default class Devteam extends Component { + render(props) { + + const integrantes = ["alan", "diego", "idalid"] + const links = [] + for(const value of integrantes){ + + links.push({value}) + } + + return ( +
+ + {links} + + +
+ ); + } +} \ No newline at end of file diff --git a/src/components/Header.js b/src/components/Header.js index 5d362b1..a5f0ad1 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -30,7 +30,7 @@ export default class Header extends Component { diff --git a/src/components/Integrante.js b/src/components/Integrante.js new file mode 100644 index 0000000..6ad4757 --- /dev/null +++ b/src/components/Integrante.js @@ -0,0 +1,71 @@ +import React, { Component } from 'react'; +// import { Link, useParams } from 'react-router-dom'; + +// import Titulo from "./Titulo"; +// import styles from './css/titulo.module.css'; + +export default class Devteam extends Component { + constructor(props){ + super(props); + this.state = { + integrante: {}, + integrantes: { + alan : { + imagenRuta: "", + nombre: "Alan Alvarez", + contacto: ["linkedin", "github", "mail", "whatsapp"], + skills: ["vue", "etc"], + proyectos: [{nombre: "proyecto1", imagenRuta: "", descr:"", links: ["github", "pagina"]}] + }, + diego : { + imagenRuta: "", + nombre: "Diego", + contacto: ["linkedin", "github", "mail", "whatsapp"], + skills: ["vue", "angular", "etc"], + proyectos: [{nombre: "proyecto1", imagenRuta: "", descr:"", links: ["github", "pagina"]}] + }, + idalid : { + imagenRuta: "", + nombre: "Idalid", + contacto: ["linkedin", "github", "mail", "whatsapp"], + skills: ["vue"], + proyectos: [{nombre: "proyecto1", imagenRuta: "", descr:"", links: ["github", "pagina"]}] + } + } + } + + } + + componentWillMount(){ + let nombre = this.props.match.params.nombre + this.setState({integrante: this.state.integrantes[nombre]}) + } + + render() { + + console.log(this.state.integrante) + + const skills = [] + for(let value of this.state.integrante.skills){ + skills.push(
  • {value}
    • ) + } + return ( +
    +

    {this.state.integrante.nombre}

    +
      +
    • {this.state.integrante.contacto[0]}
      • +
    • {this.state.integrante.contacto[1]}
      • +
    • {this.state.integrante.contacto[2]}
      • +
    • {this.state.integrante.contacto[3]}
      • +
    +

    Skills

    +
      + {skills} +
    + + + +
    + ); + } +} diff --git a/src/components/Router.js b/src/components/Router.js index 8342d39..f3cef8e 100644 --- a/src/components/Router.js +++ b/src/components/Router.js @@ -5,9 +5,11 @@ import Header from './Header'; import Home from './Home'; import Eventos from './Eventos'; import Contacto from './Contacto'; -import Noticias from './Noticias'; +// import Noticias from './Noticias'; import Nosotros from './Nosotros'; import Conducta from './Conducta'; +import Devteam from './Devteam'; +import Integrante from './Integrante'; import Error from './Error'; @@ -22,7 +24,9 @@ export default class Router extends Component { - + {/* */} + + {/* */} From 0044dbd29f6b02f9a2b54b9eeaa6835007c32fc9 Mon Sep 17 00:00:00 2001 From: Diego Rosas Date: Sat, 4 Apr 2020 22:47:42 -0600 Subject: [PATCH 05/13] componente sill agregado --- src/components/Integrante.js | 59 ++++++++++++++++-------- src/components/Skill.js | 14 ++++++ src/components/css/integrante.module.css | 15 ++++++ src/components/css/skill.module.css | 6 +++ 4 files changed, 76 insertions(+), 18 deletions(-) create mode 100644 src/components/Skill.js create mode 100644 src/components/css/integrante.module.css create mode 100644 src/components/css/skill.module.css diff --git a/src/components/Integrante.js b/src/components/Integrante.js index 6ad4757..a67651e 100644 --- a/src/components/Integrante.js +++ b/src/components/Integrante.js @@ -1,8 +1,13 @@ import React, { Component } from 'react'; +import {Container, Row, Column} from 'react-bootstrap'; + +import Skill from './Skill'; // import { Link, useParams } from 'react-router-dom'; // import Titulo from "./Titulo"; -// import styles from './css/titulo.module.css'; +// import styles from './css/integrante.module.css'; +// import { Content } from 'react-bootstrap/lib/Tab'; + export default class Devteam extends Component { constructor(props){ @@ -11,7 +16,7 @@ export default class Devteam extends Component { integrante: {}, integrantes: { alan : { - imagenRuta: "", + imagenRuta: "/img/alan.jpg", nombre: "Alan Alvarez", contacto: ["linkedin", "github", "mail", "whatsapp"], skills: ["vue", "etc"], @@ -50,22 +55,40 @@ export default class Devteam extends Component { skills.push(
  • {value}
    • ) } return ( -
    -

    {this.state.integrante.nombre}

    -
      -
    • {this.state.integrante.contacto[0]}
      • -
    • {this.state.integrante.contacto[1]}
      • -
    • {this.state.integrante.contacto[2]}
      • -
    • {this.state.integrante.contacto[3]}
      • -
    -

    Skills

    -
      - {skills} -
    - - - -
    + + +

    Web Developer

    + +

    Skills

    + + + + + +     + + // + //
    + // user + //

    {this.state.integrante.nombre}

    + //

    Web Developer

    + //
    + // + // + // + // + //
    + //
      + //
    • {this.state.integrante.contacto[0]}
      • + //
    • {this.state.integrante.contacto[1]}
      • + //
    • {this.state.integrante.contacto[2]}
      • + //
    • {this.state.integrante.contacto[3]}
      • + //
    + //

    Skills

    + //
      + // {skills} + //
    + //
    ); } } diff --git a/src/components/Skill.js b/src/components/Skill.js new file mode 100644 index 0000000..fcdfadd --- /dev/null +++ b/src/components/Skill.js @@ -0,0 +1,14 @@ +import React, { Component } from 'react'; + +import styles from './css/skill.module.css'; + +export default class Skill extends Component { + state = { } + render() { + return ( +
    +

    {this.props.title}

    +
    + ); + } +} \ No newline at end of file diff --git a/src/components/css/integrante.module.css b/src/components/css/integrante.module.css new file mode 100644 index 0000000..c8aa1bc --- /dev/null +++ b/src/components/css/integrante.module.css @@ -0,0 +1,15 @@ +.container { + display: flex; + flex-direction: column; + align-items: center; +} + +.userImage { + width: 20rem; + border-radius: 100%; +} + +.socialContainer i { + font-size: 3rem; + padding: 1rem; +} \ No newline at end of file diff --git a/src/components/css/skill.module.css b/src/components/css/skill.module.css new file mode 100644 index 0000000..a9cfd20 --- /dev/null +++ b/src/components/css/skill.module.css @@ -0,0 +1,6 @@ +.container { + border-radius: 10rem; + color: white; + padding-left: 0.5rem; + padding-top: 0.3pt; +} \ No newline at end of file From e8f8f584a3aff959161729bae61400a7b651fbcc Mon Sep 17 00:00:00 2001 From: Alan Alvarez Date: Sat, 4 Apr 2020 23:19:35 -0600 Subject: [PATCH 06/13] Seccion devteam --- public/img/team.png | Bin 0 -> 30643 bytes src/components/Devteam.js | 24 +++++++++++++++++++----- src/components/Persona.js | 13 +++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 public/img/team.png create mode 100644 src/components/Persona.js diff --git a/public/img/team.png b/public/img/team.png new file mode 100644 index 0000000000000000000000000000000000000000..11032635f6d5436dfa034f09cf5fa9c9fc0a0b67 GIT binary patch literal 30643 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 literal 0 HcmV?d00001 diff --git a/src/components/Devteam.js b/src/components/Devteam.js index 4f6dbbc..760b77e 100644 --- a/src/components/Devteam.js +++ b/src/components/Devteam.js @@ -2,24 +2,38 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; import Titulo from "./Titulo"; +import Persona from './Persona'; // import styles from './css/titulo.module.css'; export default class Devteam extends Component { render(props) { - const integrantes = ["alan", "diego", "idalid"] + const integrantes = ["Alan", "Diego", "Idalid", "Miguel", "Hugo", "Apk"] const links = [] for(const value of integrantes){ - - links.push({value}) + links.push( ) } return (
    - {links} - +
    + Responsive image +
    + +
    +

    Un equipo preparado y profesional. Queremos escucharte. Síguenos en nuestras redes sociales donde tenemos contenido interesante y publicamos información relevante para ti. Enterate de todo lo relacionado a desarrollo de software y de como trabajamos para llegar a ser la mejor comunidad de desarrolladores.

    +
    + +
    +

    Nuestro Equipo

    +
    +
    +
    + {links} +
    +
    ); } diff --git a/src/components/Persona.js b/src/components/Persona.js new file mode 100644 index 0000000..a644cb5 --- /dev/null +++ b/src/components/Persona.js @@ -0,0 +1,13 @@ +import React, { Component } from 'react'; + + +export default class Persona extends Component { + render(props) { + return ( +
    + ... +

    {this.props.nombre}

    +
    + ); + } +} \ No newline at end of file From 48f6ab87948654818491b2b191098defcfa8a32b Mon Sep 17 00:00:00 2001 From: Alan Alvarez Date: Sat, 4 Apr 2020 23:39:15 -0600 Subject: [PATCH 07/13] Size componente persona --- src/components/Devteam.js | 2 +- src/components/Persona.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Devteam.js b/src/components/Devteam.js index 760b77e..8704545 100644 --- a/src/components/Devteam.js +++ b/src/components/Devteam.js @@ -11,7 +11,7 @@ export default class Devteam extends Component { const integrantes = ["Alan", "Diego", "Idalid", "Miguel", "Hugo", "Apk"] const links = [] for(const value of integrantes){ - links.push( ) + links.push( ) } return ( diff --git a/src/components/Persona.js b/src/components/Persona.js index a644cb5..c7d9115 100644 --- a/src/components/Persona.js +++ b/src/components/Persona.js @@ -5,7 +5,7 @@ export default class Persona extends Component { render(props) { return (
    - ... + ...

    {this.props.nombre}

    ); From a26f884676cb389cc52c2bc69dbc157c6ad4b330 Mon Sep 17 00:00:00 2001 From: Diego Rosas Date: Sun, 5 Apr 2020 00:45:53 -0600 Subject: [PATCH 08/13] Pantalla integrante casi terminada --- src/components/Integrante.js | 71 +++++++++++++++++++++++------ src/components/css/skill.module.css | 14 +++++- 2 files changed, 69 insertions(+), 16 deletions(-) diff --git a/src/components/Integrante.js b/src/components/Integrante.js index a67651e..2410d80 100644 --- a/src/components/Integrante.js +++ b/src/components/Integrante.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import {Container, Row, Column} from 'react-bootstrap'; - +import {Container, Row, Col, Card, CardDeck, Button} from 'react-bootstrap'; +import Persona from './Persona'; import Skill from './Skill'; // import { Link, useParams } from 'react-router-dom'; @@ -20,7 +20,7 @@ export default class Devteam extends Component { nombre: "Alan Alvarez", contacto: ["linkedin", "github", "mail", "whatsapp"], skills: ["vue", "etc"], - proyectos: [{nombre: "proyecto1", imagenRuta: "", descr:"", links: ["github", "pagina"]}] + proyectos: [{nombre: "proyecto1", imagenRuta: "/img/grupo2.jpeg", descr:"project description", links: ["github", "pagina"]}, {nombre: "proyecto2", imagenRuta: "/img/grupo2.jpeg", descr:"project description", links: ["github", "pagina"]}] }, diego : { imagenRuta: "", @@ -52,19 +52,62 @@ export default class Devteam extends Component { const skills = [] for(let value of this.state.integrante.skills){ - skills.push(
  • {value}
    • ) + skills.push( + // TODO: Hacer que cambie el color del skill + + ) } return ( - - -

    Web Developer

    - -

    Skills

    - - - - - + + + +

    Web Developer

    + +     + + + + +

    Skills

    + + {skills} + +

    Proyectos

    + + + + {this.state.integrante.proyectos.map((proyecto, index) => + + + + {proyecto.nombre} + + + + + + + + + {proyecto.descr} + + + + + + //
  • {proyecto.nombre}
    • + )} +     +     +

    Conoce a todos los integrantes

    + + + + + + + + // diff --git a/src/components/css/skill.module.css b/src/components/css/skill.module.css index a9cfd20..12c5aef 100644 --- a/src/components/css/skill.module.css +++ b/src/components/css/skill.module.css @@ -1,6 +1,16 @@ .container { border-radius: 10rem; color: white; - padding-left: 0.5rem; - padding-top: 0.3pt; + padding-top: 0.2rem; + padding-bottom: 0.2rem; + padding-left: 0.6rem; + padding-right: 0.6rem; + margin-left: 0.5rem; + margin-right: 0.5rem; + +} + +.container p { + padding: 0; + margin: 0; } \ No newline at end of file From 974783181d81e73d916feb292e85099c6711294d Mon Sep 17 00:00:00 2001 From: Diego Rosas Date: Sun, 5 Apr 2020 00:50:39 -0600 Subject: [PATCH 09/13] =?UTF-8?q?tama=C3=B1o=20correcto=20de=20las=20image?= =?UTF-8?q?nes=20usado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Integrante.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/Integrante.js b/src/components/Integrante.js index 2410d80..5ebfad4 100644 --- a/src/components/Integrante.js +++ b/src/components/Integrante.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import {Container, Row, Col, Card, CardDeck, Button} from 'react-bootstrap'; +import {Container, Row, Card, CardDeck, Button} from 'react-bootstrap'; import Persona from './Persona'; import Skill from './Skill'; // import { Link, useParams } from 'react-router-dom'; @@ -60,7 +60,7 @@ export default class Devteam extends Component { return ( - +

    Web Developer

    @@ -101,12 +101,12 @@ export default class Devteam extends Component {

    Conoce a todos los integrantes

    - - - - - - + + + + + + From abcc6decd8112ba7aa4f3097378601c71a0f1088 Mon Sep 17 00:00:00 2001 From: Alan Alvarez Date: Sun, 5 Apr 2020 12:14:37 -0500 Subject: [PATCH 10/13] Integrantes nav bar --- src/components/Integrante.js | 37 ++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/src/components/Integrante.js b/src/components/Integrante.js index 5ebfad4..53e76e7 100644 --- a/src/components/Integrante.js +++ b/src/components/Integrante.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import {Container, Row, Card, CardDeck, Button} from 'react-bootstrap'; import Persona from './Persona'; import Skill from './Skill'; -// import { Link, useParams } from 'react-router-dom'; +import { Link} from 'react-router-dom'; // import Titulo from "./Titulo"; // import styles from './css/integrante.module.css'; @@ -23,32 +23,48 @@ export default class Devteam extends Component { proyectos: [{nombre: "proyecto1", imagenRuta: "/img/grupo2.jpeg", descr:"project description", links: ["github", "pagina"]}, {nombre: "proyecto2", imagenRuta: "/img/grupo2.jpeg", descr:"project description", links: ["github", "pagina"]}] }, diego : { - imagenRuta: "", + imagenRuta: "/img/alan.jpg", nombre: "Diego", contacto: ["linkedin", "github", "mail", "whatsapp"], skills: ["vue", "angular", "etc"], proyectos: [{nombre: "proyecto1", imagenRuta: "", descr:"", links: ["github", "pagina"]}] }, idalid : { - imagenRuta: "", + imagenRuta: "/img/alan.jpg", nombre: "Idalid", contacto: ["linkedin", "github", "mail", "whatsapp"], skills: ["vue"], proyectos: [{nombre: "proyecto1", imagenRuta: "", descr:"", links: ["github", "pagina"]}] } - } + }, + equipo: ["Alan", "Diego", "Idalid"], + nombre: "", + prueba: '' } } + componentWillMount(){ - let nombre = this.props.match.params.nombre - this.setState({integrante: this.state.integrantes[nombre]}) + let nombre = this.props.match.params.nombre; + this.setState({nombre: nombre, integrante: this.state.integrantes[nombre] }); + } + componentWillUpdate(){ + // let nombre = this.props.match.params.nombre; + // this.setState({nombre: nombre, integrante: this.state.integrantes[nombre] }); + // this.setState({prueba: 'hola'}) + // this.componentWillMount() } render() { - console.log(this.state.integrante) + // console.log(this.state.integrante) + const equipo = [] + for( const value of this.state.equipo){ + if(value.toLowerCase() !== this.state.nombre){ + equipo.push( ) + } + } const skills = [] for(let value of this.state.integrante.skills){ @@ -60,7 +76,7 @@ export default class Devteam extends Component { return ( - +

    Web Developer

    @@ -101,12 +117,13 @@ export default class Devteam extends Component {

    Conoce a todos los integrantes

    + {/* - - + */} + {equipo} From 794328b478bb0c80f8c63d548d664b5255c5768c Mon Sep 17 00:00:00 2001 From: Diego Rosas Date: Sun, 5 Apr 2020 13:46:38 -0500 Subject: [PATCH 11/13] se cambiaron los Row por Container por un error en la vista en movil --- src/components/Integrante.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Integrante.js b/src/components/Integrante.js index 53e76e7..6ee84c4 100644 --- a/src/components/Integrante.js +++ b/src/components/Integrante.js @@ -62,7 +62,7 @@ export default class Devteam extends Component { const equipo = [] for( const value of this.state.equipo){ if(value.toLowerCase() !== this.state.nombre){ - equipo.push( ) + equipo.push( ) } } @@ -78,12 +78,12 @@ export default class Devteam extends Component {

    Web Developer

    - + - +

    Skills

    {skills} @@ -116,7 +116,7 @@ export default class Devteam extends Component {

    Conoce a todos los integrantes

    - + {/* @@ -124,7 +124,7 @@ export default class Devteam extends Component { */} {equipo} - + // From 844797fbc095a869b32b52db6c7e451f9de9a810 Mon Sep 17 00:00:00 2001 From: Diego Rosas Date: Sun, 5 Apr 2020 14:29:15 -0500 Subject: [PATCH 12/13] El skill ya cambia de color segun el nombre que se le ponga --- src/components/Skill.js | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/components/Skill.js b/src/components/Skill.js index fcdfadd..20c3010 100644 --- a/src/components/Skill.js +++ b/src/components/Skill.js @@ -3,10 +3,29 @@ import React, { Component } from 'react'; import styles from './css/skill.module.css'; export default class Skill extends Component { - state = { } + constructor(props){ + super(props); + this.state = {color: 'blue'} + } + + componentDidMount(){ + // Aquí se ponen los colores de los skills + switch (this.props.title.toLowerCase()) { + case "vue": + this.setState({color: '#13E564'}) + break; + case "firebase": + this.setState({color: '#E59C13'}) + break; + default: + this.setState({color: '#1685D9'}) + break; + } + } render() { + let skill return ( -
    +

    {this.props.title}

    ); From 4b8b597f9acc1fe9e662b3c864cc17faec6ea9dc Mon Sep 17 00:00:00 2001 From: Diego Rosas Date: Sun, 5 Apr 2020 14:49:30 -0500 Subject: [PATCH 13/13] actualizacion nombre en navbar --- src/components/Header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Header.js b/src/components/Header.js index a5f0ad1..97dbda0 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -30,7 +30,7 @@ export default class Header extends Component {