Merge branch 'master' of https://bitbucket.org/vel1024/capstone

minsung
Commit 0fb510985e07b166e4fdc86d53c504c7931da61e 0fb51098 2 parents 56b95363 57cb3109
Showing 4 changed files with 25 additions and 20 deletions
back/package-lock.json
back/package.json
front/src/Components/Message.js
package.json
--- a/back/package-lock.json
View file @0fb5109
+++ b/back/package-lock.json
View file @0fb5109
@@ -1083,15 +1083,28 @@
       }
     },
     "@prisma/cli": {
-      "version": "2.0.0-beta.5",
+      "version": "2.0.0-beta.8",
-      "resolved": "https://registry.npmjs.org/@prisma/cli/-/cli-2.0.0-beta.5.tgz",
+      "resolved": "https://registry.npmjs.org/@prisma/cli/-/cli-2.0.0-beta.8.tgz",
-      "integrity": "sha512-Kl3IqOq6sYdajnLA034SLJxFCB0IxXcrSLYR8W9XTOyt3RRP/TCUPp5yBVfO9B21Kwe9YrFujTbSD2qQaDg1QA==",
+      "integrity": "sha512-l1bHUmPzjdOF87MzIkcE55AkGLDKV2apmS2D9ZuYM+7hWWMk7lcJjjquDr9RAtSDMN8nuvYQcXnFFg7JP4DUxw==",
       "dev": true
     },
     "@prisma/client": {
-      "version": "2.0.0-beta.2",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-2.0.0-beta.2.tgz",
+      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-2.0.0.tgz",
-      "integrity": "sha512-VhNYeeGTrFfLjB/JL7XPoWpxSTCb+YV+F3ggR1X0CGa4b/u6Kxy65aElLozs+yFdMQPVNkyg2PwUO8xQ7G9fpg=="
+      "integrity": "sha512-3Ejs4qmyM0bsLdZbKZWrngYLZMupbHRScBmPdikupTCFraq8I9aLb5CuSCsROf1C8tWwWcDaH6RdIS7I+EiESQ==",
+      "requires": {
+        "pkg-up": "^3.1.0"
+      },
+      "dependencies": {
+        "pkg-up": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+          "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        }
+      }
     },
     "@sendgrid/client": {
       "version": "7.0.1",
@@ -2058,7 +2071,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
       "requires": {
         "locate-path": "^3.0.0"
       }
@@ -2658,7 +2670,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
       "requires": {
         "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
@@ -2997,7 +3008,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
       "requires": {
         "p-try": "^2.0.0"
       }
@@ -3006,7 +3016,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
       "requires": {
         "p-limit": "^2.0.0"
       }
@@ -3014,8 +3023,7 @@
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-      "dev": true
     },
     "package-json": {
       "version": "4.0.1",
@@ -3066,8 +3074,7 @@
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
-      "dev": true
     },
     "path-is-inside": {
       "version": "1.0.2",
--- a/back/package.json
View file @0fb5109
+++ b/back/package.json
View file @0fb5109
@@ -16,7 +16,7 @@
   "license": "ISC",
   "homepage": "https://bitbucket.org/vel1024/capstone2#readme",
   "dependencies": {
-    "@prisma/client": "^2.0.0-beta.2",
+    "@prisma/client": "^2.0.0",
     "@sendgrid/mail": "^7.0.1",
     "bcryptjs": "^2.4.3",
     "country-data": "0.0.31",
@@ -33,7 +33,7 @@
     "@babel/core": "^7.9.0",
     "@babel/node": "^7.8.7",
     "@babel/preset-env": "^7.9.0",
-    "@prisma/cli": "^2.0.0-beta.5",
+    "@prisma/cli": "^2.0.0-beta.8",
     "morgan": "^1.10.0",
     "nodemon": "^2.0.2"
   }
--- a/front/src/Components/Message.js
View file @0fb5109
+++ b/front/src/Components/Message.js
View file @0fb5109
@@ -47,9 +47,6 @@ const Time = styled.span`
 `;
 export default ({ text, avatar, time }) => {
-  console.log(time);
-  let UTCTime = moment().utc();
-  console.log(UTCTime);
   return (
     <MessageWrapper className="MessageWrapper">
       <MsgContainer>
--- a/package.json
View file @0fb5109
+++ b/package.json
View file @0fb5109
@@ -16,5 +16,6 @@
     "email": "vel1024@khu.ac.kr"
   },
   "license": "ISC",
-  "devDependencies": {}
+  "devDependencies": {},
+  "dependencies": {}
 }