Merge branch 'feature/draft' of https://github.com/bigcapitalhq/client

src/routes/dashboard.js

@@ -785,6 +785,13 @@ export const getDashboardRoutes = () => [
     subscriptionActive: [SUBSCRIPTION_TYPE.MAIN],
     defaultSearchResource: RESOURCES_TYPES.ACCOUNT,
   },
+  {
+    path: `/transactions-locking`,
+    component: lazy(() =>
+      import('../containers/TransactionsLocking/TransactionsLockingList'),
+    ),
+    pageTitle: intl.get('sidebar.transactions_locaking'),
+  },
   // Homepage
   {
     path: `/`,

src/routes/preferences.js

@@ -1,5 +1,6 @@
 import General from 'containers/Preferences/General/General';
-import Users from 'containers/Preferences/Users/Users';
+import Users from '../containers/Preferences/Users/Users';
+import Roles from '../containers/Preferences/Users/Roles/RolesForm/RolesFormPage';
 import Accountant from 'containers/Preferences/Accountant/Accountant';
 // import Accounts from 'containers/Preferences/Accounts/Accounts';
 import Currencies from 'containers/Preferences/Currencies/Currencies';
@@ -20,6 +21,16 @@ export default [
     component: Users,
     exact: true,
   },
+  {
+    path: `${BASE_URL}/roles`,
+    component: Roles,
+    exact: true,
+  },
+  {
+    path: `${BASE_URL}/roles/:id`,
+    component: Roles,
+    exact: true,
+  },
   {
     path: `${BASE_URL}/currencies`,
     component: Currencies,

src/routes/preferencesTabs.js

@@ -1,30 +1,20 @@
 // import AccountsCustomFields from "containers/Preferences/AccountsCustomFields";
-import UsersList from 'containers/Preferences/Users/UsersList';
-import RolesList from 'containers/Preferences/Users/RolesList';
+import UsersList from '../containers/Preferences/Users/UsersList';
+import RolesList from '../containers/Preferences/Users/Roles/RolesLanding/RolesList';
 
 export default {
-  accounts: [
-    // {
-    //   path: '',
-    //   component: AccountsCustomFields,
-    //   exact: true,
-    // },
-    // {
-    //   path: 'custom_fields',
-    //   component: AccountsCustomFields,
-    //   exact: true,
-    // },
-  ],
   users: [
     {
       path: '',
       component: UsersList,
       exact: true,
     },
+  ],
+  roles: [
     {
-      path: '/roles',
+      path: '',
       component: RolesList,
       exact: true,
     },
   ],
-} 
+};