diff --git a/client/src/components/Footer/index.js b/client/src/components/Footer/index.js index 26b239360c..32425f9414 100644 --- a/client/src/components/Footer/index.js +++ b/client/src/components/Footer/index.js @@ -68,6 +68,7 @@ function Footer() { Gitter GitHub Support + Academic Honesty Code of Conduct Privacy Policy Terms of Service diff --git a/client/src/components/settings/Honesty.js b/client/src/components/settings/Honesty.js index bfe26438cb..93020372dd 100644 --- a/client/src/components/settings/Honesty.js +++ b/client/src/components/settings/Honesty.js @@ -2,9 +2,9 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { Button, Panel } from '@freecodecamp/react-bootstrap'; -import FullWidthRow from '../helpers/FullWidthRow'; +import { FullWidthRow } from '../helpers'; import SectionHeader from './SectionHeader'; -import academicPolicy from '../../resources/honesty-policy'; +import HonestyPolicy from '../../resources/honesty-policy'; import './honesty.css'; @@ -37,10 +37,10 @@ class Honesty extends Component { Academic Honesty Policy - {academicPolicy} -
- {isHonest ? this.renderIsHonestAgreed() : this.renderAgreeButton()} +
+
+ {isHonest ? this.renderIsHonestAgreed() : this.renderAgreeButton()}
); diff --git a/client/src/components/settings/honesty.css b/client/src/components/settings/honesty.css index 6ecb8f900f..ee2d8d9358 100644 --- a/client/src/components/settings/honesty.css +++ b/client/src/components/settings/honesty.css @@ -7,18 +7,16 @@ padding-top: 15px; } -.honesty-panel .agreed { +.honesty-policy .agreed { display: flex; justify-content: center; align-items: center; - height: 40px; background-color: rgba(0, 100, 0, 0.8); color: #fff; border-color: #006400; - margin-bottom: 0px; } -.honesty-panel .agreed p { +.honesty-policy .agreed p { margin-top: 0; margin-bottom: 0; } diff --git a/client/src/pages/academic-honesty.js b/client/src/pages/academic-honesty.js index 9bec57e588..4b48e1c9d5 100644 --- a/client/src/pages/academic-honesty.js +++ b/client/src/pages/academic-honesty.js @@ -2,10 +2,9 @@ import React, { Fragment } from 'react'; import { Grid } from '@freecodecamp/react-bootstrap'; import Helmet from 'react-helmet'; -import honesty from '../resources/honesty-policy'; - import Spacer from '../components/helpers/Spacer'; import FullWidthRow from '../components/helpers/FullWidthRow'; +import HonestyPolicy from '../resources/honesty-policy'; function AcademicHonesty() { return ( @@ -18,7 +17,7 @@ function AcademicHonesty() {

Academic Honesty Policy


- {honesty} + diff --git a/client/src/resources/honesty-policy.js b/client/src/resources/honesty-policy.js index ec542c858f..c8117d8848 100644 --- a/client/src/resources/honesty-policy.js +++ b/client/src/resources/honesty-policy.js @@ -1,43 +1,49 @@ -import React from 'react'; +import React, { Fragment } from 'react'; -const policy = [ -

- Before we issue our verified certification to a camper, he or she must - accept our Academic Honesty Pledge, which reads: -

, -

- "I understand that plagiarism means copying someone else’s work and - presenting the work as if it were my own, without clearly attributing the - original author." -

, -

- "I understand that plagiarism is an act of intellectual dishonesty, and that - people usually get kicked out of university or fired from their jobs if they - get caught plagiarizing". -

, -

- "Aside from using open source libraries such as jQuery and Bootstrap, and - short snippets of code which are clearly attributed to their original - author, 100% of the code in my projects was written by me, or along with - another camper with whom I was pair programming in real time." -

, -

- "I pledge that I did not plagiarize any of my freeCodeCamp.org work. I - understand that freeCodeCamp.org’s team will audit my projects to confirm - this." -

, -

- In the situations where we discover instances of unambiguous plagiarism, we - will replace the camper in question’s certification with a message that - "Upon review, this account has been flagged for academic dishonesty." -

, -

- As an academic institution that grants achievement-based certifications, we - take academic honesty very seriously. If you have any questions about this - policy, or suspect that someone has violated it, you can email{' '} - team@freecodecamp.org -  and we will investigate. -

-]; +const HonestyPolicy = () => { + return ( + +

+ Before we issue our verified certification to a camper, he or she must + accept our Academic Honesty Pledge, which reads: +

+

+ "I understand that plagiarism means copying someone else’s work and + presenting the work as if it were my own, without clearly attributing + the original author." +

+

+ "I understand that plagiarism is an act of intellectual dishonesty, and + that people usually get kicked out of university or fired from their + jobs if they get caught plagiarizing". +

+

+ "Aside from using open source libraries such as jQuery and Bootstrap, + and short snippets of code which are clearly attributed to their + original author, 100% of the code in my projects was written by me, or + along with another camper with whom I was pair programming in real + time." +

+

+ "I pledge that I did not plagiarize any of my freeCodeCamp.org work. I + understand that freeCodeCamp.org’s team will audit my projects to + confirm this." +

+

+ In the situations where we discover instances of unambiguous plagiarism, + we will replace the camper in question’s certification with a message + that "Upon review, this account has been flagged for academic + dishonesty." +

+

+ As an academic institution that grants achievement-based certifications, + we take academic honesty very seriously. If you have any questions about + this policy, or suspect that someone has violated it, you can email{' '} + team@freecodecamp.org and we + will investigate. +

+
+ ); +}; -export default policy; +export default HonestyPolicy;