Skip to content

Commit

Permalink
Merge pull request #58 from gusdnvkfks/dev
Browse files Browse the repository at this point in the history
[Common] add: deploy
  • Loading branch information
gusdnvkfks authored Dec 16, 2021
2 parents 5953bef + fea5ace commit 45bbc7d
Show file tree
Hide file tree
Showing 6 changed files with 123 additions and 38 deletions.
2 changes: 2 additions & 0 deletions server/controllers/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module.exports = {
auth: require("./users/auth"),
delete: require("./users/delete"),
put: require("./users/put"),
signup: require("./users/signup"),
signin: require("./users/signin"),
signout: require("./users/signout"),
Expand Down
14 changes: 14 additions & 0 deletions server/controllers/users/delete.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const { user } = require("../../models");

module.exports = (res, req) => {
const userInfo = user.destroy({
where: { id: 1 },
});

console.log(userInfo);

res
// .cookie("jwt", null, { maxAge: 0 })
.status(200)
.json({ id: 1 });
};
1 change: 1 addition & 0 deletions server/controllers/users/put.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = (res, req) => {};
46 changes: 45 additions & 1 deletion server/controllers/users/signup.js
Original file line number Diff line number Diff line change
@@ -1 +1,45 @@
module.exports = (req, res) => {};
const { user } = require("../../models");
const { generateAccessToken } = require("../tokenFunctions");

module.exports = (req, res) => {
const userInfo = req.body;
if (
userInfo.email === undefined ||
req.body.nickname === undefined ||
req.body.password === undefined
) {
res.status(400).send({ message: "잘못된 요청" });
} else {
user
.findOrCreate({
where: { email: userInfo.email },
defaults: { password: userInfo.password, nickname: userInfo.nickname },
})
.then(([users, created]) => {
// created - true => 11번째줄 where에 해당하는 email이 없어서 새로 만들어줌.
// created - false => 11번째줄에 where에 해당하는 email이 있어서 만들지 않음.
if (created) {
const payload = {
// 추후에 데이터를 받아오는것 보고 수정
id: users.dataValues.id,
email: users.dataValues.email,
nickname: users.dataValues.nickname,
createdAt: users.dataValues.createdAt,
updatedAt: users.dataValues.updatedAt,
};

const token = generateAccessToken(payload);
res
.cookie("jwt", token, {
httpOnly: true,
sameSite: "none",
secure: true,
})
.status(201)
.send({ message: "Ok" });
} else {
res.status(409).send({ message: "Email Exists" });
}
});
}
};
61 changes: 38 additions & 23 deletions server/index.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,43 @@
// const express = require("express");
// const app = express();
// const cors = require("cors");
// const cookieParser = require("cookie-parser");
// const port = 4000;

// const controllers = require("./controllers");

// app.use(express.json());
// // 좀 찾아보기로 밑에꺼
// app.use(express.urlencoded({ extended: false }));
// app.use(
// cors({
// origin: "*",
// credentials: true,
// methods: ["GET", "POST", "OPTION", "PUT"],
// })
// );

// app.use(cookieParser());
// app.get("/:id", controllers.auth);
// app.delete("/:id", controllers.delete);
// app.put("/:id", controllers.put);
// app.post("/signup", controllers.signup);
// app.post("/signin", controllers.signin);
// app.post("/signout", controllers.signout);

// module.exports = app.listen(port, () => {
// console.log(` Server is starting on ${port}`);
// });

const express = require("express");
const app = express();
const cors = require("cors");
const cookieParser = require("cookie-parser");

const port = 4000;

const controllers = require("./controller");

app.use(express.json());
// 좀 찾아보기로 밑에꺼
app.use(express.urlencoded({ extended: false }));
app.use(
cors({
origin: "*",
credentials: true,
methods: ["GET", "POST", "OPTION", "PUT"],
})
);

app.use(cookieParser());
app.get("/auth", controllers.auth);
app.post("/signup", controllers.signup);
app.post("/signin", controllers.signin);
app.post("/signout", controllers.signout);

module.exports = app.listen(port, () => {
console.log(` Server is starting on ${port}`);
app.get("/", (req, res) => {
res.send("Hello World");
});

app.listen(port, () => {
console.log("성공");
});
37 changes: 23 additions & 14 deletions server/models/index.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,40 @@
'use strict';
"use strict";

const fs = require('fs');
const path = require('path');
const Sequelize = require('sequelize');
const fs = require("fs");
const path = require("path");
const Sequelize = require("sequelize");
const basename = path.basename(__filename);
const env = process.env.NODE_ENV || 'development';
const config = require(__dirname + '/../config/config.json')[env];
const env = process.env.NODE_ENV || "development";
const config = require(__dirname + "/../config/config.js")[env];
const db = {};

let sequelize;
if (config.use_env_variable) {
sequelize = new Sequelize(process.env[config.use_env_variable], config);
} else {
sequelize = new Sequelize(config.database, config.username, config.password, config);
sequelize = new Sequelize(
config.database,
config.username,
config.password,
config
);
}

fs
.readdirSync(__dirname)
.filter(file => {
return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
fs.readdirSync(__dirname)
.filter((file) => {
return (
file.indexOf(".") !== 0 && file !== basename && file.slice(-3) === ".js"
);
})
.forEach(file => {
const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes);
.forEach((file) => {
const model = require(path.join(__dirname, file))(
sequelize,
Sequelize.DataTypes
);
db[model.name] = model;
});

Object.keys(db).forEach(modelName => {
Object.keys(db).forEach((modelName) => {
if (db[modelName].associate) {
db[modelName].associate(db);
}
Expand Down

0 comments on commit 45bbc7d

Please sign in to comment.