+
+{% endblock body %}
+
diff --git a/EMS/admin-ui-bundle/webpack.config.js b/EMS/admin-ui-bundle/webpack.config.js
new file mode 100644
index 000000000..c18a67eb4
--- /dev/null
+++ b/EMS/admin-ui-bundle/webpack.config.js
@@ -0,0 +1,87 @@
+const path = require('path');
+const webpack = require('webpack');
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const CopyPlugin = require("copy-webpack-plugin");
+const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
+
+module.exports = (env, argv) => {
+ return {
+ plugins: [
+ new webpack.ProvidePlugin({
+ $: "jquery",
+ jQuery: "jquery"
+ }),
+ new webpack.ProvidePlugin({
+ Buffer: ['buffer', 'Buffer'],
+ }),
+ new webpack.ProvidePlugin({
+ process: 'process/browser',
+ }),
+ new WebpackManifestPlugin({'publicPath': 'bundles/emsadminui/'}),
+ new CleanWebpackPlugin({
+ cleanOnceBeforeBuildPatterns: ['**/*', '!static/**'],
+ }),
+ new CopyPlugin({
+ "patterns": [
+ {from: './assets/images', to: 'images'},
+ ]
+ }),
+ new MiniCssExtractPlugin({
+ filename: "css/[name].[contenthash].css",
+ chunkFilename: "[id].css"
+ }),
+ ],
+ optimization: {
+ minimizer: [new TerserPlugin({
+ extractComments: false,
+ })],
+ },
+ context: path.resolve(__dirname, './'),
+ entry: {
+ 'app': './assets/js/app.js',
+ },
+ output: {
+ path: path.resolve(__dirname, 'src/Resources/public'),
+ filename: 'js/[name].[contenthash].js',
+ },
+ resolve: {
+ fallback: {
+ "tty": require.resolve("tty-browserify"),
+ "stream": require.resolve("stream-browserify"),
+ "buffer": require.resolve("buffer")
+ }
+ },
+ module: {
+ rules: [
+ {
+ test: /\.(sa|sc|c)ss$/,
+ use: [
+ {loader: MiniCssExtractPlugin.loader, options: {publicPath: '../'}},
+ {loader: 'css-loader', options: {sourceMap: (argv.mode !== 'production')}},
+ {loader: 'sass-loader', options: {sourceMap: (argv.mode !== 'production')}}
+ ],
+ },
+ {
+ test: /\.(png|jpg|gif|svg)$/,
+ type: 'asset/inline',
+ },
+ {
+ test: /\.(woff|woff2|eot|ttf|otf)$/,
+ type: 'asset/resource',
+ generator: {
+ filename: 'media/[name][ext]'
+ }
+ },
+ {
+ test: /\.js$/,
+ exclude: /node_modules/,
+ use: {
+ loader: 'babel-loader',
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/EMS/core-bundle/src/Controller/User/LoginController.php b/EMS/core-bundle/src/Controller/User/LoginController.php
index 743b6e4a8..24f9a122c 100644
--- a/EMS/core-bundle/src/Controller/User/LoginController.php
+++ b/EMS/core-bundle/src/Controller/User/LoginController.php
@@ -10,7 +10,7 @@
class LoginController
{
- public function __construct(private readonly Environment $twig)
+ public function __construct(private readonly Environment $twig, private readonly string $templateNamespace)
{
}
@@ -19,7 +19,7 @@ public function login(AuthenticationUtils $authenticationUtils): Response
$error = $authenticationUtils->getLastAuthenticationError();
$lastUsername = $authenticationUtils->getLastUsername();
- return new Response($this->twig->render('@EMSCore/user/login.html.twig', [
+ return new Response($this->twig->render("@$this->templateNamespace/user/login.html.twig", [
'last_username' => $lastUsername,
'error' => $error,
]));
diff --git a/EMS/core-bundle/src/DependencyInjection/Configuration.php b/EMS/core-bundle/src/DependencyInjection/Configuration.php
index 397bdf7b2..0f104aadb 100644
--- a/EMS/core-bundle/src/DependencyInjection/Configuration.php
+++ b/EMS/core-bundle/src/DependencyInjection/Configuration.php
@@ -36,6 +36,7 @@ class Configuration implements ConfigurationInterface
final public const DEFAULT_BULK_SIZE = 500;
final public const CLEAN_JOBS_TIME_STRING = '-7 days';
final public const FALLBACK_LOCALE = 'en';
+ final public const TEMPLATE_NAMESPACE = 'EMSCore';
public function getConfigTreeBuilder(): TreeBuilder
{
@@ -81,6 +82,7 @@ public function getConfigTreeBuilder(): TreeBuilder
->scalarNode('clean_jobs_time_string')->defaultValue(self::CLEAN_JOBS_TIME_STRING)->end()
->scalarNode('fallback_locale')->defaultValue(self::FALLBACK_LOCALE)->end()
->scalarNode('custom_user_options_form')->defaultValue(null)->end()
+ ->scalarNode('template_namespace')->defaultValue(self::TEMPLATE_NAMESPACE)->end()
->end()
;
diff --git a/EMS/core-bundle/src/DependencyInjection/EMSCoreExtension.php b/EMS/core-bundle/src/DependencyInjection/EMSCoreExtension.php
index b1e8344d7..b07cb9418 100644
--- a/EMS/core-bundle/src/DependencyInjection/EMSCoreExtension.php
+++ b/EMS/core-bundle/src/DependencyInjection/EMSCoreExtension.php
@@ -73,6 +73,7 @@ public function load(array $configs, ContainerBuilder $container): void
$container->setParameter('ems_core.fallback_locale', $config['fallback_locale']);
$container->setParameter('ems_core.url_user', $config['url_user']);
$container->setParameter('ems_core.custom_user_options_form', $config['custom_user_options_form']);
+ $container->setParameter('ems_core.template_namespace', $config['template_namespace']);
$container->setParameter('ems_core.security.firewall.core', $config['security']['firewall']['core']);
$container->setParameter('ems_core.security.firewall.api', $config['security']['firewall']['api']);
diff --git a/EMS/core-bundle/src/Resources/config/controllers.xml b/EMS/core-bundle/src/Resources/config/controllers.xml
index fa77c0364..55589a5d2 100644
--- a/EMS/core-bundle/src/Resources/config/controllers.xml
+++ b/EMS/core-bundle/src/Resources/config/controllers.xml
@@ -336,6 +336,7 @@
+
+  }})
+
+
+
+
+
+
+
+
+ {{ 'user.login.message'|trans }}
+ + {% if error %} +
+
+ {% endif %}
+
+
+
+
+ {{ error.messageKey|trans(error.messageData) }}
+