Update jobs to remove all panels and wells

This commit is contained in:
Berkeley Martinez
2016-01-15 02:46:25 -08:00
parent 9d3fd2274e
commit b4f574b2be
9 changed files with 35 additions and 131 deletions

View File

@ -11,7 +11,6 @@ import {
import navLinks from './links.json'; import navLinks from './links.json';
import FCCNavItem from './NavItem.jsx'; import FCCNavItem from './NavItem.jsx';
const win = typeof window !== 'undefined' ? window : {};
const fCClogo = 'https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg'; const fCClogo = 'https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg';
const logoElement = ( const logoElement = (
@ -29,16 +28,6 @@ const toggleButtonChild = (
</Col> </Col>
); );
function getDashedName() {
let challengeDashedName;
if (typeof win.localStorage !== 'undefined') {
challengeDashedName = win.localStorage.getItem('currentDashedName');
}
return challengeDashedName && challengeDashedName !== 'undefined' ?
challengeDashedName :
'';
}
export default React.createClass({ export default React.createClass({
displayName: 'Nav', displayName: 'Nav',
@ -76,22 +65,6 @@ export default React.createClass({
}); });
}, },
renderLearnBtn() {
return (
<NavItem
href='#'
onClick={ () => {
const challengeDashedName = getDashedName();
const goTo = challengeDashedName ?
'/challenges/' + challengeDashedName :
'/map';
win.location = goTo;
}}>
Learn
</NavItem>
);
},
renderPoints(username, points) { renderPoints(username, points) {
if (!username) { if (!username) {
return null; return null;
@ -120,12 +93,11 @@ export default React.createClass({
); );
} else { } else {
return ( return (
<FCCNavItem <NavItem
className='btn signup-btn signup-btn-nav signin-button-nav'
eventKey={ 2 } eventKey={ 2 }
href='/login'> href='/login'>
Sign In Sign In
</FCCNavItem> </NavItem>
); );
} }
}, },
@ -144,7 +116,6 @@ export default React.createClass({
className='hamburger-dropdown' className='hamburger-dropdown'
navbar={ true } navbar={ true }
pullRight={ true }> pullRight={ true }>
{ this.renderLearnBtn() }
{ this.renderLinks() } { this.renderLinks() }
{ this.renderPoints(username, points) } { this.renderPoints(username, points) }
{ this.renderSignin(username, picture) } { this.renderSignin(username, picture) }

View File

@ -1,43 +0,0 @@
import React, { PropTypes } from 'react';
import { History } from 'react-router';
import { Button, Modal } from 'react-bootstrap';
export default React.createClass({
displayName: 'CreateJobsModal',
propTypes: {
onHide: PropTypes.func,
showModal: PropTypes.bool
},
mixins: [History],
goToNewJob(onHide) {
onHide();
this.history.pushState(null, '/jobs/new');
},
render() {
const {
showModal,
onHide
} = this.props;
return (
<Modal
onHide={ onHide }
show={ showModal }>
<Modal.Body>
<h4>Welcome to Free Code Camp's board</h4>
<p>We post jobs specifically target to our junior developers.</p>
<Button
block={ true }
className='signup-btn'
onClick={ () => this.goToNewJob(onHide) }>
Post a Job
</Button>
</Modal.Body>
</Modal>
);
}
});

View File

@ -1,5 +1,5 @@
import React, { PropTypes } from 'react'; import React, { PropTypes } from 'react';
import { Button, Input, Col, Panel, Row, Well } from 'react-bootstrap'; import { Button, Input, Col, Row, Well } from 'react-bootstrap';
import { contain } from 'thundercats-react'; import { contain } from 'thundercats-react';
// real paypal buttons // real paypal buttons
@ -177,7 +177,7 @@ export default contain(
sm={ 8 } sm={ 8 }
smOffset={ 2 } smOffset={ 2 }
xs={ 12 }> xs={ 12 }>
<Panel> <div>
<Row> <Row>
<Col <Col
md={ 6 } md={ 6 }
@ -262,7 +262,7 @@ export default contain(
</Col> </Col>
</Row> </Row>
<div className='spacer' /> <div className='spacer' />
</Panel> </div>
</Col> </Col>
</Row> </Row>
</div> </div>

View File

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import { LinkContainer } from 'react-router-bootstrap'; import { LinkContainer } from 'react-router-bootstrap';
import { Button, Row, Col, Panel } from 'react-bootstrap'; import { Button, Row, Col } from 'react-bootstrap';
export default React.createClass({ export default React.createClass({
displayName: 'NoJobFound', displayName: 'NoJobFound',
@ -12,7 +12,7 @@ export default React.createClass({
<Col <Col
md={ 6 } md={ 6 }
mdOffset={ 3 }> mdOffset={ 3 }>
<Panel> <div>
No job found... No job found...
<LinkContainer to='/jobs'> <LinkContainer to='/jobs'>
<Button <Button
@ -22,7 +22,7 @@ export default React.createClass({
Go to the job board Go to the job board
</Button> </Button>
</LinkContainer> </LinkContainer>
</Panel> </div>
</Col> </Col>
</Row> </Row>
</div> </div>

View File

@ -17,9 +17,7 @@ import {
Button, Button,
Col, Col,
Input, Input,
Row, Row
Panel,
Well
} from 'react-bootstrap'; } from 'react-bootstrap';
import { import {
@ -277,7 +275,7 @@ export default contain({
<Col <Col
md={ 10 } md={ 10 }
mdOffset={ 1 }> mdOffset={ 1 }>
<Panel className='text-center'> <div className='text-center'>
<form <form
className='form-horizontal' className='form-horizontal'
onSubmit={ this.handleSubmit }> onSubmit={ this.handleSubmit }>
@ -292,6 +290,7 @@ export default contain({
xsOffset={ 3 }> xsOffset={ 3 }>
<Row> <Row>
<Button <Button
bsStyle='primary'
className={ isFrontEndCert ? 'active' : '' } className={ isFrontEndCert ? 'active' : '' }
onClick={ () => { onClick={ () => {
if (!isFrontEndCert) { if (!isFrontEndCert) {
@ -310,6 +309,7 @@ export default contain({
<div className='button-spacer' /> <div className='button-spacer' />
<Row> <Row>
<Button <Button
bsStyle='primary'
className={ isBackEndCert ? 'active' : ''} className={ isBackEndCert ? 'active' : ''}
onClick={ () => { onClick={ () => {
if (!isBackEndCert) { if (!isBackEndCert) {
@ -330,6 +330,7 @@ export default contain({
<div className='spacer'> <div className='spacer'>
<h2>Tell us about the position</h2> <h2>Tell us about the position</h2>
</div> </div>
<hr />
<Input <Input
bsStyle={ position.bsStyle } bsStyle={ position.bsStyle }
label='Job Title' label='Job Title'
@ -373,6 +374,8 @@ export default contain({
type='checkbox' type='checkbox'
wrapperClassName={ checkboxClass } /> wrapperClassName={ checkboxClass } />
<div className='spacer' /> <div className='spacer' />
<hr />
<Row> <Row>
<div> <div>
<h2>How should they apply?</h2> <h2>How should they apply?</h2>
@ -391,6 +394,7 @@ export default contain({
</Row> </Row>
<div className='spacer' /> <div className='spacer' />
<hr />
<div> <div>
<h2>Tell us about your organization</h2> <h2>Tell us about your organization</h2>
</div> </div>
@ -432,7 +436,8 @@ export default contain({
wrapperClassName={ inputClass } /> wrapperClassName={ inputClass } />
<div className='spacer' /> <div className='spacer' />
<Well> <hr />
<div>
<div> <div>
<h2>Make it stand out</h2> <h2>Make it stand out</h2>
</div> </div>
@ -463,7 +468,7 @@ export default contain({
checkboxClass.replace('text-left', '') checkboxClass.replace('text-left', '')
} /> } />
</Row> </Row>
</Well> </div>
<Row> <Row>
<Col <Col
@ -480,7 +485,7 @@ export default contain({
</Col> </Col>
</Row> </Row>
</form> </form>
</Panel> </div>
</Col> </Col>
</Row> </Row>
</div> </div>

View File

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import { LinkContainer } from 'react-router-bootstrap'; import { LinkContainer } from 'react-router-bootstrap';
import { Button, Panel, Col, Row } from 'react-bootstrap'; import { Button, Col, Row } from 'react-bootstrap';
export default React.createClass({ export default React.createClass({
displayName: 'NewJobCompleted', displayName: 'NewJobCompleted',
@ -8,7 +8,7 @@ export default React.createClass({
render() { render() {
return ( return (
<div className='text-center'> <div className='text-center'>
<Panel> <div>
<Row> <Row>
<h1> <h1>
Your Position has Been Submitted Your Position has Been Submitted
@ -32,7 +32,7 @@ export default React.createClass({
Go to the job board Go to the job board
</Button> </Button>
</LinkContainer> </LinkContainer>
</Panel> </div>
</div> </div>
); );
} }

View File

@ -1,6 +1,6 @@
import React, { PropTypes } from 'react'; import React, { PropTypes } from 'react';
import { Lifecycle } from 'react-router'; import { Lifecycle } from 'react-router';
import { Panel, Button, Row, Col } from 'react-bootstrap'; import { Button, Row, Col } from 'react-bootstrap';
import { contain } from 'thundercats-react'; import { contain } from 'thundercats-react';
import ShowJob from './ShowJob.jsx'; import ShowJob from './ShowJob.jsx';
@ -51,12 +51,14 @@ export default contain(
return ( return (
<div> <div>
<ShowJob job={ job } /> <ShowJob job={ job } />
<div className='spacer'></div>
<hr />
<Row> <Row>
<Col <Col
md={ 10 } md={ 10 }
mdOffset={ 1 } mdOffset={ 1 }
xs={ 12 }> xs={ 12 }>
<Panel> <div>
<Button <Button
block={ true } block={ true }
className='signup-btn' className='signup-btn'
@ -75,7 +77,7 @@ export default contain(
onClick={ () => appActions.goBack() } > onClick={ () => appActions.goBack() } >
Head back and make edits Head back and make edits
</Button> </Button>
</Panel> </div>
</Col> </Col>
</Row> </Row>
</div> </div>

View File

@ -1,5 +1,5 @@
import React, { PropTypes } from 'react'; import React, { PropTypes } from 'react';
import { Well, Row, Col, Thumbnail, Panel } from 'react-bootstrap'; import { Row, Col, Thumbnail } from 'react-bootstrap';
import urlRegexFactory from 'url-regex'; import urlRegexFactory from 'url-regex';
const urlRegex = urlRegexFactory(); const urlRegex = urlRegexFactory();
@ -56,17 +56,18 @@ export default React.createClass({
return ( return (
<Row> <Row>
<hr />
<Col <Col
md={ 6 } md={ 6 }
mdOffset={ 3 }> mdOffset={ 3 }>
<Well> <div>
<bold>{ preview ? 'How do I apply?' : message }</bold> <bold>{ preview ? 'How do I apply?' : message }</bold>
<br /> <br />
<br /> <br />
<span dangerouslySetInnerHTML={{ <span dangerouslySetInnerHTML={{
__html: addATags(howToApply) __html: addATags(howToApply)
}} /> }} />
</Well> </div>
</Col> </Col>
</Row> </Row>
); );
@ -98,7 +99,7 @@ export default React.createClass({
md={ 10 } md={ 10 }
mdOffset={ 1 } mdOffset={ 1 }
xs={ 12 }> xs={ 12 }>
<Panel> <div>
<Row> <Row>
<h2 className='text-center'> <h2 className='text-center'>
{ company } { company }
@ -123,6 +124,7 @@ export default React.createClass({
{ locale ? locale : `${city}, ${state}` } { locale ? locale : `${city}, ${state}` }
</Col> </Col>
</Row> </Row>
<hr />
<div className='spacer' /> <div className='spacer' />
<Row> <Row>
<Col <Col
@ -134,7 +136,7 @@ export default React.createClass({
</Col> </Col>
</Row> </Row>
{ this.renderHowToApply(showApply, preview, message, howToApply) } { this.renderHowToApply(showApply, preview, message, howToApply) }
</Panel> </div>
</Col> </Col>
</Row> </Row>
</div> </div>

View File

@ -1,33 +0,0 @@
import React, { PropTypes } from 'react';
import { Button } from 'react-bootstrap';
const followLink = 'https://twitter.com/intent/follow?' +
'ref_src=twsrc%5Etfw&amp;region=follow_link&amp;screen_name=CamperJobs&' +
'amp;tw_p=followbutton';
function commify(count) {
return Number(count).toLocaleString('en');
}
export default React.createClass({
displayName: 'FollowButton',
propTypes: {
count: PropTypes.number
},
render() {
const { count } = this.props;
return (
<Button
block={ true }
bsSize='large'
bsStyle='primary'
href={ followLink }
target='__blank'>
Join { commify(count) } followers who see our job postings on Twitter.
</Button>
);
}
});