Skip to content

Commit

Permalink
Merge 45043c5 into 1c5e938
Browse files Browse the repository at this point in the history
  • Loading branch information
mattwr18 committed Dec 17, 2018
2 parents 1c5e938 + 45043c5 commit bd4d728
Show file tree
Hide file tree
Showing 48 changed files with 3,218 additions and 189 deletions.
4 changes: 4 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": ["react", "env"],
"plugins": ["emotion"]
}
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Run
```
$ yarn start
```

Dokku Deployment
-----------------

Expand Down
21 changes: 20 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,43 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.8",
"@fortawesome/free-brands-svg-icons": "5",
"@fortawesome/free-solid-svg-icons": "^5.5.0",
"@fortawesome/react-fontawesome": "^0.1.3",
"coveralls": "^3.0.2",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"jest-enzyme": "^6.0.3",
"moment": "^2.22.2",
"moxios": "^0.4.0",
"pryjs": "^1.0.3",
"react": "^16.2.0",
"react-big-calendar": "^0.20.2",
"react-bootstrap": "^0.32.1",
"react-dom": "^16.2.0",
"react-hover": "^1.3.2",
"react-redux": "^5.1.1",
"react-router-bootstrap": "^0.24.4",
"react-router-dom": "^4.2.2",
"react-scripts": "1.1.0",
"react-test-renderer": "^16.4.1"
"react-select": "^2.0.0-beta.7",
"react-spinners": "^0.4.7",
"react-test-renderer": "^16.4.1",
"redux": "^4.0.1",
"redux-mock-store": "^1.5.3",
"redux-thunk": "^2.3.0",
"semantic-ui-css": "^2.4.1",
"semantic-ui-react": "^0.82.5"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom --coverage --collectCoverageFrom=src/**/*js --collectCoverageFrom=!src/registerServiceWorker.js",
"coveralls": "cat ./coverage/lcov.info | coveralls",
"eject": "react-scripts eject"
},
"devDependencies": {
"axios": "^0.18.0"
}
}
9 changes: 0 additions & 9 deletions src/AboutUs.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
import React, { Component } from 'react'
import logo from './images/logo.png';
import AVNavbar from './components/AVNavbar';
import './App.css';

class AboutUs extends Component {
render() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<h1 className="App-title">Welcome to AgileVentures</h1>
</header>

<AVNavbar/>

<p className="App-intro">
About Us
</p>
Expand Down
7 changes: 7 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,10 @@
.btn {
margin: 100px;
}

ul {
list-style: none;
}
.rbc-month-row {
min-height: 100px;
}
142 changes: 71 additions & 71 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
import React, { Component } from 'react'
import { Modal, Grid, Col, Row, Button } from 'react-bootstrap'

import logo from './images/logo.png'
import codingWithCat from './images/coding-with-cat.svg'
import realprojects from './images/real-projects.svg'
import runners from './images/runners.svg'
import jobs from './images/jobs.svg'
import scrum from './images/scrum.svg'
import AVNavbar from './components/AVNavbar'
import './App.css'
import React, { Component } from "react";
import { Modal, Grid, Col, Row, Button } from "react-bootstrap";
import codingWithCat from "./images/coding-with-cat.svg";
import realprojects from "./images/real-projects.svg";
import runners from "./images/runners.svg";
import jobs from "./images/jobs.svg";
import scrum from "./images/scrum.svg";
import "./App.css";

class App extends Component {

constructor(props, context) {
super(props, context);

Expand All @@ -24,101 +20,105 @@ class App extends Component {

this.modals = [
{
buttonText: 'You are here!',
buttonText: "You are here!",
xsOffset: 1,
reactId: 'here',
reactId: "here",
image: codingWithCat,
imageAltText: 'working on a computer at home with cat',
imageWidth: '250px',
modalText: 'Tired of toy projects, tutorials and online courses?'
imageAltText: "working on a computer at home with cat",
imageWidth: "250px",
modalText: "Tired of toy projects, tutorials and online courses?"
},
{
buttonText: 'Scrums',
buttonText: "Scrums",
xsOffset: 0,
mdPull: 2,
reactId: 'scrums',
reactId: "scrums",
image: scrum,
imageAltText: 'team sitting round a table with kanban board in background',
imageWidth: '350px',
modalText: 'Meet others and plan your work in online hangouts.'
imageAltText:
"team sitting round a table with kanban board in background",
imageWidth: "350px",
modalText: "Meet others and plan your work in online hangouts."
},
{
buttonText: 'Real Projects',
buttonText: "Real Projects",
xsOffset: 3,
reactId: 'projects',
reactId: "projects",
image: realprojects,
imageAltText: 'shaking hands with business client across desk',
imageWidth: '320px',
modalText: 'Satisfy real charity clients around the world.'
imageAltText: "shaking hands with business client across desk",
imageWidth: "320px",
modalText: "Satisfy real charity clients around the world."
},
{
buttonText: 'Sprints',
buttonText: "Sprints",
xsOffset: 7,
reactId: 'sprints',
reactId: "sprints",
image: runners,
imageAltText: 'two people running',
imageWidth: '320px',
modalText: 'Commit to a week long sprint to accelerate your learning.'
imageAltText: "two people running",
imageWidth: "320px",
modalText: "Commit to a week long sprint to accelerate your learning."
},
{
buttonText: 'Jobs',
buttonText: "Jobs",
xsOffset: 5,
reactId: 'jobs',
reactId: "jobs",
image: jobs,
imageAltText: 'person holding briefcase looking towards city',
imageWidth: '300px',
modalText: 'Get paid for in-house projects or go on to great things in the wider world.'
}
]
imageAltText: "person holding briefcase looking towards city",
imageWidth: "300px",
modalText:
"Get paid for in-house projects or go on to great things in the wider world."
}
];
}

handleClose() {
this.setState({show: null});
this.setState({ show: null });
}

handleShow(id) {
this.setState({show: id});
this.setState({ show: id });
}

renderModals() {
return this.modals.map(modal => {
return (
<Row key={modal.reactId}>
<Col xsOffset={modal.xsOffset} sm={5} mdPull={modal.mdPull}>
<Button bsStyle="primary" bsSize="large" block onClick={() => this.handleShow(modal.reactId)}>
<h1>{modal.buttonText}</h1>
</Button>
<Modal
show={this.state.show === modal.reactId} onHide={this.handleClose}
>
<Modal.Header closeButton closeLabel="close window">
</Modal.Header>
<Modal.Body>
<img src={modal.image} width={modal.imageWidth} alt={modal.imageAltText} className="modal-image" />
<p className='landing-page-markers you-are-here'>{modal.modalText}</p>
</Modal.Body>
</Modal>
</Col>
</Row>
)
<Col xsOffset={modal.xsOffset} sm={5} mdPull={modal.mdPull}>
<Button
bsStyle="primary"
bsSize="large"
block
onClick={() => this.handleShow(modal.reactId)}
>
<h1>{modal.buttonText}</h1>
</Button>
<Modal
show={this.state.show === modal.reactId}
onHide={this.handleClose}
>
<Modal.Header closeButton closeLabel="close window" />
<Modal.Body>
<img
src={modal.image}
width={modal.imageWidth}
alt={modal.imageAltText}
className="modal-image"
/>
<p className="landing-page-markers you-are-here">
{modal.modalText}
</p>
</Modal.Body>
</Modal>
</Col>
</Row>
);
});
}

render() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<h1 className="App-title">AgileVentures</h1>
<h2>Boost your team coding skills!</h2>
</header>

<AVNavbar />

<Grid>
{this.renderModals()}
</Grid>
</div >
<React.Fragment>
<Grid>{this.renderModals()}</Grid>
</React.Fragment>
);
}
}
Expand Down
20 changes: 0 additions & 20 deletions src/App.test.js

This file was deleted.

10 changes: 10 additions & 0 deletions src/actions/getEventsAction.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import axios from "axios";
import { GET_EVENTS } from "../types";

export let getEvents = events => ({ type: GET_EVENTS, payload: events });

export let fetchEvents = () => dispatch => {
return axios.get("https://www.agileventures.org/events.json").then(response => {
dispatch(getEvents(response.data));
});
};
22 changes: 22 additions & 0 deletions src/actions/getProjectsAction.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import axios from "axios";
import { GET_PROJECTS } from "../types";

export let getProjects = projects => ({
type: GET_PROJECTS,
payload: projects
});

export let fetchProjects = () => dispatch => {
return axios
.get("https://develop.websiteone.agileventures.org/api/v1/projects")
.then(response => {
let { projects, languages, followers, documents } = response.data;
projects = projects.map(project => {
project.languages = languages[project.title] && languages[project.title].map(lang => lang.name);
project.followers = followers[project.title];
project.documents = documents[project.title];
return project;
});
dispatch(getProjects(projects));
});
};
33 changes: 33 additions & 0 deletions src/assets/Navbar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#main-header {
background-color: #ee7335 !important;
height: 60px !important;
}

#main-header a {
color: #fff !important;
font-size: 1.2em;
padding: 0px 15px !important;
}

.navbar-brand {
float: left;
padding: 15px 15px;
font-size: 18px;
line-height: 20px;
height: 50px;
width: 100% !important;
}

#nav {
margin: 60px 0px 15px 0px !important;
height: 50px !important;
border-radius: 0% !important;
background-color: #34495E !important;
}

#nav a, .text, .icon {
font-weight: 700;
text-transform: uppercase;
color: #fff !important;
font-size: 16px !important;
}
4 changes: 4 additions & 0 deletions src/assets/PaginateProjects.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.spinner {
margin-top: 40px !important;
float: left;
}

0 comments on commit bd4d728

Please sign in to comment.