diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..7ae768a
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,5 @@
+
+ RewriteEngine On
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteRule ^(.*)$ web/$1 [QSA,L]
+
diff --git a/app/config/config.yml b/app/config/config.yml
index 3b5108c..eb9e4f7 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -70,6 +70,11 @@ assetic:
bundles: ~
filters:
cssrewrite: ~
+ uglifyjs2:
+ bin: "%kernel.root_dir%/../node_modules/uglify-js/bin/uglifyjs"
+ no_copyright: true
+ uglifycss:
+ bin: "%kernel.root_dir%/../node_modules/uglifycss/uglifycss"
# FOS User Configuration
fos_user:
diff --git a/package.json b/package.json
index 537a5c9..1965227 100644
--- a/package.json
+++ b/package.json
@@ -10,11 +10,12 @@
"babel-loader": "^6.2.5",
"babel-preset-es2015": "^6.14.0",
"babel-preset-react": "^6.11.1",
- "clipboard": "^1.5.15",
"howler": "^2.0.1",
"js-base64": "^2.1.9",
"react": "^15.3.2",
"react-dom": "^15.3.2",
+ "uglify-js": "^2.7.4",
+ "uglifycss": "0.0.25",
"webpack": "^1.13.3"
},
"devDependencies": {},
diff --git a/src/Jotunheimr/AdminBundle/Resources/views/System/elfinder-summernote.html.twig b/src/Jotunheimr/AdminBundle/Resources/views/System/elfinder-summernote.html.twig
index da97ca8..2b5b116 100644
--- a/src/Jotunheimr/AdminBundle/Resources/views/System/elfinder-summernote.html.twig
+++ b/src/Jotunheimr/AdminBundle/Resources/views/System/elfinder-summernote.html.twig
@@ -5,27 +5,27 @@
- {% if includeAssets %}
- {% stylesheets filter='cssrewrite'
- '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/css/elfinder.full.css'
- '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/css/theme.css' %}
-
- {% endstylesheets %}
- {% endif %}
+ {#{% if includeAssets %}#}
+ {#{% stylesheets filter='cssrewrite'#}
+ {#'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/'#}
+ {#'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/css/theme.css' %}#}
+ {##}
+ {#{% endstylesheets %}#}
+ {#{% endif %}#}
- {% if includeAssets %}
-
-
-
+ {#{% if includeAssets %}#}
+ {##}
+ {##}
+ {##}
- {% javascripts
- '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/js/elfinder.min.js'
- '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/js/i18n/elfinder.hu.js'%}
-
- {% endjavascripts %}
- {% endif %}
+ {#{% javascripts#}
+ {#'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/js/elfinder.min.js'#}
+ {#'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/js/i18n/elfinder.hu.js'%}#}
+ {##}
+ {#{% endjavascripts %}#}
+ {#{% endif %}#}
-
-
-
+ {% javascripts filter='?uglifyjs2'
+ '@MineSeekerBundle/Resources/public/js/node/howler/dist/howler.min.js'
+ '@MineSeekerBundle/Resources/public/js/node/js-base64/base64.min.js'
+ '@MineSeekerBundle/Resources/public/js/index.js'%}
+
+ {% endjavascripts %}
{% endblock %}
diff --git a/web/.htaccess-prod b/web/.htaccess-prod
new file mode 100644
index 0000000..db4aad2
--- /dev/null
+++ b/web/.htaccess-prod
@@ -0,0 +1,7 @@
+
+ RewriteEngine On
+ RewriteCond %{THE_REQUEST} ^(GET|HEAD)\ /web/
+ RewriteRule ^(.*)$ /$1 [L,R=301]
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteRule ^(.*)$ app.php [QSA,L]
+
diff --git a/web/node b/web/node
deleted file mode 120000
index 61c06aa..0000000
--- a/web/node
+++ /dev/null
@@ -1 +0,0 @@
-bundles/mineseeker/js/node/
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index 8bd9b41..488f993 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,7 +3,7 @@
module.exports = {
entry: './web/bundles/mineseeker/js/mine-seeker.js',
output: {
- path: './web/js',
+ path: './src/Mine/SeekerBundle/Resources/public/js',
filename: 'index.js'
},
module: {