Merge pull request #6 from Scharkee/production-server-fix

Production server fix

package.json

@@ -7,8 +7,8 @@
   "scripts": {
     "dev": "node src/server.js",
     "build": "nuxt build",
-    "start": "nuxt start",
-    "prod": "nuxt build && nuxt start",
+    "start": "NODE_ENV=production node src/server.js",
+    "launch": "nuxt build && npm run start",
     "precommit": "npm run lint",
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
     "test": "ava --serial --verbose",

pages/_id.vue

@@ -10,6 +10,7 @@
 <script>
 import axios from "axios";
 
+
 export default {
   name: "id",
   asyncData({ params, error }) {

pages/login.vue

@@ -45,6 +45,7 @@
 <script>
 import axios from "axios";
 
+
 export default {
   head() {
     return {

pages/profile.vue

@@ -130,6 +130,7 @@
 <script>
 import axios from "axios";
 
+
 export default {
   head() {
     return {

pages/register.vue

@@ -44,6 +44,7 @@
 <script>
 import axios from "axios";
 
+
 export default {
   head() {
     return {

config/passportConfig.js → src/passport/passportConfig.js

@@ -1,13 +1,12 @@
-require("dotenv").config();
 const passport = require("passport");
 const { Strategy: LocalStrategy } = require("passport-local");
 const { Strategy: TwitterStrategy } = require("passport-twitter");
 const { OAuth2Strategy: GoogleStrategy } = require("passport-google-oauth");
 
-const db = require("../src/external/db.js");
-const keysConf = require("../config/passportKeys.json");
-const User = require("../src/controllers/user.js");
-const config = require("./config.json");
+const db = require("../external/db.js");
+const keysConf = require("../../config/passportKeys.json");
+const User = require("../controllers/user.js");
+const config = require("../../config/config.json");
 
 passport.serializeUser((user, done) => done(null, user.data._id));
 

src/server.js

@@ -1,4 +1,4 @@
-// deps
+"use strict";
 process.env.DEBUG = process.env.NODE_ENV === "production" ? "" : "nuxt:*";
 const { Nuxt, Builder } = require("nuxt");
 const bodyParser = require("body-parser");
@@ -29,7 +29,7 @@ const config = require("../config/config.json");
 /*
 Passport configuration.
  */
-const passportConfig = require("../config/passportConfig.js");
+const passportConfig = require("./passport/passportConfig.js");
 
 /*
 The user model
@@ -400,12 +400,12 @@ const nuxtConfig = require("../nuxt.config.js");
 
 nuxtConfig.dev = process.env.NODE_ENV !== "production";
 const nuxt = new Nuxt(nuxtConfig);
-
+// serving nuxt in devmode
 if (nuxtConfig.dev) {
   const builder = new Builder(nuxt);
   builder.build();
 }
-// No build in production
+// serving nuxt
 app.use(nuxt.render);
 
 /*

test/index.test.js

@@ -176,7 +176,6 @@ test("Login again", async t => {
 });
 
 test("Delete account", async t => {
-  console.log(email);
   try {
     const { data } = await ax({
       method: "post",