admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add deploy buttons and clean environment variables (#974)

Browse Source 
* add render.yaml

* Clean environment variables



---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Félix Malfait
2023-07-31 14:36:04 -07:00
committed by GitHub
parent a90cbac5e6
commit b028d9fd2a
31 changed files with 194 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
front/src/modules/auth/hooks/useAuth.ts
View File

@ -118,8 +118,11 @@ export function useAuth() {
);
const handleGoogleLogin = useCallback((workspaceInviteHash?: string) => {
const authServerUrl =
process.env.REACT_APP_SERVER_AUTH_URL ??
process.env.REACT_APP_SERVER_BASE_URL + '/auth';
window.location.href =
`${process.env.REACT_APP_AUTH_URL}/google/${
`${authServerUrl}/google/${
workspaceInviteHash ? '?inviteHash=' + workspaceInviteHash : ''
}` || '';
}, []);

8
front/src/modules/auth/sign-in-up/hooks/useSignInUp.tsx
View File

@ -6,7 +6,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
import * as Yup from 'yup';
import { authProvidersState } from '@/client-config/states/authProvidersState';
import { isDemoModeState } from '@/client-config/states/isDemoModeState';
import { isSignInPrefilledState } from '@/client-config/states/isSignInPrefilledState';
import { AppPath } from '@/types/AppPath';
import { PageHotkeyScope } from '@/types/PageHotkeyScope';
import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar';
@ -45,7 +45,7 @@ export function useSignInUp() {
const { enqueueSnackBar } = useSnackBar();
const isMatchingLocation = useIsMatchingLocation();
const [authProviders] = useRecoilState(authProvidersState);
const isDemoMode = useRecoilValue(isDemoModeState);
const isSignInPrefilled = useRecoilValue(isSignInPrefilledState);
const workspaceInviteHash = useParams().workspaceInviteHash;
const [signInUpStep, setSignInUpStep] = useState<SignInUpStep>(
SignInUpStep.Init,
@ -61,8 +61,8 @@ export function useSignInUp() {
mode: 'onChange',
defaultValues: {
exist: false,
email: isDemoMode ? 'tim@apple.dev' : '',
password: isDemoMode ? 'Applecar2025' : '',
email: isSignInPrefilled ? 'tim@apple.dev' : '',
password: isSignInPrefilled ? 'Applecar2025' : '',
},
resolver: yupResolver(validationSchema),
});