Merge branch 'develop' into feat/#10-cropimages

CapstoneDesign-2022 · Nov 10, 2022 · beec1cb · beec1cb
2 parents 02364cf + 6a92915
commit beec1cb
Show file tree

Hide file tree

Showing 65 changed files with 13,834 additions and 3,363 deletions.
diff --git a/.gitignore b/.gitignore
@@ -94,7 +94,6 @@ out
 
 # Nuxt.js build / generate output
 .nuxt
-dist
 
 # Gatsby files
 .cache/
@@ -104,7 +103,7 @@ dist
 
 # vuepress build output
 .vuepress/dist
-
+.dist
 # vuepress v2.x temp and cache directory
 .temp
 
@@ -167,6 +166,8 @@ dist
 # Ignore code-workspaces
 *.code-workspace
 
+dist
+
 # End of https://www.toptal.com/developers/gitignore/api/node,visualstudiocode
 
 .DS_Store
diff --git a/buildspec.yml b/buildspec.yml
@@ -23,19 +23,21 @@ phases:
   install:
     #Ubuntu 표준 이미지 2.0 이상을 사용하는 경우 런타임 버전을 지정해야 합니다.
     #런타임 버전을 지정하는 경우 Ubuntu 표준 이미지 2.0 이외의 이미지를 사용하면 빌드에 실패합니다.
-    #runtime-versions:
-      # name: version
+    runtime-versions:
+      nodejs: 16
       # name: version
     commands:
-      - npm install
-      # - command
-  #pre_build:
-    #commands:
+      # - npm install
+      - npm install -g yarn
+      - yarn install
       # - command
+  pre_build:
+    commands:
+      # - yarn install
       # - command
   build:
     commands:
-      - npm run build
+      - yarn run build
       # - command
   #post_build:
     #commands:

diff --git a/dist/config/index.js b/dist/config/index.js
diff --git a/dist/config/index.js.map b/dist/config/index.js.map
diff --git a/dist/config/multer.js b/dist/config/multer.js
diff --git a/dist/config/multer.js.map b/dist/config/multer.js.map
diff --git a/dist/config/s3Config.js b/dist/config/s3Config.js
diff --git a/dist/config/s3Config.js.map b/dist/config/s3Config.js.map
diff --git a/dist/controllers/UserController.js b/dist/controllers/UserController.js
diff --git a/dist/controllers/UserController.js.map b/dist/controllers/UserController.js.map
diff --git a/dist/controllers/WordController.js b/dist/controllers/WordController.js