fix merge conflict lineDev -> db

@@ -3,12 +3,20 @@
   "version": "0.1.0",
   "version": "0.1.0",
   "private": true,
   "private": true,
   "dependencies": {
   "dependencies": {
+
     "@material-ui/core": "^4.11.2",
     "@material-ui/core": "^4.11.2",
     "@testing-library/jest-dom": "^5.11.6",
     "@testing-library/jest-dom": "^5.11.6",
     "@testing-library/react": "^11.2.2",
     "@testing-library/react": "^11.2.2",
     "@testing-library/user-event": "^12.5.0",
     "@testing-library/user-event": "^12.5.0",
     "axios": "^0.21.0",
     "axios": "^0.21.0",
     "immer": "^8.0.0",
     "immer": "^8.0.0",
+    "@material-ui/core": "^4.10.2",
+    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/react": "^9.3.2",
+    "@testing-library/user-event": "^7.1.2",
+    "axios": "^0.19.2",
+    "eslint": "^7.14.0",
+    "immer": "^7.0.5",
     "include-media": "^1.4.9",
     "include-media": "^1.4.9",
     "moment": "^2.29.1",
     "moment": "^2.29.1",
     "open-color": "^1.7.0",
     "open-color": "^1.7.0",
@@ -30,7 +38,10 @@
     "eject": "react-scripts eject"
     "eject": "react-scripts eject"
   },
   },
   "eslintConfig": {
   "eslintConfig": {
-    "extends": "react-app"
+    "extends": "react-app",
+    "rules": {
+      "jsx-a11y/anchor-is-valid": "off"
+    }
   },
   },
   "browserslist": {
   "browserslist": {
     "production": [
     "production": [
@@ -44,5 +55,5 @@
       "last 1 safari version"
       "last 1 safari version"
     ]
     ]
   },
   },
-  "proxy": "http://localhost:4000"
+  "proxy": "http://localhost:4000/"
 }
 }

@@ -37,6 +37,7 @@ mongoose
     useNewUrlParser: true,
     useNewUrlParser: true,
     useFindAndModify: false,
     useFindAndModify: false,
     useUnifiedTopology: true,
     useUnifiedTopology: true,
+    useCreateIndex : true
   })
   })
   .then(() => {
   .then(() => {
     console.log("Connected to MongoDB");
     console.log("Connected to MongoDB");

@@ -14,7 +14,7 @@ exports.register = async (ctx) => {
     password: Joi.string().required(),
     password: Joi.string().required(),
   });
   });
 
 
-  const result = Joi.validate(ctx.request.body, schema);
+  const result = schema.validate(ctx.request.body);
   if (result.error) {
   if (result.error) {
     ctx.status = 400;
     ctx.status = 400;
     ctx.body = result.error;
     ctx.body = result.error;

@@ -51,7 +51,7 @@ exports.setProfile = async (ctx) => {
     })
     })
     .unknown();
     .unknown();
   console.log(ctx.request.body);
   console.log(ctx.request.body);
-  const result = Joi.validate(ctx.request.body, schema);
+  const result = schema.validate(ctx.request.body);
   if (result.error) {
   if (result.error) {
     ctx.status = 400;
     ctx.status = 400;
     ctx.body = result.error;
     ctx.body = result.error;