From 96d6c58a7a6177667515e56a1d0347fc42e69258 Mon Sep 17 00:00:00 2001 From: Gerhard Seidel Date: Fri, 25 Sep 2020 13:55:39 +0200 Subject: [PATCH 1/5] Add enhavo/app-bundle recipe --- .../assets/services/enhavo/enhavo_app.yaml | 4 ++++ enhavo/app-bundle/0.9/assets/theme/base.js | 1 + .../0.9/assets/theme/images/.gitignore | 0 .../0.9/assets/theme/styles/base.scss | 0 .../0.9/config/packages/enhavo_app.yaml | 2 ++ .../0.9/config/routes/enhavo_app.yaml | 3 +++ enhavo/app-bundle/0.9/manifest.json | 24 +++++++++++++++++++ enhavo/app-bundle/0.9/post-install.txt | 15 ++++++++++++ enhavo/app-bundle/0.9/public/build/.gitignore | 0 9 files changed, 49 insertions(+) create mode 100644 enhavo/app-bundle/0.9/assets/services/enhavo/enhavo_app.yaml create mode 100644 enhavo/app-bundle/0.9/assets/theme/base.js create mode 100644 enhavo/app-bundle/0.9/assets/theme/images/.gitignore create mode 100644 enhavo/app-bundle/0.9/assets/theme/styles/base.scss create mode 100644 enhavo/app-bundle/0.9/config/packages/enhavo_app.yaml create mode 100644 enhavo/app-bundle/0.9/config/routes/enhavo_app.yaml create mode 100644 enhavo/app-bundle/0.9/manifest.json create mode 100644 enhavo/app-bundle/0.9/post-install.txt create mode 100644 enhavo/app-bundle/0.9/public/build/.gitignore diff --git a/enhavo/app-bundle/0.9/assets/services/enhavo/enhavo_app.yaml b/enhavo/app-bundle/0.9/assets/services/enhavo/enhavo_app.yaml new file mode 100644 index 00000000..9d676bb1 --- /dev/null +++ b/enhavo/app-bundle/0.9/assets/services/enhavo/enhavo_app.yaml @@ -0,0 +1,4 @@ +imports: + - + path: '@enhavo/app/services/*' + diff --git a/enhavo/app-bundle/0.9/assets/theme/base.js b/enhavo/app-bundle/0.9/assets/theme/base.js new file mode 100644 index 00000000..58717275 --- /dev/null +++ b/enhavo/app-bundle/0.9/assets/theme/base.js @@ -0,0 +1 @@ +import './styles/base.scss'; \ No newline at end of file diff --git a/enhavo/app-bundle/0.9/assets/theme/images/.gitignore b/enhavo/app-bundle/0.9/assets/theme/images/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/enhavo/app-bundle/0.9/assets/theme/styles/base.scss b/enhavo/app-bundle/0.9/assets/theme/styles/base.scss new file mode 100644 index 00000000..e69de29b diff --git a/enhavo/app-bundle/0.9/config/packages/enhavo_app.yaml b/enhavo/app-bundle/0.9/config/packages/enhavo_app.yaml new file mode 100644 index 00000000..3fc734d8 --- /dev/null +++ b/enhavo/app-bundle/0.9/config/packages/enhavo_app.yaml @@ -0,0 +1,2 @@ +enhavo_app: + menu: diff --git a/enhavo/app-bundle/0.9/config/routes/enhavo_app.yaml b/enhavo/app-bundle/0.9/config/routes/enhavo_app.yaml new file mode 100644 index 00000000..a99a04d2 --- /dev/null +++ b/enhavo/app-bundle/0.9/config/routes/enhavo_app.yaml @@ -0,0 +1,3 @@ +enhavo_app_admin: + resource: "@EnhavoAppBundle/Resources/config/routing/admin.yml" + prefix: /admin diff --git a/enhavo/app-bundle/0.9/manifest.json b/enhavo/app-bundle/0.9/manifest.json new file mode 100644 index 00000000..22eb4ab2 --- /dev/null +++ b/enhavo/app-bundle/0.9/manifest.json @@ -0,0 +1,24 @@ +{ + "bundles": { + "Enhavo\\Bundle\\AppBundle\\EnhavoAppBundle": ["all"] + }, + "container": { + "locale": "en" + }, + "env": { + "MAILER_FROM": "no-reply@email.com", + "MAILER_TO": "my@email.com", + "MAILER_NAME": "enhavo", + "MAILER_DELIVERY_ADDRESS": "my@email.com" + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/", + "assets/": "assets/", + "public/": "%PUBLIC_DIR%/" + }, + "gitignore": [ + "public/build/enhavo/*", + "public/build/theme/*", + "public/js/fos_routes.js" + ] +} diff --git a/enhavo/app-bundle/0.9/post-install.txt b/enhavo/app-bundle/0.9/post-install.txt new file mode 100644 index 00000000..1064db6b --- /dev/null +++ b/enhavo/app-bundle/0.9/post-install.txt @@ -0,0 +1,15 @@ + + Complete EnhavoAppBundle installation ... + + + * Update your package.json file + * Update your webpack.config.js file + * Update your configurations + * Add a tsconfig.json file + * Build your assets with + + $ yarn encore dev + $ yarn routes:dump + + Read more details about the steps: + https://docs.enhavo.com/book/app-bundle/installation.html diff --git a/enhavo/app-bundle/0.9/public/build/.gitignore b/enhavo/app-bundle/0.9/public/build/.gitignore new file mode 100644 index 00000000..e69de29b From 9a600c441a126a45bf8ef3b408ffe276fee664b5 Mon Sep 17 00:00:00 2001 From: Gerhard Seidel Date: Fri, 25 Sep 2020 18:17:39 +0200 Subject: [PATCH 2/5] Fix routes --- enhavo/app-bundle/0.9/config/routes/enhavo_app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enhavo/app-bundle/0.9/config/routes/enhavo_app.yaml b/enhavo/app-bundle/0.9/config/routes/enhavo_app.yaml index a99a04d2..77d516c0 100644 --- a/enhavo/app-bundle/0.9/config/routes/enhavo_app.yaml +++ b/enhavo/app-bundle/0.9/config/routes/enhavo_app.yaml @@ -1,3 +1,3 @@ enhavo_app_admin: - resource: "@EnhavoAppBundle/Resources/config/routing/admin.yml" + resource: "@EnhavoAppBundle/Resources/config/routes/admin/*" prefix: /admin From 4f7c73d6b41b0446a49dafb7c9a037115c81055b Mon Sep 17 00:00:00 2001 From: Gerhard Seidel Date: Sat, 26 Sep 2020 18:26:30 +0200 Subject: [PATCH 3/5] Add tsconfig.json --- enhavo/app-bundle/0.9/manifest.json | 3 ++- enhavo/app-bundle/0.9/post-install.txt | 1 - enhavo/app-bundle/0.9/tsconfig.json | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 enhavo/app-bundle/0.9/tsconfig.json diff --git a/enhavo/app-bundle/0.9/manifest.json b/enhavo/app-bundle/0.9/manifest.json index 22eb4ab2..6910c53a 100644 --- a/enhavo/app-bundle/0.9/manifest.json +++ b/enhavo/app-bundle/0.9/manifest.json @@ -14,7 +14,8 @@ "copy-from-recipe": { "config/": "%CONFIG_DIR%/", "assets/": "assets/", - "public/": "%PUBLIC_DIR%/" + "public/": "%PUBLIC_DIR%/", + "tsconfig.json": "tsconfig.json" }, "gitignore": [ "public/build/enhavo/*", diff --git a/enhavo/app-bundle/0.9/post-install.txt b/enhavo/app-bundle/0.9/post-install.txt index 1064db6b..bc001e89 100644 --- a/enhavo/app-bundle/0.9/post-install.txt +++ b/enhavo/app-bundle/0.9/post-install.txt @@ -5,7 +5,6 @@ * Update your package.json file * Update your webpack.config.js file * Update your configurations - * Add a tsconfig.json file * Build your assets with $ yarn encore dev diff --git a/enhavo/app-bundle/0.9/tsconfig.json b/enhavo/app-bundle/0.9/tsconfig.json new file mode 100644 index 00000000..65764146 --- /dev/null +++ b/enhavo/app-bundle/0.9/tsconfig.json @@ -0,0 +1,16 @@ +{ + "compilerOptions": { + "lib": [ "es2015", "dom" ], + "module": "amd", + "target": "es5", + "allowJs": true, + "noImplicitAny": true, + "suppressImplicitAnyIndexErrors": true, + "moduleResolution": "node", + "sourceMap": true, + "experimentalDecorators": true + }, + "include": [ + "./assets/**/*" + ] +} \ No newline at end of file From 9d3130acdcd802bb6425d9fbe9d640d989f87163 Mon Sep 17 00:00:00 2001 From: Gerhard Seidel Date: Sat, 26 Sep 2020 18:28:07 +0200 Subject: [PATCH 4/5] Fix validation --- enhavo/app-bundle/0.9/tsconfig.json | 30 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/enhavo/app-bundle/0.9/tsconfig.json b/enhavo/app-bundle/0.9/tsconfig.json index 65764146..794984fb 100644 --- a/enhavo/app-bundle/0.9/tsconfig.json +++ b/enhavo/app-bundle/0.9/tsconfig.json @@ -1,16 +1,16 @@ { - "compilerOptions": { - "lib": [ "es2015", "dom" ], - "module": "amd", - "target": "es5", - "allowJs": true, - "noImplicitAny": true, - "suppressImplicitAnyIndexErrors": true, - "moduleResolution": "node", - "sourceMap": true, - "experimentalDecorators": true - }, - "include": [ - "./assets/**/*" - ] -} \ No newline at end of file + "compilerOptions": { + "lib": [ "es2015", "dom" ], + "module": "amd", + "target": "es5", + "allowJs": true, + "noImplicitAny": true, + "suppressImplicitAnyIndexErrors": true, + "moduleResolution": "node", + "sourceMap": true, + "experimentalDecorators": true + }, + "include": [ + "./assets/**/*" + ] +} From 51fbfa4bc0dfae17928cbee37cc48946ad6567d7 Mon Sep 17 00:00:00 2001 From: Gerhard Seidel Date: Mon, 12 Oct 2020 22:19:44 +0200 Subject: [PATCH 5/5] Update env vars --- enhavo/app-bundle/0.9/config/packages/enhavo_app.yaml | 5 +++++ enhavo/app-bundle/0.9/manifest.json | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/enhavo/app-bundle/0.9/config/packages/enhavo_app.yaml b/enhavo/app-bundle/0.9/config/packages/enhavo_app.yaml index 3fc734d8..04275d52 100644 --- a/enhavo/app-bundle/0.9/config/packages/enhavo_app.yaml +++ b/enhavo/app-bundle/0.9/config/packages/enhavo_app.yaml @@ -1,2 +1,7 @@ enhavo_app: + mailer: + defaults: + from: '%env(resolve:MAILER_FROM)%' + name: '%env(resolve:MAILER_NAME)%' + to: '%env(resolve:MAILER_TO)%' menu: diff --git a/enhavo/app-bundle/0.9/manifest.json b/enhavo/app-bundle/0.9/manifest.json index 6910c53a..ad159674 100644 --- a/enhavo/app-bundle/0.9/manifest.json +++ b/enhavo/app-bundle/0.9/manifest.json @@ -7,9 +7,8 @@ }, "env": { "MAILER_FROM": "no-reply@email.com", - "MAILER_TO": "my@email.com", "MAILER_NAME": "enhavo", - "MAILER_DELIVERY_ADDRESS": "my@email.com" + "MAILER_TO": "my@email.com" }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/",