From 67a23ce452bbe5cdd4d37c94bd2b52e4987e67b3 Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Tue, 19 May 2020 04:48:50 +0200 Subject: [PATCH] WIP feature/ Dashboard_breadcrumbs & fix_localize --- client/src/components/Breadcrumbs.js | 11 +--- .../Dashboard/DashboardBreadcrumbs.js | 61 +++++++++++-------- client/src/components/Expenses/ExpenseForm.js | 16 ++--- .../Accounting/MakeJournalEntriesForm.js | 6 +- .../containers/Authentication/InviteAccept.js | 10 +-- client/src/containers/Authentication/Login.js | 29 +++++---- .../src/containers/Authentication/Register.js | 16 ++--- .../Authentication/ResetPassword.js | 11 ++-- .../Authentication/SendResetPassword.js | 7 +-- .../containers/Dialogs/AccountFormDialog.js | 4 +- .../src/containers/Dialogs/CurrencyDialog.js | 16 +++-- .../containers/Dialogs/ExchangeRateDialog.js | 6 +- .../containers/Dialogs/InviteUserDialog.js | 8 +-- .../containers/Dialogs/ItemCategoryDialog.js | 2 +- .../src/containers/Dialogs/ItemFromDialog.js | 2 +- .../src/containers/Dialogs/UserFormDialog.js | 2 +- .../BalanceSheet/BalanceSheetHeader.js | 4 +- .../ProfitLossSheet/ProfitLossSheetHeader.js | 4 +- .../TrialBalanceSheetHeader.js | 4 +- client/src/containers/Items/ItemForm.js | 8 +-- .../containers/Preferences/General/General.js | 18 +++--- client/src/index.js | 5 ++ client/src/lang/en/index.js | 44 +++++++++---- client/src/lang/en/locale.js | 60 ++++++++++++++++++ client/src/lang/printValue.js | 48 +++++++++++++++ 25 files changed, 269 insertions(+), 133 deletions(-) create mode 100644 client/src/lang/en/locale.js create mode 100644 client/src/lang/printValue.js diff --git a/client/src/components/Breadcrumbs.js b/client/src/components/Breadcrumbs.js index e09c30a8f..9d88bd8c6 100644 --- a/client/src/components/Breadcrumbs.js +++ b/client/src/components/Breadcrumbs.js @@ -12,15 +12,6 @@ const PureBreadcrumbs = ({ breadcrumbs }) => ( ))} - - //
- // {breadcrumbs.map(({ breadcrumb, match }, index) => ( - //
- // {breadcrumb} - // {index < breadcrumbs.length - 1 && ">"} - //
- // ))} - //
); - + export default withBreadcrumbs(routes)(PureBreadcrumbs); diff --git a/client/src/components/Dashboard/DashboardBreadcrumbs.js b/client/src/components/Dashboard/DashboardBreadcrumbs.js index 82b6faa08..5093cf569 100644 --- a/client/src/components/Dashboard/DashboardBreadcrumbs.js +++ b/client/src/components/Dashboard/DashboardBreadcrumbs.js @@ -3,38 +3,47 @@ import { CollapsibleList, MenuItem, Classes, - Boundary + Boundary, } from '@blueprintjs/core'; import classNames from 'classnames'; +import withBreadcrumbs from 'react-router-breadcrumbs-hoc'; +import routes from 'routes/dashboard'; -export default function DashboardBreadcrumbs() { - function renderBreadcrumb(props) { - if (props.href != null) { - return {props.text}; - } else { - return ( +function DashboardBreadcrumbs({breadcrumbs}){ + + const renderBreadcrumb =(props)=>{ + + if(props.href != null){ + + return {props.text}; + }else{ + + return( + className={classNames(Classes.BREADCRUMB, Classes.BREADCRUMB_CURRENT)}> + {props.text} - ); + ) } } - return ( - } - visibleItemRenderer={renderBreadcrumb} - collapseFrom={Boundary.START} - visibleItemCount={0} - > - - - - - - - - ); + return( +} + visibleItemRenderer={renderBreadcrumb} + collapseFrom={Boundary.START} + visibleItemCount={0}> + + { + breadcrumbs.map(({breadcrumb,match},index)=>{ + + return + }) + } + + + ) } + +export default withBreadcrumbs(routes)(DashboardBreadcrumbs) diff --git a/client/src/components/Expenses/ExpenseForm.js b/client/src/components/Expenses/ExpenseForm.js index d305c6597..a902ac1b7 100644 --- a/client/src/components/Expenses/ExpenseForm.js +++ b/client/src/components/Expenses/ExpenseForm.js @@ -32,14 +32,14 @@ export default function ExpenseForm({ selectedPaymentAccount: null }); const validationSchema = Yup.object().shape({ - date: Yup.date().required(), - description: Yup.string().trim(), - expense_account_id: Yup.number().required(), - payment_account_id: Yup.number().required(), - amount: Yup.number().required(), - currency_code: Yup.string().required(), - publish: Yup.boolean(), - exchange_rate: Yup.number() + date: Yup.date().required().label(formatMessage({id:'date'})), + description: Yup.string().trim().label(formatMessage({id:'description'})), + expense_account_id: Yup.number().required().label(formatMessage({id:'expense_account_id'})), + payment_account_id: Yup.number().required().label(formatMessage({id:'payment_account_id'})), + amount: Yup.number().required().label(formatMessage({id:'amount'})), + currency_code: Yup.string().required().label(formatMessage({id:'currency_code_'})), + publish: Yup.boolean().label(formatMessage({id:'publish'})), + exchange_rate: Yup.number().label(formatMessage({id:'exchange_rate_'})) }); const formik = useFormik({ diff --git a/client/src/containers/Accounting/MakeJournalEntriesForm.js b/client/src/containers/Accounting/MakeJournalEntriesForm.js index 3115e8418..b663bd042 100644 --- a/client/src/containers/Accounting/MakeJournalEntriesForm.js +++ b/client/src/containers/Accounting/MakeJournalEntriesForm.js @@ -63,8 +63,8 @@ function MakeJournalEntriesForm({ }, [changePageTitle, changePageSubtitle, manualJournal]); const validationSchema = Yup.object().shape({ - journal_number: Yup.string().required(), - date: Yup.date().required(), + journal_number: Yup.string().required().label(formatMessage({id:'journal_number_'})), + date: Yup.date().required().label(formatMessage({id:'date'})), reference: Yup.string(), description: Yup.string(), entries: Yup.array().of( @@ -147,7 +147,7 @@ function MakeJournalEntriesForm({ // Validate the total credit should be eqials total debit. if (totalCredit !== totalDebit) { AppToaster.show({ - message: 'credit_and_debit_not_equal', + message: formatMessage({id:'credit_and_debit_not_equal'}), }); setSubmitting(false); return; diff --git a/client/src/containers/Authentication/InviteAccept.js b/client/src/containers/Authentication/InviteAccept.js index f7867965a..cb746408a 100644 --- a/client/src/containers/Authentication/InviteAccept.js +++ b/client/src/containers/Authentication/InviteAccept.js @@ -33,14 +33,14 @@ function Invite({ requestInviteAccept, requestInviteMetaByToken }) { }, [shown]); const ValidationSchema = Yup.object().shape({ - first_name: Yup.string().required(formatMessage({ id: 'required' })), - last_name: Yup.string().required(formatMessage({ id: 'required' })), + first_name: Yup.string().required().label(formatMessage({id:'first_name_'})), + last_name: Yup.string().required().label(formatMessage({id:'last_name_'})), phone_number: Yup.string() .matches() - .required(formatMessage({ id: 'required' })), + .required().label(formatMessage({id:''})), password: Yup.string() - .min(4, 'Password has to be longer than 4 characters!') - .required('Password is required!'), + .min(4) + .required().label(formatMessage({id:'password'})) }); const inviteMeta = useAsync(() => { diff --git a/client/src/containers/Authentication/Login.js b/client/src/containers/Authentication/Login.js index 47d33041d..fe6b47ce8 100644 --- a/client/src/containers/Authentication/Login.js +++ b/client/src/containers/Authentication/Login.js @@ -1,6 +1,8 @@ import React, { useMemo, useState } from 'react'; import { Link, useHistory } from 'react-router-dom'; import * as Yup from 'yup'; + + import { useFormik } from 'formik'; import { FormattedMessage as T, useIntl } from 'react-intl'; import { @@ -34,14 +36,15 @@ function Login({ const [shown, setShown] = useState(false); const passwordRevealer = () => { setShown(!shown); }; + // Validation schema. - const loginValidationSchema = Yup.object().shape({ + const loginValidationSchema = Yup.object().shape({ crediential: Yup.string() - .required(formatMessage({ id: 'required' })) - .email(formatMessage({ id: 'invalid_email_or_phone_number' })), + .required() + .email().label(formatMessage({id:'email'})), password: Yup.string() - .required(formatMessage({ id: 'required' })) - .min(4), + .required() + .min(4).label(formatMessage({id:'password'})) }); // Formik validation schema and submit handler. @@ -69,7 +72,7 @@ function Login({ const toastBuilders = []; if (errors.find((e) => e.type === ERRORS_TYPES.INVALID_DETAILS)) { toastBuilders.push({ - message: formatMessage({id:'email_and_password_entered_did_not_match'}), + message: formatMessage({ id: 'email_and_password_entered_did_not_match' }), intent: Intent.DANGER, }); } @@ -110,7 +113,7 @@ function Login({ } intent={(errors.crediential && touched.crediential) && Intent.DANGER} - helperText={} + helperText={} className={'form-group--crediential'} > - + } labelInfo={passwordRevealerTmp} intent={(errors.password && touched.password) && Intent.DANGER} - helperText={} - className={'form-group--password has-password-revealer'} + helperText={} + className={'form-group--password has-password-revealer'} > - +
- +
@@ -155,7 +158,7 @@ function Login({ - +
diff --git a/client/src/containers/Authentication/Register.js b/client/src/containers/Authentication/Register.js index fc7d9233c..3c89112c6 100644 --- a/client/src/containers/Authentication/Register.js +++ b/client/src/containers/Authentication/Register.js @@ -10,6 +10,7 @@ import { FormGroup, Spinner, } from '@blueprintjs/core'; + import { Row, Col } from 'react-grid-system'; import { Link, useHistory } from 'react-router-dom'; import withAuthenticationActions from './withAuthenticationActions'; @@ -29,18 +30,19 @@ function Register({ requestRegister }) { }, [shown]); const ValidationSchema = Yup.object().shape({ - organization_name: Yup.string().required(formatMessage({ id: 'required' })), - first_name: Yup.string().required(formatMessage({ id: 'required' })), - last_name: Yup.string().required(formatMessage({ id: 'required' })), + organization_name: Yup.string().required().label(formatMessage({id:'organization_name_'})), + first_name: Yup.string().required().label(formatMessage({id:'first_name_'})), + last_name: Yup.string().required().label(formatMessage({id:'last_name_'})), email: Yup.string() .email() - .required(formatMessage({ id: 'required' })), + .required() + .label(formatMessage({ id: 'email' })), phone_number: Yup.string() .matches() - .required(formatMessage({ id: 'required' })), + .required().label(formatMessage({id:'phone_number_'})), password: Yup.string() - .min(4, 'Password has to be longer than 8 characters!') - .required('Password is required!'), + .min(4) + .required().label(formatMessage({id:'password'})), }); const initialValues = useMemo( diff --git a/client/src/containers/Authentication/ResetPassword.js b/client/src/containers/Authentication/ResetPassword.js index 43d5d3f75..4a5d6ee4a 100644 --- a/client/src/containers/Authentication/ResetPassword.js +++ b/client/src/containers/Authentication/ResetPassword.js @@ -17,18 +17,21 @@ import withAuthenticationActions from './withAuthenticationActions'; import AuthInsider from 'containers/Authentication/AuthInsider'; import { FormattedMessage as T, useIntl } from 'react-intl'; + + function ResetPassword({ requestResetPassword }) { const { formatMessage } = useIntl(); const { token } = useParams(); const history = useHistory(); + const ValidationSchema = Yup.object().shape({ password: Yup.string() - .min(4, 'Password has to be longer than 4 characters!') - .required('Password is required!'), + .min(4) + .required().label(formatMessage({id:'password'})), confirm_password: Yup.string() - .oneOf([Yup.ref('password'), null], 'Passwords must match') - .required('Confirm Password is required'), + .oneOf([Yup.ref('password'), null]) + .required().label(formatMessage({id:'confirm_password'})), }); const initialValues = useMemo( diff --git a/client/src/containers/Authentication/SendResetPassword.js b/client/src/containers/Authentication/SendResetPassword.js index f352760f7..e551734b0 100644 --- a/client/src/containers/Authentication/SendResetPassword.js +++ b/client/src/containers/Authentication/SendResetPassword.js @@ -4,7 +4,6 @@ import { useFormik } from 'formik'; import { FormattedMessage as T, useIntl } from 'react-intl'; import { Link, useHistory } from 'react-router-dom'; import { Button, InputGroup, Intent, FormGroup } from '@blueprintjs/core'; -import { FormattedMessage } from 'react-intl'; import { compose } from 'utils'; @@ -21,9 +20,9 @@ function SendResetPassword({ requestSendResetPassword }) { // Validation schema. const ValidationSchema = Yup.object().shape({ - crediential: Yup.string('') - .required(formatMessage({ id: 'required' })) - .email(formatMessage({ id: 'invalid_email_or_phone_numner' })), + crediential: Yup.string() + .required() + .email().label(formatMessage({id:''})), }); const initialValues = useMemo( diff --git a/client/src/containers/Dialogs/AccountFormDialog.js b/client/src/containers/Dialogs/AccountFormDialog.js index 3e7f8b31b..e358208e1 100644 --- a/client/src/containers/Dialogs/AccountFormDialog.js +++ b/client/src/containers/Dialogs/AccountFormDialog.js @@ -52,11 +52,11 @@ function AccountFormDialog({ }) { const { formatMessage } = useIntl(); const accountFormValidationSchema = Yup.object().shape({ - name: Yup.string().required(formatMessage({ id: 'required' })), + name: Yup.string().required().label(formatMessage({id:'account_name_'})), code: Yup.number(), account_type_id: Yup.string() .nullable() - .required(formatMessage({ id: 'required' })), + .required().label(formatMessage({id:'account_type_id'})), description: Yup.string().trim() }); diff --git a/client/src/containers/Dialogs/CurrencyDialog.js b/client/src/containers/Dialogs/CurrencyDialog.js index bb7872aac..51ea46fb2 100644 --- a/client/src/containers/Dialogs/CurrencyDialog.js +++ b/client/src/containers/Dialogs/CurrencyDialog.js @@ -46,13 +46,11 @@ function CurrencyDialog({ }) { const {formatMessage} = useIntl(); - const ValidationSchema = Yup.object().shape({ - currency_name: Yup.string().required( - formatMessage({ id: 'required' }) - ), + const validationSchema = Yup.object().shape({ + currency_name: Yup.string().required().label(formatMessage({id:'currency_name_'})), currency_code: Yup.string() .max(4) - .required(formatMessage({ id: 'required' })), + .required().label(formatMessage({id:'currency_code_'})), }); const initialValues = useMemo(() => ({ currency_name: '', @@ -63,9 +61,9 @@ function CurrencyDialog({ values, errors, touched, + isSubmitting, setFieldValue, getFieldProps, - isSubmitting, handleSubmit, resetForm, } = useFormik({ @@ -74,13 +72,13 @@ function CurrencyDialog({ ...(payload.action === 'edit' && pick(currency, Object.keys(initialValues))), }, - validationSchema: ValidationSchema, + validationSchema: validationSchema, onSubmit: (values, { setSubmitting }) => { if (payload.action === 'edit') { requestEditCurrency(currency.id, values).then((response) => { closeDialog(name); AppToaster.show({ - message: 'the_currency_has_been_edited', + message: formatMessage({id:'the_currency_has_been_successfully_edited'}), intent: Intent.SUCCESS, }); setSubmitting(false); @@ -92,7 +90,7 @@ function CurrencyDialog({ requestSubmitCurrencies(values).then((response) => { closeDialog(name); AppToaster.show({ - message: 'the_currency_has_been_submit', + message: formatMessage({id:'the_currency_has_been_successfully_created'}), intent: Intent.SUCCESS, }); setSubmitting(false); diff --git a/client/src/containers/Dialogs/ExchangeRateDialog.js b/client/src/containers/Dialogs/ExchangeRateDialog.js index 574e4ed5f..7541a572d 100644 --- a/client/src/containers/Dialogs/ExchangeRateDialog.js +++ b/client/src/containers/Dialogs/ExchangeRateDialog.js @@ -49,9 +49,9 @@ function ExchangeRateDialog({ const [selectedItems, setSelectedItems] = useState({}); const validationSchema = Yup.object().shape({ - exchange_rate: Yup.number().required(), - currency_code: Yup.string().max(3).required(), - date: Yup.date().required(), + exchange_rate: Yup.number().required().label(formatMessage({id:'exchange_rate_'})), + currency_code: Yup.string().max(3).required(formatMessage({id:'currency_code_'})), + date: Yup.date().required().label(formatMessage({id:'date'})), }); const initialValues = useMemo(() => ({ diff --git a/client/src/containers/Dialogs/InviteUserDialog.js b/client/src/containers/Dialogs/InviteUserDialog.js index e6406bae3..dab39129c 100644 --- a/client/src/containers/Dialogs/InviteUserDialog.js +++ b/client/src/containers/Dialogs/InviteUserDialog.js @@ -37,12 +37,12 @@ function InviteUserDialog({ }, false); const validationSchema = Yup.object().shape({ - first_name: Yup.string().required(formatMessage({ id: 'required' })), - last_name: Yup.string().required(formatMessage({ id: 'required' })), + first_name: Yup.string().required().label(formatMessage({id:'first_name_'})), + last_name: Yup.string().required().label(formatMessage({id:'last_name_'})), email: Yup.string() .email() - .required(formatMessage({ id: 'required' })), - phone_number: Yup.number().required(formatMessage({ id: 'required' })), + .required().label(formatMessage({id:'email'})), + phone_number: Yup.number().required().label(formatMessage({id:'phone_number_'})), }); const initialValues = useMemo( diff --git a/client/src/containers/Dialogs/ItemCategoryDialog.js b/client/src/containers/Dialogs/ItemCategoryDialog.js index 47c8c2b07..8d08ba943 100644 --- a/client/src/containers/Dialogs/ItemCategoryDialog.js +++ b/client/src/containers/Dialogs/ItemCategoryDialog.js @@ -61,7 +61,7 @@ function ItemCategoryDialog({ () => requestFetchItemCategories()); const validationSchema = Yup.object().shape({ - name: Yup.string().required(), + name: Yup.string().required().label(formatMessage({id:'category_name_'})), parent_category_id: Yup.string().nullable(), description: Yup.string().trim() }); diff --git a/client/src/containers/Dialogs/ItemFromDialog.js b/client/src/containers/Dialogs/ItemFromDialog.js index 3e50cf87d..9f84a5b31 100644 --- a/client/src/containers/Dialogs/ItemFromDialog.js +++ b/client/src/containers/Dialogs/ItemFromDialog.js @@ -30,7 +30,7 @@ function ItemFromDialog({ const [state, setState] = useState({}); const { formatMessage } = useIntl(); const ValidationSchema = Yup.object().shape({ - name: Yup.string().required(formatMessage({ id: 'required' })), + name: Yup.string().required().label(formatMessage({id:'category_name_'})), description: Yup.string().trim(), }); diff --git a/client/src/containers/Dialogs/UserFormDialog.js b/client/src/containers/Dialogs/UserFormDialog.js index 506426eef..32e89206c 100644 --- a/client/src/containers/Dialogs/UserFormDialog.js +++ b/client/src/containers/Dialogs/UserFormDialog.js @@ -36,7 +36,7 @@ function UserFormDialog({ }, false); const validationSchema = Yup.object().shape({ - email: Yup.string().email().required(), + email: Yup.string().email().required().label(formatMessage({id:'email'})), }); const initialValues = { diff --git a/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js b/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js index 3ac70aafa..405ae1a4d 100644 --- a/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js +++ b/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js @@ -31,8 +31,8 @@ export default function BalanceSheetHeader({ to_date: moment(pageFilter.to_date).toDate(), }, validationSchema: Yup.object().shape({ - from_date: Yup.date().required(), - to_date: Yup.date().min(Yup.ref('from_date')).required(), + from_date: Yup.date().required().label(formatMessage({id:'from_data'})), + to_date: Yup.date().min(Yup.ref('from_date')).required().label(formatMessage({id:'to_date'})), }), onSubmit: (values, actions) => { onSubmitFilter(values); diff --git a/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js b/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js index 7b1cd5bc5..ecc26e04d 100644 --- a/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js +++ b/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js @@ -26,8 +26,8 @@ export default function JournalHeader({ to_date: moment(pageFilter.to_date).toDate() }, validationSchema: Yup.object().shape({ - from_date: Yup.date().required(), - to_date: Yup.date().min(Yup.ref('from_date')).required(), + from_date: Yup.date().required().label(formatMessage({id:'from_date'})), + to_date: Yup.date().min(Yup.ref('from_date')).required().label(formatMessage({id:'to_date'})), }), onSubmit: (values, actions) => { onSubmitFilter(values); diff --git a/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetHeader.js b/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetHeader.js index e9175db50..c01845dc2 100644 --- a/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetHeader.js +++ b/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetHeader.js @@ -25,8 +25,8 @@ export default function TrialBalanceSheetHeader({ to_date: moment(pageFilter.to_date).toDate() }, validationSchema: Yup.object().shape({ - from_date: Yup.date().required(), - to_date: Yup.date().min(Yup.ref('from_date')).required(), + from_date: Yup.date().required().label(formatMessage({id:'from_date'})), + to_date: Yup.date().min(Yup.ref('from_date')).required().label(formatMessage({id:'to_date'})), }), onSubmit: (values, { setSubmitting }) => { onSubmitFilter(values); diff --git a/client/src/containers/Items/ItemForm.js b/client/src/containers/Items/ItemForm.js index 6fd9362f9..767e6c706 100644 --- a/client/src/containers/Items/ItemForm.js +++ b/client/src/containers/Items/ItemForm.js @@ -67,13 +67,13 @@ const ItemForm = ({ const validationSchema = Yup.object().shape({ active: Yup.boolean(), - name: Yup.string().required(), - type: Yup.string().trim().required(), + name: Yup.string().required().label(formatMessage({id:'item_name_'})), + type: Yup.string().trim().required().label(formatMessage({id:'item_type_'})), sku: Yup.string().trim(), cost_price: Yup.number(), sell_price: Yup.number(), - cost_account_id: Yup.number().required(), - sell_account_id: Yup.number().required(), + cost_account_id: Yup.number().required().label(formatMessage({id:'cost_account_id'})), + sell_account_id: Yup.number().required().label(formatMessage({id:'sell_account_id'})), inventory_account_id: Yup.number().when('type', { is: (value) => value === 'inventory', then: Yup.number().required(), diff --git a/client/src/containers/Preferences/General/General.js b/client/src/containers/Preferences/General/General.js index ac9df8c09..a268c107c 100644 --- a/client/src/containers/Preferences/General/General.js +++ b/client/src/containers/Preferences/General/General.js @@ -32,7 +32,7 @@ function GeneralPreferences({ requestSubmitOptions, requestFetchOptions, }) { - const intl = useIntl(); + const {formatMessage} = useIntl(); const [selectedItems, setSelectedItems] = useState({}); const [timeZone, setTimeZone] = useState(''); @@ -65,16 +65,16 @@ function GeneralPreferences({ ]; const validationSchema = Yup.object().shape({ - name: Yup.string().required(intl.formatMessage({ id: 'required' })), - industry: Yup.string().required(intl.formatMessage({ id: 'required' })), - location: Yup.string().required(intl.formatMessage({ id: 'required' })), + name: Yup.string().required().label(formatMessage({id:'organization_name_'})), + industry: Yup.string().required().label(formatMessage({id:'organization_industry_'})), + location: Yup.string().required().label(formatMessage({id:'location'})), base_currency: Yup.string().required( - intl.formatMessage({ id: 'required' }) + formatMessage({ id: 'required' }) ), - fiscal_year: Yup.string().required(intl.formatMessage({ id: 'required' })), - language: Yup.string().required(intl.formatMessage({ id: 'required' })), - // time_zone: Yup.object().required(intl.formatMessage({ id: 'required' })), - date_format: Yup.date().required(intl.formatMessage({ id: 'required' })), + fiscal_year: Yup.string().required().label(formatMessage({id:'base_currency_'})), + language: Yup.string().required().label(formatMessage({id:'language'})), + // time_zone: Yup.object().required()..label(formatMessage({id:''})), + date_format: Yup.date().required().label(formatMessage({id:'date_format_'})), }); const { diff --git a/client/src/index.js b/client/src/index.js index f2ae83e6f..4db7f18b1 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -6,7 +6,12 @@ import App from 'components/App'; import * as serviceWorker from 'serviceWorker'; import createStore from 'store/createStore'; import AppProgress from 'components/NProgress/AppProgress'; +import { setLocale } from 'yup'; +import {locale} from 'lang/en/locale'; + + +setLocale(locale) ReactDOM.render( diff --git a/client/src/lang/en/index.js b/client/src/lang/en/index.js index 9e1dbf9b5..0760e8181 100644 --- a/client/src/lang/en/index.js +++ b/client/src/lang/en/index.js @@ -1,10 +1,10 @@ export default { hello_world: 'Hello World', - email_or_phone_number: 'Email or phone number', + 'email_or_phone_number': 'Email or phone number', password: 'Password', login: 'Login', invalid_email_or_phone_number: 'Invalid email or phone number.', - required: 'Required', + 'required': 'Required', reset_password: 'Reset Password', the_user_has_been_suspended_from_admin: 'The user has been suspended from the administrator.', email_and_password_entered_did_not_match: @@ -75,7 +75,6 @@ export default { new_exchange_rate: 'New Exchange Rate', delete_exchange_rate: 'Delete Exchange Rate', exchange_rate: 'Exchange Rate', - currency_code: 'Currency Code', edit_invite: 'Edit invite', edit_category: 'Edit Category', delete_category: 'Delete Category', @@ -116,7 +115,7 @@ export default { cancel: 'Cancel', move_to_trash: 'Move to Trash', save_new: 'Save & New', - journal_number: 'Journal number', + journal_number: 'Journal Number', credit_currency: 'Credit ({currency})', debit_currency: 'Debit ({currency})', note: 'Note', @@ -292,16 +291,35 @@ run_report:'Run Report', num:'Num.', acc_code:'Acc. Code', display_report_columns:'Display report columns', -select_display_columns_by:'Select display columns by...' - - - - - - - - +select_display_columns_by:'Select display columns by...', +credit_and_debit_not_equal:'credit and debit not equal', +the_currency_has_been_successfully_edited:'The currency has been successfully edited', +the_currency_has_been_successfully_created:'The currency has been successfully created', +// Name Labels +expense_account_id :'Expense account', +payment_account_id: 'Payment account', +currency_code_: 'Currency code', +publish:'Publish', +exchange_rate_:'Exchange rate', +journal_number_:'Journal number', +first_name_: 'First name', +last_name_:'Last name', +phone_number_:'Phone number', +organization_name_:'Organization name', +confirm_password:'Confirm password', +crediential:'Email or Phone number', +account_type_id:'Account type', +account_name_:'Account name', +currency_name_:'Currency name', +cost_account_id:'Cost account', +sell_account_id:'Sell account', +item_type_:'Item type', +item_name_:'Item name', +organization_industry_:'Organization industry', +base_currency_:'Base currency', +date_format_:'Date format', +view_name_:'View name' }; diff --git a/client/src/lang/en/locale.js b/client/src/lang/en/locale.js new file mode 100644 index 000000000..132f85bb6 --- /dev/null +++ b/client/src/lang/en/locale.js @@ -0,0 +1,60 @@ +import printValue from '../printValue'; +export const locale = { + + mixed: { + default: "${path} is invalid", + required: "${path} is a required field ", + oneOf: "${path} must be one of the following values: ${values}", + notOneOf: "${path} must not be one of the following values: ${values}", + notType: ({ path, type, value, originalValue }) => { + let isCast = originalValue != null && originalValue !== value; + let msg = + `${path} must beeeeee a \`${type}\` type, ` + + `but the final value was: \`${printValue(value, true)}\`` + + (isCast + ? ` (cast from the value \`${printValue(originalValue, true)}\`).` + : '.'); + + if (value === null) { + msg += `\n If "null" is intended as an empty value be sure to mark the schema as \`.nullable()\``; + } + + return msg; + }, + defined: '${path} must be defined', + }, + string: { + length: "${path} must be exactly ${length} characters", + min: "${path} must be at least ${min} characters", + max: "${path} must be at most ${max} characters", + matches: '${path} must match the following: "${regex}"', + email: "${path} must be a valid email", + url: "${path} must be a valid URL", + trim: "${path} must be a trimmed string", + lowercase: "${path} must be a lowercase string", + uppercase: "${path} must be a upper case string" + }, + number: { + min: "${path} must be greater than or equal to ${min}", + max: "${path} must be less than or equal to ${max}", + lessThan: "${path} must be less than ${less}", + moreThan: "${path} must be greater than ${more}", + notEqual: "${path} must be not equal to ${notEqual}", + positive: "${path} must be a positive number", + negative: "${path} must be a negative number", + integer: "${path} must be an integer" + }, + date: { + min: "${path} field must be later than ${min}", + max: "${path} field must be at earlier than ${max}" + }, + boolean : {}, + object: { + noUnknown: + "${path} field cannot have keys not specified in the object shape" + }, + array: { + min: "${path} field must have at least ${min} items", + max: "${path} field must have less than or equal to ${max} items" + } +}; diff --git a/client/src/lang/printValue.js b/client/src/lang/printValue.js new file mode 100644 index 000000000..3bf5f0a6f --- /dev/null +++ b/client/src/lang/printValue.js @@ -0,0 +1,48 @@ +const toString = Object.prototype.toString; +const errorToString = Error.prototype.toString; +const regExpToString = RegExp.prototype.toString; +const symbolToString = + typeof Symbol !== 'undefined' ? Symbol.prototype.toString : () => ''; +const SYMBOL_REGEXP = /^Symbol\((.*)\)(.*)$/; + +function printNumber(val) { + if (val != +val) return 'NaN'; + const isNegativeZero = val === 0 && 1 / val < 0; + return isNegativeZero ? '-0' : '' + val; +} + +function printSimpleValue(val, quoteStrings = false) { + if (val == null || val === true || val === false) return '' + val; + + const typeOf = typeof val; + if (typeOf === 'number') return printNumber(val); + if (typeOf === 'string') return quoteStrings ? `"${val}"` : val; + if (typeOf === 'function') + return '[Function ' + (val.name || 'anonymous') + ']'; + if (typeOf === 'symbol') + return symbolToString.call(val).replace(SYMBOL_REGEXP, 'Symbol($1)'); + + const tag = toString.call(val).slice(8, -1); + if (tag === 'Date') + return isNaN(val.getTime()) ? '' + val : val.toISOString(val); + if (tag === 'Error' || val instanceof Error) + return '[' + errorToString.call(val) + ']'; + if (tag === 'RegExp') return regExpToString.call(val); + + return null; +} + +export default function printValue(value, quoteStrings) { + let result = printSimpleValue(value, quoteStrings); + if (result !== null) return result; + + return JSON.stringify( + value, + function(key, value) { + let result = printSimpleValue(this[key], quoteStrings); + if (result !== null) return result; + return value; + }, + 2, + ); +} \ No newline at end of file