Skip to content

Commit 76f6d32

Browse files
committed
getting rid of unwanted file changes
1 parent 325e138 commit 76f6d32

67 files changed

Lines changed: 439 additions & 210 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.

.github/workflows/lint-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Node.js
2020
uses: actions/setup-node@v3
2121
with:
22-
node-version: 18.17.1
22+
node-version: 20.18.1
2323
cache: 'yarn'
2424
- name: Install modules
2525
run: yarn install && yarn prisma:generate

.github/workflows/prettier-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Node.js
2020
uses: actions/setup-node@v3
2121
with:
22-
node-version: 18.17.1
22+
node-version: 20.18.1
2323
cache: 'yarn'
2424
- name: Install modules
2525
run: yarn install

.github/workflows/production-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Node.js
1818
uses: actions/setup-node@v3
1919
with:
20-
node-version: 18.17.1
20+
node-version: 20.18.1
2121
cache: 'yarn'
2222
- name: Yarn Install
2323
run: yarn install

.github/workflows/run-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Node.js
2626
uses: actions/setup-node@v3
2727
with:
28-
node-version: 18.17.1
28+
node-version: 20.18.1
2929
cache: 'yarn'
3030
- name: Add Env Variables
3131
run: cd src/backend && echo "DATABASE_URL=\"postgresql://postgres:docker@localhost:5432/nerpm?schema=public\"" >> .env

.github/workflows/system-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Node.js
1919
uses: actions/setup-node@v3
2020
with:
21-
node-version: 18.17.1
21+
node-version: 20.18.1
2222
cache: 'yarn'
2323
- name: Yarn Install
2424
run: yarn install

.github/workflows/tsc-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Node.js
2424
uses: actions/setup-node@v3
2525
with:
26-
node-version: 18
26+
node-version: 20.18.1
2727

2828
- name: Install dependencies
2929
run: yarn install && yarn prisma:generate

src/backend/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"prisma:manual": "ts-node ./src/prisma/manual.ts"
1010
},
1111
"dependencies": {
12-
"@prisma/client": "^5.7.1",
12+
"@prisma/client": "^6.2.1",
1313
"@slack/events-api": "^3.0.1",
14-
"@slack/web-api": "^6.7.2",
14+
"@slack/web-api": "^7.8.0",
1515
"@types/concat-stream": "^2.0.0",
1616
"@types/cookie-parser": "^1.4.3",
1717
"@types/cors": "^2.8.12",
@@ -40,12 +40,11 @@
4040
"@types/node": "^20.0.0",
4141
"@types/supertest": "^2.0.12",
4242
"nodemon": "^2.0.16",
43-
"prisma": "^5.7.1",
43+
"prisma": "^6.2.1",
4444
"supertest": "^6.2.4",
45-
"ts-jest": "^26.2.0",
4645
"ts-node": "^8.10.1",
4746
"typescript": "^5.7.3",
48-
"vitest": "^2.1.8"
47+
"vitest": "^3.0.0"
4948
},
5049
"main": "index.ts",
5150
"prisma": {

src/backend/src/controllers/users.controllers.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,13 @@ export default class UsersController {
200200
next(error);
201201
}
202202
}
203+
204+
static async logUserOut(_req: Request, res: Response, next: NextFunction) {
205+
try {
206+
res.clearCookie('token');
207+
res.status(200).json({ message: 'successfully logged out' });
208+
} catch (error: unknown) {
209+
next(error);
210+
}
211+
}
203212
}

src/backend/src/prisma-query-args/cars.query-args.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Prisma } from '@prisma/client';
2-
import { getAssemblyQueryArgs, getMaterialQueryArgs } from './bom.query-args';
32
import { getDescriptionBulletQueryArgs } from './description-bullets.query-args';
43
import { getLinkQueryArgs } from './links.query-args';
54
import { getUserQueryArgs } from './user.query-args';
@@ -18,9 +17,7 @@ export const getCarQueryArgs = (organizationId: string) =>
1817
changes: {
1918
where: { changeRequest: { dateDeleted: null } },
2019
include: { implementer: getUserQueryArgs(organizationId) }
21-
},
22-
materials: getMaterialQueryArgs(organizationId),
23-
assemblies: getAssemblyQueryArgs(organizationId)
20+
}
2421
}
2522
}
2623
}

src/backend/src/prisma-query-args/work-packages.query-args.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { Prisma } from '@prisma/client';
22
import { getUserQueryArgs } from './user.query-args';
3-
import { getTaskQueryArgs } from './tasks.query-args';
43
import { getDescriptionBulletQueryArgs } from './description-bullets.query-args';
5-
import { getDesignReviewQueryArgs } from './design-reviews.query-args';
4+
import { getDesignReviewPreviewQueryArgs } from './design-reviews.query-args';
65

76
export type WorkPackageQueryArgs = ReturnType<typeof getWorkPackageQueryArgs>;
87

@@ -29,9 +28,8 @@ export const getWorkPackageQueryArgs = (organizationId: string) =>
2928
orderBy: { dateImplemented: 'asc' }
3029
},
3130
blocking: { where: { wbsElement: { dateDeleted: null } }, include: { wbsElement: true } },
32-
tasks: { where: { dateDeleted: null }, ...getTaskQueryArgs(organizationId) },
3331
descriptionBullets: { where: { dateDeleted: null }, ...getDescriptionBulletQueryArgs(organizationId) },
34-
designReviews: { where: { dateDeleted: null }, ...getDesignReviewQueryArgs(organizationId) }
32+
designReviews: { where: { dateDeleted: null }, ...getDesignReviewPreviewQueryArgs(organizationId) }
3533
}
3634
},
3735
blockedBy: { where: { dateDeleted: null } }

0 commit comments

Comments
 (0)