Skip to content

Commit

Permalink
Merge branch 'main' into 1884-get-contest-submission-informations-abo…
Browse files Browse the repository at this point in the history 
…ut-one-user
  • Loading branch information
@Jaehyeon1020
Jaehyeon1020 authored Aug 5, 2024
2 parents a463a5a + f468272 commit 53d9186
Show file tree
Hide file tree
Showing 20 changed files with 1,003 additions and 964 deletions.
16 changes: 8 additions & 8 deletions apps/backend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
},
"dependencies": {
"@apollo/server": "^4.10.5",
"@aws-sdk/client-s3": "^3.617.0",
"@aws-sdk/client-ses": "^3.616.0",
"@aws-sdk/credential-provider-node": "^3.616.0",
"@aws-sdk/client-s3": "^3.623.0",
"@aws-sdk/client-ses": "^3.623.0",
"@aws-sdk/credential-provider-node": "^3.623.0",
"@golevelup/nestjs-rabbitmq": "^5.3.0",
"@nestjs-modules/mailer": "^2.0.2",
"@nestjs/apollo": "^12.2.0",
Expand All @@ -39,7 +39,7 @@
"@opentelemetry/exporter-metrics-otlp-http": "^0.52.1",
"@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
"@opentelemetry/host-metrics": "^0.35.3",
"@opentelemetry/instrumentation-express": "^0.41.0",
"@opentelemetry/instrumentation-express": "^0.41.1",
"@opentelemetry/instrumentation-http": "^0.52.1",
"@opentelemetry/resources": "^1.25.1",
"@opentelemetry/sdk-metrics": "^1.25.1",
Expand All @@ -49,8 +49,8 @@
"@prisma/client": "^5.17.0",
"@prisma/instrumentation": "~5.17.0",
"argon2": "^0.40.3",
"axios": "^1.7.2",
"cache-manager": "^5.7.3",
"axios": "^1.7.3",
"cache-manager": "^5.7.4",
"cache-manager-redis-yet": "^5.1.3",
"chai-exclude": "^2.1.1",
"class-transformer": "^0.5.1",
Expand Down Expand Up @@ -85,12 +85,12 @@
"@nestjs/schematics": "^10.1.3",
"@nestjs/testing": "^10.3.10",
"@types/cache-manager": "^4.0.6",
"@types/chai": "^4.3.16",
"@types/chai": "^4.3.17",
"@types/chai-as-promised": "^7.1.8",
"@types/express": "^4.17.21",
"@types/graphql-upload": "8.0.12",
"@types/mocha": "^10.0.7",
"@types/node": "^20.14.12",
"@types/node": "^20.14.14",
"@types/nodemailer": "^6.4.15",
"@types/passport-jwt": "^4.0.1",
"@types/proxyquire": "^1.3.31",
Expand Down
12 changes: 0 additions & 12 deletions ...a/migrations/20240801094119_add_student_id_and_major_field_in_contest_model/migration.sql
View file

This file was deleted.

11 changes: 11 additions & 0 deletions .../backend/prisma/migrations/20240801120143_add_cascade_on_announcement_model/migration.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
-- DropForeignKey
ALTER TABLE "announcement" DROP CONSTRAINT "announcement_contest_id_fkey";

-- DropForeignKey
ALTER TABLE "announcement" DROP CONSTRAINT "announcement_problem_id_fkey";

-- AddForeignKey
ALTER TABLE "announcement" ADD CONSTRAINT "announcement_contest_id_fkey" FOREIGN KEY ("contest_id") REFERENCES "contest"("id") ON DELETE CASCADE ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "announcement" ADD CONSTRAINT "announcement_problem_id_fkey" FOREIGN KEY ("problem_id") REFERENCES "problem"("id") ON DELETE CASCADE ON UPDATE CASCADE;
3 changes: 3 additions & 0 deletions apps/backend/prisma/migrations/20240801152242_add_student_id_and_major_field/migration.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- AlterTable
ALTER TABLE "user" ADD COLUMN "major" TEXT DEFAULT 'none',
ADD COLUMN "student_id" TEXT DEFAULT '0000000000';
6 changes: 3 additions & 3 deletions apps/backend/prisma/schema.prisma
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ model User {
password String
role Role @default(User)
email String @unique
studentId String? @unique @default("0000000000") @map("student_id")
studentId String? @default("0000000000") @map("student_id")
major String? @default("none")
lastLogin DateTime? @map("last_login")
createTime DateTime @default(now()) @map("create_time")
Expand Down Expand Up @@ -312,9 +312,9 @@ model ContestProblem {
model Announcement {
id Int @id @default(autoincrement())
content String
contest Contest @relation(fields: [contestId], references: [id])
contest Contest @relation(fields: [contestId], references: [id], onDelete: Cascade)
contestId Int @map("contest_id")
problem Problem? @relation(fields: [problemId], references: [id])
problem Problem? @relation(fields: [problemId], references: [id], onDelete: Cascade)
problemId Int? @map("problem_id")
createTime DateTime @default(now()) @map("create_time")
updateTime DateTime @updatedAt @map("update_time")
Expand Down
36 changes: 18 additions & 18 deletions apps/frontend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "vitest"
},
"dependencies": {
"@apollo/client": "^3.11.1",
"@apollo/client": "^3.11.2",
"@codemirror/lang-cpp": "^6.0.2",
"@codemirror/lang-java": "^6.0.1",
"@codemirror/lang-python": "^6.1.6",
Expand Down Expand Up @@ -40,17 +40,17 @@
"@radix-ui/react-toast": "^1.2.1",
"@radix-ui/react-toggle": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.2",
"@sentry/nextjs": "^8.20.0",
"@sentry/nextjs": "^8.22.0",
"@tailwindcss/typography": "^0.5.13",
"@tanstack/react-query": "^5.51.11",
"@tanstack/react-query": "^5.51.21",
"@tanstack/react-table": "^8.19.3",
"@tiptap/core": "^2.5.4",
"@tiptap/extension-image": "^2.5.4",
"@tiptap/extension-link": "^2.5.4",
"@tiptap/extension-placeholder": "^2.5.4",
"@tiptap/pm": "^2.5.4",
"@tiptap/react": "^2.5.4",
"@tiptap/starter-kit": "^2.5.4",
"@tiptap/core": "^2.5.8",
"@tiptap/extension-image": "^2.5.8",
"@tiptap/extension-link": "^2.5.8",
"@tiptap/extension-placeholder": "^2.5.8",
"@tiptap/pm": "^2.5.8",
"@tiptap/react": "^2.5.8",
"@tiptap/starter-kit": "^2.5.8",
"@uiw/codemirror-extensions-langs": "^4.23.0",
"@uiw/codemirror-themes": "^4.23.0",
"@uiw/react-codemirror": "^4.23.0",
Expand All @@ -59,13 +59,13 @@
"date-fns": "^3.6.0",
"dayjs": "^1.11.12",
"dotenv": "^16.4.5",
"embla-carousel-react": "8.1.7",
"framer-motion": "^11.3.17",
"embla-carousel-react": "8.1.8",
"framer-motion": "^11.3.21",
"graphql": "^16.9.0",
"isomorphic-dompurify": "^2.14.0",
"js-confetti": "^0.12.0",
"katex": "^0.16.11",
"ky": "^1.4.0",
"ky": "^1.5.0",
"next": "14.2.5",
"next-auth": "^4.24.7",
"next-themes": "^0.3.0",
Expand All @@ -86,28 +86,28 @@
"devDependencies": {
"@codemirror/language": "^6.10.2",
"@graphql-codegen/cli": "^5.0.2",
"@graphql-codegen/client-preset": "^4.3.2",
"@graphql-codegen/client-preset": "^4.3.3",
"@graphql-typed-document-node/core": "^3.2.0",
"@testing-library/react": "^16.0.0",
"@types/apollo-upload-client": "^18.0.0",
"@types/katex": "^0.16.7",
"@types/node": "^20.14.12",
"@types/node": "^20.14.14",
"@types/react": "^18.3.3",
"@types/react-copy-to-clipboard": "^5.0.7",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"autoprefixer": "^10.4.19",
"autoprefixer": "^10.4.20",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"eslint-config-next": "^14.2.5",
"jsdom": "^24.1.1",
"lucide-react": "^0.416.0",
"lucide-react": "^0.424.0",
"postcss": "^8.4.40",
"tailwind-merge": "^2.4.0",
"tailwind-scrollbar-hide": "^1.1.7",
"tailwindcss": "^3.4.7",
"tailwindcss-animate": "^1.0.7",
"typescript": "^5.5.4",
"vitest": "^2.0.4"
"vitest": "^2.0.5"
}
}
60 changes: 30 additions & 30 deletions apps/infra/production/codedang/.terraform.lock.hcl
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/infra/production/codedang/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 5.59"
version = "~> 5.61"
}

rabbitmq = {
Expand Down
2 changes: 1 addition & 1 deletion apps/infra/production/codedang/modules/cluster_autoscaling/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 5.59"
version = "~> 5.61"
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/infra/production/codedang/modules/loadbalancing/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 5.59"
version = "~> 5.61"
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/infra/production/codedang/modules/service_autoscaling/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 5.59"
version = "~> 5.61"
}
}

Expand Down
60 changes: 30 additions & 30 deletions apps/infra/production/network/.terraform.lock.hcl
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/infra/production/network/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 5.59"
version = "~> 5.61"
}
}

Expand Down
Loading

0 comments on commit 53d9186

Please sign in to comment.