From 2728293110ca0719c033d960601d456274495a2a Mon Sep 17 00:00:00 2001
From: Sergey Yarkov <serzh.yarkov@gmail.com>
Date: Sat, 1 Feb 2020 15:05:35 +0300
Subject: [PATCH] server file structure

---
 package.json                                       | 4 ++--
 {config => server/config}/nodemailer.config.js     | 0
 {config => server/config}/passport.config.js       | 0
 {config => server}/database.js                     | 0
 {config => server}/routes/admin.js                 | 4 +---
 {config => server}/routes/api.js                   | 0
 {config => server}/routes/control-panel.js         | 0
 {config => server}/routes/main.js                  | 2 +-
 {config => server}/routes/payments/qiwi.payment.js | 0
 {config => server}/routes/success.js               | 2 +-
 {config => server}/server.js                       | 2 +-
 11 files changed, 6 insertions(+), 8 deletions(-)
 rename {config => server/config}/nodemailer.config.js (100%)
 rename {config => server/config}/passport.config.js (100%)
 rename {config => server}/database.js (100%)
 rename {config => server}/routes/admin.js (92%)
 rename {config => server}/routes/api.js (100%)
 rename {config => server}/routes/control-panel.js (100%)
 rename {config => server}/routes/main.js (99%)
 rename {config => server}/routes/payments/qiwi.payment.js (100%)
 rename {config => server}/routes/success.js (98%)
 rename {config => server}/server.js (99%)

diff --git a/package.json b/package.json
index 59dee50..ba22450 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,9 @@
   "name": "digital-store",
   "version": "1.0.0",
   "description": "",
-  "main": "index.js",
+  "main": "server/server.js",
   "scripts": {
-    "start": "node config/server.js"
+    "start": "node server/server.js"
   },
   "repository": {
     "type": "git",
diff --git a/config/nodemailer.config.js b/server/config/nodemailer.config.js
similarity index 100%
rename from config/nodemailer.config.js
rename to server/config/nodemailer.config.js
diff --git a/config/passport.config.js b/server/config/passport.config.js
similarity index 100%
rename from config/passport.config.js
rename to server/config/passport.config.js
diff --git a/config/database.js b/server/database.js
similarity index 100%
rename from config/database.js
rename to server/database.js
diff --git a/config/routes/admin.js b/server/routes/admin.js
similarity index 92%
rename from config/routes/admin.js
rename to server/routes/admin.js
index 3b94ca2..daeb225 100644
--- a/config/routes/admin.js
+++ b/server/routes/admin.js
@@ -1,7 +1,5 @@
-const bcrypt = require('bcryptjs');
 const passport = require('passport');
-
-const initializePassport = require('../passport.config');
+const initializePassport = require('../config/passport.config');
 
 function checkNotAuthenticated(req, res, next) {
     if (req.isAuthenticated()) return res.redirect('/control-panel');
diff --git a/config/routes/api.js b/server/routes/api.js
similarity index 100%
rename from config/routes/api.js
rename to server/routes/api.js
diff --git a/config/routes/control-panel.js b/server/routes/control-panel.js
similarity index 100%
rename from config/routes/control-panel.js
rename to server/routes/control-panel.js
diff --git a/config/routes/main.js b/server/routes/main.js
similarity index 99%
rename from config/routes/main.js
rename to server/routes/main.js
index a0e99f2..09ffc7d 100644
--- a/config/routes/main.js
+++ b/server/routes/main.js
@@ -1,5 +1,5 @@
 const ObjectID = require('mongodb').ObjectID;
-const nodemailer = require('../nodemailer.config');
+const nodemailer = require('../config/nodemailer.config');
 
 module.exports = function (server, db) {
     server.get('/', async (req, res) => {
diff --git a/config/routes/payments/qiwi.payment.js b/server/routes/payments/qiwi.payment.js
similarity index 100%
rename from config/routes/payments/qiwi.payment.js
rename to server/routes/payments/qiwi.payment.js
diff --git a/config/routes/success.js b/server/routes/success.js
similarity index 98%
rename from config/routes/success.js
rename to server/routes/success.js
index 322c3eb..c3962a3 100644
--- a/config/routes/success.js
+++ b/server/routes/success.js
@@ -1,5 +1,5 @@
 const ObjectID = require('mongodb').ObjectID;
-const nodemailer = require('../nodemailer.config');
+const nodemailer = require('../config/nodemailer.config');
 
 module.exports = function(server, db, qiwiApi) {
     server.get('/success', async (req, res) => {
diff --git a/config/server.js b/server/server.js
similarity index 99%
rename from config/server.js
rename to server/server.js
index 79a92b9..40b0875 100644
--- a/config/server.js
+++ b/server/server.js
@@ -28,7 +28,7 @@ MongoClient.connect(db_config.url, {useNewUrlParser: true, useUnifiedTopology: t
         });
     
         // Config
-        server.use(cors())
+        server.use(cors());
         server.use(express.static(path.join(__dirname, '../dist/public')));
         server.use(multer({storage: storage}).single('img'));
         server.use(express.urlencoded({ extended: false }));