From be228d6909e94de3f2ca5bc4e09684df884909c8 Mon Sep 17 00:00:00 2001
From: epson220 <62466439+epson220@users.noreply.github.com>
Date: Wed, 25 Nov 2020 22:32:51 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AA=BD=EA=B3=A0=EB=94=94=EB=B9=84=EC=97=B0?=
=?UTF-8?q?=EA=B2=B0=EB=AC=B8=EC=A0=9C=ED=95=B4=EA=B2=B0=3F=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/app.js | 11 ++++++-----
backend/models/user.js | 24 ++++++++++++++++--------
backend/package-lock.json | 5 +++++
backend/package.json | 1 +
backend/routes/users.js | 1 +
frontend/.eslintcache | 2 +-
6 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/backend/app.js b/backend/app.js
index cf6400a..b22273c 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -1,24 +1,25 @@
+require("dotenv").config();
var createError = require("http-errors");
var express = require("express");
var path = require("path");
var cookieParser = require("cookie-parser");
var logger = require("morgan");
var passport = require("passport");
+var flash = require("connect-flash");
const mongoose = require("mongoose");
const mongooseAutoInc = require("mongoose-auto-increment");
-const UserModel = require("./models/user");
+//const UserModel = require("./models/user");
-mongoose.connect("mongodb://localhost:27017/websysprojDB", {
+mongoose.connect("mongodb://localhost:27017/local", {
useFindAndModify: false,
useNewUrlParser: true,
useUnifiedTopology: true,
});
mongooseAutoInc.initialize(mongoose.connection);
-var indexRouter = require("./routes/index");
+//var indexRouter = require("./routes/index");
var usersRouter = require("./routes/users");
-const { emit } = require("process");
var app = express();
@@ -35,7 +36,7 @@ app.use(passport.initialize());
app.use(passport.session());
app.use(flash());
-app.use("/", indexRouter);
+//app.use("/", indexRouter);
app.use("/users", usersRouter);
// catch 404 and forward to error handler
diff --git a/backend/models/user.js b/backend/models/user.js
index d78e730..dcef24a 100644
--- a/backend/models/user.js
+++ b/backend/models/user.js
@@ -1,14 +1,22 @@
const mongoose = require("mongoose");
const mongooseAutoInc = require("mongoose-auto-increment");
-let UserSchma = new mongoose.Schema({
- email: { type: String, default: "", required: true, unique: true },
- password: { type: String, required: true, default: "" },
- name: { type: String, index: "hashed", default: "" },
- created_at: { type: Date, index: { unique: false }, default: Date.now },
- deleted_at: { type: Date, index: { unique: false } },
+const UserSchema = new mongoose.Schema({
+ email: { type: String, required: true, unique: true },
+ password: { type: String, required: true },
+ name: { type: String },
+ created_at: { type: Date, default: Date.now },
+ deleted_at: { type: Date },
+ user_id: { type: Number, default: 0, unique: true },
});
-movieSchema.plugin(mongooseAutoInc.plugin, "user");
+// mongoose.connect("mongodb://localhost:27017/local", {
+// useFindAndModify: false,
+// useNewUrlParser: true,
+// useUnifiedTopology: true,
+// });
+// mongooseAutoInc.initialize(mongoose.connection);
-module.exports = mongoose.model("user", userSchema);
+UserSchema.plugin(mongooseAutoInc.plugin, "user");
+
+module.exports = mongoose.model("user", UserSchema);
diff --git a/backend/package-lock.json b/backend/package-lock.json
index e4bce76..1e6469b 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -254,6 +254,11 @@
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
},
+ "dotenv": {
+ "version": "8.2.0",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+ "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
+ },
"ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
diff --git a/backend/package.json b/backend/package.json
index 528f7d4..1e83fd8 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -9,6 +9,7 @@
"connect-flash": "^0.1.1",
"cookie-parser": "~1.4.4",
"debug": "~2.6.9",
+ "dotenv": "^8.2.0",
"express": "~4.16.1",
"http-errors": "~1.6.3",
"jade": "~1.11.0",
diff --git a/backend/routes/users.js b/backend/routes/users.js
index 6e6abdd..0dd1230 100644
--- a/backend/routes/users.js
+++ b/backend/routes/users.js
@@ -2,6 +2,7 @@ var express = require("express");
const passport = require("passport");
var flash = require("connect-flash");
var router = express.Router();
+var UserModel = require("../models/user");
let LocalStrategy = require("passport-local").Strategy;
diff --git a/frontend/.eslintcache b/frontend/.eslintcache
index 058faf7..ba93ff8 100644
--- a/frontend/.eslintcache
+++ b/frontend/.eslintcache
@@ -1 +1 @@
-[{"C:\\WYH\\frontend\\src\\reportWebVitals.js":"1","C:\\WYH\\frontend\\src\\App.js":"2","C:\\WYH\\frontend\\src\\index.js":"3","C:\\WYH\\frontend\\src\\Home.js":"4"},{"size":362,"mtime":1606157613272,"results":"5","hashOfConfig":"6"},{"size":689,"mtime":1606240339668,"results":"7","hashOfConfig":"6"},{"size":544,"mtime":1606240034288,"results":"8","hashOfConfig":"6"},{"size":370,"mtime":1606240470375,"results":"9","hashOfConfig":"6"},{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"10w9ldj",{"filePath":"12","messages":"13","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"16","messages":"17","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"C:\\WYH\\frontend\\src\\reportWebVitals.js",[],"C:\\WYH\\frontend\\src\\App.js",["18"],"C:\\WYH\\frontend\\src\\index.js",[],"C:\\WYH\\frontend\\src\\Home.js",["19"],{"ruleId":"20","severity":1,"message":"21","line":1,"column":17,"nodeType":"22","messageId":"23","endLine":1,"endColumn":26},{"ruleId":"20","severity":1,"message":"24","line":2,"column":10,"nodeType":"22","messageId":"23","endLine":2,"endColumn":15},"no-unused-vars","'Component' is defined but never used.","Identifier","unusedVar","'Route' is defined but never used."]
\ No newline at end of file
+[{"C:\\WYH\\frontend\\src\\reportWebVitals.js":"1","C:\\WYH\\frontend\\src\\App.js":"2","C:\\WYH\\frontend\\src\\index.js":"3","C:\\WYH\\frontend\\src\\Home.js":"4"},{"size":362,"mtime":1606157613272,"results":"5","hashOfConfig":"6"},{"size":689,"mtime":1606240339668,"results":"7","hashOfConfig":"6"},{"size":544,"mtime":1606240034288,"results":"8","hashOfConfig":"6"},{"size":370,"mtime":1606296711314,"results":"9","hashOfConfig":"6"},{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"10w9ldj",{"filePath":"12","messages":"13","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"16","messages":"17","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"C:\\WYH\\frontend\\src\\reportWebVitals.js",[],"C:\\WYH\\frontend\\src\\App.js",["18"],"C:\\WYH\\frontend\\src\\index.js",[],"C:\\WYH\\frontend\\src\\Home.js",["19"],{"ruleId":"20","severity":1,"message":"21","line":1,"column":17,"nodeType":"22","messageId":"23","endLine":1,"endColumn":26},{"ruleId":"20","severity":1,"message":"24","line":2,"column":10,"nodeType":"22","messageId":"23","endLine":2,"endColumn":15},"no-unused-vars","'Component' is defined but never used.","Identifier","unusedVar","'Route' is defined but never used."]
\ No newline at end of file
--
GitLab