Skip to content

Commit

Permalink
refactoring directory structure
Browse files Browse the repository at this point in the history
  • Loading branch information
barrfalk committed Mar 29, 2024
1 parent 1936ab9 commit db7a6eb
Show file tree
Hide file tree
Showing 17 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion backend/src/admin/admin.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
Param,
Res,
} from '@nestjs/common';
import { ExportDataObject, SessionData, UserObject } from 'utils/types';
import { ExportDataObject, SessionData, UserObject } from 'src/types';
import { AxiosRequestConfig } from 'axios';
import { AdminService } from './admin.service';
import { AuthenticationFilter } from 'src/authentication/authentication.filter';
Expand Down
2 changes: 1 addition & 1 deletion backend/src/admin/admin.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Injectable } from '@nestjs/common';
import * as dotenv from 'dotenv';
import { HttpService } from '@nestjs/axios';
import { SearchResultsItem, UserObject } from 'utils/types';
import { SearchResultsItem, UserObject } from 'src/types';
import { DocumentTemplateService } from 'src/document_template/document_template.service';
import { ProvisionService } from 'src/provision/provision.service';
import { DocumentTypeService } from 'src/document_type/document_type.service';
Expand Down
6 changes: 3 additions & 3 deletions backend/src/app.controller.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Get, Controller, Render, Param, UseGuards, UseFilters, Session, Query, Res } from '@nestjs/common';
import { AppService } from '../src/app.service';
import { NFR_VARIANTS, NFR_VARIANTS_ARRAY, PAGE_TITLES, REPORT_TYPES } from 'utils/constants';
import { SessionData } from 'utils/types';
import { NFR_VARIANTS, NFR_VARIANTS_ARRAY, PAGE_TITLES, REPORT_TYPES } from 'src/constants';
import { SessionData } from 'src/types';
import { AuthenticationGuard } from './authentication/authentication.guard';
import { AuthenticationFilter } from './authentication/authentication.filter';
import { TTLSService } from './ttls/ttls.service';
Expand All @@ -11,7 +11,7 @@ import { firstValueFrom } from 'rxjs';
import { Req } from '@nestjs/common/decorators/http/route-params.decorator';
import { Request, Response } from 'express';
import { ReportService } from './report/report.service';
import { nfrInterestedParties } from 'utils/util';
import { nfrInterestedParties } from 'src/util';

//
let requestUrl: string;
Expand Down
2 changes: 1 addition & 1 deletion backend/src/authentication/authentication.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Body, Controller, Post, Session, UseFilters, UseGuards } from '@nestjs/common';
import { SessionData } from 'utils/types';
import { SessionData } from 'src/types';
import { AuthenticationFilter } from './authentication.filter';
import { AuthenticationGuard } from './authentication.guard';

Expand Down
2 changes: 1 addition & 1 deletion backend/src/authentication/authentication.guard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { CanActivate, ExecutionContext, Injectable, UnauthorizedException } from
import { AuthenticationService } from './authentication.service';
import { Request } from 'express';
import { URL } from 'url';
import { AccountObject, TokenObject } from 'utils/types';
import { AccountObject, TokenObject } from 'src/types';

@Injectable()
export class AuthenticationGuard implements CanActivate {
Expand Down
2 changes: 1 addition & 1 deletion backend/src/authentication/authentication.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import * as base64 from 'base-64';
import { URLSearchParams } from 'url';
import jwt_decode from 'jwt-decode';
import { AccountObject, TokenObject } from 'utils/types';
import { AccountObject, TokenObject } from 'src/types';
const axios = require('axios');

export class AuthenticationError extends Error {}
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion backend/src/document_data/document_data.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Body, Controller, Delete, Get, Param, Post } from '@nestjs/common';
import { ProvisionJSON, VariableJSON } from 'utils/types';
import { ProvisionJSON, VariableJSON } from 'src/types';
import { CreateDocumentDataDto } from './dto/create-document_data.dto';
import { DocumentDataService } from './document_data.service';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { FileInterceptor } from '@nestjs/platform-express';
import { Express } from 'express';
import { Param } from '@nestjs/common/decorators';
import { DocumentTemplate } from './entities/document_template.entity';
import { TrimmedDocumentTemplate } from '../../utils/types';
import { TrimmedDocumentTemplate } from '../types';

@Controller('document-template')
export class DocumentTemplateController {
Expand Down
2 changes: 1 addition & 1 deletion backend/src/document_type/document_type.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { AuthenticationFilter } from 'src/authentication/authentication.filter';
import { AuthenticationGuard } from 'src/authentication/authentication.guard';
import { GenerateReportGuard } from 'src/authentication/generate-report.guard';
import { DocumentTypeService } from './document_type.service';
import { SessionData } from 'utils/types';
import { SessionData } from 'src/types';
import { ProvisionGroup } from './entities/provision_group.entity';

// @UseFilters(AuthenticationFilter)
Expand Down
2 changes: 1 addition & 1 deletion backend/src/provision/provision.controller.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Body, Controller, Get, Param, Post, Session } from '@nestjs/common';
import { CreateProvisionDto } from './dto/create-provision.dto';
import { ProvisionService } from './provision.service';
import { ManageDocTypeProvision, SessionData } from 'utils/types';
import { ManageDocTypeProvision, SessionData } from 'src/types';

@Controller('provision')
export class ProvisionController {
Expand Down
2 changes: 1 addition & 1 deletion backend/src/provision/provision.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { DocumentTypeService } from 'src/document_type/document_type.service';
import { DocumentType } from 'src/document_type/entities/document_type.entity';
import { DocumentTypeProvision } from './entities/document_type_provision';
import { ProvisionGroup } from 'src/document_type/entities/provision_group.entity';
import { ManageDocTypeProvision } from 'utils/types';
import { ManageDocTypeProvision } from 'src/types';

@Injectable()
export class ProvisionService {
Expand Down
2 changes: 1 addition & 1 deletion backend/src/report/report.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
UseGuards,
UseFilters,
} from '@nestjs/common';
import { ProvisionJSON, SessionData, VariableJSON } from 'utils/types';
import { ProvisionJSON, SessionData, VariableJSON } from 'src/types';
import { TTLSService } from '../ttls/ttls.service';
import { AxiosRequestConfig } from 'axios';
import { AuthenticationFilter } from 'src/authentication/authentication.filter';
Expand Down
6 changes: 3 additions & 3 deletions backend/src/report/report.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { firstValueFrom } from 'rxjs';
import { DocumentTemplateService } from 'src/document_template/document_template.service';
import { ProvisionService } from 'src/provision/provision.service';
import { TTLSService } from 'src/ttls/ttls.service';
import { GL_REPORT_TYPE, LUR_REPORT_TYPE, SL_REPORT_TYPE, numberWords, sectionTitles } from 'utils/constants';
import { ProvisionJSON, VariableJSON } from 'utils/types';
import { convertToSpecialCamelCase, formatMoney, grazingLeaseVariables, nfrAddressBuilder } from 'utils/util';
import { GL_REPORT_TYPE, LUR_REPORT_TYPE, SL_REPORT_TYPE, numberWords, sectionTitles } from 'src/constants';
import { ProvisionJSON, VariableJSON } from 'src/types';
import { convertToSpecialCamelCase, formatMoney, grazingLeaseVariables, nfrAddressBuilder } from 'src/util';
import { DocumentDataService } from 'src/document_data/document_data.service';
import { DocumentDataLogService } from 'src/document_data_log/document_data_log.service';
import { DocumentTypeService } from 'src/document_type/document_type.service';
Expand Down
2 changes: 1 addition & 1 deletion backend/src/ttls/ttls.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { map } from 'rxjs/operators';
import { URLSearchParams } from 'url';
import * as dotenv from 'dotenv';
import * as base64 from 'base-64';
import { formatPostalCode, getNFRMailingAddress } from 'utils/util';
import { formatPostalCode, getNFRMailingAddress } from 'src/util';
declare const Buffer;
const axios = require('axios');

Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit db7a6eb

Please sign in to comment.