From e13577f20f0d1f3355daddd9963462684b765ef5 Mon Sep 17 00:00:00 2001
From: grid <gridsane@gmail.com>
Date: Mon, 14 Mar 2016 12:13:39 +0500
Subject: [PATCH] fix dependecies levels, fix gitingore, fix production build

---
 .gitignore             |  4 ++--
 package.json           | 29 +++++++++++++++--------------
 src/assets/logo.svg    |  3 +++
 src/config.js          | 34 +++++++++++++++++++++++-----------
 webpack.config.prod.js |  8 ++++----
 5 files changed, 47 insertions(+), 31 deletions(-)
 create mode 100644 src/assets/logo.svg

diff --git a/.gitignore b/.gitignore
index 0c47733..2961772 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 node_modules/
-assets/
-build/
+/assets/
+/build/
 .env
diff --git a/package.json b/package.json
index 921fe5e..231982f 100644
--- a/package.json
+++ b/package.json
@@ -21,11 +21,22 @@
     "lint": "eslint src test"
   },
   "engines": {
-    "node": "4.2.1"
+    "node": "4.2.1",
+    "npm": "2.14.17"
   },
   "dependencies": {
+    "babel": "^6.3.26",
+    "babel-cli": "^6.4.0",
+    "babel-core": "^6.4.0",
+    "babel-loader": "^6.2.1",
+    "babel-plugin-add-module-exports": "^0.1.2",
+    "babel-plugin-react-transform": "^2.0.0",
     "babel-polyfill": "^6.2.0",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-0": "^6.3.13",
     "body-parser": "^1.14.1",
+    "brfs": "^1.4.3",
     "express": "^4.13.3",
     "mongodb": "^2.0.49",
     "react": "^0.14.0",
@@ -36,20 +47,12 @@
     "redux-persist": "^1.5.0",
     "redux-thunk": "^1.0.0",
     "superagent": "^1.4.0",
-    "superagent-jsonp": "0.0.6"
+    "superagent-jsonp": "0.0.6",
+    "transform-loader": "^0.2.3",
+    "webpack": "^1.12.2"
   },
   "devDependencies": {
-    "babel": "^6.3.26",
-    "babel-cli": "^6.4.0",
-    "babel-core": "^6.4.0",
     "babel-eslint": "^5.0.0-beta6",
-    "babel-loader": "^6.2.1",
-    "babel-plugin-add-module-exports": "^0.1.2",
-    "babel-plugin-react-transform": "^2.0.0",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-react": "^6.3.13",
-    "babel-preset-stage-0": "^6.3.13",
-    "brfs": "^1.4.3",
     "eslint": "^1.9.0",
     "eslint-plugin-react": "^3.8.0",
     "expect": "^1.13.0",
@@ -62,8 +65,6 @@
     "react-transform-catch-errors": "^1.0.0",
     "react-transform-hmr": "^1.0.1",
     "redbox-react": "^1.1.1",
-    "transform-loader": "^0.2.3",
-    "webpack": "^1.12.2",
     "webpack-dev-middleware": "^1.2.0",
     "webpack-dev-server": "^1.12.1",
     "webpack-hot-middleware": "^2.4.1"
diff --git a/src/assets/logo.svg b/src/assets/logo.svg
new file mode 100644
index 0000000..de25282
--- /dev/null
+++ b/src/assets/logo.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 85 89">
+  <path fill="#FF4081" fill-rule="evenodd" d="M69.238 64.13l1.113-.63c18.252-10.354 18.252-27.14 0-37.494l-1.112-.63V64.13zm-7.103 4.03L33.178 84.587C14.926 94.94.13 86.327.13 65.335V24.17C.13 3.186 14.927-5.433 33.18 4.92l28.957 16.426v19.868H53.36v-21.16h-7.1v49.4h7.1V47.458h8.775v20.7zM40.48 58.42c0 1.528-.29 2.985-.87 4.372-.582 1.388-1.382 2.602-2.404 3.643-1.02 1.04-2.216 1.873-3.586 2.498-1.37.624-2.843.936-4.422.936-1.346 0-2.715-.186-4.108-.556-1.393-.37-2.646-1.006-3.76-1.908-1.114-.902-2.03-2.093-2.75-3.573-.72-1.48-1.08-3.353-1.08-5.62V31.015c0-1.62.278-3.122.836-4.51.557-1.387 1.346-2.59 2.367-3.607 1.02-1.018 2.24-1.816 3.656-2.394 1.415-.578 2.982-.867 4.7-.867 1.624 0 3.133.29 4.525.867 1.393.578 2.6 1.387 3.62 2.428 1.023 1.04 1.823 2.29 2.404 3.747.58 1.456.87 3.04.87 4.752v2.775h-7.103v-2.36c0-1.387-.395-2.59-1.184-3.607-.79-1.018-1.857-1.526-3.203-1.526-1.765 0-2.937.543-3.517 1.63-.58 1.087-.87 2.463-.87 4.128v25.255c0 1.434.313 2.637.94 3.608.626.972 1.752 1.457 3.377 1.457.464 0 .963-.08 1.497-.243.534-.162 1.02-.428 1.462-.798.44-.37.8-.88 1.08-1.527.277-.647.417-1.457.417-2.428v-2.43h7.102v3.054z"/>
+</svg>
diff --git a/src/config.js b/src/config.js
index 91cc416..1b58ff7 100644
--- a/src/config.js
+++ b/src/config.js
@@ -2,20 +2,32 @@ import fs from 'fs';
 
 // @todo its a shameless plug. Find another way to store YOUTUBE_API when
 // running locally
-const dotEnvVars = fs.readFileSync('.env')
-  .toString()
-  .split("\n")
-  .reduce((p, str) => {
-    const [key, val] = str.split('=');
-    if (key) {
-      p[key] = val;
-    }
+let dotEnvVars = null;
 
-    return p;
-  }, {});
+function getVars() {
+  return fs.readFileSync('.env')
+    .toString()
+    .split("\n")
+    .reduce((p, str) => {
+      const [key, val] = str.split('=');
+      if (key) {
+        p[key] = val;
+      }
+
+      return p;
+    }, {});
+}
 
 function resolveVar(varName) {
-  return process.env[varName] || dotEnvVars[varName];
+  if (process.env[varName]) {
+    return process.env[varName];
+  }
+
+  if (!dotEnvVars) {
+    dotEnvVars = getVars();
+  }
+
+  return dotEnvVars[varName];
 }
 
 export const MONGO_URI = resolveVar('MONGO_URI');
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
index ac57df1..af5d585 100644
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -30,12 +30,12 @@ module.exports = {
     loaders: [
       {
         test: /\.js$/,
-        loaders: ['babel-loader'],
-        include: path.join(__dirname, 'src'),
+        loader: 'transform?brfs',
       },
       {
-        test: /\.svg$/,
-        loader: 'svg-inline-loader',
+        test: /\.js$/,
+        loaders: ['babel-loader'],
+        include: path.join(__dirname, 'src'),
       },
     ],
   },