WIP feature/ Dashboard_breadcrumbs & fix_localize

client/src/components/Breadcrumbs.js

@@ -12,15 +12,6 @@ const PureBreadcrumbs = ({ breadcrumbs }) => (
       </span>
     ))}
   </div>
-
-  // <div>
-  //   {breadcrumbs.map(({ breadcrumb, match }, index) => (
-  //     <div key={match.url}>
-  //       <Link to={match.url || ""}>{breadcrumb}</Link>
-  //       {index < breadcrumbs.length - 1 && ">"}
-  //     </div>
-  //   ))}
-  // </div>
 );
-
+  
 export default withBreadcrumbs(routes)(PureBreadcrumbs);

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 <a className={Classes.BREADCRUMB}>{props.text}</a>;
-    } else {
-      return (
+function DashboardBreadcrumbs({breadcrumbs}){
+
+  const renderBreadcrumb =(props)=>{
+
+    if(props.href != null){
+
+    return <a className={Classes.BREADCRUMB}>{props.text}</a>;
+    }else{
+
+      return(
         <span
-          className={classNames(Classes.BREADCRUMB, Classes.BREADCRUMB_CURRENT)}
-        >
+        className={classNames(Classes.BREADCRUMB, Classes.BREADCRUMB_CURRENT)}>
+
           {props.text}
         </span>
-      );
+      )
     }
   }
-  return (
-    <CollapsibleList
-      className={Classes.BREADCRUMBS}
-      dropdownTarget={<span className={Classes.BREADCRUMBS_COLLAPSED} />}
-      visibleItemRenderer={renderBreadcrumb}
-      collapseFrom={Boundary.START}
-      visibleItemCount={0}
-    >
-      <MenuItem icon='folder-close' text='All files' href='#' />
-      <MenuItem icon='folder-close' text='Users' href='#' />
-      <MenuItem icon='folder-close' text='Jane Person' href='#' />
-      <MenuItem icon='folder-close' text='My documents' href='#' />
-      <MenuItem icon='folder-close' text='Classy dayjob' href='#' />
-      <MenuItem icon='document' text='How to crush it' />
-    </CollapsibleList>
-  );
+  return(
+<CollapsibleList
+   className={Classes.BREADCRUMBS}
+   dropdownTarget={<span className={Classes.BREADCRUMBS_COLLAPSED} />}
+   visibleItemRenderer={renderBreadcrumb}
+   collapseFrom={Boundary.START}
+   visibleItemCount={0}>
+
+     {
+       breadcrumbs.map(({breadcrumb,match},index)=>{
+
+        return <MenuItem key={match.url} icon={'folder-close'} text={breadcrumb} href={match.url} />
+       })
+     }
+</CollapsibleList>
+
+  )
 }
+
+export default withBreadcrumbs(routes)(DashboardBreadcrumbs)

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({