Skip to content

Commit e40c8be

Browse files
Feat/new user onboarding flow and UI changes (#1124)
2 parents 320fdf0 + 2426a49 commit e40c8be

File tree

77 files changed

+16297
-454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+16297
-454
lines changed

apps/api/src/app/common/usecases/get-import-config/get-import-config.usecase.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ export class GetImportConfig {
2020
isFeatureAvailableMap.set(code, false);
2121
});
2222

23-
try {
24-
for (const billableMetricCode of Object.keys(BILLABLEMETRIC_CODE_ENUM)) {
23+
for (const billableMetricCode of Object.values(BILLABLEMETRIC_CODE_ENUM)) {
24+
try {
2525
const isAvailable = await this.paymentAPIService.checkEvent({
2626
email: userEmail,
2727
billableMetricCode: BILLABLEMETRIC_CODE_ENUM[billableMetricCode],
2828
});
2929
isFeatureAvailableMap.set(billableMetricCode, isAvailable);
30-
}
31-
} catch (error) {}
30+
} catch (error) {}
31+
}
3232

3333
let template: TemplateEntity;
3434
if (templateId) {

apps/api/src/app/project/usecases/create-project/create-project.command.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ export class CreateProjectCommand extends AuthenticatedCommand {
99
@IsBoolean()
1010
@IsOptional()
1111
onboarding?: boolean;
12+
13+
@IsBoolean()
14+
@IsOptional()
15+
autoGenerated?: boolean;
1216
}

apps/api/src/app/review/usecases/do-review/do-review.usecase.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ export class DoReview extends BaseReview {
298298
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
299299
// @ts-ignore
300300
const teamMemberEmails = environment.map((teamMember) => teamMember._userId.email);
301-
console.log(teamMemberEmails);
302301

303302
const emailContents = this.emailService.getEmailContent({
304303
type: 'IMPORT_LIMIT_EXCEEDED_EMAIL',

apps/api/src/app/review/usecases/start-process/start-process.usecase.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ export class StartProcess {
186186
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
187187
// @ts-ignore
188188
const teamMemberEmails = environment.map((teamMember) => teamMember._userId.email);
189-
console.log(teamMemberEmails);
190189

191190
const emailContents = this.emailService.getEmailContent({
192191
type: 'IMPORT_LIMIT_EXCEEDED_EMAIL',
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { HttpException, HttpStatus } from '@nestjs/common';
2+
import { APIMessages } from '../constants';
3+
4+
export class InvalidVerificationCodeException extends HttpException {
5+
constructor() {
6+
super(
7+
{
8+
message: APIMessages.INVALID_VERIFICATION_CODE,
9+
error: 'InvalidVerificationCode',
10+
statusCode: HttpStatus.BAD_REQUEST,
11+
},
12+
HttpStatus.BAD_REQUEST
13+
);
14+
}
15+
}

apps/api/src/app/team/usecase/invite/invite.usecase.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ export class Invite {
1717

1818
async exec(command: InviteCommand) {
1919
try {
20-
// const subscription = await this.paymentAPIService.fetchActiveSubscription(command.invitedBy);
21-
// const allocated = subscription.meta.TEAM_MEMBERS;
20+
/*
21+
* const subscription = await this.paymentAPIService.fetchActiveSubscription(command.invitedBy);
22+
* const allocated = subscription.meta.TEAM_MEMBERS;
23+
*/
2224

2325
const existingInvitationsCount = await this.projectInvitationRepository.count({
2426
_projectId: command.projectId,

apps/api/src/app/template/usecases/update-template-columns/update-template-columns.usecase.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ export class UpdateTemplateColumns {
3333

3434
column.sequence = index;
3535
column.dateFormats = column.dateFormats?.map((format) => format.toUpperCase()) || [];
36-
column.isRequired = existingUserColumns?.isRequired || false;
37-
column.isUnique = existingUserColumns?.isUnique || false;
38-
column.selectValues = existingUserColumns?.selectValues || [];
39-
column.dateFormats = existingUserColumns?.dateFormats || [];
40-
column.validations = existingUserColumns?.validations || [];
36+
column.isRequired = existingUserColumns?.isRequired || column.isRequired || false;
37+
column.isUnique = existingUserColumns?.isUnique || column.isUnique || false;
38+
column.selectValues = column.selectValues || existingUserColumns?.selectValues || [];
39+
column.dateFormats = existingUserColumns?.dateFormats || column.dateFormats || [];
40+
column.validations = existingUserColumns?.validations || column.validations || [];
4141
});
4242
const columns = await this.columnRepository.createMany(userColumns);
4343
await this.saveSampleFile.execute(columns, _templateId);

apps/web/assets/icons/Forbidden.icon.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ export function ForbiddenIcon({ size = 'xl' }: IconType) {
1414
id="Forbid--Streamline-Tabler"
1515
>
1616
<desc>Forbid Streamline Icon: https://streamlinehq.com</desc>
17-
<path d="M3 12a9 9 0 1 0 18 0 9 9 0 1 0 -18 0" stroke-width="2"></path>
18-
<path d="m9 9 6 6" stroke-width="2"></path>
17+
<path d="M3 12a9 9 0 1 0 18 0 9 9 0 1 0 -18 0" strokeWidth="2"></path>
18+
<path d="m9 9 6 6" strokeWidth="2"></path>
1919
</svg>
2020
);
2121
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import React from 'react';
2+
3+
export const GiveHeartIcon = () => (
4+
<svg width="38" height="31" viewBox="0 0 38 31" fill="none" xmlns="http://www.w3.org/2000/svg">
5+
<path
6+
d="M13.8834 14.4273L17.5 14.4281C21.6422 14.4281 25 17.786 25 21.9281L13.3317 21.9266L13.3333 23.5948L26.6667 23.5935V21.9281C26.6667 20.124 26.1364 18.423 25.1899 16.9268L30 16.9281C33.3205 16.9281 36.1874 18.8701 37.5269 21.6805C33.5855 26.8815 27.2032 30.2615 20 30.2615C15.3979 30.2615 11.4991 29.2771 8.33265 27.5535L8.33507 12.0465C10.411 12.3438 12.3106 13.1875 13.8834 14.4273ZM5 10.2614C5.85473 10.2614 6.55918 10.9048 6.65547 11.7337L6.66667 11.9266V26.9281C6.66667 27.8486 5.92048 28.5948 5 28.5948H1.66667C0.7462 28.5948 0 27.8486 0 26.9281V11.9281C0 11.0076 0.7462 10.2614 1.66667 10.2614H5ZM21.0774 1.22039L21.6662 1.81L22.2559 1.22039C23.883 -0.406796 26.5214 -0.406796 28.1485 1.22039C29.7757 2.84757 29.7757 5.48575 28.1485 7.11294L21.6667 13.5948L15.1849 7.11294C13.5577 5.48575 13.5577 2.84757 15.1849 1.22039C16.812 -0.406796 19.4502 -0.406796 21.0774 1.22039Z"
7+
fill="#F7B801"
8+
/>
9+
</svg>
10+
);
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { IconType } from '@types';
2+
import { IconSizes } from 'config';
3+
4+
export const ImporterIcon = ({ size = 'xl', color = 'currentColor', className }: IconType) => {
5+
return (
6+
<svg
7+
width={IconSizes[size]}
8+
height={IconSizes[size]}
9+
viewBox="0 0 30 27"
10+
fill="none"
11+
xmlns="http://www.w3.org/2000/svg"
12+
className={className}
13+
>
14+
<path
15+
d="M30 1.5C30 0.67158 29.3284 0 28.5 0H1.5C0.67158 0 0 0.67158 0 1.5V25.5C0 26.3284 0.67158 27 1.5 27H28.5C29.3284 27 30 26.3284 30 25.5V1.5ZM3 18H8.12406C9.2814 20.6488 11.9245 22.5 15 22.5C18.0754 22.5 20.7186 20.6488 21.876 18H27V24H3V18ZM3 3H27V15H19.5C19.5 17.4853 17.4853 19.5 15 19.5C12.5147 19.5 10.5 17.4853 10.5 15H3V3ZM21 9H16.5V4.5H13.5V9H9L15 15.75L21 9Z"
16+
fill={color}
17+
/>
18+
</svg>
19+
);
20+
};

0 commit comments

Comments
 (0)