Skip to content

Commit d609ae7

Browse files
committed
move assets directory to AppBundle Resources
1 parent 612e2e7 commit d609ae7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+9
-24
lines changed

RoboFile.php

+9-6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ class RoboFile extends \Robo\Tasks
44
{
55
use Agallou\RoboHash\loadTasks;
66

7+
private $appBundleAssetsPath = 'src/AFUP/HaphpyBirthdayBundle/Resources/assets/';
8+
79
public function watch()
810
{
911
$this->build();
@@ -16,7 +18,7 @@ public function watch()
1618

1719
$this
1820
->taskWatch()
19-
->monitor(array('app/Resources/assets/sass/'), $buildCss)
21+
->monitor(array($this->appBundleAssetsPath.'sass/'), $buildCss)
2022
->run()
2123
;
2224
}
@@ -55,8 +57,8 @@ public function build()
5557
protected function _buildCss()
5658
{
5759
$this
58-
->taskScss(['app/Resources/assets/sass/main.scss' => 'app/cache/assets/sass/main_sass.css'])
59-
->addImportPath('app/Resources/assets/sass')
60+
->taskScss([$this->appBundleAssetsPath.'sass/main.scss' => 'app/cache/assets/sass/main_sass.css'])
61+
->addImportPath($this->appBundleAssetsPath.'sass')
6062
->addImportPath('bower_components/compass-mixins/lib/')
6163
->run();
6264

@@ -141,10 +143,11 @@ protected function _cleanOtherAssets()
141143

142144
protected function _buildOtherAssets()
143145
{
144-
$this->_copyDir('app/Resources/assets/icons', 'web/assets/icons');
145-
$this->_copyDir('app/Resources/assets/images', 'web/assets/images');
146+
$this->_copyDir($this->appBundleAssetsPath.'icons', 'web/assets/icons');
147+
$this->_copyDir($this->appBundleAssetsPath.'images', 'web/assets/images');
148+
$this->_copyDir($this->appBundleAssetsPath.'php-user-group', 'web/assets/images/php-user-group');
146149
$this->_copyDir('bower_components/ElaoStrap/dist/images', 'web/assets/images');
147-
$this->_copyDir('app/Resources/assets/videos', 'web/assets/videos');
150+
$this->_copyDir($this->appBundleAssetsPath.'videos', 'web/assets/videos');
148151
$this->_copyDir('bower_components/ElaoStrap/dist/fonts/elaostrap', 'web/assets/fonts/elaostrap');
149152
$this->_copyDir('bower_components/fontawesome/fonts', 'web/assets/fonts/font-awesome');
150153
$this->_copyDir('bower_components/dropify/dist/fonts', 'web/assets/fonts/dropify');

app/Resources/views/base.html.twig

-13
This file was deleted.

app/Resources/views/default/index.html.twig

-5
This file was deleted.

0 commit comments

Comments
 (0)