Skip to content
This repository was archived by the owner on Jun 20, 2021. It is now read-only.

Commit

Permalink
ajout prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin GAREL committed Jul 4, 2018
1 parent 22833ac commit db73161
Show file tree
Hide file tree
Showing 15 changed files with 299 additions and 140 deletions.
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"bracketSpacing": false,
"singleQuote": true,
"printWidth": 120,
"jsxBracketSameLine": true
}
145 changes: 145 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"version": "0.1.0",
"private": true,
"devDependencies": {
"husky": "^1.0.0-rc.10",
"prettier": "^1.13.7",
"react-scripts": "^1.1.4"
},
"dependencies": {
Expand All @@ -25,6 +27,12 @@
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
"eject": "react-scripts eject",
"prettier": "prettier --write \"src/**/*.js\""
},
"husky": {
"hooks": {
"pre-commit": "npm run prettier"
}
}
}
15 changes: 7 additions & 8 deletions src/containers/app/app-navbar.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { Link } from "react-router-dom";
import React from 'react';
import {Link} from 'react-router-dom';
import {
Collapse,
Navbar,
Expand All @@ -10,7 +10,7 @@ import {
DropdownToggle,
DropdownMenu,
DropdownItem
} from "reactstrap";
} from 'reactstrap';

export default class AppNavbar extends React.Component {
constructor(props) {
Expand All @@ -30,7 +30,9 @@ export default class AppNavbar extends React.Component {
return (
<div>
<Navbar color="light" light expand="md">
<NavbarBrand tag={Link} to="/">Calculette RH</NavbarBrand>
<NavbarBrand tag={Link} to="/">
Calculette RH
</NavbarBrand>
<NavbarToggler onClick={this.toggle} />
<Collapse isOpen={this.state.isOpen} navbar>
<Nav className="mr-auto" navbar>
Expand All @@ -42,10 +44,7 @@ export default class AppNavbar extends React.Component {
<DropdownItem tag={Link} to="/gestionPersonnel/anciennete">
Ancienneté
</DropdownItem>
<DropdownItem
tag={Link}
to="/gestionPersonnel/conversionMinCent"
>
<DropdownItem tag={Link} to="/gestionPersonnel/conversionMinCent">
Conversion minutes / centièmes
</DropdownItem>
</DropdownMenu>
Expand Down
6 changes: 3 additions & 3 deletions src/containers/app/index.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from 'react';
import { Route } from 'react-router-dom';
import {Route} from 'react-router-dom';
import Home from '../home';
import Anciennete from '../gestionPersonnel/anciennete';
import ConversionMinCent from '../gestionPersonnel/conversionMinCent';
import AppNavBar from './app-navbar'
import AppNavBar from './app-navbar';

const App = () => (
<div>
<AppNavBar/>
<AppNavBar />
<main>
<Route exact path="/" component={Home} />
<Route exact path="/gestionPersonnel/anciennete" component={Anciennete} />
Expand Down
43 changes: 21 additions & 22 deletions src/containers/gestionPersonnel/anciennete.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,32 @@ import {connect} from 'react-redux';
import AncienneteForm from './ancienneteForm';

class Anciennete extends React.Component {

render() {
const {isValid, anciennete, ancienneteStr} = this.props;
return (
<article className="container mt-3">
render() {
const {isValid, anciennete, ancienneteStr} = this.props;
return (
<article className="container mt-3">
<h1>Calcul de l'ancienneté</h1>
<div className="mt-5">
<AncienneteForm />
{isValid &&
<blockquote className="mt-3">
<p>
Ce salarié a <mark>{anciennete.toFixed(2)} an(s)</mark> d'ancienneté, soit {ancienneteStr}.
</p>
</blockquote>
}
<AncienneteForm />
{isValid && (
<blockquote className="mt-3">
<p>
Ce salarié a <mark>{anciennete.toFixed(2)} an(s)</mark> d'ancienneté, soit {ancienneteStr}.
</p>
</blockquote>
)}
</div>
</article>
);
};
</article>
);
}
}

function mapStateToProps(state) {
return {
isValid: state.anciennete.isValid,
anciennete: state.anciennete.anciennete,
ancienneteStr: state.anciennete.ancienneteStr
}
return {
isValid: state.anciennete.isValid,
anciennete: state.anciennete.anciennete,
ancienneteStr: state.anciennete.ancienneteStr
};
}

export default connect(mapStateToProps)(Anciennete);
export default connect(mapStateToProps)(Anciennete);
40 changes: 20 additions & 20 deletions src/containers/gestionPersonnel/ancienneteForm.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
import React from 'react';
import { Field, reduxForm } from 'redux-form'
import {Field, reduxForm} from 'redux-form';
import {updateAnciennete} from '../../reducers/anciennete';

let AncienneteForm = props => {

return (
<form className="form-inline">
<div className="form-group">
<label className="mr-2">Date d'entrée</label>
<Field component="input" type="text" name="dateEntree" className="form-control" placeholder="JJ/MM/AAAA"
/>
</div>
<div className="form-group">
<label className="ml-2 mr-2">au</label>
<Field component="input" type="text" name="dateSortie" className="form-control" placeholder="JJ/MM/AAAA"
/>
</div>
</form>
)};
return (
<form className="form-inline">
<div className="form-group">
<label className="mr-2">Date d'entrée</label>
<Field component="input" type="text" name="dateEntree" className="form-control" placeholder="JJ/MM/AAAA" />
</div>
<div className="form-group">
<label className="ml-2 mr-2">au</label>
<Field component="input" type="text" name="dateSortie" className="form-control" placeholder="JJ/MM/AAAA" />
</div>
</form>
);
};

AncienneteForm = reduxForm({
form: 'anciennete',
onChange: (values, dispatch) => { updateAnciennete(values, dispatch) }
})(AncienneteForm)
form: 'anciennete',
onChange: (values, dispatch) => {
updateAnciennete(values, dispatch);
}
})(AncienneteForm);

export default AncienneteForm
export default AncienneteForm;
Loading

0 comments on commit db73161

Please sign in to comment.