Merge 70ecd39 into baebfc3

Gum-Joe · Jan 3, 2017 · 8be621e · 8be621e
2 parents baebfc3 + 70ecd39
commit 8be621e
Show file tree

Hide file tree

Showing 515 changed files with 97,235 additions and 80,639 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,6 @@
 {
-  "presets": ["es2015-loose", "stage-0", "react"]
+  "plugins": [
+    "react-hot-loader/babel"
+  ],
+  "presets": ["latest", "stage-0", "react"]
 }
diff --git a/.eslintrc b/.eslintrc
@@ -134,7 +134,7 @@ rules:
 
   # Node.js and CommonJS
   callback-return: 2
-  global-require: 1
+  global-require: 0
   handle-callback-err: 2
   no-mixed-requires: 0
   no-new-require: 0

diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,6 @@ tmp
 
 # Cache
 .sass-cache
+
+# Semantic UI
+client/semantic/dist
diff --git a/app.js b/app.js
@@ -124,7 +124,7 @@ module.exports = (options) => {
 
   // Static files
   app.use(express.static(path.join(__dirname, 'node_modules')));
-  app.use(express.static(path.join(__dirname, 'client', 'assets')));
+  app.use(express.static(path.join(__dirname, 'client')));
   app.use(express.static(path.join(__dirname, 'views')));
 
   // Routes