change to readme

.travis.yml

@@ -4,6 +4,9 @@ node_js:
 cache:
   directories:
     - node_modules
+branches:
+  only:
+    - master
 script:
   - echo "Deploying!"
   - npm test

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.<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
+Diego

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(<Link className="text-decoration-none" style={{color: "black"}} key="0" to={"/devteam/"+value.toLowerCase()}> <Persona width="175" nombre={value} img="/img/alan.jpg"/> </Link>)
+        }
+
+        return (
+            <div>
+                <Titulo pre_titulo="" titulo="Web Development Team" post_titulo="" leyenda="Del código a la web"/>
+                <div className="text-center mb-3">
+                <img src="/img/team.png" className="w-50 img-fluid" alt="Responsive image"></img>
+                </div>
+
+                <div className="text-center container text-justify text-break">
+                        <p><span className="font-weight-bold">Un equipo preparado y profesional.</span> 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.</p>
+                </div>
+
+                <div className="container text-center my-5">
+                    <h2 className="font-weight-bold font-italic">Nuestro Equipo</h2>
+                </div>
+                <div className="container">
+
+                <div className="row row-cols-1 row-cols-md-3 mb-5">
+                    {links}
+                </div>
+                </div>
+            </div>
+        );
+    }
+}

src/components/Header.js

@@ -30,7 +30,7 @@ export default class Header extends Component {
                         <Nav className="ml-auto">
                             <Nav.Link className={styles.links} href="/nosotros"><p>Nosotros</p></Nav.Link>
                             <Nav.Link className={styles.links} href="/eventos"><p>Eventos</p></Nav.Link>
-                            <Nav.Link className={styles.links} href="/noticias"><p>Noticias</p></Nav.Link>
+                            <Nav.Link className={styles.links} href="/devteam"><p>Dev Team</p></Nav.Link>
                             <Nav.Link className={styles.links} href="/contacto"><p>Contacto</p></Nav.Link>
                         </Nav>
 

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(<a className="text-decoration-none px-4" style={{color: "black"}} key="0" href={"/devteam/"+value.toLowerCase()}><Persona width="100" nombre={value} img={this.state.integrantes[value.toLowerCase()].imagenRuta}/> </a>)
+            }
+        }
+
+        const skills = []
+        for(let value of this.state.integrante.skills){
+            skills.push(
+            // TODO: Hacer que cambie el color del skill
+            <Skill title={value} color="blue"></Skill>
+            )
+        }
+        return (
+            <Container className="text-center pt-5">
+
+                <Persona width="170" nombre={this.state.integrante.nombre} img="/img/alan.jpg"/>
+                    <h3>Web Developer</h3>
+                    <Container className="justify-content-md-center">
+                        <a className="px-2"href={this.state.integrante.contacto[0]} rel="noopener noreferrer" style={{fontSize: "2rem"}} target="_blank" title="LinkedIn"><i class="fab fa-linkedin"></i></a>
+                        <a className="px-2"href={this.state.integrante.contacto[1]} rel="noopener noreferrer" style={{fontSize: "2rem"}} target="_blank" title="GitHub"><i class="fab fa-github"></i></a>
+                        <a className="px-2"href={this.state.integrante.contacto[2]} rel="noopener noreferrer" style={{fontSize: "2rem"}} target="_blank" title="Mail"><i class="fas fa-envelope"></i></a>
+                        <a className="px-2"href={this.state.integrante.contacto[3]} rel="noopener noreferrer" style={{fontSize: "2rem"}} target="_blank" title="WhatsApp"><i class="fab fa-whatsapp"></i></a>
+                    </Container>
+                    <h3 className="pt-5">Skills</h3>
+                    <Container className="d-flex justify-content-center pb-5">
+                        {skills}
+                    </Container>
+                    <h2>Proyectos</h2>
+                    <Row></Row>
+                    <Container className="py-5">
+                        <CardDeck>
+                            {this.state.integrante.proyectos.map((proyecto, index) =>
+                                <Card key={index} >
+                                    <Card.Header>
+                                        <Card.Title>
+                                            {proyecto.nombre}
+                                        </Card.Title>
+                                    </Card.Header>
+                                    <Card.Img  src={proyecto.imagenRuta}/>
+                                    <Card.Body>
+                                        <a href={this.state.integrante.contacto[1]} rel="noopener noreferrer" target="_blank" title="GitHub">
+                                            <i class="fab fa-github" style={{fontSize: "2rem"}}></i>
+                                        </a>
+                                        <Card.Text>
+                                            {proyecto.descr}
+                                        </Card.Text>
+                                        <Button variant="primary">Ver demo</Button>
+
+                                    </Card.Body>
+                                </Card>
+                            // <li key={index}>{proyecto.nombre}</li>
+                            )}
+                        </CardDeck>
+                    </Container>
+                    <h3 className="pt-4">Conoce a todos los integrantes</h3>
+                    <Container className="d-flex flex-row justify-content-center py-5">
+                        {/* <Persona width="100" nombre="Alan Álvarez" img="/img/alan.jpg"/>
+                        <Persona width="100" nombre="Alan Álvarez" img="/img/alan.jpg"/>
+                        <Persona width="100" nombre="Alan Álvarez" img="/img/alan.jpg"/>
+                        <Persona width="100" nombre="Alan Álvarez" img="/img/alan.jpg"/>
+                        <Persona width="100" nombre="Alan Álvarez" img="/img/alan.jpg"/>
+                        <Persona width="100" nombre="Alan Álvarez" img="/img/alan.jpg"/> */}
+                        {equipo}
+                    </Container>
+            </Container>
+
+            // 
+            // <div className={styles.container}>
+            // <img className={styles.userImage} alt="user" src={this.state.integrante.imagenRuta}/>
+            // <h3>{this.state.integrante.nombre}</h3>
+            // <h4>Web Developer</h4>
+            // <div className={styles.socialContainer}>
+            //     <a href={this.state.integrante.contacto[0]} rel="noopener noreferrer" className={styles.socialIcon} target="_blank" title="LinkedIn"><i class="fab fa-linkedin"></i></a>
+            //     <a href={this.state.integrante.contacto[1]} rel="noopener noreferrer" className={styles.socialIcon} target="_blank" title="GitHub"><i class="fab fa-github"></i></a>
+            //     <a href={this.state.integrante.contacto[2]} rel="noopener noreferrer" className={styles.socialIcon} target="_blank" title="Mail"><i class="fas fa-envelope"></i></a>
+            //     <a href={this.state.integrante.contacto[3]} rel="noopener noreferrer" className={styles.socialIcon} target="_blank" title="WhatsApp"><i class="fab fa-whatsapp"></i></a>
+            // </div>
+            // <ul>
+            //     <li>{this.state.integrante.contacto[0]}</li>
+            //     <li>{this.state.integrante.contacto[1]}</li>
+            //     <li>{this.state.integrante.contacto[2]}</li>
+            //     <li>{this.state.integrante.contacto[3]}</li>
+            // </ul>
+            // <h2>Skills</h2>
+            // <ul>
+            //      {skills} 
+            // </ul>
+            // </div>
+        );
+    }
+}

src/components/Persona.js

@@ -0,0 +1,13 @@
+import React, { Component } from 'react';
+
+
+export default class Persona extends Component {
+    render(props) {
+        return (
+            <div className="text-center card border-0 my-2">
+                    <img src={this.props.img} alt="..." class="mx-auto img-responsive rounded-circle" width={this.props.width} />
+                    <h2 className="font-weight-bold my-2">{this.props.nombre}</h2>
+            </div>
+        );
+    }
+}

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 {
                     <Route exact path="/" component={Home} />
                     <Route exact path="/eventos" component={Eventos} />
                     <Route exact path="/contacto" component={Contacto} />
-                    <Route exact path="/noticias" component={Noticias} />
+                    {/* <Route exact path="/noticias" component={Noticias} /> */}
+                    <Route exact path="/devteam" component={Devteam} />
+                    <Route exact path="/devteam/:nombre" component={Integrante} />
                     <Route exact path="/nosotros" component={Nosotros} />
                     <Route exact path="/conducta" component={Conducta} />
                     {/* <Route exact path="/"component={Home} /> */}

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 (
+            <div className={styles.container} style={{backgroundColor: this.state.color}}>
+                <p>{this.props.title}</p>
+            </div>
+        );
+    }
+}

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;
+}

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;
+}