Skip to content

Commit e8716f5

Browse files
committed
Move email templates out of ~/core/email into _module_/emails/*.email.tsx
1 parent de70226 commit e8716f5

File tree

9 files changed

+46
-35
lines changed

9 files changed

+46
-35
lines changed
File renamed without changes.

src/components/dbl-upload-notification/handlers/dbl-upload-notification.handler.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import {
3838
resolveProductType,
3939
} from '../../product/dto';
4040
import { ProjectMemberRepository } from '../../project/project-member/project-member.repository';
41-
import { DBLUpload } from '../templates/dbl-upload-email.template';
41+
import { DBLUpload } from '../emails/dbl-upload.email';
4242

4343
@EventsHandler(WorkflowUpdatedEvent)
4444
export class DBLUploadNotificationHandler

src/core/email/templates/progress-report-status-changed.template.tsx renamed to src/components/progress-report/workflow/emails/progress-report-status-changed.email.tsx

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
import * as Mjml from '@seedcompany/nestjs-email/templates/mjml';
21
import { fiscalQuarter, fiscalYear } from '~/common';
3-
import { type Language } from '../../../components/language/dto';
4-
import { type PeriodicReport } from '../../../components/periodic-report/dto';
5-
import { ProgressReportStatus } from '../../../components/progress-report/dto';
6-
import { type ProgressReportWorkflowEvent } from '../../../components/progress-report/workflow/dto/workflow-event.dto';
7-
import { type Project } from '../../../components/project/dto';
8-
import { type User } from '../../../components/user/dto';
9-
import { EmailTemplate, Heading } from './base';
10-
import { FormattedDateTime } from './formatted-date-time';
11-
import { useFrontendUrl } from './frontend-url';
12-
import { UserRef, type UserRefProps } from './user-ref';
2+
import {
3+
EmailTemplate,
4+
FormattedDateTime,
5+
Heading,
6+
Mjml,
7+
useFrontendUrl,
8+
UserRef,
9+
type UserRefProps,
10+
} from '~/core/email';
11+
import { type Language } from '../../../language/dto';
12+
import { type PeriodicReport } from '../../../periodic-report/dto';
13+
import { type Project } from '../../../project/dto';
14+
import { type User } from '../../../user/dto';
15+
import { ProgressReportStatus } from '../../dto';
16+
import { type ProgressReportWorkflowEvent } from '../dto/workflow-event.dto';
1317

1418
export interface ProgressReportStatusChangedProps {
1519
changedBy: UserRefProps;

src/components/progress-report/workflow/handlers/progress-report-workflow-notification.handler.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ import {
1010
} from '~/core';
1111
import { Identity } from '~/core/authentication';
1212
import { MailerService } from '~/core/email';
13-
import {
14-
type ProgressReportStatusChangedProps as EmailReportStatusNotification,
15-
ProgressReportStatusChanged,
16-
} from '~/core/email/templates/progress-report-status-changed.template';
1713
import { LanguageService } from '../../../language';
1814
import { PeriodicReportService } from '../../../periodic-report';
1915
import { ProjectService } from '../../../project';
2016
import { UserService } from '../../../user';
2117
import { type ProgressReportStatus as Status } from '../../dto';
2218
import { type ProgressReportWorkflowEvent } from '../dto/workflow-event.dto';
19+
import {
20+
type ProgressReportStatusChangedProps as EmailReportStatusNotification,
21+
ProgressReportStatusChanged,
22+
} from '../emails/progress-report-status-changed.email';
2323
import { WorkflowUpdatedEvent } from '../events/workflow-updated.event';
2424
import { ProgressReportWorkflowRepository } from '../progress-report-workflow.repository';
2525
import { ProgressReportWorkflowService } from '../progress-report-workflow.service';

src/core/email/templates/project-step-changed.template.tsx renamed to src/components/project/workflow/emails/project-step-changed.email.tsx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
import { cleanJoin } from '@seedcompany/common';
2-
import { InHtml } from '@seedcompany/nestjs-email/templates';
3-
import * as Mjml from '@seedcompany/nestjs-email/templates/mjml';
2+
import {
3+
EmailTemplate,
4+
FormattedDateTime,
5+
Heading,
6+
InHtml,
7+
Mjml,
8+
useFrontendUrl,
9+
UserRef,
10+
} from '~/core/email';
11+
import { type User } from '../../../user/dto';
412
import {
513
type Project,
614
ProjectStep as Step,
715
ProjectType as Type,
8-
} from '../../../components/project/dto';
9-
import { type User } from '../../../components/user/dto';
10-
import { EmailTemplate, Heading } from './base';
11-
import { FormattedDateTime } from './formatted-date-time';
12-
import { useFrontendUrl } from './frontend-url';
13-
import { UserRef } from './user-ref';
16+
} from '../../dto';
1417

1518
export interface ProjectStepChangedProps {
1619
recipient: Pick<

src/components/project/workflow/handlers/project-workflow-notification.handler.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import {
1010
} from '~/core';
1111
import { Identity } from '~/core/authentication';
1212
import { MailerService } from '~/core/email';
13-
import {
14-
ProjectStepChanged,
15-
type ProjectStepChangedProps,
16-
} from '~/core/email/templates/project-step-changed.template';
1713
import { ProjectService } from '../../../project';
1814
import { UserService } from '../../../user';
1915
import { type User } from '../../../user/dto';
2016
import { type Notifier } from '../../../workflow/transitions/notifiers';
2117
import { type Project, type ProjectStep } from '../../dto';
18+
import {
19+
ProjectStepChanged,
20+
type ProjectStepChangedProps,
21+
} from '../emails/project-step-changed.email';
2222
import { ProjectTransitionedEvent } from '../events/project-transitioned.event';
2323

2424
@EventsHandler(ProjectTransitionedEvent)

src/core/authentication/authentication.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import {
1010
} from '~/common';
1111
import { MailerService } from '~/core/email';
1212
import { ILogger, Logger } from '~/core/logger';
13-
import { ForgotPassword } from '../email/templates';
1413
import { disableAccessPolicies, Gel } from '../gel';
1514
import { AuthenticationRepository } from './authentication.repository';
1615
import { CryptoService } from './crypto.service';
1716
import type { LoginInput, RegisterInput, ResetPasswordInput } from './dto';
17+
import { ForgotPassword } from './emails/forgot-password.email';
1818
import { JwtService } from './jwt.service';
1919
import { SessionHost } from './session/session.host';
2020
import { SessionManager } from './session/session.manager';

src/core/email/templates/forgot-password.template.tsx renamed to src/core/authentication/emails/forgot-password.email.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
import { InHtml, InText } from '@seedcompany/nestjs-email/templates';
2-
import * as Mjml from '@seedcompany/nestjs-email/templates/mjml';
3-
import { EmailTemplate, Heading, Link, ReplyInfoFooter } from './base';
4-
import { useFrontendUrl } from './frontend-url';
1+
import {
2+
EmailTemplate,
3+
Heading,
4+
InHtml,
5+
InText,
6+
Link,
7+
Mjml,
8+
ReplyInfoFooter,
9+
useFrontendUrl,
10+
} from '../../email';
511

612
export interface ForgotPasswordProps {
713
token: string;

src/core/email/templates/index.ts

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)