split gui environement

semji · Oct 25, 2017 · f0c0653 · f0c0653
1 parent 23fa57b
commit f0c0653
Show file tree

Hide file tree

Showing 35 changed files with 8,332 additions and 4,994 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,6 @@
 .idea
 /app/mocks/*
-/app/node_modules/*
-/app/frontend/app.css
-/app/dist
 !/app/mocks/.keep
-!/app/mocks/vidlis.json
+/app/node_modules
+/app/dist
 /docker-compose.override.yml
diff --git a/Dockerfile b/Dockerfile
@@ -3,13 +3,15 @@ FROM node:8
 COPY ./app /usr/src/app
 
 RUN cd /usr/src/app && \
+    npm install
+
+RUN cd /usr/src/app/gui && \
     npm install && \
-    npm run sass-build && \
-    npm run webpack-build
+    npm run build-app
 
 EXPOSE 80
 EXPOSE 4580
 
 WORKDIR /usr/src/app
 
-CMD ["node",  "server.js"]
+CMD ["node",  "app.js"]
diff --git a/Makefile b/Makefile
@@ -1,14 +1,24 @@
 DOCKER_DEPENDENCY_CONTAINER_COMMAND=docker run --rm -v $$SSH_AUTH_SOCK:/ssh-agent -v $$(pwd)/ssh_config:/etc/ssh/ssh_config --env SSH_AUTH_SOCK=/ssh-agent
 
-npm_install:
+npm_install_app:
 	$(DOCKER_DEPENDENCY_CONTAINER_COMMAND) -v $$(pwd)/app:/usr/src/app -w /usr/src/app node:8 npm install || if [ $(STOP_ON_FAILURE) = true ]; then exit 1 ; fi
 
+npm_install_gui:
+	$(DOCKER_DEPENDENCY_CONTAINER_COMMAND) -v $$(pwd)/app/gui:/usr/src/app -w /usr/src/app node:8 npm install || if [ $(STOP_ON_FAILURE) = true ]; then exit 1 ; fi
+
+npm_install: npm_install_app npm_install_gui
+
 npm_bash:
 	$(DOCKER_DEPENDENCY_CONTAINER_COMMAND) -it -v $$(pwd)/app:/usr/src/app -w /usr/src/app node:8 bash || if [ $(STOP_ON_FAILURE) = true ]; then exit 1 ; fi
 
-npm_clear:
+npm_clear_app:
 	$(DOCKER_DEPENDENCY_CONTAINER_COMMAND) -it -v $$(pwd)/app:/usr/src/app -w /usr/src/app node:8 rm -rf node_modules || if [ $(STOP_ON_FAILURE) = true ]; then exit 1 ; fi
 
+npm_clear_gui:
+	$(DOCKER_DEPENDENCY_CONTAINER_COMMAND) -it -v $$(pwd)/app/gui:/usr/src/app -w /usr/src/app node:8 rm -rf node_modules || if [ $(STOP_ON_FAILURE) = true ]; then exit 1 ; fi
+
+npm_clear: npm_clear_gui npm_clear_app
+
 dev: npm_install
 	docker-compose up
 

diff --git a/backend/server.js → app/app.js b/backend/server.js → app/app.js
diff --git a/app/frontend/app.js b/app/frontend/app.js
diff --git a/app/frontend/components/VLink.vue b/app/frontend/components/VLink.vue
diff --git a/app/frontend/layouts/Main.vue b/app/frontend/layouts/Main.vue
diff --git a/app/frontend/pages/404.vue b/app/frontend/pages/404.vue
diff --git a/app/frontend/pages/About.vue b/app/frontend/pages/About.vue
diff --git a/app/frontend/pages/Home.vue b/app/frontend/pages/Home.vue
diff --git a/app/frontend/routes.js b/app/frontend/routes.js
diff --git a/app/frontend/sass/component/body.scss b/app/frontend/sass/component/body.scss
diff --git a/app/frontend/sass/component/footer.scss b/app/frontend/sass/component/footer.scss
diff --git a/app/frontend/sass/component/header.scss b/app/frontend/sass/component/header.scss
diff --git a/app/frontend/sass/component/nav.scss b/app/frontend/sass/component/nav.scss
diff --git a/app/frontend/sass/generic/variables.scss b/app/frontend/sass/generic/variables.scss
diff --git a/app/frontend/sass/global.scss b/app/frontend/sass/global.scss
diff --git a/app/gui/.babelrc b/app/gui/.babelrc
@@ -0,0 +1,5 @@
+{
+  "presets": [
+    ["env", { "modules": false }]
+  ]
+}
diff --git a/app/gui/.gitignore b/app/gui/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+npm-debug.log*