Change config var name from STEEMCONNECT_IMG_HOST to IMG_HOST

robert9g · Oct 21, 2017 · 8a00786 · 8a00786
1 parent 022b6ac
commit 8a00786
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -14,9 +14,9 @@
     "dev-server:auth-server": "node ./server/auth-server.js",
     "start": "cross-env NODE_ENV=production npm run run:server",
     "dev": "cross-env NODE_ENV=development run-p build:server:dev run:server",
-    "test": "cross-env STEEMCONNECT_IMG_HOST=https://img.busy.org jest",
-    "test:watch": "cross-env STEEMCONNECT_IMG_HOST=https://img.busy.org jest --watch",
-    "test:coverage": "cross-env STEEMCONNECT_IMG_HOST=https://img.busy.org jest --coverage",
+    "test": "cross-env IMG_HOST=https://img.busy.org jest",
+    "test:watch": "cross-env IMG_HOST=https://img.busy.org jest --watch",
+    "test:coverage": "cross-env IMG_HOST=https://img.busy.org jest --coverage",
     "eslint-autofix": "eslint --fix \"src/**/*.js\"",
     "lint": "eslint \"src/**/*.js\"",
     "run:server": "nodemon --watch busy.server.js busy.server.js",

diff --git a/src/components/Avatar.js b/src/components/Avatar.js
@@ -7,7 +7,7 @@ const Avatar = ({ username, size }) =>
     className="Avatar"
     style={{ minWidth: `${size}px`, width: `${size}px`, height: `${size}px` }}
     alt={username}
-    src={`${process.env.STEEMCONNECT_IMG_HOST}/@${username || 'steemconnect'}?s=${size}`}
+    src={`${process.env.IMG_HOST}/@${username || 'steemconnect'}?s=${size}`}
   />);
 
 Avatar.propTypes = {

diff --git a/src/components/UserHeader.js b/src/components/UserHeader.js
@@ -23,7 +23,7 @@ const UserHeader = ({
 }) => (
   <div
     className={classNames('UserHeader', { 'UserHeader--cover': hasCover })}
-    style={{ backgroundImage: `url("${process.env.STEEMCONNECT_IMG_HOST}/@${handle}/cover")` }}
+    style={{ backgroundImage: `url("${process.env.IMG_HOST}/@${handle}/cover")` }}
   >
     <div className="UserHeader__container">
       <Avatar username={handle} size={100} />

diff --git a/src/post/PostContent.js b/src/post/PostContent.js
@@ -165,7 +165,7 @@ class PostContent extends React.Component {
     const htmlBody = getHtml(body, {}, 'text');
     const bodyText = sanitize(htmlBody, { allowedTags: [] });
     const desc = `${bodyText.substring(0, 140)} by ${author}`;
-    const image = postMetaImage || `${process.env.STEEMCONNECT_IMG_HOST}/@${author}`;
+    const image = postMetaImage || `${process.env.IMG_HOST}/@${author}`;
     const canonicalUrl = `${canonicalHost}${content.url}`;
     const url = `${busyHost}${content.url}`;
     const metaTitle = `${title} - Busy`;

diff --git a/src/user/User.js b/src/user/User.js
@@ -76,7 +76,7 @@ export default class User extends React.Component {
     const { profile = {} } = user.json_metadata || {};
     const busyHost = global.postOrigin || 'https://busy.org';
     const desc = profile.about || `Post by ${username}`;
-    const image = `${process.env.STEEMCONNECT_IMG_HOST}/@${username}`;
+    const image = `${process.env.IMG_HOST}/@${username}`;
     const canonicalUrl = `${busyHost}/@${username}`;
     const url = `${busyHost}/@${username}`;
     const displayedUsername = profile.name || username || '';

diff --git a/webpack/makeConfig.js b/webpack/makeConfig.js
@@ -45,7 +45,7 @@ function makePlugins(options) {
         // This has effect on the react lib size
         NODE_ENV: isDevelopment ? JSON.stringify('development') : JSON.stringify('production'),
         ENABLE_LOGGER: JSON.stringify(process.env.ENABLE_LOGGER),
-        STEEMCONNECT_IMG_HOST: JSON.stringify(process.env.STEEMCONNECT_IMG_HOST || 'https://img.busy.org'),
+        IMG_HOST: JSON.stringify(process.env.IMG_HOST || 'https://img.busy.org'),
         SENTRY_PUBLIC_DSN: isDevelopment ? null : JSON.stringify(process.env.SENTRY_PUBLIC_DSN),
         STEEMCONNECT_CLIENT_ID: JSON.stringify(process.env.STEEMCONNECT_CLIENT_ID || 'busy.app'),
         STEEMCONNECT_REDIRECT_URL: JSON.stringify(process.env.STEEMCONNECT_REDIRECT_URL || 'http://localhost:3000/callback'),

diff --git a/webpack/webpack-dev-server.js b/webpack/webpack-dev-server.js
@@ -17,7 +17,7 @@ module.exports = {
       'process.env': {
         NODE_ENV: JSON.stringify('development'),
         ENABLE_LOGGER: JSON.stringify(process.env.ENABLE_LOGGER),
-        STEEMCONNECT_IMG_HOST: JSON.stringify(process.env.STEEMCONNECT_IMG_HOST || 'https://img.busy.org'),
+        IMG_HOST: JSON.stringify(process.env.IMG_HOST || 'https://img.busy.org'),
         SENTRY_PUBLIC_DSN: null,
         STEEMCONNECT_CLIENT_ID: JSON.stringify(process.env.STEEMCONNECT_CLIENT_ID || 'busy.app'),
         STEEMCONNECT_REDIRECT_URL: JSON.stringify(process.env.STEEMCONNECT_REDIRECT_URL || 'http://localhost:3000/callback'),

diff --git a/webpack/webpack.server.config.js b/webpack/webpack.server.config.js
@@ -89,7 +89,7 @@ module.exports = {
   plugins: [
     new webpack.DefinePlugin({
       'process.env': {
-        STEEMCONNECT_IMG_HOST: JSON.stringify(process.env.STEEMCONNECT_IMG_HOST || 'https://img.busy.org'),
+        IMG_HOST: JSON.stringify(process.env.IMG_HOST || 'https://img.busy.org'),
         STEEMCONNECT_CLIENT_ID: JSON.stringify(process.env.STEEMCONNECT_CLIENT_ID || 'busy.app'),
         STEEMCONNECT_REDIRECT_URL: JSON.stringify(process.env.STEEMCONNECT_REDIRECT_URL || 'http://localhost:3000/callback'),
         STEEMCONNECT_HOST: JSON.stringify(process.env.STEEMCONNECT_HOST || 'https://v2.steemconnect.com'),