Merge branch 'master' of ssh://rhea.netlor.fr:2222/monarc/MonarcAppBO

.gitignore

@@ -6,8 +6,8 @@ nbproject
 .idea
 .project
 .settings
-composer.lock
 vendor/bin
+composer.json
 migrations
 *.sublime-*
 vendor/

README.md

@@ -1,6 +1,8 @@
 Skeleton Monarc Project
 =======================
 
+*Disclaimer: This is a work in progress and software is still in alpha stage.*
+
 Introduction
 ------------
 Skeleton Monarc Project.
@@ -31,6 +33,7 @@ Alternately, clone the repository and manually invoke `composer` using the shipp
 (The `self-update` directive is to ensure you have an up-to-date `composer.phar`
 available.)
 
+![Arbo](public/img/arbo1.png "Arbo")
 
 Databases
 ---------
@@ -43,9 +46,20 @@ Change Sql Mode in my.cnf:
 
     sql-mode = MYSQL40
     
+There is 2 databases: 
+* monarc_common contain models and data create by smile.
+* monarc_master contain all user and authentication information
 
 Symbolics links
 ---------------
+
+The project is splited on 2 parts :
+* an Api in charge of retrieve data
+* an interface to display data
+
+The Api is not direct modules of the project but libraries.
+You must create modules with symbolics link to libraries
+
 Create 2 symbolics links at project root: 
 
     mkdir module
@@ -53,6 +67,14 @@ Create 2 symbolics links at project root:
     ln -s ./../vendor/monarc/core MonarcCore;
     ln -s ./../vendor/monarc/backoffice MonarcBO;
 
+There is 2 parts:
+* one only for front office
+* one common for front office and back office (private project)
+
+It is develop with zend framework 2
+
+![Arbo](public/img/arbo2.png "Arbo")
+
 Interfaces
 ----------
 Repository for angular at project root:
@@ -62,6 +84,13 @@ Repository for angular at project root:
     git clone https://github.com/CASES-LU/ng-backoffice.git ng_backoffice
     git clone https://github.com/CASES-LU/ng-anr.git ng_anr
 
+ There is 2 parts:
+ * one only for front office (ng_client)
+ * one common for front office and back office (private project) (ng_anr)
+ 
+ It is develop with angular framework version 1
+     
+![Arbo](public/img/arbo3.png "Arbo")
        
 Web Server Setup
 ----------------
@@ -155,13 +184,27 @@ Play script (mandatory from the root of the project)(pull and migrations):
     
 This shell script use others shell script. May be you node to change rights of these others files
 
-Create Initial User
+Create Initial User and Client
--------------------
+------------------------------
 
-Modify email and password (firstname or lastname) of first user in /module/MonarcFO/migrations/seeds/adminUserInit.php 
+Modify email and password (firstname or lastname) of first user in /module/MonarcBO/migrations/seeds/adminUserInit.php 
 
 If you have a mail server, you can keep default password and click on "Password forgotten ?" after user creation.
 
 Create first user:
 
     php ./vendor/robmorgan/phinx/bin/phinx seed:run -c ./module/MonarcBO/migrations/phinx.php
+    
+Data Model
+----------
+
+monarc_common
+![monarc_common](public/img/model-common.png "monarc_common")
+
+License
+-------
+
+This software is licensed under [GNU Affero General Public License version 3](http://www.gnu.org/licenses/agpl-3.0.html)
+
+Copyright (C) 2016-2017 SMILE gie securitymadein.lu
+

build.properties

@@ -3,9 +3,10 @@ author.name=Pascal Paulis
 author.email=pascal.paulis@continuousphp.com
 
 db.host=localhost
-db.name=monarc
 db.username=dbuser
 db.password=123
+db.name.core=monarc_core
+db.name.backoffice=monarc_backoffice
 
 dir.bin=./bin
 

build.xml

@@ -32,34 +32,40 @@
     </target>
 
     <target name="setup-db" description="Setup Database Credentials">
+        <echo msg="Loading file ${project.basedir}/config/autoload/database.local.php.dist" />
         <loadfile property="db.config" file="${project.basedir}/config/autoload/database.local.php.dist">
             <filterchain>
                 <replacetokens>
                     <token key="db.host" value="${db.host}"/>
                     <token key="db.username" value="${db.username}"/>
                     <token key="db.password" value="${db.password}"/>
-                    <token key="db.name" value="${db.name}"/>
+                    <token key="db.name.backoffice" value="${db.name.backoffice}"/>
+                    <token key="db.name.core" value="${db.name.core}"/>
                 </replacetokens>
             </filterchain>
         </loadfile>
+        <echo msg="Writing file ${project.basedir}/config/autoload/database.local.php" />
         <echo message="${db.config}" file="${project.basedir}/config/autoload/database.local.php"/>
     </target>
 
     <target name="setup-languages" description="Setup Languages">
+        <echo msg="Loading file ${project.basedir}/config/autoload/languages.local.php.dist" />
         <loadfile property="languages.config" file="${project.basedir}/config/autoload/languages.local.php.dist">
             <!-- PLACE YOUR FILE MODIFICATIONS HERE -->
         </loadfile>
+        <echo msg="Writing file ${project.basedir}/config/autoload/languages.local.php" />
         <echo message="${languages.config}" file="${project.basedir}/config/autoload/languages.local.php"/>
     </target>
 
     <target name="setup-application" description="Setup Application config">
-        <loadfile property="app.config" file="${project.basedir}/config/application.config.php-dist-BO">
+        <loadfile property="app.config" file="/config/application.config.php">
             <!-- PLACE YOUR FILE MODIFICATIONS HERE -->
         </loadfile>
         <echo message="${app.config}" file="${project.basedir}/config/application.config.php"/>
     </target>
 
     <target name="setup-sec-auth" description="Setup Security and Authentication">
+        <echo msg="Loading file ${project.basedir}/config/autoload/security-authentication.local.php.dist" />
         <loadfile property="sec.config" file="${project.basedir}/config/autoload/security-authentication.local.php.dist">
             <filterchain>
                 <replacetokens>
@@ -68,6 +74,7 @@
                 </replacetokens>
             </filterchain>
         </loadfile>
+        <echo msg="Writing file ${project.basedir}/config/autoload/security-authentication.local.php" />
         <echo message="${sec.config}" file="${project.basedir}/config/autoload/security-authentication.local.php"/>
     </target>
 
@@ -97,8 +104,8 @@
     </target>
 
     <target name="db-migration" description="Update the database version">
-        <exec command="${project.basedir}/scripts/client-upgrade-db.sh backoffice ${db.host} ${db.username} ${db.password} ${db.name}" passthru="true"/>
+        <exec command="${project.basedir}/scripts/client-upgrade-db.sh backoffice ${db.host} ${db.username} ${db.password} ${db.name.backoffice}" passthru="true"/>
-        <exec command="${project.basedir}/scripts/client-upgrade-db.sh core ${db.host} ${db.username} ${db.password} ${db.name}" passthru="true"/>
+        <exec command="${project.basedir}/scripts/client-upgrade-db.sh core ${db.host} ${db.username} ${db.password} ${db.name.core}" passthru="true"/>
     </target>
 
     <target name="reset-db"
@@ -107,5 +114,5 @@
 
     <target name="init"
             description="Setup external dependencies and migrate data"
-            depends="setup-db, db-migration"/>
+            depends="setup-languages, setup-sec-auth, setup-db, db-migration"/>
 </project>

composer.json

@@ -13,8 +13,8 @@
         "zendframework/zendframework": "2.5.3",
         "doctrine/doctrine-orm-module": "^0.10",
         "robmorgan/phinx": "0.5.*",
-        "monarc/core": "dev-master",
+        "monarc/core": "dev-beta",
-        "monarc/backoffice": "dev-master",
+        "monarc/backoffice": "dev-beta",
         "phing/phing": "~2.0"
     },
     "config": {
@@ -23,11 +23,11 @@
     "repositories": [
         {
             "type": "vcs",
-            "url": "git+ssh://gogs@rhea.netlor.fr:2222/monarc/zm_core"
+            "url": "https://github.com/CASES-LU/zm-core"
         },
         {
             "type": "vcs",
-            "url": "git+ssh://gogs@rhea.netlor.fr:2222/monarc/zm_backoffice"
+            "url": "https://github.com/CASES-LU/zm-backoffice"
         }
     ]
 }

config/application.config.php-dist-FO

@@ -1,31 +0,0 @@
-<?php
-/**
- * Configuration file generated by ZFTool
- * The previous configuration file is stored in application.config.old
- *
- * @see https://github.com/zendframework/ZFTool
- */
-$env = getenv('APP_ENV') ?: 'production';
-return array(
-    'modules' => array(
-        'DoctrineModule',
-        'DoctrineORMModule',
-        'MonarcCore',
-        'MonarcFO',
-    ),
-    'module_listener_options' => array(
-        'module_paths' => array(
-            './module',
-            './vendor'
-        ),
-        'config_glob_paths' => array(
-            'config/autoload/{,*.}{global,local}.php'
-        ),
-        'config_cache_enabled' => ($env == 'production'),
-        'config_cache_key' => 'c8aaaaa11586f8b1bf5565cc6064e70a', // md5('config_cache_key_monarc')
-        'module_map_cache_enabled' => ($env == 'production'),
-        'module_map_cache_key' => '664579376c4dcdcaa0bcdd0f7e7bf25b', // md5('module_map_cache_key_monarc'),
-        'cache_dir' => 'data/cache/',
-        'check_dependencies' => ($env != 'production'),
-    ),
-);

continuous.yml

@@ -1,5 +1,6 @@
 # continuous.yml
 deployment:
   hooks:
-    AfterInstall:
+    AfterActivate:
       - command: scripts/migrate.sh
+      - command: scripts/restart-server.sh

package.json

@@ -10,8 +10,8 @@
   "author": "Netlor",
   "license": "Copyright",
   "dependencies": {
-    "ng_anr": "git+ssh://gogs@rhea.netlor.fr:2222/monarc/ng_anr#master",
+    "ng_anr": "https://github.com/CASES-LU/ng-anr#beta",
-    "ng_backoffice": "git+ssh://gogs@rhea.netlor.fr:2222/monarc/ng_backoffice#master"
+    "ng_backoffice": "https://github.com/CASES-LU/ng-backoffice#beta"
   },
   "devDependencies": {
     "grunt": "~0.4.1",

scripts/restart-server.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+service apache2 restart > /dev/null 2>&1 &
+service php7.0-fpm restart > /dev/null 2>&1 &