Skip to content

Commit 03c0f29

Browse files
committed
Merge branch 'main' of github.com:dump-hr/internship-app
Merge main
2 parents fe58c71 + a3d6988 commit 03c0f29

21 files changed

+193
-146
lines changed

apps/api/src/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import { QuestionModule } from './interview-question/interview-question.module';
1212
import { InterviewSlotModule } from './interview-slot/interview-slot.module';
1313
import { InterviewerModule } from './interviewer/interviewer.module';
1414
import { LoggerModule } from './logger/logger.module';
15+
import { OldInternResultModule } from './old-intern-result/old-intern-result.module';
1516
import { PrismaService } from './prisma.service';
1617
import { TestSlotModule } from './test-slot/test-slot.module';
17-
import { OldInternResultModule } from './old-intern-result/old-intern-result.module';
1818

1919
@Module({
2020
imports: [

apps/api/src/email/email.controller.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import {
1010
import { ApiTags } from '@nestjs/swagger';
1111
import { AdminLogAction } from '@prisma/client';
1212
import { Response } from 'express';
13+
import * as fs from 'fs';
14+
import { join } from 'path';
1315
import { MemberGuard } from 'src/auth/azure.guard';
1416
import { LoggerService } from 'src/logger/logger.service';
1517

1618
import { EmailsDto } from './dto/emails.dto';
1719
import { EmailsSendDto } from './dto/emailsSend.dto';
1820
import { EmailService } from './email.service';
19-
import { join } from 'path';
20-
import * as fs from 'fs';
2121

2222
@Controller('email')
2323
@ApiTags('email')

apps/api/src/intern/intern.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import {
1818
TestStatus,
1919
} from '@prisma/client';
2020
import * as postmark from 'postmark';
21+
import { EmailService } from 'src/email/email.service';
2122
import { PrismaService } from 'src/prisma.service';
2223

2324
import * as disposableEmailBlocklist from './disposable-email-blocklist.json';
2425
import { CreateInternDto } from './dto/createIntern.dto';
25-
import { EmailService } from 'src/email/email.service';
2626

2727
@Injectable()
2828
export class InternService {

apps/api/src/old-intern-result/old-intern-result.controller.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { Controller, Get, Query } from '@nestjs/common';
2-
import { OldInternResultService } from './old-intern-result.service';
3-
import { FindDto } from './dto/find.dto';
42
import { ApiTags } from '@nestjs/swagger';
53

4+
import { FindDto } from './dto/find.dto';
5+
import { OldInternResultService } from './old-intern-result.service';
6+
67
@Controller('old-intern-result')
78
@ApiTags('old-intern-result')
89
export class OldInternResultController {

apps/api/src/old-intern-result/old-intern-result.module.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { Module } from '@nestjs/common';
2-
import { OldInternResultService } from './old-intern-result.service';
3-
import { OldInternResultController } from './old-intern-result.controller';
42
import { PrismaService } from 'src/prisma.service';
53

4+
import { OldInternResultController } from './old-intern-result.controller';
5+
import { OldInternResultService } from './old-intern-result.service';
6+
67
@Module({
78
controllers: [OldInternResultController],
89
providers: [OldInternResultService, PrismaService],

apps/api/src/old-intern-result/old-intern-result.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { Injectable } from '@nestjs/common';
12
import { PrismaService } from 'src/prisma.service';
3+
24
import { FindDto } from './dto/find.dto';
3-
import { Injectable } from '@nestjs/common';
45

56
@Injectable()
67
export class OldInternResultService {
File renamed without changes.

apps/web/src/assets/fonts/FuseV.2Display-BookItalic.woff2 renamed to apps/web/public/fonts/FuseV.2Display-BookItalic.woff2

File renamed without changes.

apps/web/src/assets/fonts/FuseV.2Display-ExtraBold.woff2 renamed to apps/web/public/fonts/FuseV.2Display-ExtraBold.woff2

File renamed without changes.

apps/web/src/assets/fonts/FuseV.2Display-ExtraBoldItalic.woff2 renamed to apps/web/public/fonts/FuseV.2Display-ExtraBoldItalic.woff2

File renamed without changes.

0 commit comments

Comments
 (0)