[finished] reordering the file structure

str8coder · str8coder · commit bc95f9fb4f47 · 2019-11-24T10:00:58.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ node_modules
 .idea
 package-lock.json
 .env
-.nyc_output
+.nyc_output
+build
diff --git a/api/v1/app.js b/api/v1/app.js
@@ -7,7 +7,7 @@ import articleRoutes from './routes/article';
 import userRoutes from './routes/user';
 import feedRoutes from './routes/feed';
 import auth from './middleware/auth';
-import Role from '../../config/rolesConfig';
+import Role from './config/rolesConfig';
 
 
 const app = express();
diff --git a/api/v1/config/cloudinaryConfig.js b/api/v1/config/cloudinaryConfig.js
diff --git a/api/v1/config/dbConfig.js b/api/v1/config/dbConfig.js
diff --git a/api/v1/config/rolesConfig.js b/api/v1/config/rolesConfig.js
diff --git a/api/v1/controllers/gif.js b/api/v1/controllers/gif.js
@@ -1,7 +1,7 @@
 import moment from 'moment';
 import gf from '../models/gif';
 import comnt from '../models/comment';
-import cld from '../../../config/cloudinaryConfig';
+import cld from '../config/cloudinaryConfig';
 
 const {
   findOneGif, findAllGifs, saveGif, deleteGif,
diff --git a/api/v1/middleware/multerConfig.js b/api/v1/middleware/multerConfig.js
@@ -1,6 +1,6 @@
 import multer from 'multer';
 import cloudinaryStorage from 'multer-storage-cloudinary';
-import cld from '../../../config/cloudinaryConfig';
+import cld from '../config/cloudinaryConfig';
 
 const storage = cloudinaryStorage(
   {
diff --git a/api/v1/models/index.js b/api/v1/models/index.js
@@ -1,4 +1,4 @@
-import pool from '../../../config/dbConfig';
+import pool from '../config/dbConfig';
 
 pool.connect();
 
diff --git a/api/v1/routes/article.js b/api/v1/routes/article.js
@@ -5,7 +5,7 @@ import {
 } from '../controllers/article';
 import commentRoutes from './comment';
 import auth from '../middleware/auth';
-import Role from '../../../config/rolesConfig';
+import Role from '../config/rolesConfig';
 
 const router = Router();
 
diff --git a/api/v1/routes/gif.js b/api/v1/routes/gif.js
@@ -5,7 +5,7 @@ import {
 import commentRoutes from './comment';
 import multerUploads from '../middleware/multerConfig';
 import auth from '../middleware/auth';
-import Role from '../../../config/rolesConfig';
+import Role from '../config/rolesConfig';
 
 const router = Router();
 
diff --git a/api/v1/routes/user.js b/api/v1/routes/user.js
@@ -1,7 +1,7 @@
 import { Router } from 'express';
 import { signUp, login } from '../controllers/user';
 import auth from '../middleware/auth';
-import Role from '../../../config/rolesConfig';
+import Role from '../config/rolesConfig';
 
 const router = Router();
 
diff --git a/api/v1/server.js b/api/v1/server.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import http from 'http';
 import dotenv from 'dotenv';
-import app from './api/v1/app';
+import app from './app';
 
 dotenv.config();
 
diff --git a/api/v1/test/article.spec.js b/api/v1/test/article.spec.js
@@ -4,7 +4,7 @@ import 'chai/register-should';
 import dotenv from 'dotenv';
 import moment from 'moment';
 import uuidv1 from 'uuid/v1';
-import server from '../../../server';
+import server from '../server';
 import Article from '../models/article';
 import User from '../models/user';
 import helper from '../controllers/helper';
diff --git a/api/v1/test/comment.spec.js b/api/v1/test/comment.spec.js
@@ -4,7 +4,7 @@ import 'chai/register-should';
 import dotenv from 'dotenv';
 import moment from 'moment';
 import uuidv1 from 'uuid/v1';
-import server from '../../../server';
+import server from '../server';
 import Gif from '../models/gif';
 import User from '../models/user';
 import Article from '../models/article';
diff --git a/api/v1/test/feed.spec.js b/api/v1/test/feed.spec.js
@@ -4,7 +4,7 @@ import 'chai/register-should';
 import dotenv from 'dotenv';
 import moment from 'moment';
 import uuidv1 from 'uuid/v1';
-import server from '../../../server';
+import server from '../server';
 import Gif from '../models/gif';
 import User from '../models/user';
 import Article from '../models/article';
diff --git a/api/v1/test/gif.spec.js b/api/v1/test/gif.spec.js
@@ -4,7 +4,7 @@ import 'chai/register-should';
 import dotenv from 'dotenv';
 import moment from 'moment';
 import uuidv1 from 'uuid/v1';
-import server from '../../../server';
+import server from '../server';
 import Gif from '../models/gif';
 import User from '../models/user';
 import helper from '../controllers/helper';
diff --git a/api/v1/test/user.spec.js b/api/v1/test/user.spec.js
@@ -3,7 +3,7 @@ import chaiHttp from 'chai-http';
 import 'chai/register-should';
 import uuidv1 from 'uuid/v1';
 import dotenv from 'dotenv';
-import server from '../../../server';
+import server from '../server';
 import User from '../models/user';
 import helper from '../controllers/helper';
 
diff --git a/package.json b/package.json
@@ -4,14 +4,15 @@
   "description": "",
   "main": "server.js",
   "scripts": {
-    "start": "nodemon --exec babel-node server.js",
-    "dev_win": "set NODE_ENV=development&&npm start",
-    "dev_unix": "NODE_ENV=development npm start",
-    "prod_win": "set NODE_ENV=production&&npm start",
-    "prod_unix": "NODE_ENV=production npm start",
+    "start": "npm run prod_server && node ./build/server.js",
+    "prod_server": "set NODE_ENV=production&&npm run build",
+
+    "dev": "set NODE_ENV=development&&npm run dev_server",
+    "dev_server": "nodemon --exec babel-node ./api/v1/server.js",
+
     "test": "mocha  --require @babel/register ./api/v1/test --timeout 30000 --exit",
-    "coverage": "nyc npm run test",
-    "build": "rm -rf ./build && babel -d ./build ./v1/api -s"
+    "build": "rm -rf ./build && babel -d ./build ./api/v1 -s",
+    "coverage": "nyc npm run test"
   },
   "repository": {
     "type": "git",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import multer from 'multer';`
`2`	`2`	`import cloudinaryStorage from 'multer-storage-cloudinary';`
`3`		`-import cld from '../../../config/cloudinaryConfig';`
	`3`	`+import cld from '../config/cloudinaryConfig';`
`4`	`4`
`5`	`5`	`const storage = cloudinaryStorage(`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import pool from '../../../config/dbConfig';`
	`1`	`+import pool from '../config/dbConfig';`
`2`	`2`
`3`	`3`	`pool.connect();`
`4`	`4`