Skip to content

Commit

Permalink
Merge pull request #308 from impresso/develop
Browse files Browse the repository at this point in the history
Beta release
  • Loading branch information
danieleguido authored May 13, 2019
2 parents 1466c67 + b097ec5 commit 93282fc
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 20 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ yarn-error.log*
test/unit/coverage
test/e2e/reports
selenium-debug.log
config/*.js
!config/index.js
!config/default.env.js
!config/example.*.env.js

# Editor directories and files
.idea
Expand Down
11 changes: 11 additions & 0 deletions config/default.env.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
'use strict'
module.exports = {
NODE_ENV: '"development"',
TYPEKIT_ID: '"your-TYPEKIT_ID"',
MIDDLELAYER_API: '"http://localhost:3030"',
MIDDLELAYER_MEDIA_PATH: '"/media"',
MIDDLELAYER_API_PATH: '"/"',
MIDDLELAYER_API_SOCKET_PATH: '"/socket.io/"',
TAWK_TO_SITE_ID: false,
GITHUB_WIKI_HOME: '"https://path/to/home.md"',
};
16 changes: 0 additions & 16 deletions config/dev.env.js

This file was deleted.

9 changes: 9 additions & 0 deletions config/example.dev.env.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
'use strict'
const merge = require('webpack-merge')
const defaultEnv = require('./default.env')

module.exports = merge(defaultEnv, {
TYPEKIT_ID: '""', // should be specified
TAWK_TO_SITE_ID: false, // if false then wont show
GITHUB_WIKI_HOME: '"https://raw.githubusercontent.com/wiki/path/to/wiki.md"',
});
15 changes: 15 additions & 0 deletions config/example.prod.env.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
'use strict'
const merge = require('webpack-merge')
const defaultEnv = require('./default.env')

'use strict'
module.exports = {
NODE_ENV: '"production"',
TYPEKIT_ID: '"..."',
MIDDLELAYER_API: "https://"',
MIDDLELAYER_MEDIA_PATH: '"/media"',
MIDDLELAYER_API_PATH: '"/api"',
MIDDLELAYER_API_SOCKET_PATH: '"/api/socket.io/"',
TAWK_TO_SITE_ID: '"..."',
GITHUB_WIKI_HOME: '"https://raw.githubusercontent.com/wiki/path/to/wiki.md"',
};
8 changes: 4 additions & 4 deletions config/prod.env.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
module.exports = {
NODE_ENV: '"production"',
TYPEKIT_ID: '"egx1cmg"',
MIDDLELAYER_API: process.env.API_BASE_URL || '"https://impresso-project.ch"',
MIDDLELAYER_MEDIA_PATH: '"/alpha/media"',
MIDDLELAYER_API_PATH: '"/alpha/api"',
MIDDLELAYER_API_SOCKET_PATH: '"/alpha/api/socket.io/"',
MIDDLELAYER_API: '"https://impresso-project.ch"',
MIDDLELAYER_MEDIA_PATH: '"/app/media"',
MIDDLELAYER_API_PATH: '"/"',
MIDDLELAYER_API_SOCKET_PATH: '"/socket.io/"',
TAWK_TO_SITE_ID: '"5c49872f51410568a1081bed"',
GITHUB_WIKI_HOME: '"https://raw.githubusercontent.com/wiki/impresso/impresso-frontend/Home.md"',
};

0 comments on commit 93282fc

Please sign in to comment.