Skip to content

Commit

Permalink
Merge pull request #1026 from knod/clean-style-6
Browse files Browse the repository at this point in the history
Cleans code style of '/src/containers'. #1018
  • Loading branch information
knod committed Dec 2, 2018
2 parents 68e9402 + e820663 commit 8083aca
Show file tree
Hide file tree
Showing 7 changed files with 111 additions and 103 deletions.
8 changes: 4 additions & 4 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import localforage from 'localforage';
import { Confirmer } from './utils/getUserConfirmation';

// CUSTOM COMPONENTS
import HomePage from './containers/HomePage';
import AboutPage from './containers/AboutPage';
import VisitPage from './containers/VisitPage';
import { HomePage } from './containers/HomePage';
import { AboutPage } from './containers/AboutPage';
import { VisitPage } from './containers/VisitPage';
import { Footer } from './components/Footer';
import { Header } from './components/Header';

Expand Down Expand Up @@ -345,7 +345,7 @@ class App extends Component {
</div>
);
}; // End render()
}
};


export default App;
26 changes: 16 additions & 10 deletions src/containers/AboutPage.js
Original file line number Diff line number Diff line change
@@ -1,46 +1,51 @@
import React from 'react';
import {
Header,
Message,
} from 'semantic-ui-react';

import { Header, Message } from 'semantic-ui-react';
// PROJECT COMPONENTS
import { ExternalLink } from '../components/ExternalLink';
import { PageLayout } from '../components/PageLayout';


const AboutPage = ({ translations }) => {
return (
<PageLayout>

<Header
className="ac-header"
as='h1'>
className = { `ac-header` }
as = { `h1` }>
{ translations.i_aboutPageHeader }
</Header>

<Header as='h3'>{ translations.i_whatForHeader }</Header>
<Header as={ `h3` }>{ translations.i_whatForHeader }</Header>
<Message>{ translations.i_whatForImportantNote }</Message>
<p>{ translations.i_whatFor }</p>

<Header as='h3'>{ translations.i_whyHeader }</Header>
<Header as={ `h3` }>{ translations.i_whyHeader }</Header>
<p>{ translations.i_why1 }</p>
<p>{ translations.i_why2 }</p>

<ul>
<li>
<ExternalLink href="https://www.youtube.com/watch?v=BveX_rID4_E">
<ExternalLink href={ `https://www.youtube.com/watch?v=BveX_rID4_E` }>
{ translations.i_videoLinkText }
</ExternalLink>
</li>

<li>
<ExternalLink href="http://www.nccp.org/projects/files/NCCP_CO_presentation07.pdf">
<ExternalLink href={ `http://www.nccp.org/projects/files/NCCP_CO_presentation07.pdf` }>
{ translations.i_quantLinkText }
</ExternalLink>
</li>
</ul>

<Header as='h3'>{ translations.i_howToUseHeader }</Header>
<Header as={ `h3` }>{ translations.i_howToUseHeader }</Header>
<p>{ translations.i_howToUse }</p>
<Message>{ translations.i_howToUseNote }</Message>

<Header as='h3'>{ translations.i_whoMadeThisHeader }</Header>
<Header as={ `h3` }>{ translations.i_whoMadeThisHeader }</Header>
<p>{ translations.i_whoMadeThis1 }</p>
<p>{ translations.i_whoMadeThis2 }</p>
<p>{ translations.i_whoMadeThis3 }</p>
Expand All @@ -49,4 +54,5 @@ const AboutPage = ({ translations }) => {
);
}; // Ends <AboutPage>

export default AboutPage;

export { AboutPage };
2 changes: 1 addition & 1 deletion src/containers/DevSwitch.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const DevSwitch = function ({ setDev, devProps, history }) {
</Segment>
);

}; // End <DevSwitch>
}; // Ends <DevSwitch>


export { DevSwitch };
8 changes: 5 additions & 3 deletions src/containers/HomePage.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { Component } from 'react';
import { Link } from 'react-router-dom';


class HomePage extends Component {
render() {
return (
Expand Down Expand Up @@ -30,7 +31,8 @@ class HomePage extends Component {
</div>
</div>
);
}
}
};
};


export default HomePage;
export { HomePage };

0 comments on commit 8083aca

Please sign in to comment.