Merge pull request #45 from KSJaay/v0.5.1

v0.5.1 -  Fixes issue with certificates and moves utils to shared folder

app/components/home/monitor/layout/card.jsx

@@ -6,7 +6,7 @@ import { useNavigate } from 'react-router-dom';
 // import local files
 import StatusBar from '../../../ui/statusBar';
 import MonitorOptions from '../options';
-import { monitorPropType } from '../../../../utils/propTypes';
+import { monitorPropType } from '../../../../../shared/utils/propTypes';
 
 const MonitorCard = ({ monitor = {} }) => {
   const navigate = useNavigate();

app/components/home/monitor/layout/compact.jsx

@@ -4,7 +4,7 @@ import './compact.scss';
 import { useNavigate } from 'react-router-dom';
 
 // import local files
-import { monitorPropType } from '../../../../utils/propTypes';
+import { monitorPropType } from '../../../../../shared/utils/propTypes';
 
 const MonitorList = ({ monitor = {} }) => {
   const navigate = useNavigate();

app/components/home/monitor/layout/list.jsx

@@ -5,7 +5,7 @@ import { useNavigate } from 'react-router-dom';
 
 // import local files
 import StatusBar from '../../../ui/statusBar';
-import { monitorPropType } from '../../../../utils/propTypes';
+import { monitorPropType } from '../../../../../shared/utils/propTypes';
 
 const MonitorList = ({ monitor = {} }) => {
   const navigate = useNavigate();

app/components/modal/settings/account/password.jsx

@@ -8,7 +8,7 @@ import RegisterChecklist from '../../../register/checklist';
 import { useState } from 'react';
 import { MdEye, MdEyeOff } from '../../../icons';
 import handleChangePassword from '../../../../handlers/settings/account/password';
-import validators from '../../../../../server/utils/validators';
+import validators from '../../../../../shared/validators';
 
 const SettingsAccountPasswordModal = ({ modalTitle, id, closeModal }) => {
   const [values, setValues] = useState({

app/components/modal/settings/account/username.jsx

@@ -28,12 +28,7 @@ const SettingsAccountUsernameModal = ({
 
   const submit = async () => {
     const value = document.getElementById(`settings-edit-${id}`).value;
-    const query = await handleChangeUsername(
-      value,
-      setError,
-      closeModal,
-      handleError
-    );
+    const query = await handleChangeUsername(value, handleError, closeModal);
 
     if (query === true) {
       updateUsingKey('displayName', value);

app/components/modal/settings/avatar.jsx

@@ -10,7 +10,7 @@ import { toast } from 'react-toastify';
 import Modal from '../../ui/modal';
 import useContextStore from '../../../context';
 import { createPostRequest } from '../../../services/axios';
-import { userPropType } from '../../../utils/propTypes';
+import { userPropType } from '../../../../shared/utils/propTypes';
 
 const avatars = [
   'Ape',

app/components/modal/settings/manage/approve.jsx

@@ -7,7 +7,7 @@ import { observer } from 'mobx-react-lite';
 import { createPostRequest } from '../../../../services/axios';
 import Modal from '../../../ui/modal';
 import useTeamContext from '../../../../context/team';
-import { userPropType } from '../../../../utils/propTypes';
+import { userPropType } from '../../../../../shared/utils/propTypes';
 
 const MemberApproveModal = ({ member, onClose }) => {
   const { updateUserVerified } = useTeamContext();

app/components/modal/settings/manage/decline.jsx

@@ -6,7 +6,7 @@ import { toast } from 'react-toastify';
 import { createPostRequest } from '../../../../services/axios';
 import Modal from '../../../ui/modal';
 import useTeamContext from '../../../../context/team';
-import { userPropType } from '../../../../utils/propTypes';
+import { userPropType } from '../../../../../shared/utils/propTypes';
 
 const MemberDeclineModal = ({ member, onClose }) => {
   const { removeUser } = useTeamContext();

app/components/modal/settings/manage/delete.jsx

@@ -6,7 +6,7 @@ import { toast } from 'react-toastify';
 import { createPostRequest } from '../../../../services/axios';
 import Modal from '../../../ui/modal';
 import useTeamContext from '../../../../context/team';
-import { userPropType } from '../../../../utils/propTypes';
+import { userPropType } from '../../../../../shared/utils/propTypes';
 
 const MemberDeleteModal = ({ member, onClose }) => {
   const { removeUser } = useTeamContext();

app/components/modal/settings/manage/permissions.jsx

@@ -10,7 +10,7 @@ import classNames from 'classnames';
 import { createPostRequest } from '../../../../services/axios';
 import Modal from '../../../ui/modal';
 import useTeamContext from '../../../../context/team';
-import { userPropType } from '../../../../utils/propTypes';
+import { userPropType } from '../../../../../shared/utils/propTypes';
 
 const MemeberPermission = ({ title, description, isActive, ...props }) => {
   const containerClasses = classNames('permissions-container', {

app/components/monitor/graph/index.jsx

@@ -22,7 +22,7 @@ import { Chart } from 'react-chartjs-2';
 import useLocalStorageContext from '../../../hooks/useLocalstorage';
 import GraphMenu from './menu';
 import useGraphStatus from '../../../hooks/useGraphStatus';
-import { fullMonitorPropType } from '../../../utils/propTypes';
+import { fullMonitorPropType } from '../../../../shared/utils/propTypes';
 
 ChartJs.register(
   LineController,

app/components/monitor/status.jsx

@@ -1,7 +1,7 @@
 import './status.scss';
 
 // import local files
-import { fullMonitorPropType } from '../../utils/propTypes';
+import { fullMonitorPropType } from '../../../shared/utils/propTypes';
 
 const MonitorStatus = ({ monitor = [] }) => {
   const [lastHeartbeat = {}] = monitor.heartbeats;

app/components/monitor/updateInfo.jsx

@@ -6,7 +6,7 @@ import moment from 'moment';
 import classNames from 'classnames';
 
 // import local files
-import { heartbeatPropType } from '../../utils/propTypes';
+import { heartbeatPropType } from '../../../shared/utils/propTypes';
 import useLocalStorageContext from '../../hooks/useLocalstorage';
 
 const UptimeInfo = ({ heartbeat = {} }) => {

app/components/monitor/uptime.jsx

@@ -5,7 +5,7 @@ import 'moment-timezone';
 import PropTypes from 'prop-types';
 
 // import local files
-import { heartbeatPropType } from '../../utils/propTypes';
+import { heartbeatPropType } from '../../../shared/utils/propTypes';
 import UptimeInfo from './updateInfo';
 
 const MonitorUptime = ({ heartbeats = [] }) => {

app/components/settings/manage/member/actions.jsx

@@ -19,7 +19,7 @@ import MemberDeclineModal from '../../../modal/settings/manage/decline';
 import MemberDeleteModal from '../../../modal/settings/manage/delete';
 import MemberPermissionsModal from '../../../modal/settings/manage/permissions';
 import useContextStore from '../../../../context';
-import { userPropType } from '../../../../utils/propTypes';
+import { userPropType } from '../../../../../shared/utils/propTypes';
 
 const MemberRowActions = ({ member = {}, canManage = false }) => {
   const classes = classNames({

app/components/settings/manage/member/index.jsx

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 
 // import local files
 import MemberTableRow from './row';
-import { userPropType } from '../../../../utils/propTypes';
+import { userPropType } from '../../../../../shared/utils/propTypes';
 
 const MembersTable = ({ members = [] }) => {
   const membersList = members.map((member, index) => (

app/components/settings/manage/member/row.jsx

@@ -7,7 +7,7 @@ import { observer } from 'mobx-react-lite';
 // import local files
 import MemberRowActions from './actions';
 import useContextStore from '../../../../context';
-import { userPropType } from '../../../../utils/propTypes';
+import { userPropType } from '../../../../../shared/utils/propTypes';
 
 const positions = { 1: 'Owner', 2: 'Admin', 3: 'Editor', 4: 'Guest' };
 

app/components/ui/button.jsx

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 // import local files
-import { colorPropType } from '../../utils/propTypes';
+import { colorPropType } from '../../../shared/utils/propTypes';
 
 const Button = ({
   children,

app/components/ui/dropdown/item.jsx

@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 
 // import local files
-import { colorPropType } from '../../../utils/propTypes';
+import { colorPropType } from '../../../../shared/utils/propTypes';
 
 const Item = ({
   dotColor,

app/components/ui/modal/button.jsx

@@ -3,7 +3,7 @@ import './style.scss';
 // import dependencies
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { colorPropType } from '../../../utils/propTypes';
+import { colorPropType } from '../../../../shared/utils/propTypes';
 
 const Button = ({ children, color, ...props }) => {
   const classes = classNames('modal-button', {

app/components/ui/select/item.jsx

@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 
 // import local files
-import { colorPropType } from '../../../utils/propTypes';
+import { colorPropType } from '../../../../shared/utils/propTypes';
 
 const Item = ({
   dotColor,

app/components/ui/statusBar.jsx

@@ -4,7 +4,7 @@ import './statusBar.scss';
 import PropTypes from 'prop-types';
 
 // import local files
-import { heartbeatPropType } from '../../utils/propTypes';
+import { heartbeatPropType } from '../../../shared/utils/propTypes';
 
 const StatusBar = ({ heartbeats = {}, maxHeartbeats = 12 }) => {
   const heartbeatList = [];

app/handlers/login.js

@@ -3,7 +3,7 @@ import { toast } from 'react-toastify';
 
 // import local files
 import { createPostRequest } from '../services/axios';
-import * as validators from '../utils/validators';
+import validators from '../../shared/validators';
 
 const handleLogin = async (inputs, setErrors, navigate) => {
   try {

app/handlers/register.js

@@ -3,7 +3,7 @@ import { toast } from 'react-toastify';
 
 // import local files
 import { createPostRequest } from '../services/axios';
-import * as validators from '../utils/validators';
+import validators from '../../shared/validators';
 
 const handleRegister = async (inputs, setErrors, setPage, navigate) => {
   try {
@@ -12,7 +12,7 @@ const handleRegister = async (inputs, setErrors, setPage, navigate) => {
     const isInvalidPassword = validators.auth.password(password);
 
     if (isInvalidPassword) {
-      return setErrors({ password: isInvalidPassword });
+      return setErrors(isInvalidPassword);
     }
 
     if (password !== confirmPassword) {

app/handlers/settings/account/password.js

@@ -2,7 +2,7 @@
 import { toast } from 'react-toastify';
 
 // import local files
-import * as validators from '../../../utils/validators';
+import validators from '../../../../shared/validators';
 import { createPostRequest } from '../../../services/axios';
 
 const handleChangePassword = async ({
@@ -20,7 +20,7 @@ const handleChangePassword = async ({
     const isInvalid = validators.auth.password(newPassword);
 
     if (isInvalid) {
-      return handleErrors('new', isInvalid);
+      return handleErrors('new', isInvalid.password);
     }
 
     const query = await createPostRequest('/api/user/update/password', {

app/handlers/settings/account/username.js

@@ -2,20 +2,15 @@
 import { toast } from 'react-toastify';
 
 // import local files
-import * as validators from '../../../utils/validators';
+import validators from '../../../../shared/validators';
 import { createPostRequest } from '../../../services/axios';
 
-const handleChangeUsername = async (
-  displayName,
-  setError,
-  closeModal,
-  handleErrors
-) => {
+const handleChangeUsername = async (displayName, handleError, closeModal) => {
   try {
     const isInvalid = validators.auth.username(displayName);
 
     if (isInvalid) {
-      return setError(isInvalid);
+      return handleError(isInvalid.username);
     }
 
     const query = await createPostRequest('/api/user/update/username', {
@@ -29,12 +24,8 @@ const handleChangeUsername = async (
 
     return true;
   } catch (error) {
-    if (error.response?.data?.current) {
-      return handleErrors('current', error.response?.data?.current);
-    }
-
-    if (error?.response?.status === 400) {
-      return handleErrors('new', error.response.data?.message);
+    if (error.response?.data?.username) {
+      return handleError(error.response?.data?.username);
     }
 
     toast.error('Something went wrong, please try again later.');

app/hooks/useLogin.jsx

@@ -2,7 +2,7 @@
 import { useState } from 'react';
 
 // import local files
-import * as validators from '../utils/validators';
+import validators from '../../shared/validators';
 
 const useLogin = () => {
   const [values, setValues] = useState({
@@ -18,12 +18,18 @@ const useLogin = () => {
 
       if (isInvalid) {
         return setValues((prev) => ({
-          ...prev,
-          errors: { ...prev.errors, [id]: isInvalid },
+          inputs: {
+            ...prev.inputs,
+            [id]: value,
+          },
+          errors: { ...prev.errors, ...isInvalid },
         }));
       } else {
         setValues((prev) => ({
-          ...prev,
+          inputs: {
+            ...prev.inputs,
+            [id]: value,
+          },
           errors: { ...prev.errors, [id]: null },
         }));
       }

app/hooks/useMonitorForm.jsx

@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import handleMonitor from '../handlers/monitor';
-import monitorValidators from '../utils/validators/monitor';
+import monitorValidators from '../../shared/validators/monitor';
 
 const initialPage = {
   page: 1,

app/hooks/useRegister.jsx

@@ -4,7 +4,7 @@ import { toast } from 'react-toastify';
 
 // import local files
 import { createPostRequest } from '../services/axios';
-import * as validators from '../utils/validators';
+import validators from '../../shared/validators';
 
 const useRegister = () => {
   const [values, setValues] = useState({
@@ -26,8 +26,8 @@ const useRegister = () => {
           ...prev,
           errors: {
             ...prev.errors,
-            email: isInvalidEmail,
-            username: isInvalidUsername,
+            ...isInvalidEmail,
+            ...isInvalidUsername,
           },
         }));
       }
@@ -79,7 +79,7 @@ const useRegister = () => {
           },
           errors: {
             ...prev.errors,
-            [id]: isInvalid,
+            ...isInvalid,
           },
         }));
       } else {

app/pages/login.jsx

@@ -16,9 +16,9 @@ const Login = () => {
   return (
     <div className="auth-form-container">
       <div className="auth-form">
-        <div className="auth-form-title">Create your account</div>
+        <div className="auth-form-title">Signin to Lunalytics</div>
         <div className="auth-form-subtitle">
-          Please provide your name and email
+          Please provide your email and password
         </div>
 
         {errors['general'] && (