From 72da3d85e09197cfa2a84a45a41a3ef6270c8154 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 22:19:27 +0200
Subject: [PATCH] moved npm, webpack and eslint stuff to root

---
 frontend/.babelrc => .babelrc                   | 0
 frontend/.eslintrc.json => .eslintrc.json       | 0
 .gitignore                                      | 2 +-
 frontend/package-lock.json => package-lock.json | 0
 frontend/package.json => package.json           | 4 ++--
 frontend/postcss.config.js => postcss.config.js | 0
 frontend/webpack.config.js => webpack.config.js | 8 ++++----
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename frontend/.babelrc => .babelrc (100%)
 rename frontend/.eslintrc.json => .eslintrc.json (100%)
 rename frontend/package-lock.json => package-lock.json (100%)
 rename frontend/package.json => package.json (95%)
 rename frontend/postcss.config.js => postcss.config.js (100%)
 rename frontend/webpack.config.js => webpack.config.js (89%)

diff --git a/frontend/.babelrc b/.babelrc
similarity index 100%
rename from frontend/.babelrc
rename to .babelrc
diff --git a/frontend/.eslintrc.json b/.eslintrc.json
similarity index 100%
rename from frontend/.eslintrc.json
rename to .eslintrc.json
diff --git a/.gitignore b/.gitignore
index 553ebdac4..0e2a4677f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@ dist*
 static/bundles/
 static/tmp/
 static/combined/
-frontend/node_modules/
+node_modules/
 *.hi
 *.o
 *.sqlite3
diff --git a/frontend/package-lock.json b/package-lock.json
similarity index 100%
rename from frontend/package-lock.json
rename to package-lock.json
diff --git a/frontend/package.json b/package.json
similarity index 95%
rename from frontend/package.json
rename to package.json
index 54dffc78d..b2691f2bb 100644
--- a/frontend/package.json
+++ b/package.json
@@ -6,11 +6,11 @@
   "author": "",
   "license": "ISC",
   "scripts": {
-    "lint": "eslint src",
+    "lint": "eslint frontend/src",
     "dev": "webpack --watch"
   },
   "husky": {
-    "hooks": { }
+    "hooks": {}
   },
   "lint-staged": {
     "src/js/**/*.js": [
diff --git a/frontend/postcss.config.js b/postcss.config.js
similarity index 100%
rename from frontend/postcss.config.js
rename to postcss.config.js
diff --git a/frontend/webpack.config.js b/webpack.config.js
similarity index 89%
rename from frontend/webpack.config.js
rename to webpack.config.js
index 9d6eb44d5..d2e851ce6 100644
--- a/frontend/webpack.config.js
+++ b/webpack.config.js
@@ -66,13 +66,13 @@ module.exports = {
 
 	entry: {
 		main: [
-			path.resolve(__dirname, 'src', 'main.js'),
+			path.resolve(__dirname, 'frontend/src', 'main.js'),
 		],
 		vendor: [
-			path.resolve(__dirname, 'vendor', 'main.js'),
+			path.resolve(__dirname, 'frontend/vendor', 'main.js'),
 		],
 		polyfills: [
-			path.resolve(__dirname, 'polyfills', 'main.js'),
+			path.resolve(__dirname, 'frontend/polyfills', 'main.js'),
 		],
 	},
 
@@ -85,7 +85,7 @@ module.exports = {
 	output: {
 		chunkFilename: 'js/[name].[chunkname].js',
 		filename: 'js/[name].js',
-		path: path.resolve(__dirname, '..', 'static', 'bundles')
+		path: path.resolve(__dirname, 'static', 'bundles')
 	},
 
 	mode: 'development',