Skip to content
This repository has been archived by the owner on Mar 10, 2022. It is now read-only.

Commit

Permalink
fix(Views): Remove files and clean up file structure
Browse files Browse the repository at this point in the history
  • Loading branch information
cjoshmartin committed Jul 23, 2018
1 parent f1e4af0 commit 7f8b4f4
Show file tree
Hide file tree
Showing 15 changed files with 358 additions and 383 deletions.
8 changes: 0 additions & 8 deletions src/App.test.js

This file was deleted.

5 changes: 2 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import React from 'react';
import ReactDOM from 'react-dom';
import registerServiceWorker from './registerServiceWorker';
//import 'semantic-ui-css/semantic.min.css';
import './index.css';

import { HashRouter as Router, Route } from 'react-router-dom'
import App from './views/App.js'
import MainAppContainer from './views/mainAppContainer/MainAppContainer.js'


ReactDOM.render(
<Router>
<Route component={App} />
<Route component={MainAppContainer} />
</Router>,
document.getElementById('root')
);
Expand Down
53 changes: 0 additions & 53 deletions src/views/Blog.js

This file was deleted.

1 change: 0 additions & 1 deletion src/views/CNAME

This file was deleted.

138 changes: 0 additions & 138 deletions src/views/Main.js

This file was deleted.

72 changes: 0 additions & 72 deletions src/views/Projects.js

This file was deleted.

61 changes: 12 additions & 49 deletions src/views/About.js → src/views/about/AboutUtils.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import React from 'react';
import {Grid,Row,Col} from 'react-bootstrap';
import {Col} from 'react-bootstrap';
import Media from "react-media"

import marked from "marked"

import DocumentTitle from 'react-document-title'
import PropTypes from 'prop-types'

function classList( classes = [])
{
return classes.map((list, index) => {
Expand Down Expand Up @@ -53,7 +49,7 @@ const description = (me = "") => {
)
};

const picture = (picture = "") => {
const picture = (picture = "") => {
const alt_text = "picture of Josh";
const common_styles = {
borderRadius: "9px",
Expand Down Expand Up @@ -105,47 +101,14 @@ const certifications = (certificationsItems = []) => {
)
};

const About = (props) => {
return (
<DocumentTitle title={"Josh Martin - About"}>
<div className="indexPage">

<Grid>
<Row>
<Col xs={12} sm={12} md={12}>
<Grid>
<Row>
{description(props.about.me)}
{picture(props.picture)}
</Row>
</Grid>
<br />
</Col>
</Row>
<Row>
{relevantCoursework(props.classes)}
{developerEnvironment(props.about.dev_env)}
{certifications(props.certifications)}
</Row>
</Grid>
</div>
</DocumentTitle>
);
};

export default About

About.defaultProps = {
about: {
me: "db has fail, please refresh",
},
class : {},
picture: "",
};

About.protoTypes = {
about: PropTypes.object,
picture: PropTypes.string,
class: PropTypes.array,
certifications: PropTypes.array,
};
export {
classList,
certificationList,
developerEnvironmentList,
description,
picture,
relevantCoursework,
developerEnvironment,
certifications
}
Loading

0 comments on commit 7f8b4f4

Please sign in to comment.