Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1b6988d
added revenue endpoints, seeded dynamo table, added swagger doc
yumi520 Mar 21, 2026
823c937
Upload and get works correctly
prooflesben Mar 23, 2026
bea56c5
Connecting cost to backend
janekamata Mar 24, 2026
977132c
Fixing spacing
janekamata Mar 24, 2026
0723ce8
Updating cost kpi
janekamata Mar 24, 2026
271dccf
Guarding cashflow route admin only
janekamata Mar 24, 2026
98b5d6c
made revenue defaults blank, added error handling
lyannne Mar 26, 2026
6790e90
cost + reseting form when submitted
lyannne Mar 26, 2026
2eb61d2
alll endpoints impolemented just need to tgest everything
prooflesben Mar 26, 2026
131d34a
added more error checking
prooflesben Mar 26, 2026
9874537
Merge remote-tracking branch 'origin/revenue-backend' into connect-ad…
lyannne Mar 26, 2026
89af791
successmessage when added cost or revenue successfully
lyannne Mar 26, 2026
7f6434b
revenue sources displayed
lyannne Mar 26, 2026
0982df5
delete get cost by type
lyannne Mar 26, 2026
5b7678c
changed patch to put for costs
lyannne Mar 27, 2026
644259e
made it so update cost does not make a put request if costs have the …
lyannne Mar 27, 2026
3441ced
patch to put
lyannne Mar 27, 2026
9ab4f12
tailwind fixes
lyannne Mar 27, 2026
5406fc7
Merge branch 'main' into connect-add-cost-and-revenue-to-backend
lyannne Mar 27, 2026
8d32066
clear success message after submitted again
lyannne Mar 27, 2026
6862032
resolved copilot comments, resolved revenue ones but did not actually…
lyannne Mar 27, 2026
40aa526
fixes login issue with login method not returning user
lyannne Mar 27, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { AuthModule } from './auth/auth.module';
import { UserModule } from './user/user.module';
import { GrantModule } from './grant/grant.module';
import { NotificationsModule } from './notifications/notification.module';
import { CashflowModule } from './cashflow/cashflow.module';
import { RevenueModule } from './revenue/cashflow-revenue.module';
import { CostModule } from './cost/cashflow-cost.module';
import { DefaultValuesModule } from './default-values/default-values.module';

@Module({
imports: [AuthModule, UserModule, GrantModule, NotificationsModule, CashflowModule, CostModule, DefaultValuesModule],
imports: [AuthModule, UserModule, GrantModule, NotificationsModule, RevenueModule, CostModule, DefaultValuesModule],
})
export class AppModule {}
8 changes: 6 additions & 2 deletions backend/src/auth/auth.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Response } from 'express';
import { VerifyUserGuard } from "../guards/auth.guard";
import { LoginBody, RegisterBody, SetPasswordBody, UpdateProfileBody, ChangePasswordBody } from './types/auth.types';
import { ApiBearerAuth, ApiResponse } from '@nestjs/swagger';
import { User } from '../../../middle-layer/types/User';

@Controller('auth')
export class AuthController {
Expand Down Expand Up @@ -145,7 +146,7 @@ export class AuthController {
async login(
@Res({ passthrough: true }) response: Response,
@Body() body:LoginBody
): Promise<{ message: string }> {
): Promise<{ message: string; user: User }> {
const result = await this.authService.login(body.email, body.password);

// Set cookie with access token
Expand Down Expand Up @@ -183,7 +184,10 @@ export class AuthController {
}


return { message: 'User logged in successfully' };
return {
message: 'User logged in successfully',
user: result.user,
};
}

/**
Expand Down
16 changes: 0 additions & 16 deletions backend/src/cashflow/cashflow.controller.ts

This file was deleted.

10 changes: 0 additions & 10 deletions backend/src/cashflow/cashflow.module.ts

This file was deleted.

9 changes: 0 additions & 9 deletions backend/src/cashflow/cashflow.service.ts

This file was deleted.

Loading
Loading