Skip to content

Commit

Permalink
Merge pull request #790 from dreammall-earth/revert-788-bbb-api
Browse files Browse the repository at this point in the history
fix(backend): revert feat backend bbb api
  • Loading branch information
Elweyn authored May 10, 2024
2 parents 0e706b2 + f591d20 commit 3950d37
Show file tree
Hide file tree
Showing 17 changed files with 57 additions and 787 deletions.
3 changes: 1 addition & 2 deletions backend/.env.dist
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ BREVO_NEWSLETTER_TEMPLATE_OPTIN="3"
BREVO_NEWSLETTER_LIST="3"
DATABASE_URL="mysql://root:@localhost:3306/dreammall.earth"

BBB_SHARED_SECRET=""
BBB_URL=""
ROOM_LINK="http://my-room.earth"
8 changes: 4 additions & 4 deletions backend/jest.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
],
"coverageThreshold": {
"global": {
"statements": 96,
"branches": 89,
"functions": 95,
"lines": 96
"statements": 98,
"branches": 97,
"functions": 96,
"lines": 98
}
},
"modulePathIgnorePatterns": ["<rootDir>/build/"],
Expand Down
72 changes: 1 addition & 71 deletions backend/package-lock.json

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

6 changes: 1 addition & 5 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@
"@getbrevo/brevo": "^2.1.1",
"@prisma/client": "^5.13.0",
"@vuepress/theme-default": "^2.0.0-rc.26",
"axios": "^1.6.8",
"class-validator": "^0.14.1",
"dotenv": "^16.4.5",
"fast-xml-parser": "^4.3.6",
"graphql": "^16.8.1",
"graphql-scalars": "^1.23.0",
"jsonwebtoken": "^9.0.2",
Expand All @@ -51,15 +49,13 @@
"reflect-metadata": "^0.2.2",
"tsconfig-paths": "^4.2.0",
"tslog": "^4.9.2",
"type-graphql": "^2.0.0-rc.1",
"uuid": "^9.0.1"
"type-graphql": "^2.0.0-rc.1"
},
"devDependencies": {
"@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
"@types/jest": "^29.5.12",
"@types/jsonwebtoken": "^9.0.6",
"@types/node": "^20.12.10",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"@vuepress/bundler-vite": "^2.0.0-rc.9",
Expand Down
30 changes: 0 additions & 30 deletions backend/prisma/migrations/20240508040257_add_meeting/migration.sql

This file was deleted.

This file was deleted.

This file was deleted.

16 changes: 0 additions & 16 deletions backend/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,4 @@ model User {
username String @db.VarChar(100) @unique
name String @db.VarChar(254)
createdAt DateTime @default(now())
meeting Meeting? @relation(fields: [meetingId], references: [id])
meetingId Int? @unique
}

model Meeting {
id Int @id @default(autoincrement())
name String @db.VarChar(254)
meetingID String @db.VarChar(36) @unique
attendeePW String? @db.VarChar(64)
moderatorPW String? @db.VarChar(64)
createdAt DateTime @default(now())
voiceBridge Int?
dialNumber String? @db.VarChar(64)
createTime Int?
createDate DateTime?
user User?
}
102 changes: 0 additions & 102 deletions backend/src/api/BBB.spec.ts

This file was deleted.

Loading

0 comments on commit 3950d37

Please sign in to comment.