Fixing merge issue & adding pre/post build script

.gitignore

@@ -1,7 +1,13 @@
 # Dependency directories
 node_modules/
 .vscode/
+
+# Build files
 static/
+inloco/
+rjinloco/
+inloco.zip
+rjinloco.zip
 
 # Automatic generated docs
 public/esdoc/
@@ -18,4 +24,4 @@ src/components/App/sass/leaflet
 coverage
 
 # Mac OS X crap
-.DS_Store
+.DS_Store

package.json

@@ -83,7 +83,9 @@
     "logrequests": "npm run copyfiles && cross-env DEBUG='express:*' webpack-dev-server",
     "mprj": "npm run copyfiles && cross-env NODE_ENV=mprj webpack-dev-server",
     "prod": "npm run copyfiles && cross-env NODE_ENV=production webpack-dev-server --env.prod=true",
+    "prebuild": "rm -rf inloco inloco.zip 2> /dev/null",
     "build": "npm run copyfiles && cross-env NODE_ENV=production webpack --env.prod=true",
+    "postbuild": "mv static inloco && zip -r inloco.zip inloco",
     "lint": "eslint ./client ./webpack.config.js -f table || true",
     "doc": "esdoc -c esdoc.json",
     "test": "jest",

src/components/App/sass/components.scss

@@ -18,7 +18,6 @@
 @import "../../SidebarLeft/sidebarLeft.scss";
 @import "../../SidebarRight/sidebarRight.scss";
 @import "../../Sinalid/sinalid.scss";
-@import "../../StreetView/streetView.scss";
 @import "../../Toolbar/toolbar.scss";
 @import "../../ToolbarMenu/toolbarMenu.scss";
 @import "../../Tooltip/tooltip.scss";