From 00c459e9556db4fb9c854f201089b62a99f5e9a6 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Sat, 17 Sep 2016 17:47:46 +0200 Subject: [PATCH 1/6] grunt setup --- scripts/compile_translations.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/compile_translations.sh b/scripts/compile_translations.sh index c84ea1f..83525d3 100755 --- a/scripts/compile_translations.sh +++ b/scripts/compile_translations.sh @@ -1,14 +1,16 @@ #!/bin/bash +pwd + if [ -d node_modules/ng_backoffice ]; then pushd node_modules/ng_backoffice - grunt compile_translations - grunt concat + node_modules/.bin/grunt compile_translations + node_modules/.bin/grunt concat fi if [ -d node_modules/ng_client ]; then pushd node_modules/ng_client - grunt compile_translations - grunt concat + node_modules/.bin/grunt compile_translations + node_modules/.bin/grunt concat fi From 84ab71d4adc7c41634f9d3fe149c09e959ef5abb Mon Sep 17 00:00:00 2001 From: ppaulis Date: Sat, 17 Sep 2016 18:02:11 +0200 Subject: [PATCH 2/6] grunt setup --- package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index daee00a..a8900ad 100644 --- a/package.json +++ b/package.json @@ -8,5 +8,9 @@ "url": "ssh://gogs@rhea.netlor.fr:2222/monarc/skeleton.git" }, "author": "Netlor", - "license": "Copyright" + "license": "Copyright", + "devDependencies": { + "grunt": "~0.4.1", + "grunt-cli": "~0.1.13" + } } From 0a72de930aa7fda3f720307e52fb1d693c865ad2 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Sat, 17 Sep 2016 18:18:50 +0200 Subject: [PATCH 3/6] grunt setup --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a8900ad..6495a18 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "repository": { "type": "git", - "url": "ssh://gogs@rhea.netlor.fr:2222/monarc/skeleton.git" + "url": "https://github.com/CASES-LU/skeleton.git" }, "author": "Netlor", "license": "Copyright", From 21710f3423945c5787d5c1d32add09a3f0656bfc Mon Sep 17 00:00:00 2001 From: ppaulis Date: Sun, 18 Sep 2016 10:23:13 +0200 Subject: [PATCH 4/6] grunt setup --- scripts/extract_translations.sh | 4 ++-- scripts/link_modules_resources.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/extract_translations.sh b/scripts/extract_translations.sh index 2f435cd..6ba7dfc 100755 --- a/scripts/extract_translations.sh +++ b/scripts/extract_translations.sh @@ -2,11 +2,11 @@ if [ -d node_modules/ng_backoffice ]; then pushd node_modules/ng_backoffice - grunt extract_translations + node_modules/.bin/grunt extract_translations fi if [ -d node_modules/ng_client ]; then pushd node_modules/ng_client - grunt extract_translations + node_modules/.bin/grunt extract_translations fi diff --git a/scripts/link_modules_resources.sh b/scripts/link_modules_resources.sh index 1728c91..4c192b2 100755 --- a/scripts/link_modules_resources.sh +++ b/scripts/link_modules_resources.sh @@ -54,7 +54,7 @@ if [ -d node_modules/ng_backoffice ]; then cd ../.. pushd node_modules/ng_backoffice - grunt concat + node_modules/.bin/grunt concat popd fi @@ -80,7 +80,7 @@ if [ -d node_modules/ng_client ]; then cd ../.. pushd node_modules/ng_client - grunt concat + node_modules/.bin/grunt concat popd fi From f1c953ae0bec3eab82e6d67927fef7d8d6f6fe79 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Sun, 18 Sep 2016 14:25:25 +0200 Subject: [PATCH 5/6] database setup --- config/autoload/database.local.php.dist | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 config/autoload/database.local.php.dist diff --git a/config/autoload/database.local.php.dist b/config/autoload/database.local.php.dist new file mode 100644 index 0000000..2e30aae --- /dev/null +++ b/config/autoload/database.local.php.dist @@ -0,0 +1,24 @@ + array( + 'connection' => array( + 'orm_default' => array( + 'params' => array( + 'host' => '@db.host@', + 'user' => '@db.username@', + 'password' => '@db.password@', + 'dbname' => '@db.name@', + ) + ), + 'orm_cli' => array( + 'params' => array( + 'host' => '@db.host@', + 'user' => '@db.username@', + 'password' => '@db.password@', + 'dbname' => '@db.name@', + ) + ) + ) + ) +); From ea3a454b77f46f84e67773022c994db896122912 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Sun, 18 Sep 2016 22:42:07 +0200 Subject: [PATCH 6/6] working on setup with phing --- config/autoload/languages.local.php.dist | 30 +++++++++++++++++++ .../security-authentication.local.php.dist | 8 +++++ 2 files changed, 38 insertions(+) create mode 100644 config/autoload/languages.local.php.dist create mode 100644 config/autoload/security-authentication.local.php.dist diff --git a/config/autoload/languages.local.php.dist b/config/autoload/languages.local.php.dist new file mode 100644 index 0000000..fbc7c8b --- /dev/null +++ b/config/autoload/languages.local.php.dist @@ -0,0 +1,30 @@ + [ + 1 => 'Français', + 2 => 'English', + 3 => 'Deutsch' + ], + + 'defaultLanguageIndex' => 1, + + /* Link with (ModuleCore) + config['languages'] = [ + 'fr' => array( + 'index' => 1, + 'label' => 'Français' + ), + 'en' => array( + 'index' => 2, + 'label' => 'English' + ), + 'de' => array( + 'index' => 3, + 'label' => 'Deutsch' + ), + ] + */ + + 'activeLanguages' => array('fr','en','de',) +); diff --git a/config/autoload/security-authentication.local.php.dist b/config/autoload/security-authentication.local.php.dist new file mode 100644 index 0000000..1213f69 --- /dev/null +++ b/config/autoload/security-authentication.local.php.dist @@ -0,0 +1,8 @@ + array( + 'ttl' => @monarc.ttl@, // timeout + 'salt' => '@monarc.salt@', // salt privé pour chiffrement pwd + ), +);