Skip to content

Revert "Bill" #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hwangsungmin-00 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert "Bill" #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.env

/sessions
/node_modules
32 changes: 0 additions & 32 deletions config/config.js
View file
Open in desktop

This file was deleted.

19 changes: 5 additions & 14 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,24 @@
const express = require('express');
const morgan = require('morgan');
const path = require('path');
const mysql2 = require('mysql2');
const mysql = require('mysql');

const billRouter = require('./routes/bill');
const memberRouter = require('./routes/member');
const sequelize = require('./models').sequelize;
const { swaggerUi, specs } = require('./swagger/swagger');

const { appendFileSync } = require('fs');

require("dotenv").config({ path: ".env" });

const app = express();

(async () => {
await sequelize.sync();
})();

app.set('port', process.env.PORT || 8001);
app.set('port', process.env.PORT || 3306);

app.use(morgan('dev'));
app.use(express.json());
app.use(express.urlencoded({ extended: false }));

app.use('/api/bill', billRouter);
app.use('/api/member', memberRouter);

app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(specs, { explorer: true }));
app.use('/bill', billRouter);
app.use('/member', memberRouter);


// 404 미들웨어
Expand All @@ -42,7 +33,7 @@ app.use((err, req, res, next) => {
res.locals.message = err.message;
res.locals.error = req.app.get('env') === 'development' ? err : {};
res.status(err.status || 500);
// res.render('error');
res.render('error');
});

app.listen(app.get("port"), () => {
Expand Down
61 changes: 0 additions & 61 deletions models/bill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +0,0 @@
module.exports = (sequelize, Datatypes) => (
sequelize.define('bill', {
id:{
type: Datatypes.STRING(50),
primaryKey: true,
},
bill_num: {
type: Datatypes.STRING(20),
},
title:{
type: Datatypes.STRING(100),
},
committee: {
type: Datatypes.STRING(50),
},
created_at: {
type: Datatypes.DATEONLY,
allowNull: false,
defaultValue: Datatypes.NOW,
//type: Datatypes.DATEONLY,
},
detail_link: {
type: Datatypes.STRING(150),
},
proposer: {
// ㅇㅇㅇ외 100인
type: Datatypes.STRING(20),
},
party: {
type: Datatypes.STRING(20),
},
main_proposer: {
type: Datatypes.STRING(10),
},
proposer_array: {
type: Datatypes.STRING(200),
},
proposer_link: {
type: Datatypes.STRING(150),
},
content: {
type: Datatypes.STRING(700),
},
result: {
// 처리상태
type: Datatypes.STRING(50),
},
result_cd: {
// 표결결과
type: Datatypes.STRING(20),
},
hashtag: {
type: Datatypes.STRING(60),
},
}, {
timestamps: false,
// 데이터베이스 문자열을 한글을 지원하는 UTF8로 설정하겠다는 뜻
charset: 'utf8',
collate: 'utf8_general_ci',
})
);
17 changes: 0 additions & 17 deletions models/hashtag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +0,0 @@
module.exports = (sequelize, Datatypes) => (
sequelize.define('hashtag', {
id: {
type: Datatypes.INTEGER,
autoIncrement: true,
primaryKey: true,
},
name: {
type: Datatypes.STRING(20),
},
}, {
timestamps: false,
// 모든 모델에 넣어야됨! 데이터베이스 문자열을 한글을 지원하는 UTF8로 설정하겠다는 뜻
charset: 'utf8',
collate: 'utf8_general_ci',
})
);
36 changes: 0 additions & 36 deletions models/index.js
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions models/like.js
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions models/member.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +0,0 @@
module.exports = (sequelize, Datatypes) => (
sequelize.define('member', {
id:{
type: Datatypes.STRING(20),
primaryKey: true,
},
name: {
type: Datatypes.STRING(10),
},
hj_name:{
type: Datatypes.STRING(20),
},
bth_sl: {
type: Datatypes.STRING(5),
},
bth_date: {
type: Datatypes.STRING(20),
},
position: {
type: Datatypes.STRING(20),
},
party: {
type: Datatypes.STRING(20),
},
origin: {
type: Datatypes.STRING(20),
},
election: {
type: Datatypes.STRING(20),
},
main_committee: {
type: Datatypes.STRING(50),
},
committees_array: {
type: Datatypes.STRING(200),
},
gender: {
type: Datatypes.STRING(5),
},
phone: {
type: Datatypes.STRING(20),
},
email: {
type: Datatypes.STRING(50),
},
homepage: {
type: Datatypes.STRING(100),
},
image: {
// 의원 사진 URL
type: Datatypes.STRING(100),
},
}, {
timestamps: false,
// 데이터베이스 문자열을 한글을 지원하는 UTF8로 설정하겠다는 뜻
charset: 'utf8',
collate: 'utf8_general_ci',
})
);
Loading