wip (#50)

Jovert Lota Palonpon · web-flow · commit 86f718e4fd01 · 2019-04-28T22:13:39.000+08:00
diff --git a/resources/js/core/Navigator.js b/resources/js/core/Navigator.js
@@ -24,10 +24,10 @@ const Navigator = props => {
                                     return (
                                         <Redirect
                                             to={{
-                                                search: UrlUtils._queryString({
+                                                search: UrlUtils.queryString({
                                                     username,
                                                 }),
-                                                pathname: NavigationUtils._route(
+                                                pathname: NavigationUtils.route(
                                                     'auth.signin',
                                                 ),
                                             }}
@@ -40,7 +40,7 @@ const Navigator = props => {
                                 if (authenticated) {
                                     return (
                                         <Redirect
-                                            to={NavigationUtils._route(
+                                            to={NavigationUtils.route(
                                                 `${environment}.home`,
                                             )}
                                         />
diff --git a/resources/js/index.backoffice.js b/resources/js/index.backoffice.js
@@ -3,7 +3,7 @@ import './bootstrap';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import { _register as registerServiceWorker } from './utils/ServiceWorker';
+import { register as registerServiceWorker } from './utils/ServiceWorker';
 import App from './App';
 import { dark as darkTheme, light as lightTheme } from './themes/backoffice';
 
diff --git a/resources/js/utils/Navigation.js b/resources/js/utils/Navigation.js
@@ -8,7 +8,7 @@ import * as UrlUtils from '../utils/URL';
  * @param {object} segmentParams
  * @param {object} queryParams
  */
-export function _route(name, segmentParams = {}, queryParams = {}) {
+export function route(name, segmentParams = {}, queryParams = {}) {
     const i = ROUTES.findIndex(route => route.name === name);
 
     if (i < 0) {
@@ -31,7 +31,7 @@ export function _route(name, segmentParams = {}, queryParams = {}) {
 
     // We will append a query string if there are query parameters provided.
     if (segmentParams && Object.values(segmentParams).length > 0) {
-        routePath = `${routePath}${UrlUtils._queryString(queryParams)}`;
+        routePath = `${routePath}${UrlUtils.queryString(queryParams)}`;
     }
 
     return routePath;
diff --git a/resources/js/utils/Random.js b/resources/js/utils/Random.js
@@ -5,7 +5,7 @@
  *
  * @return {string}
  */
-export const _color = key => {
+export const color = key => {
     const colors = [
         'red',
         'pink',
diff --git a/resources/js/utils/ServiceWorker.js b/resources/js/utils/ServiceWorker.js
@@ -1,7 +1,7 @@
 /**
  * Register the service worker file.
  */
-export function _register(serviceWorkerFile) {
+export function register(serviceWorkerFile) {
     if ('serviceWorker' in navigator) {
         if (serviceWorkerFile) {
             navigator.serviceWorker
diff --git a/resources/js/utils/String.js b/resources/js/utils/String.js
@@ -5,7 +5,7 @@
  *
  * @return {string}
  */
-export function _uppercaseFirst(string) {
+export function uppercaseFirst(string) {
     return string.charAt(0).toUpperCase() + string.slice(1);
 }
 
@@ -18,6 +18,6 @@ export function _uppercaseFirst(string) {
  *
  * @return {string}
  */
-export function _limit(string, count, delimiter = '...') {
+export function limit(string, count, delimiter = '...') {
     return string.slice(0, count) + (string.length > count ? delimiter : '');
 }
diff --git a/resources/js/utils/URL.js b/resources/js/utils/URL.js
@@ -5,7 +5,7 @@
  *
  * @return {object}
  */
-export function _queryParams(queryString) {
+export function queryParams(queryString) {
     let pairs = queryString
         .substring(1)
         .replace(/&$/, '')
@@ -29,7 +29,7 @@ export function _queryParams(queryString) {
  *
  * @return {string}
  */
-export function _queryString(queryParams) {
+export function queryString(queryParams) {
     var paramString = '?';
 
     for (let param in queryParams) {
diff --git a/resources/js/views/__backoffice/layouts/Master.js b/resources/js/views/__backoffice/layouts/Master.js
@@ -130,7 +130,7 @@ function Master(props) {
                             component={linkProps => (
                                 <RouterLink
                                     {...linkProps}
-                                    to={NavigationUtils._route(
+                                    to={NavigationUtils.route(
                                         'backoffice.home',
                                     )}
                                 />
@@ -149,7 +149,7 @@ function Master(props) {
                                 key={key}
                                 className={classes.breadcrumbItem}
                             >
-                                {StringUtils._uppercaseFirst(segment)}
+                                {StringUtils.uppercaseFirst(segment)}
                             </Typography>
                         );
 
@@ -177,7 +177,7 @@ function Master(props) {
                                 )}
                                 className={classes.breadcrumbItem}
                             >
-                                {StringUtils._uppercaseFirst(segment)}
+                                {StringUtils.uppercaseFirst(segment)}
                             </Link>
                         );
                     })}
diff --git a/resources/js/views/__backoffice/partials/Header.js b/resources/js/views/__backoffice/partials/Header.js
@@ -58,7 +58,7 @@ const UserAvatar = props => {
         <Avatar
             style={{
                 fontSize: 17,
-                backgroundColor: RandomUtils._color(
+                backgroundColor: RandomUtils.color(
                     user.firstname.length -
                         user.created_at.charAt(user.created_at.length - 2),
                 ),
@@ -204,7 +204,7 @@ const AccountMenu = props => {
                                 <MenuItem
                                     onClick={() =>
                                         navigate(
-                                            NavigationUtils._route(
+                                            NavigationUtils.route(
                                                 'backoffice.settings.profile',
                                             ),
                                         )
diff --git a/resources/js/views/__backoffice/partials/Sidebar.js b/resources/js/views/__backoffice/partials/Sidebar.js
@@ -63,7 +63,7 @@ function Sidebar(props) {
                 <DashboardIcon />
             </Tooltip>
         ),
-        path: NavigationUtils._route('backoffice.home'),
+        path: NavigationUtils.route('backoffice.home'),
     };
 
     const linkGroups = [
@@ -82,7 +82,7 @@ function Sidebar(props) {
                             <PeopleIcon />
                         </Tooltip>
                     ),
-                    path: NavigationUtils._route(
+                    path: NavigationUtils.route(
                         'backoffice.resources.users.index',
                     ),
                 },
@@ -254,7 +254,7 @@ function Sidebar(props) {
                             ) : (
                                 <ListItem>
                                     <Typography noWrap color="textSecondary">
-                                        {StringUtils._limit(
+                                        {StringUtils.limit(
                                             links
                                                 .map(link => link.name)
                                                 .join(', '),
diff --git a/resources/js/views/__backoffice/settings/Account.js b/resources/js/views/__backoffice/settings/Account.js
@@ -150,7 +150,7 @@ function Account(props) {
     };
 
     useEffect(() => {
-        const queryParams = UrlUtils._queryParams(location.search);
+        const queryParams = UrlUtils.queryParams(location.search);
 
         if (queryParams.hasOwnProperty('visible')) {
             setFormVisibility(true);
diff --git a/resources/js/views/__backoffice/settings/Profile.js b/resources/js/views/__backoffice/settings/Profile.js
@@ -89,7 +89,7 @@ function Profile(props) {
     };
 
     useEffect(() => {
-        const queryParams = UrlUtils._queryParams(location.search);
+        const queryParams = UrlUtils.queryParams(location.search);
 
         if (queryParams.hasOwnProperty('visible')) {
             setFormVisibility(true);
diff --git a/resources/js/views/__backoffice/users/Create.js b/resources/js/views/__backoffice/users/Create.js
@@ -146,7 +146,7 @@ function Create(props) {
                         user={user}
                         handleSkip={() =>
                             history.push(
-                                NavigationUtils._route(
+                                NavigationUtils.route(
                                     'backoffice.resources.users.index',
                                 ),
                             )
diff --git a/resources/js/views/__backoffice/users/Edit.js b/resources/js/views/__backoffice/users/Edit.js
@@ -132,7 +132,7 @@ function Edit(props) {
         const { params } = props.match;
         const { location } = props;
 
-        const queryParams = UrlUtils._queryParams(location.search);
+        const queryParams = UrlUtils.queryParams(location.search);
 
         if (queryParams.hasOwnProperty('step')) {
             setActiveStep(parseInt(queryParams.step));
@@ -207,7 +207,7 @@ function Edit(props) {
                         user={user}
                         handleSkip={() =>
                             history.push(
-                                NavigationUtils._route(
+                                NavigationUtils.route(
                                     'backoffice.resources.users.index',
                                 ),
                             )
diff --git a/resources/js/views/__backoffice/users/List.js b/resources/js/views/__backoffice/users/List.js
@@ -292,7 +292,7 @@ function List(props) {
         const { current_page: page, per_page: perPage } = pagination;
         const { by: sortBy, type: sortType } = sorting;
 
-        const queryString = UrlUtils._queryString({
+        const queryString = UrlUtils.queryString({
             page,
             perPage,
             sortBy,
@@ -315,7 +315,7 @@ function List(props) {
 
         const { location } = props;
         const queryParams = location.search
-            ? UrlUtils._queryParams(location.search)
+            ? UrlUtils.queryParams(location.search)
             : {};
 
         const prevFilters = {};
@@ -350,7 +350,7 @@ function List(props) {
         }),
         clicked: () =>
             history.push(
-                NavigationUtils._route('backoffice.resources.users.create'),
+                NavigationUtils.route('backoffice.resources.users.create'),
             ),
     };
 
@@ -396,7 +396,7 @@ function List(props) {
                                 <Avatar
                                     style={{
                                         fontSize: 17,
-                                        backgroundColor: RandomUtils._color(
+                                        backgroundColor: RandomUtils.color(
                                             user.firstname.length -
                                                 user.created_at.charAt(
                                                     user.created_at.length - 2,
@@ -427,7 +427,7 @@ function List(props) {
                             <IconButton
                                 onClick={() =>
                                     history.push(
-                                        NavigationUtils._route(
+                                        NavigationUtils.route(
                                             'backoffice.resources.users.edit',
                                             {
                                                 id: user.id,
@@ -451,7 +451,7 @@ function List(props) {
                             <IconButton
                                 onClick={() =>
                                     history.push(
-                                        NavigationUtils._route(
+                                        NavigationUtils.route(
                                             'backoffice.resources.users.edit',
                                             {
                                                 id: user.id,
diff --git a/resources/js/views/auth/SignIn.js b/resources/js/views/auth/SignIn.js
@@ -77,7 +77,7 @@ function SignIn(props) {
             setUsername(response.data);
             setLoading(false);
 
-            const queryString = UrlUtils._queryString({
+            const queryString = UrlUtils.queryString({
                 username: response.data,
             });
 
@@ -181,7 +181,7 @@ function SignIn(props) {
 
         const { location } = props;
 
-        const q = UrlUtils._queryParams(location.search);
+        const q = UrlUtils.queryParams(location.search);
 
         if (q.hasOwnProperty('username') && q.username !== '') {
             identify(q.username, {});
@@ -316,12 +316,12 @@ function SignIn(props) {
                                                 <RouterLink
                                                     {...props}
                                                     to={{
-                                                        search: UrlUtils._queryString(
+                                                        search: UrlUtils.queryString(
                                                             {
                                                                 username,
                                                             },
                                                         ),
-                                                        pathname: NavigationUtils._route(
+                                                        pathname: NavigationUtils.route(
                                                             'auth.passwords.request',
                                                         ),
                                                     }}
diff --git a/resources/js/views/auth/passwords/Request.js b/resources/js/views/auth/passwords/Request.js
@@ -33,7 +33,7 @@ function PasswordRequest(props) {
 
             const { history } = props;
             const { email } = values;
-            const routeSuffix = NavigationUtils._route('auth.passwords.reset');
+            const routeSuffix = NavigationUtils.route('auth.passwords.reset');
 
             await axios.post('api/v1/auth/password/request', {
                 email,
@@ -76,8 +76,8 @@ function PasswordRequest(props) {
         const { location } = props;
 
         setEmail(
-            UrlUtils._queryParams(location.search).hasOwnProperty('username')
-                ? UrlUtils._queryParams(location.search).username
+            UrlUtils.queryParams(location.search).hasOwnProperty('username')
+                ? UrlUtils.queryParams(location.search).username
                 : '',
         );
     });
@@ -96,7 +96,7 @@ function PasswordRequest(props) {
             <Formik
                 initialValues={{
                     email: !email
-                        ? UrlUtils._queryParams(location.search).username
+                        ? UrlUtils.queryParams(location.search).username
                         : email,
                 }}
                 onSubmit={handleRequestPasswordSubmit}
@@ -144,10 +144,10 @@ function PasswordRequest(props) {
                                         <RouterLink
                                             {...props}
                                             to={{
-                                                search: UrlUtils._queryString({
+                                                search: UrlUtils.queryString({
                                                     username: email,
                                                 }),
-                                                pathname: NavigationUtils._route(
+                                                pathname: NavigationUtils.route(
                                                     'auth.signin',
                                                 ),
                                             }}
diff --git a/resources/js/views/auth/passwords/Reset.js b/resources/js/views/auth/passwords/Reset.js
@@ -108,7 +108,7 @@ function PasswordReset(props) {
 
         const { location } = props;
 
-        const queryParams = UrlUtils._queryParams(location.search);
+        const queryParams = UrlUtils.queryParams(location.search);
 
         if (!queryParams.hasOwnProperty('email')) {
             return;
@@ -269,10 +269,10 @@ function PasswordReset(props) {
                                         <RouterLink
                                             {...props}
                                             to={{
-                                                search: UrlUtils._queryString({
+                                                search: UrlUtils.queryString({
                                                     username: email,
                                                 }),
-                                                pathname: NavigationUtils._route(
+                                                pathname: NavigationUtils.route(
                                                     'auth.signin',
                                                 ),
                                             }}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* @return {string}`
`7`	`7`	`*/`
`8`		`-export const _color = key => {`
	`8`	`+export const color = key => {`
`9`	`9`	`const colors = [`
`10`	`10`	`'red',`
`11`	`11`	`'pink',`