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 diff --git a/README.md b/README.md index 9d9614c..84f44bc 100644 --- a/README.md +++ b/README.md @@ -1,68 +1,3 @@ -This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). +## You are in the development branch -## 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 +Diego \ No newline at end of file diff --git a/public/img/team.png b/public/img/team.png new file mode 100644 index 0000000..1103263 Binary files /dev/null and b/public/img/team.png differ diff --git a/src/components/Devteam.js b/src/components/Devteam.js new file mode 100644 index 0000000..8704545 --- /dev/null +++ b/src/components/Devteam.js @@ -0,0 +1,40 @@ +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", "Miguel", "Hugo", "Apk"] + const links = [] + for(const value of integrantes){ + links.push( ) + } + + return ( +
+ +
+ 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} +
+
+
+ ); + } +} \ No newline at end of file diff --git a/src/components/Header.js b/src/components/Header.js index 5d362b1..97dbda0 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..6ee84c4 --- /dev/null +++ b/src/components/Integrante.js @@ -0,0 +1,154 @@ +import React, { Component } from 'react'; +import {Container, Row, Card, CardDeck, Button} from 'react-bootstrap'; +import Persona from './Persona'; +import Skill from './Skill'; +import { Link} from 'react-router-dom'; + +// import Titulo from "./Titulo"; +// import styles from './css/integrante.module.css'; +// import { Content } from 'react-bootstrap/lib/Tab'; + + +export default class Devteam extends Component { + constructor(props){ + super(props); + this.state = { + integrante: {}, + integrantes: { + alan : { + imagenRuta: "/img/alan.jpg", + nombre: "Alan Alvarez", + contacto: ["linkedin", "github", "mail", "whatsapp"], + skills: ["vue", "etc"], + 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: "/img/alan.jpg", + nombre: "Diego", + contacto: ["linkedin", "github", "mail", "whatsapp"], + skills: ["vue", "angular", "etc"], + proyectos: [{nombre: "proyecto1", imagenRuta: "", descr:"", links: ["github", "pagina"]}] + }, + idalid : { + 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({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) + 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){ + skills.push( + // TODO: Hacer que cambie el color del skill + + ) + } + return ( + + + +

Web Developer

+ + + + + + +

Skills

+ + {skills} + +

Proyectos

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

    Conoce a todos los integrantes

    + + {/* + + + + + */} + {equipo} + +     + + // + //
    + // user + //

    {this.state.integrante.nombre}

    + //

    Web Developer

    + //
    + // + // + // + // + //
    + // + //

    Skills

    + // + //
    + ); + } +} diff --git a/src/components/Persona.js b/src/components/Persona.js new file mode 100644 index 0000000..c7d9115 --- /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 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 { - + {/* */} + + {/* */} diff --git a/src/components/Skill.js b/src/components/Skill.js new file mode 100644 index 0000000..20c3010 --- /dev/null +++ b/src/components/Skill.js @@ -0,0 +1,33 @@ +import React, { Component } from 'react'; + +import styles from './css/skill.module.css'; + +export default class Skill extends Component { + 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}

    +
    + ); + } +} \ 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..12c5aef --- /dev/null +++ b/src/components/css/skill.module.css @@ -0,0 +1,16 @@ +.container { + border-radius: 10rem; + color: white; + 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