Move components and helpers to subfolder

src/js/Error.js

@@ -1,6 +1,6 @@
 import { Alert } from '@jlbelanger/formosa';
 import Auth from './Utilities/Auth';
-import MetaTitle from './MetaTitle';
+import MetaTitle from './Components/MetaTitle';
 import PropTypes from 'prop-types';
 import React from 'react';
 

src/js/Error404.js

@@ -1,5 +1,5 @@
 import { Alert } from '@jlbelanger/formosa';
-import MetaTitle from './MetaTitle';
+import MetaTitle from './Components/MetaTitle';
 import React from 'react';
 
 export default function Error404() {

src/js/Pages/Auth/ForgotPassword.js

@@ -2,7 +2,7 @@ import { Alert, Field, Form } from '@jlbelanger/formosa';
 import { Link, useHistory } from 'react-router-dom';
 import React, { useEffect, useState } from 'react';
 import { errorMessageText } from '../../Utilities/Helpers';
-import MetaTitle from '../../MetaTitle';
+import MetaTitle from '../../Components/MetaTitle';
 
 export default function ForgotPassword() {
 	const history = useHistory();

src/js/Pages/Auth/Login.js

@@ -3,7 +3,7 @@ import Auth from '../../Utilities/Auth';
 import { errorMessageText } from '../../Utilities/Helpers';
 import { Form } from '@jlbelanger/formosa';
 import LoginForm from './LoginForm';
-import MetaTitle from '../../MetaTitle';
+import MetaTitle from '../../Components/MetaTitle';
 import { useHistory } from 'react-router-dom';
 
 export default function Login() {

src/js/Pages/Auth/Register.js

@@ -2,8 +2,8 @@ import { Field, Submit } from '@jlbelanger/formosa';
 import React, { useState } from 'react';
 import Auth from '../../Utilities/Auth';
 import { errorMessageText } from '../../Utilities/Helpers';
-import MetaTitle from '../../MetaTitle';
-import MyForm from '../../MyForm';
+import MetaTitle from '../../Components/MetaTitle';
+import MyForm from '../../Components/MyForm';
 import { useHistory } from 'react-router-dom';
 
 export default function Register() {

src/js/Pages/Auth/ResetPassword.js

@@ -2,7 +2,7 @@ import { Field, Form, Submit } from '@jlbelanger/formosa';
 import React, { useEffect, useState } from 'react';
 import { useHistory, useParams } from 'react-router-dom';
 import { errorMessageText } from '../../Utilities/Helpers';
-import MetaTitle from '../../MetaTitle';
+import MetaTitle from '../../Components/MetaTitle';
 
 export default function ResetPassword() {
 	const [row, setRow] = useState({});

src/js/Pages/Auth/VerifyEmail.js

@@ -1,7 +1,7 @@
 import { Form, Submit } from '@jlbelanger/formosa';
 import React, { useEffect } from 'react';
 import { errorMessageText } from '../../Utilities/Helpers';
-import MetaTitle from '../../MetaTitle';
+import MetaTitle from '../../Components/MetaTitle';
 import { useHistory } from 'react-router-dom';
 
 export default function VerifyEmail() {

src/js/Pages/EventTypes/Edit.js

@@ -4,9 +4,9 @@ import React, { useContext, useEffect, useState } from 'react';
 import Error from '../../Error';
 import { errorMessageText } from '../../Utilities/Helpers';
 import Fields from './Partials/Fields';
-import MetaTitle from '../../MetaTitle';
-import Modal from '../../Modal';
-import MyForm from '../../MyForm';
+import MetaTitle from '../../Components/MetaTitle';
+import Modal from '../../Components/Modal';
+import MyForm from '../../Components/MyForm';
 
 export default function Edit() {
 	const { addToast } = useContext(FormosaContext);

src/js/Pages/EventTypes/List.js

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Api } from '@jlbelanger/formosa';
 import Error from '../../Error';
 import { Link } from 'react-router-dom';
-import MetaTitle from '../../MetaTitle';
+import MetaTitle from '../../Components/MetaTitle';
 
 export default function List() {
 	const [rows, setRows] = useState(null);

src/js/Pages/EventTypes/New.js

@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
 import { errorMessageText } from '../../Utilities/Helpers';
 import Fields from './Partials/Fields';
-import MetaTitle from '../../MetaTitle';
-import MyForm from '../../MyForm';
+import MetaTitle from '../../Components/MetaTitle';
+import MyForm from '../../Components/MyForm';
 import { Submit } from '@jlbelanger/formosa';
 import { useHistory } from 'react-router-dom';
 

src/js/Pages/EventTypes/View.js

@@ -19,7 +19,7 @@ import { Api } from '@jlbelanger/formosa';
 import { Chart } from 'react-chartjs-2'; // eslint-disable-line import/no-unresolved
 import Error from '../../Error';
 import Filters from './Partials/Filters';
-import MetaTitle from '../../MetaTitle';
+import MetaTitle from '../../Components/MetaTitle';
 import Row from '../Events/Partials/Row';
 import Stats from './Partials/Stats';
 import zoomPlugin from 'chartjs-plugin-zoom';

src/js/Pages/Events/Edit.js

@@ -1,14 +1,13 @@
 import { Alert, Api, FormosaContext, Submit } from '@jlbelanger/formosa';
+import { errorMessageText, getEventLabel } from '../../Utilities/Helpers';
 import { getLocalYmdmsFromYmdhmsz, getYmdhmszFromLocalYmdhms } from '../../Utilities/Datetime';
 import React, { useContext, useEffect, useState } from 'react';
 import { useHistory, useParams } from 'react-router-dom';
 import Error from '../../Error';
-import { errorMessageText } from '../../Utilities/Helpers';
 import Fields from './Partials/Fields';
-import { getEventLabel } from '../../Utilities';
-import MetaTitle from '../../MetaTitle';
-import Modal from '../../Modal';
-import MyForm from '../../MyForm';
+import MetaTitle from '../../Components/MetaTitle';
+import Modal from '../../Components/Modal';
+import MyForm from '../../Components/MyForm';
 
 export default function Edit() {
 	const { addToast } = useContext(FormosaContext);

src/js/Pages/Events/List.js

@@ -3,7 +3,7 @@ import { Api } from '@jlbelanger/formosa';
 import Error from '../../Error';
 import { getRowsByYmd } from '../../Utilities/Datetime';
 import { Link } from 'react-router-dom';
-import MetaTitle from '../../MetaTitle';
+import MetaTitle from '../../Components/MetaTitle';
 import Row from './Partials/Row';
 
 export default function List() {

src/js/Pages/Events/New.js

@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
 import Error from '../../Error';
 import { errorMessageText } from '../../Utilities/Helpers';
 import { getCurrentYmdhmsz } from '../../Utilities/Datetime';
-import MetaTitle from '../../MetaTitle';
+import MetaTitle from '../../Components/MetaTitle';
 import NewField from './Partials/NewField';
 import NewLabel from './Partials/NewLabel';
 import { Redirect } from 'react-router-dom';

src/js/Pages/Events/Partials/Row.js

@@ -1,5 +1,5 @@
 import { prettyDate, prettyTime } from '../../../Utilities/Datetime';
-import { getEventLabel } from '../../../Utilities';
+import { getEventLabel } from '../../../Utilities/Helpers';
 import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import React from 'react';

src/js/Pages/Users/Edit.js

@@ -7,8 +7,8 @@ import ChangeUsername from './Partials/ChangeUsername';
 import DeleteData from './Partials/DeleteData';
 import Error from '../../Error';
 import { errorMessageText } from '../../Utilities/Helpers';
-import MetaTitle from '../../MetaTitle';
-import Modal from '../../Modal';
+import MetaTitle from '../../Components/MetaTitle';
+import Modal from '../../Components/Modal';
 
 export default function Edit() {
 	const id = Auth.id();

src/js/Pages/Users/Partials/ChangeEmail.js

@@ -1,7 +1,7 @@
 import { Field, FormAlert, FormosaContext, Submit } from '@jlbelanger/formosa';
 import React, { useContext, useState } from 'react';
 import { errorMessageText } from '../../../Utilities/Helpers';
-import MyForm from '../../../MyForm';
+import MyForm from '../../../Components/MyForm';
 import PropTypes from 'prop-types';
 
 export default function ChangeEmail({ email }) {

src/js/Pages/Users/Partials/ChangePassword.js

@@ -1,7 +1,7 @@
 import { Field, FormAlert, Submit } from '@jlbelanger/formosa';
 import React, { useState } from 'react';
 import { errorMessageText } from '../../../Utilities/Helpers';
-import MyForm from '../../../MyForm';
+import MyForm from '../../../Components/MyForm';
 
 export default function ChangePassword() {
 	const [row, setRow] = useState({});

src/js/Pages/Users/Partials/ChangeUsername.js

@@ -1,7 +1,7 @@
 import { Field, FormAlert, Submit } from '@jlbelanger/formosa';
 import React, { useState } from 'react';
 import { errorMessageText } from '../../../Utilities/Helpers';
-import MyForm from '../../../MyForm';
+import MyForm from '../../../Components/MyForm';
 import PropTypes from 'prop-types';
 
 export default function ChangeUsername({ id, username }) {

src/js/Pages/Users/Partials/DeleteData.js

@@ -1,7 +1,7 @@
 import { Api, Field, FormosaContext } from '@jlbelanger/formosa';
 import React, { useContext, useState } from 'react';
 import { errorMessageText } from '../../../Utilities/Helpers';
-import Modal from '../../../Modal';
+import Modal from '../../../Components/Modal';
 import PropTypes from 'prop-types';
 
 export default function DeleteData({ setDeleteError }) {

src/js/Utilities/Helpers.js

@@ -12,3 +12,17 @@ export const afterSubmitFailure = (error) => {
 		Auth.logout(error.status);
 	}
 };
+
+export const getEventLabel = (event) => { // eslint-disable-line import/prefer-default-export
+	let label = event.action_type.label;
+	if (event.value) {
+		let value = event.value;
+		if (event.action_type.suffix) {
+			value += ` ${event.action_type.suffix}`;
+		}
+		label += ` (${value})`;
+	} else if (event.option) {
+		label += ` (${event.option.label})`;
+	}
+	return label;
+};