From b78327b5982312cf6826403858861ba776eb5c3d Mon Sep 17 00:00:00 2001
From: LeeYongJae <sdc5678@ajou.ac.kr>
Date: Thu, 5 Dec 2019 20:38:11 +0900
Subject: [PATCH] Revert "Resolve merge conflict"
This reverts commit 56e5ead19b4b0142550425d942812086e0edfa4c
---
.gitignore | 4 +-
backend/app.js | 2 -
backend/package-lock.json | 5 --
backend/package.json | 3 +-
backend/routes/emails.js | 33 ----------
frontend/src/components/BookSearchPage.vue | 2 +-
frontend/src/components/home.vue | 15 +----
.../components/profilecomponent/buylist.vue | 64 -------------------
8 files changed, 5 insertions(+), 123 deletions(-)
delete mode 100644 backend/routes/emails.js
diff --git a/.gitignore b/.gitignore
index b20c624..ce60c7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
**/node_modules
-**/sessions
-**/frontend/package-lock.json
-**/frontend/package.json
+**/sessions
\ No newline at end of file
diff --git a/backend/app.js b/backend/app.js
index 2ec4475..81d1bf6 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -10,7 +10,6 @@ var FileStore = require("session-file-store")(session);
var bookRouter = require("./routes/books");
var loginRouter = require("./routes/login");
-var emailRouter = require("./routes/emails");
var app = express();
@@ -46,7 +45,6 @@ app.use(express.static(path.join(__dirname, "public")));
app.use("/api/books", bookRouter);
app.use("/api/login", loginRouter);
-app.use("/api/emails", emailRouter);
// catch 404 and forward to error handler
app.use(function(req, res, next) {
diff --git a/backend/package-lock.json b/backend/package-lock.json
index 3b4c6fa..3d3dca9 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -738,11 +738,6 @@
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
"integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
},
- "nodemailer": {
- "version": "6.4.0",
- "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.0.tgz",
- "integrity": "sha512-UBqPOfQGD1cM3HnjhuQe+0u3DWx47WWK7lBjG5UtPnGOysr7oDK5lNCzcjK6zzeBSdTk4m1tGx1xNbWFZQmMNA=="
- },
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
diff --git a/backend/package.json b/backend/package.json
index c264c6b..4d65a8a 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -16,7 +16,6 @@
"mongoose": "^5.7.12",
"morgan": "~1.9.1",
"pug": "2.0.0-beta11",
- "session-file-store": "^1.3.1",
- "nodemailer": "^6.4.0"
+ "session-file-store": "^1.3.1"
}
}
diff --git a/backend/routes/emails.js b/backend/routes/emails.js
deleted file mode 100644
index 40d50c1..0000000
--- a/backend/routes/emails.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const express = require('express');
-const nodemailer = require('nodemailer');
-const router = express.Router();
-
-router.get("", function(req, res, next){
- let email = "hj950000@ajou.ac.kr"
-
- let transporter = nodemailer.createTransport({
- service: 'gmail',
- auth: {
- user: 'majorbook202@gmail.com', // gmail 怨꾩젙 �꾩씠�붾� �낅젰
- pass: 'dnjfdydlf' // gmail 怨꾩젙�� 鍮꾨�踰덊샇瑜� �낅젰
- }
- });
-
- let mailOptions = {
- from: 'majorbook202@gmail.com', // 諛쒖넚 硫붿씪 二쇱냼 (�꾩뿉�� �묒꽦�� gmail 怨꾩젙 �꾩씠��)
- to: "hj950000@ajou.ac.kr", // �섏떊 硫붿씪 二쇱냼
- subject: 'MajorBook援щℓ�붿껌�� �ㅼ뼱�붿뒿�덈떎.', // �쒕ぉ
- text: '�щ━�� 梨� ~~�� ���� 援щℓ�붿껌�� �꾩갑�덉뒿�덈떎. �대떦 援щℓ�먯쓽 �꾪솕踰덊샇�� ~~�낅땲��.' // �댁슜
- };
-
- transporter.sendMail(mailOptions, function(error, info){
- if (error) {
- console.log(error);
- }
- else {
- console.log('Email sent: ' + info.response);
- }
- });
-})
-
-module.exports = router;
\ No newline at end of file
diff --git a/frontend/src/components/BookSearchPage.vue b/frontend/src/components/BookSearchPage.vue
index fa52caf..c8dedcf 100644
--- a/frontend/src/components/BookSearchPage.vue
+++ b/frontend/src/components/BookSearchPage.vue
@@ -69,7 +69,7 @@
<!-- =============�쒗룷�곗쫰 submit �묒떇 ================== -->
<div>
<md-dialog :md-active.sync="active" style="width : 500px; height: 1000px ">
- <md-dialog-title>�먮ℓ�꾩꽌 �깅줉</md-dialog-title>
+ <md-dialog-title>�쒗룷�곗쫰 �좎껌</md-dialog-title>
<md-field class="select">
<label>梨낆젣紐�</label>
<md-input v-model="submit.title"></md-input>
diff --git a/frontend/src/components/home.vue b/frontend/src/components/home.vue
index eb70fd6..e487846 100644
--- a/frontend/src/components/home.vue
+++ b/frontend/src/components/home.vue
@@ -13,25 +13,14 @@
<script>
import Hotlist from "./home_hotlist/HotList";
export default {
- created() {
- this
- .$http
- .get('/api/emails')
- .then(response => {
- console.log("Sending Success")
- })
- },
-
data() {
return {};
},
components: {
+
Hotlist
},
- methods: {
-
-
- }
+ methods: {}
};
</script>
diff --git a/frontend/src/components/profilecomponent/buylist.vue b/frontend/src/components/profilecomponent/buylist.vue
index 60e76dd..cfa6463 100644
--- a/frontend/src/components/profilecomponent/buylist.vue
+++ b/frontend/src/components/profilecomponent/buylist.vue
@@ -20,70 +20,6 @@
</md-button>
</md-list-item>
<md-divider></md-divider>
- <md-list-item>
- <md-button class="md-icon-button md-raised" style="color:#1DDB16;backgroundColor:#1DDB16">
- <img src="../../assets/book-open-flat.png" />
- </md-button>
- <div class="md-list-item-text">
- <span> 梨� �쒕ぉ</span>
- <span> 援щℓ ��湲곗쨷</span>
- </div>
- <md-button class="md-icon-button md-raised md-accent">
- <img src="../../assets/x-512.png" />
- </md-button>
- <md-button class="md-icon-button md-raised md-primary">
- <img src="../../assets/check-icon.png" />
- </md-button>
- </md-list-item>
- <md-divider></md-divider>
- <md-list-item>
- <md-button class="md-icon-button md-raised" style="color:#1DDB16;backgroundColor:#1DDB16">
- <img src="../../assets/book-open-flat.png" />
- </md-button>
- <div class="md-list-item-text">
- <span> 梨� �쒕ぉ</span>
- <span> 援щℓ ��湲곗쨷</span>
- </div>
- <md-button class="md-icon-button md-raised md-accent">
- <img src="../../assets/x-512.png" />
- </md-button>
- <md-button class="md-icon-button md-raised md-primary">
- <img src="../../assets/check-icon.png" />
- </md-button>
- </md-list-item>
- <md-divider></md-divider>
- <md-list-item>
- <md-button class="md-icon-button md-raised" style="color:#1DDB16;backgroundColor:#1DDB16">
- <img src="../../assets/book-open-flat.png" />
- </md-button>
- <div class="md-list-item-text">
- <span> 梨� �쒕ぉ</span>
- <span> 援щℓ ��湲곗쨷</span>
- </div>
- <md-button class="md-icon-button md-raised md-accent">
- <img src="../../assets/x-512.png" />
- </md-button>
- <md-button class="md-icon-button md-raised md-primary">
- <img src="../../assets/check-icon.png" />
- </md-button>
- </md-list-item>
- <md-divider></md-divider>
- <md-list-item>
- <md-button class="md-icon-button md-raised" style="color:#1DDB16;backgroundColor:#1DDB16">
- <img src="../../assets/book-open-flat.png" />
- </md-button>
- <div class="md-list-item-text">
- <span> 梨� �쒕ぉ</span>
- <span> 援щℓ ��湲곗쨷</span>
- </div>
- <md-button class="md-icon-button md-raised md-accent">
- <img src="../../assets/x-512.png" />
- </md-button>
- <md-button class="md-icon-button md-raised md-primary">
- <img src="../../assets/check-icon.png" />
- </md-button>
- </md-list-item>
- <md-divider></md-divider>
</md-list>
</div>
</template>
--
GitLab