Skip to content

Commit b873631

Browse files
charlesBochetabdulrahmancodes
authored andcommitted
1 parent c5bae47 commit b873631

File tree

1 file changed

+36
-13
lines changed

1 file changed

+36
-13
lines changed

packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ import { Controller, SubmitHandler, useForm } from 'react-hook-form';
55
import { Key } from 'ts-key-enum';
66
import { z } from 'zod';
77

8+
import { Logo } from '@/auth/components/Logo';
89
import { SubTitle } from '@/auth/components/SubTitle';
910
import { Title } from '@/auth/components/Title';
1011
import { useAuth } from '@/auth/hooks/useAuth';
12+
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
1113
import { useRefreshObjectMetadataItems } from '@/object-metadata/hooks/useRefreshObjectMetadataItem';
1214
import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';
1315
import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader';
@@ -16,7 +18,9 @@ import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
1618
import { TextInputV2 } from '@/ui/input/components/TextInputV2';
1719
import { Modal } from '@/ui/layout/modal/components/Modal';
1820
import { Trans, useLingui } from '@lingui/react/macro';
21+
import { isNonEmptyString } from '@sniptt/guards';
1922
import { motion } from 'framer-motion';
23+
import { useRecoilValue } from 'recoil';
2024
import { isDefined } from 'twenty-shared/utils';
2125
import { H2Title } from 'twenty-ui/display';
2226
import { Loader } from 'twenty-ui/feedback';
@@ -36,6 +40,15 @@ const StyledButtonContainer = styled.div`
3640
width: 200px;
3741
`;
3842

43+
const StyledLoaderContainer = styled.div`
44+
align-items: center;
45+
display: flex;
46+
justify-content: center;
47+
margin-top: ${({ theme }) => theme.spacing(8)};
48+
width: 100%;
49+
margin-bottom: ${({ theme }) => theme.spacing(8)};
50+
`;
51+
3952
enum PendingCreationLoaderStep {
4053
None = 'none',
4154
Step1 = 'step-1',
@@ -44,7 +57,6 @@ enum PendingCreationLoaderStep {
4457
}
4558

4659
const StyledPendingCreationLoader = styled(motion.div)`
47-
height: 388px;
4860
width: 100%;
4961
display: flex;
5062
justify-content: center;
@@ -62,6 +74,7 @@ export const CreateWorkspace = () => {
6274
const [pendingCreationLoaderStep, setPendingCreationLoaderStep] = useState(
6375
PendingCreationLoaderStep.None,
6476
);
77+
const currentWorkspace = useRecoilValue(currentWorkspaceState);
6578

6679
const validationSchema = z
6780
.object({
@@ -140,26 +153,36 @@ export const CreateWorkspace = () => {
140153
<Modal.Content isVerticalCentered isHorizontalCentered>
141154
{pendingCreationLoaderStep !== PendingCreationLoaderStep.None && (
142155
<>
156+
<Logo
157+
primaryLogo={
158+
isNonEmptyString(currentWorkspace?.logo)
159+
? currentWorkspace?.logo
160+
: undefined
161+
}
162+
/>
163+
<Title>
164+
<Trans>Creating your workspace</Trans>
165+
</Title>
143166
<StyledPendingCreationLoader>
144167
{pendingCreationLoaderStep === PendingCreationLoaderStep.Step1 && (
145-
<Title animate>
146-
<Loader color="gray" />
147-
<Trans>Setting up your database</Trans>
148-
</Title>
168+
<SubTitle>
169+
<Trans>Setting up your database...</Trans>
170+
</SubTitle>
149171
)}
150172
{pendingCreationLoaderStep === PendingCreationLoaderStep.Step2 && (
151-
<Title animate>
152-
<Loader color="gray" />
153-
<Trans>Creating your schema</Trans>
154-
</Title>
173+
<SubTitle>
174+
<Trans>Creating your data model...</Trans>
175+
</SubTitle>
155176
)}
156177
{pendingCreationLoaderStep === PendingCreationLoaderStep.Step3 && (
157-
<Title animate>
158-
<Loader color="gray" />
159-
<Trans>Prefilling your workspace data</Trans>
160-
</Title>
178+
<SubTitle>
179+
<Trans>Prefilling your workspace data...</Trans>
180+
</SubTitle>
161181
)}
162182
</StyledPendingCreationLoader>
183+
<StyledLoaderContainer>
184+
<Loader color="gray" />
185+
</StyledLoaderContainer>
163186
</>
164187
)}
165188
{pendingCreationLoaderStep === PendingCreationLoaderStep.None && (

0 commit comments

Comments
 (0)