Skip to content

Commit f979384

Browse files
committed
Merge branch 'develop' into 3895-Login-Fix
2 parents 9abfba7 + ad90ff3 commit f979384

150 files changed

Lines changed: 19230 additions & 4629 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,7 @@ eb-deploy/
6464
# Docker
6565
*.bak
6666
*.backup
67+
68+
# Claude Code Files
69+
CLAUDE.md
70+
.playwright-mcp/

infrastructure/modules/amplify-frontend/main.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ resource "aws_amplify_app" "frontend" {
2929
baseDirectory: src/frontend/dist
3030
files:
3131
- '**/*'
32-
cache:
33-
paths:
34-
- node_modules/**/*
35-
- src/frontend/node_modules/**/*
36-
- src/backend/node_modules/**/*
37-
- src/shared/node_modules/**/*
3832
EOT
3933

4034
# Environment variables for the build

src/backend/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import descriptionBulletsRouter from './src/routes/description-bullets.routes.js
1212
import tasksRouter from './src/routes/tasks.routes.js';
1313
import reimbursementRequestsRouter from './src/routes/reimbursement-requests.routes.js';
1414
import notificationsRouter from './src/routes/notifications.routes.js';
15-
import designReviewsRouter from './src/routes/design-reviews.routes.js';
1615
import wbsElementTemplatesRouter from './src/routes/wbs-element-templates.routes.js';
1716
import carsRouter from './src/routes/cars.routes.js';
1817
import organizationRouter from './src/routes/organizations.routes.js';
@@ -25,6 +24,7 @@ import statisticsRouter from './src/routes/statistics.routes.js';
2524
import retrospectiveRouter from './src/routes/retrospective.routes.js';
2625
import partsRouter from './src/routes/parts.routes.js';
2726
import financeRouter from './src/routes/finance.routes.js';
27+
import calendarRouter from './src/routes/calendar.routes.js';
2828

2929
const app = express();
3030

@@ -90,7 +90,6 @@ app.use('/change-requests', changeRequestsRouter);
9090
app.use('/description-bullets', descriptionBulletsRouter);
9191
app.use('/tasks', tasksRouter);
9292
app.use('/reimbursement-requests', reimbursementRequestsRouter);
93-
app.use('/design-reviews', designReviewsRouter);
9493
app.use('/notifications', notificationsRouter);
9594
app.use('/templates', wbsElementTemplatesRouter);
9695
app.use('/cars', carsRouter);
@@ -103,6 +102,7 @@ app.use('/statistics', statisticsRouter);
103102
app.use('/retrospective', retrospectiveRouter);
104103
app.use('/parts', partsRouter);
105104
app.use('/finance', financeRouter);
105+
app.use('/calendar', calendarRouter);
106106
app.use('/', (_req, res) => {
107107
res.status(200).json('Welcome to FinishLine');
108108
});

0 commit comments

Comments
 (0)