diff --git a/platform/firecamp-platform/package.json b/platform/firecamp-platform/package.json index 601d46bb..47e14b75 100644 --- a/platform/firecamp-platform/package.json +++ b/platform/firecamp-platform/package.json @@ -84,7 +84,6 @@ "react-ga": "^3.1.2", "react-hook-form": "^6.8.1", "react-hotkeys-hook": "^3.3.1", - "react-responsive-modal": "^6.2.0", "redux": "^3.2.1", "xml-js": "^1.6.9", "xmljson": "^0.2.0", diff --git a/platform/firecamp-platform/src/components/common/environment/selector/EnvironmentDD.tsx b/platform/firecamp-platform/src/components/common/environment/selector/EnvironmentDD.tsx index ede9793d..858afd57 100644 --- a/platform/firecamp-platform/src/components/common/environment/selector/EnvironmentDD.tsx +++ b/platform/firecamp-platform/src/components/common/environment/selector/EnvironmentDD.tsx @@ -83,7 +83,7 @@ const EnvironmentDD: FC = ({ onChange = () => {} }) => { onSelect={_onSelectEnv} classNames={{ dropdown: '!pt-0', - label: 'uppercase font-sans', + label: 'uppercase', item: '!px-5', }} sm diff --git a/platform/firecamp-platform/src/components/common/error-boundary/ErrorPopup.tsx b/platform/firecamp-platform/src/components/common/error-boundary/ErrorPopup.tsx index 3718cb4d..78a216d7 100644 --- a/platform/firecamp-platform/src/components/common/error-boundary/ErrorPopup.tsx +++ b/platform/firecamp-platform/src/components/common/error-boundary/ErrorPopup.tsx @@ -23,10 +23,8 @@ const ErrorPopup: FC = ({ error }) => { return ( diff --git a/platform/firecamp-platform/src/components/modals/ModalContainer.tsx b/platform/firecamp-platform/src/components/modals/ModalContainer.tsx index 95c510b7..356d6f35 100644 --- a/platform/firecamp-platform/src/components/modals/ModalContainer.tsx +++ b/platform/firecamp-platform/src/components/modals/ModalContainer.tsx @@ -1,11 +1,10 @@ import shallow from 'zustand/shallow'; -import { Modal } from '@firecamp/ui'; // import SSLnProxyManager from '../modals/ssl-proxy-manager/SSLnProxyManager'; // import AuthContainer from '../common/auth/AuthContainer'; // import CookieManager from '../modals/cookie-manager/CookieManager'; // import RefreshToken from '../common/auth/RefreshToken'; import { useModalStore } from '../../store/modal'; -import { EPlatformModalDefaultProps, EPlatformModalTypes } from '../../types'; +import { EPlatformModalTypes } from '../../types'; import ForgotPassword from './auth/ForgotPassword'; import RefreshToken from './auth/RefreshToken'; import ResetPassword from './auth/ResetPassword'; @@ -38,115 +37,51 @@ export const ModalContainer = () => { // Organization case EPlatformModalTypes.OrgManagement: - return ; + return ; case EPlatformModalTypes.SwitchOrg: - return ; + return ; // Workspace case EPlatformModalTypes.InviteMembers: - return ; + return ; case EPlatformModalTypes.WorkspaceManagement: - return ; + return ; case EPlatformModalTypes.SwitchWorkspace: - return ; + return ; // Request case EPlatformModalTypes.EditRequest: - return ; + return ; // Environment case EPlatformModalTypes.CloneEnvironment: - return ; + return ; // User // case EPlatformModalTypes.UserProfile: return ; // Auth case EPlatformModalTypes.SignIn: - return ; + return ; case EPlatformModalTypes.SignInWithEmail: - return ; + return ; case EPlatformModalTypes.SignUp: - return ; + return ; case EPlatformModalTypes.ForgotPassword: - return ; + return ; case EPlatformModalTypes.ResetPassword: - return ; + return ; case EPlatformModalTypes.RefreshToken: - return ; + return ; default: return <>; } }; - // return renderModal(currentOpenModal); - const modalProps = EPlatformModalDefaultProps[currentOpenModal]; - // console.log(modalProps, '.....'); return ( - + <> {renderModal(currentOpenModal)} - + ); - const modalType = currentOpenModal; - return ( - - <> - {/* Organization */} - - - - {/* Workspace */} - - - - - {/* User */} - {/* ; */} - - {/* Auth */} - - - - - - - - - ); }; diff --git a/platform/firecamp-platform/src/components/modals/auth/ForgotPassword.tsx b/platform/firecamp-platform/src/components/modals/auth/ForgotPassword.tsx index a9120396..29555410 100644 --- a/platform/firecamp-platform/src/components/modals/auth/ForgotPassword.tsx +++ b/platform/firecamp-platform/src/components/modals/auth/ForgotPassword.tsx @@ -1,12 +1,13 @@ import { FC, useState } from 'react'; import { useForm } from 'react-hook-form'; import { Modal, Button, Input, IModal } from '@firecamp/ui'; +import { Mail } from 'lucide-react'; import _auth from '../../../services/auth'; import platformContext from '../../../services/platform-context'; /** * ForgotPassword component */ -const ForgotPassword: FC = ({ isOpen = false, onClose = () => {} }) => { +const ForgotPassword: FC = ({ opened = false, onClose = () => {} }) => { const [isRequesting, setFlagIsRequesting] = useState(false); const form = useForm(); let { handleSubmit, errors } = form; @@ -50,63 +51,61 @@ const ForgotPassword: FC = ({ isOpen = false, onClose = () => {} }) => { const _onKeyDown = (e: any) => e.key === 'Enter' && handleSubmit(_onSubmit); return ( - <> - - -
- Enter your Email Address -
-
- You’ll get the password recovery token in your inbox. -
-
- -
-
- -
-
- - + + +
); }; diff --git a/platform/firecamp-platform/src/components/modals/auth/RefreshToken.tsx b/platform/firecamp-platform/src/components/modals/auth/RefreshToken.tsx index ae33d366..d69ae0d1 100644 --- a/platform/firecamp-platform/src/components/modals/auth/RefreshToken.tsx +++ b/platform/firecamp-platform/src/components/modals/auth/RefreshToken.tsx @@ -13,19 +13,13 @@ import { useUserStore } from '../../../store/user'; /** * RefreshToken component for user to autenticate. */ -const RefreshToken: FC = ({ onClose = () => {} }) => { +const RefreshToken: FC = ({ opened, onClose = () => {} }) => { return ( - <> - -
- - - - - -