wip

Jovert Lota Palonpon · Jovert Lota Palonpon · commit 0c65958b3413 · 2019-03-23T11:43:04.000+08:00
diff --git a/public/assets.json b/public/assets.json
@@ -1,4 +1,4 @@
 {
-  "js/backoffice.js": "js/backoffice.bundle.d6fa66824614d8eea736.js",
+  "js/backoffice.js": "js/backoffice.bundle.997a6e48e5aeafd35415.js",
   "js/vendor.js": "js/vendor.bundle.60bab7ed0c4b898e6cd4.js"
 }
diff --git a/public/js/backoffice.bundle.997a6e48e5aeafd35415.js b/public/js/backoffice.bundle.997a6e48e5aeafd35415.js
diff --git a/resources/js/Backoffice.js b/resources/js/Backoffice.js
@@ -3,10 +3,10 @@ import { HashRouter as Router } from 'react-router-dom';
 import { withWidth, CssBaseline, MuiThemeProvider } from '@material-ui/core';
 
 import { Navigator } from './core';
-import { ROUTES } from './config/routes';
+import { ROUTES } from './config';
 import { _route } from './utils/Navigation';
 import { _queryString } from './utils/URL';
-import { theme } from './themes/backoffice';
+import { backofficeTheme as theme } from './themes';
 import { Loading } from './views';
 
 class Backoffice extends Component {
diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js
@@ -2,7 +2,7 @@ import axios from 'axios';
 import moment from 'moment';
 import Lang from 'lang.js';
 
-import { LOCALE } from './config/locale';
+import { LOCALE } from './config';
 
 /**
  * We registered axios so that we don't have to import it all the time.
diff --git a/resources/js/config/app.js b/resources/js/config/app.js
@@ -1,3 +1,3 @@
-export const APP = {
+export default {
     name: 'LaReact',
 };
diff --git a/resources/js/config/index.js b/resources/js/config/index.js
@@ -1,3 +1,3 @@
-export { APP } from './app';
-export { LOCALE } from './locale';
-export { ROUTES } from './routes';
+export { default as APP } from './app';
+export { default as LOCALE } from './locale';
+export { default as ROUTES } from './routes';
diff --git a/resources/js/config/locale.js b/resources/js/config/locale.js
@@ -1,4 +1,4 @@
-export const LOCALE = {
+export default {
     // English
     'en.navigation': require('../../lang/en/navigation.php'),
     'en.resources': require('../../lang/en/resources.php'),
diff --git a/resources/js/config/routes.js b/resources/js/config/routes.js
@@ -1,7 +1,7 @@
 import * as Views from '../views';
-import { BACKOFFICE_ROUTES } from '../routers/backoffice';
+import { BACKOFFICE_ROUTES } from '../routers';
 
-export const ROUTES = [
+export default [
     {
         name: 'auth.signin',
         path: '/signin',
diff --git a/resources/js/core/Navigator.js b/resources/js/core/Navigator.js
@@ -5,7 +5,7 @@ import { withRouter, Route, Switch, Redirect } from 'react-router-dom';
 import { _route } from '../utils/Navigation';
 import { _queryString } from '../utils/URL';
 
-const WrappableNavigator = props => {
+const Navigator = props => {
     const { authenticated, username, environment, routes } = props.pageProps;
 
     return (
@@ -53,8 +53,8 @@ const WrappableNavigator = props => {
     );
 };
 
-WrappableNavigator.propTypes = {
+Navigator.propTypes = {
     pageProps: PropTypes.object,
 };
 
-export const Navigator = withRouter(WrappableNavigator);
+export default withRouter(Navigator);
diff --git a/resources/js/core/index.js b/resources/js/core/index.js
@@ -1 +1 @@
-export { Navigator } from './Navigator';
+export { default as Navigator } from './Navigator';
diff --git a/resources/js/models/User.js b/resources/js/models/User.js
@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-export class User {
+export default class User {
     /**
      * Fetch a paginated user list.
      *
@@ -19,4 +19,4 @@ export class User {
 
         return response.data;
     }
-}
+}
diff --git a/resources/js/models/index.js b/resources/js/models/index.js
@@ -0,0 +1 @@
+export { default as User } from './User';
diff --git a/resources/js/routers/backoffice.js b/resources/js/routers/backoffice.js
@@ -1,6 +1,6 @@
 import * as BackofficeViews from '../views/__backoffice';
 
-export const BACKOFFICE_ROUTES = [
+export default [
     {
         name: 'home',
         path: '/',
@@ -32,4 +32,4 @@ export const BACKOFFICE_ROUTES = [
     route.name = `backoffice.${route.name}`;
 
     return route;
-});
+});
diff --git a/resources/js/routers/index.js b/resources/js/routers/index.js
@@ -0,0 +1 @@
+export { default as BACKOFFICE_ROUTES } from './backoffice';
diff --git a/resources/js/themes/backoffice.js b/resources/js/themes/backoffice.js
@@ -134,4 +134,4 @@ theme = {
     },
 };
 
-export { theme };
+export default theme;
diff --git a/resources/js/themes/index.js b/resources/js/themes/index.js
@@ -0,0 +1 @@
+export { default as backofficeTheme } from './backoffice';
diff --git a/resources/js/ui/Table.js b/resources/js/ui/Table.js
@@ -15,8 +15,7 @@ import {
     Tooltip,
 } from '@material-ui/core';
 
-import { TableToolbar } from './TableToolbar/TableToolbar';
-import { TablePaginationActions } from './TablePaginationActions';
+import { TableToolbar, TablePaginationActions } from './';
 
 const Table = props => {
     const {
@@ -186,6 +185,4 @@ const styles = theme => ({
     },
 });
 
-const Styled = withStyles(styles)(Table);
-
-export { Styled as Table };
+export default withStyles(styles)(Table);
diff --git a/resources/js/ui/TablePaginationActions.js b/resources/js/ui/TablePaginationActions.js
@@ -109,4 +109,4 @@ TablePaginationActions.propTypes = {
     rowsPerPage: PropTypes.number.isRequired,
 };
 
-export { TablePaginationActions };
+export default TablePaginationActions;
diff --git a/resources/js/ui/TableToolbar/Forms/Filter.js b/resources/js/ui/TableToolbar/Forms/Filter.js
@@ -300,4 +300,4 @@ Filter = withStyles(
 
 Filter = withFormik({})(Filter);
 
-export { Filter };
+export default Filter;
diff --git a/resources/js/ui/TableToolbar/TableToolbar.js b/resources/js/ui/TableToolbar/TableToolbar.js
@@ -27,7 +27,7 @@ import {
 import { FilterList as FilterListIcon } from '@material-ui/icons';
 
 import { _uppercaseFirst } from '../../utils/String';
-import { Filter as FilterForm } from './Forms/Filter';
+import FilterForm from './Forms/Filter';
 
 class TableToolbar extends Component {
     state = {
@@ -205,7 +205,7 @@ TableToolbar.propTypes = {
     onFilterRemove: PropTypes.func,
 };
 
-const StyledTableToolbar = withStyles(
+export default withStyles(
     theme => ({
         title: {
             flex: '0 0 auto',
@@ -241,5 +241,3 @@ const StyledTableToolbar = withStyles(
     }),
     { withTheme: true },
 )(TableToolbar);
-
-export { StyledTableToolbar as TableToolbar };
diff --git a/resources/js/ui/index.js b/resources/js/ui/index.js
@@ -1,3 +1,3 @@
-export { Table } from './Table';
-export { TableToolbar } from './TableToolbar/TableToolbar';
-export { TablePaginationActions } from './TablePaginationActions';
+export { default as Table } from './Table';
+export { default as TableToolbar } from './TableToolbar/TableToolbar';
+export { default as TablePaginationActions } from './TablePaginationActions';
diff --git a/resources/js/views/Loading.js b/resources/js/views/Loading.js
@@ -47,6 +47,4 @@ const styles = theme => ({
     },
 });
 
-const Styled = withStyles(styles)(Loading);
-
-export { Styled as Loading };
+export default withStyles(styles)(Loading);
diff --git a/resources/js/views/__backoffice/users/List.js b/resources/js/views/__backoffice/users/List.js
@@ -9,7 +9,7 @@ import { _color } from '../../../utils/Random';
 import { _queryParams, _queryString } from '../../../utils/URL';
 import { Table } from '../../../ui';
 import { MasterLayout } from '../';
-import { User } from '../../../models/User';
+import { User } from '../../../models';
 
 class List extends Component {
     state = {
diff --git a/resources/js/views/index.js b/resources/js/views/index.js
@@ -1,11 +1,11 @@
-export { Auth as AuthLayout } from './layouts/Auth';
-export { Error as ErrorLayout } from './layouts/Error';
+export { default as AuthLayout } from './layouts/Auth';
+export { default as ErrorLayout } from './layouts/Error';
 
 export { SignIn as AuthSignin } from './auth/SignIn';
 export {
     PasswordRequest as AuthPasswordRequest,
 } from './auth/passwords/Request';
 export { PasswordReset as AuthPasswordReset } from './auth/passwords/Reset';
 
-export { Loading } from './Loading';
+export { default as Loading } from './Loading';
 export { NotFound as ErrorNotFound } from './errors/NotFound';
diff --git a/resources/js/views/layouts/Auth.js b/resources/js/views/layouts/Auth.js
@@ -137,6 +137,4 @@ const styles = theme => ({
     },
 });
 
-const Styled = withStyles(styles)(Auth);
-
-export { Styled as Auth };
+export default withStyles(styles)(Auth);
diff --git a/resources/js/views/layouts/Error.js b/resources/js/views/layouts/Error.js
@@ -18,6 +18,4 @@ const styles = theme => ({
     },
 });
 
-const Styled = withStyles(styles)(Error);
-
-export { Styled as Error };
+export default withStyles(styles)(Error);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "js/backoffice.js": "js/backoffice.bundle.d6fa66824614d8eea736.js",`
	`2`	`+ "js/backoffice.js": "js/backoffice.bundle.997a6e48e5aeafd35415.js",`
`3`	`3`	`"js/vendor.js": "js/vendor.bundle.60bab7ed0c4b898e6cd4.js"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export const LOCALE = {`
	`1`	`+export default {`
`2`	`2`	`// English`
`3`	`3`	`'en.navigation': require('../../lang/en/navigation.php'),`
`4`	`4`	`'en.resources': require('../../lang/en/resources.php'),`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import * as Views from '../views';`
`2`		`-import { BACKOFFICE_ROUTES } from '../routers/backoffice';`
	`2`	`+import { BACKOFFICE_ROUTES } from '../routers';`
`3`	`3`
`4`		`-export const ROUTES = [`
	`4`	`+export default [`
`5`	`5`	`{`
`6`	`6`	`name: 'auth.signin',`
`7`	`7`	`path: '/signin',`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export { Navigator } from './Navigator';`
	`1`	`+export { default as Navigator } from './Navigator';`