Skip to content

Commit 17d1d3e

Browse files
committed
Merge branch '275/intro-and-outro' of https://github.com/sandboxnu/sarge into 275/intro-and-outro
2 parents 4fd61dd + 21824d1 commit 17d1d3e

47 files changed

Lines changed: 1319 additions & 341 deletions

Some content is hidden

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

docker-compose.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ services:
3030
build:
3131
context: ./src/ws/
3232
dockerfile: Dockerfile
33+
env_file:
34+
- .env
3335
ports:
3436
- 8080:8080
3537
volumes:

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"scripts": {
77
"dev:migrate": "npx prisma migrate dev",
88
"dev:start": "next dev",
9+
"dev:ws": "node --env-file .env src/ws/index.js",
910
"dev": "npm run dev:migrate && npm run dev:start",
1011
"build": "prisma generate && next build",
1112
"start": "next start",
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
Warnings:
3+
4+
- You are about to drop the column `uniqueLink` on the `Assessment` table. All the data in the column will be lost.
5+
6+
*/
7+
-- DropIndex
8+
DROP INDEX "public"."Assessment_uniqueLink_key";
9+
10+
-- AlterTable
11+
ALTER TABLE "public"."Assessment" DROP COLUMN "uniqueLink";

prisma/schema.prisma

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ model Assessment {
224224
assessmentTemplateId String
225225
assignedAt DateTime @default(now())
226226
submittedAt DateTime?
227-
uniqueLink String @unique
228227
deadline DateTime?
229228
230229
application Application @relation(fields: [applicationId], references: [id], onDelete: Cascade)

prisma/seed-data/assessment.seed.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ export const assessmentsData = [
22
{
33
id: 'assessment_carter_001',
44
assessmentTemplateId: 'assessment_template_general_001',
5-
uniqueLink: 'https://assessment.sarge.dev/take/carter-herman-001',
65
deadline: new Date('2035-12-20T23:59:59Z'),
76
},
87
{
98
id: 'assessment_laith_001',
109
assessmentTemplateId: 'assessment_template_general_001',
11-
uniqueLink: 'https://assessment.sarge.dev/take/laith-taher-001',
1210
deadline: new Date('2035-12-20T23:59:59Z'),
1311
},
1412
];

0 commit comments

Comments
 (0)