Merge pull request #35 from setlife-network/oscar

Configures domain-ready deployment
setlife-network · Jan 9, 2019 · 5bd787b · 5bd787b
2 parents 3f175bf + 9d8a9f0
commit 5bd787b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,6 @@ jspm_packages
 .idea/
 yarn.lock
 package-lock.json
+
+# Mac filesystem
+**/.DS_Store
diff --git a/server.js b/server.js
@@ -36,6 +36,7 @@ var cors = require('cors');
 var whitelist = [
     'http://localhost:8080',
     'http://localhost:3000',
+    'https://www.setblocks.com',
     'https://setblocks.herokuapp.com/'
 ];
 var corsOptions = {

diff --git a/web/constants/index.js b/web/constants/index.js
@@ -1,7 +1,7 @@
 import { Calendar } from 'styled-icons/feather/Calendar.cjs'
 import { Users } from 'styled-icons/feather/Users.cjs'
 
-export const SITE_ROOT = process.env.NODE_ENV == 'production' ? 'https://setblocks.herokuapp.com' : 'http://localhost:3000';
+export const SITE_ROOT = process.env.NODE_ENV == 'production' ? 'https://www.setblocks.com' : 'http://localhost:3000';
 export const API_ROOT = SITE_ROOT + '/api/v/1/'
 
 export const NAVIGATION = {