fix deploy env

Author: mariosp

json-server/app.js

@@ -1,12 +1,26 @@
 const express = require('express');
 const path = require('path');
+const jsonServer = require('json-server');
+const server = jsonServer.create();
+const router = jsonServer.router('db.json');
+const middlewares = jsonServer.defaults();
 
 const app = express();
 
+app.use(middlewares);
+app.use(router);
+
 app.use(express.static(path.join(__dirname,"../dist/todoapp/"))); //Serve static files (front end app)
 
 app.get('/*', function(req,res) {
   res.sendFile(path.join(path.join(__dirname,"../dist/todoapp/index.html")));
 });
 
+// Avoid CORS issue
+server.use(function (req, res, next) {
+  res.header("Access-Control-Allow-Origin", "*");
+  res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+  next();
+});
+
 app.listen(process.env.PORT || 8080);

src/environments/environment.prod.ts

@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
-  serverUrl: 'https://arr-todo.herokuapp.com',
+  serverUrl: process.env.NODE_ENV === 'production' ? `${window.location.origin}/` : 'http://localhost:8080',
   firebase: {
     apiKey: 'AIzaSyBx-clRxjAtjniw1bxBG_p7-4DtnhKQX6g',
     authDomain: 'todos-angular-app.firebaseapp.com',
@@ -11,3 +11,14 @@ export const environment = {
     appId: '1:676540201517:web:5792196cf1eb157b98d6a4'
   }
 };
+
+
+// export const baseUrl = 'http://localhost:3001/';
+
+const url = (process.env.NODE_ENV === "production") ?
+  `${window.location.origin}/`
+  :
+  'http://localhost:3001/' ;
+
+console.log(url);
+export const baseUrl = url;

src/environments/environment.ts

@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  serverUrl: 'http://localhost:3000',
+  serverUrl: 'http://localhost:8080',
   firebase: {
     apiKey: 'AIzaSyBx-clRxjAtjniw1bxBG_p7-4DtnhKQX6g',
     authDomain: 'todos-angular-app.firebaseapp.com',