From ec6c04debb5dc99dcc0d5dc0e4d34a7469236315 Mon Sep 17 00:00:00 2001
From: Baptiste Lemoine <contact@cipherbliss.com>
Date: Tue, 9 Oct 2018 16:13:28 +0200
Subject: [PATCH] [DEV] :zap: update submodule script

---
 .gitmodules                                    |  4 ++--
 app/Resources/views/logged/dashboard.html.twig |  3 +--
 app/Resources/views/logged/ng2.html.twig       |  8 ++++++++
 assets/js/build-frontend-submodule/main.js     |  1 +
 caisse-bliss-frontend                          |  1 +
 compile-frontend.sh                            | 11 +++++++++++
 update.sh                                      |  2 ++
 7 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 app/Resources/views/logged/ng2.html.twig
 create mode 100644 assets/js/build-frontend-submodule/main.js
 create mode 160000 caisse-bliss-frontend
 create mode 100755 compile-frontend.sh

diff --git a/.gitmodules b/.gitmodules
index aab1e5db..0162f57f 100755
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "caisse-bliss-frontend"]
-	path = web/caisse-bliss-frontend
-	url = https://gitlab.com/tykayn1/caisse-bliss-frontend
+	path = caisse-bliss-frontend
+	url = https://framagit.org/tykayn/caisse-bliss-frontend.git
diff --git a/app/Resources/views/logged/dashboard.html.twig b/app/Resources/views/logged/dashboard.html.twig
index 79dca5cd..9bdbe80d 100755
--- a/app/Resources/views/logged/dashboard.html.twig
+++ b/app/Resources/views/logged/dashboard.html.twig
@@ -1,7 +1,6 @@
 {% extends 'base.html.twig' %}
 {% block body %}
-<div id="wrapper">
-    <div id="container" class="container">
+    <div id="wrapper">
         <div id="caisse-now" class="tab-pane fade in active">
             <div class="caisse-main row"
                  ng-app="caisse"
diff --git a/app/Resources/views/logged/ng2.html.twig b/app/Resources/views/logged/ng2.html.twig
new file mode 100644
index 00000000..e4820571
--- /dev/null
+++ b/app/Resources/views/logged/ng2.html.twig
@@ -0,0 +1,8 @@
+{% extends 'base.html.twig' %}
+{% block body %}
+<div id="wrapper">
+    <h1>Appli angular embarquée</h1>
+    <script href="{{ asset('/assets/js/build-frontend-submodule/main.js') }}"></script>
+    <div ng-app="tktest"></div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/assets/js/build-frontend-submodule/main.js b/assets/js/build-frontend-submodule/main.js
new file mode 100644
index 00000000..dd8320a7
--- /dev/null
+++ b/assets/js/build-frontend-submodule/main.js
@@ -0,0 +1 @@
+console.log('this file is a placeholder, if you see this, it means you did not update the frontend submodule');
\ No newline at end of file
diff --git a/caisse-bliss-frontend b/caisse-bliss-frontend
new file mode 160000
index 00000000..474d8db5
--- /dev/null
+++ b/caisse-bliss-frontend
@@ -0,0 +1 @@
+Subproject commit 474d8db5d74ec1283bf9b9e1a0fe03221538d44c
diff --git a/compile-frontend.sh b/compile-frontend.sh
new file mode 100755
index 00000000..938993a6
--- /dev/null
+++ b/compile-frontend.sh
@@ -0,0 +1,11 @@
+#/bin/bash
+echo "###############################";
+echo "start update of frontend submodule assets";
+echo "###############################";
+git submodule update;
+cd caisse-bliss-frontend
+ng build
+cp caisse-bliss-frontend/dist/appli/* /assets/js/build-frontend-submodule
+echo "###########";
+echo "update done";
+echo "###########";
diff --git a/update.sh b/update.sh
index fe267187..96c84703 100755
--- a/update.sh
+++ b/update.sh
@@ -8,6 +8,8 @@ composer self-update
 composer update
 yarn --version
 
+bash compile-frontend.sh
+
 yarn run encore production
 php bin/console doctrine:schema:update --dump-sql
 php bin/console doctrine:schema:update --force