Merge pull request #9 from ArthurPedroti/feat/switch-to-radio-otherdetails

Feat/switch to radio otherdetails

Author: ArthurPedroti

.env

@@ -1 +1 @@
-REACT_APP_SERVER=http://192.168.2.63:3333
+REACT_APP_SERVER=https://192.168.2.250/

_redirects

@@ -0,0 +1,3 @@
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+};

commitlint.config.js

@@ -1,6 +1,6 @@
 {
   "name": "pv-agf-frontend",
-  "version": "0.9.61",
+  "version": "0.9.62",
   "private": true,
   "dependencies": {
     "@date-io/date-fns": "^2.4.0",
@@ -64,6 +64,10 @@
     ]
   },
   "devDependencies": {
+    "@commitlint/cli": "^9.0.1",
+    "@commitlint/config-conventional": "^9.0.1",
+    "commitizen": "^4.1.2",
+    "cz-conventional-changelog": "3.2.0",
     "eslint": "^6.8.0",
     "eslint-config-airbnb": "^18.1.0",
     "eslint-config-prettier": "^6.11.0",
@@ -72,6 +76,18 @@
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-react": "^7.19.0",
     "eslint-plugin-react-hooks": "^2.5.0",
+    "husky": "^4.2.5",
     "prettier": "^2.0.5"
+  },
+  "husky": {
+    "hooks": {
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
+      "prepare-commit-msg": "exec < /dev/tty && git cz --hook || true"
+    }
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
   }
 }

package.json

@@ -223,7 +223,7 @@ export default function PdfMakeKit({
     : null;
 
   const engate = values.engate === true ? 'SIM' : 'NÃO';
-  const contrato = values.contrato === true ? 'SIM' : 'NÃO';
+  const contrato = values.contrato === 'sim' ? 'SIM' : 'NÃO';
   const pontExtraFormated = pontExtraFormat();
   const formattedProducts = productsFormat(produtos);
   const formattedPayments = paymentsFormat(parcelas);

src/components/PdfMakeDefault.js

@@ -74,9 +74,9 @@ let ClientDetails = ({
     }
   }
 
-  function ClientSelect(values) {
-    if (values !== undefined) {
-      if (values.clientType === 'seller') {
+  function ClientSelect(clientValues) {
+    if (clientValues !== undefined) {
+      if (clientValues.clientType === 'seller') {
         return (
           <WindowedSelect
             options={clientList}

src/components/PdfMakeKit.js

@@ -8,62 +8,68 @@ import Button from '@material-ui/core/Button';
 
 import { bindActionCreators } from 'redux';
 
+import { Form } from 'antd';
 import TextField from '@material-ui/core/TextField';
-
+import Radio from '@material-ui/core/Radio';
+import RadioGroup from '@material-ui/core/RadioGroup';
 import FormControlLabel from '@material-ui/core/FormControlLabel';
-import Switch from '@material-ui/core/Switch';
+import { useCallback } from 'react';
 import { Creators as SelectActions } from '../../store/ducks/select_infos';
 
 import Menu from '../../components/Menu';
 
-const renderDate = ({ input, label, type }) => (
-  <div>
-    <TextField
-      {...input}
-      label={label}
-      fullWidth
-      type={type}
-      InputLabelProps={{ shrink: true }}
-      margin="normal"
-      size="small"
-    />
-  </div>
-);
-
-const renderInput = ({ input, label }) => (
-  <div>
-    <TextField
-      {...input}
-      label={label}
-      fullWidth
-      margin="normal"
-      size="small"
-    />
-  </div>
-);
+let OtherDetails = ({ history, handleSubmit, submitting }) => {
+  const showResults = useCallback(
+    () => {
+      history.push('/confirm');
+    },
+    [history],
+  );
 
-const renderSwitch = ({ input, label }) => (
-  <div>
-    <FormControlLabel
-      control={(
-        <Switch
+  const renderDate = useCallback(
+    ({ input, label, type }) => (
+      <div>
+        <TextField
           {...input}
-          checked={!!input.value}
-          onChange={input.onChange}
-          value="checked"
-          color="primary"
+          label={label}
+          fullWidth
+          type={type}
+          InputLabelProps={{ shrink: true }}
+          margin="normal"
+          size="small"
         />
-      )}
-      labelPlacement="start"
-      label={label}
-    />
-  </div>
-);
+      </div>
+    ),
+    [],
+  );
 
-let OtherDetails = ({ history, handleSubmit, submitting }) => {
-  async function showResults() {
-    history.push('/confirm');
-  }
+  const renderInput = useCallback(({ input, label }) => (
+    <div>
+      <TextField
+        {...input}
+        label={label}
+        fullWidth
+        margin="normal"
+        size="small"
+      />
+    </div>
+  ),
+  []);
+
+  const radioButton = useCallback(({ input, ...rest }) => (
+    <RadioGroup row {...input} {...rest} value={input.value || 'não'}>
+      <FormControlLabel
+        value="nao"
+        control={<Radio />}
+        label="Não"
+      />
+      <FormControlLabel
+        value="sim"
+        control={<Radio />}
+        label="Sim"
+      />
+    </RadioGroup>
+  ), []);
 
   return (
     <div>
@@ -72,12 +78,11 @@ let OtherDetails = ({ history, handleSubmit, submitting }) => {
       <Container maxWidth="md" component="main" align="center">
         <form onSubmit={handleSubmit(showResults)}>
           <Container maxWidth="sm" align="left">
-            <Field
-              name="contrato"
+            <Form.Item
               label="Com contrato?"
-              type="text"
-              component={renderSwitch}
+              style={{ fontWeight: 500, marginBottom: 0 }}
             />
+            <Field name="contrato" component={radioButton} />
             <Field
               name="num_contrato"
               label="Nº Contrato:"