r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

Exposes API endpoint URL to client via env variable (#323)

Browse source
This commit is contained in:
Andrew Nicolaou 2017-03-16 05:34:14 +01:00 committed by Cassie Tarakajian
parent 352d81e9f7
commit 6af92a4a32
9 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -13,6 +13,7 @@ This project is currently in development! It will be announced when there is a (
5. Create a file called `.env` in the root of this directory that looks like 5. Create a file called `.env` in the root of this directory that looks like
``` ```
API_URL=/api
MONGO_URL=mongodb://localhost:27017/p5js-web-editor MONGO_URL=mongodb://localhost:27017/p5js-web-editor
PORT=8000 PORT=8000
SESSION_SECRET=whatever_you_want_this_to_be_it_only_matters_for_production SESSION_SECRET=whatever_you_want_this_to_be_it_only_matters_for_production
@ -36,6 +37,7 @@ This project is currently in development! It will be announced when there is a (
5. Create a file called `.env` in the root of this directory that looks like 5. Create a file called `.env` in the root of this directory that looks like
``` ```
API_URL=/api
MONGO_URL=mongodb://localhost:27017/p5js-web-editor MONGO_URL=mongodb://localhost:27017/p5js-web-editor
PORT=8000 PORT=8000
SESSION_SECRET=make_this_a_long-random_string_like_maybe_126_characters_long SESSION_SECRET=make_this_a_long-random_string_like_maybe_126_characters_long

2
client/modules/IDE/actions/files.js
View file

@ -5,7 +5,7 @@ import { reset } from 'redux-form';
import * as ActionTypes from '../../../constants'; import * as ActionTypes from '../../../constants';
import { setUnsavedChanges } from './ide'; import { setUnsavedChanges } from './ide';
const ROOT_URL = location.href.indexOf('localhost') > 0 ? 'http://localhost:8000/api' : '/api'; const ROOT_URL = process.env.API_URL;
function appendToFilename(filename, string) { function appendToFilename(filename, string) {
const dotIndex = filename.lastIndexOf('.'); const dotIndex = filename.lastIndexOf('.');

2
client/modules/IDE/actions/preferences.js
View file

@ -1,7 +1,7 @@
import axios from 'axios'; import axios from 'axios';
import * as ActionTypes from '../../../constants'; import * as ActionTypes from '../../../constants';
const ROOT_URL = location.href.indexOf('localhost') > 0 ? 'http://localhost:8000/api' : '/api'; const ROOT_URL = process.env.API_URL;
function updatePreferences(formParams, dispatch) { function updatePreferences(formParams, dispatch) {
axios.put(`${ROOT_URL}/preferences`, formParams, { withCredentials: true }) axios.put(`${ROOT_URL}/preferences`, formParams, { withCredentials: true })

2
client/modules/IDE/actions/project.js
View file

@ -8,7 +8,7 @@ import { setUnsavedChanges,
resetJustOpenedProject, resetJustOpenedProject,
showErrorModal } from './ide'; showErrorModal } from './ide';
const ROOT_URL = location.href.indexOf('localhost') > 0 ? 'http://localhost:8000/api' : '/api'; const ROOT_URL = process.env.API_URL;
export function setProject(project) { export function setProject(project) {
return { return {

2
client/modules/IDE/actions/projects.js
View file

@ -3,7 +3,7 @@ import * as ActionTypes from '../../../constants';
import { showErrorModal, setPreviousPath } from './ide'; import { showErrorModal, setPreviousPath } from './ide';
import { resetProject } from './project'; import { resetProject } from './project';
const ROOT_URL = location.href.indexOf('localhost') > 0 ? 'http://localhost:8000/api' : '/api'; const ROOT_URL = process.env.API_URL;
export function getProjects(username) { export function getProjects(username) {
return (dispatch) => { return (dispatch) => {

2
client/modules/IDE/actions/uploader.js
View file

@ -3,7 +3,7 @@ import { createFile } from './files';
const textFileRegex = /(text\/|application\/json)/; const textFileRegex = /(text\/|application\/json)/;
const s3BucketHttps = `https://s3-us-west-2.amazonaws.com/${process.env.S3_BUCKET}/`; const s3BucketHttps = `https://s3-us-west-2.amazonaws.com/${process.env.S3_BUCKET}/`;
const ROOT_URL = location.href.indexOf('localhost') > 0 ? 'http://localhost:8000/api' : '/api'; const ROOT_URL = process.env.API_URL;
const MAX_LOCAL_FILE_SIZE = 80000; // bytes, aka 80 KB const MAX_LOCAL_FILE_SIZE = 80000; // bytes, aka 80 KB
function localIntercept(file, options = {}) { function localIntercept(file, options = {}) {

2
client/modules/User/actions.js
View file

@ -4,7 +4,7 @@ import * as ActionTypes from '../../constants';
import { showErrorModal, justOpenedProject } from '../IDE/actions/ide'; import { showErrorModal, justOpenedProject } from '../IDE/actions/ide';
const ROOT_URL = location.href.indexOf('localhost') > 0 ? 'http://localhost:8000/api' : '/api'; const ROOT_URL = process.env.API_URL;
export function authError(error) { export function authError(error) {
return { return {

1
webpack.config.dev.js
View file

@ -34,6 +34,7 @@ module.exports = {
}), }),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
API_URL: '"' + process.env.API_URL + '"',
CLIENT: JSON.stringify(true), CLIENT: JSON.stringify(true),
'NODE_ENV': JSON.stringify('development'), 'NODE_ENV': JSON.stringify('development'),
'S3_BUCKET': '"' + process.env.S3_BUCKET + '"' 'S3_BUCKET': '"' + process.env.S3_BUCKET + '"'

3
webpack.config.prod.js
View file

@ -76,6 +76,7 @@ module.exports = {
plugins: [ plugins: [
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
'API_URL': '"' + process.env.API_URL + '"',
'NODE_ENV': JSON.stringify('production'), 'NODE_ENV': JSON.stringify('production'),
'S3_BUCKET': '"' + process.env.S3_BUCKET + '"' 'S3_BUCKET': '"' + process.env.S3_BUCKET + '"'
} }
@ -112,4 +113,4 @@ module.exports = {
clearMessages: true clearMessages: true
}) })
] ]
}; };