Skip to content

Commit 3d1bb36

Browse files
committed
Files moved
1 parent ba73c87 commit 3d1bb36

File tree

10 files changed

+5
-45
lines changed

10 files changed

+5
-45
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/Providers/ModuleServiceProvider.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ class ModuleServiceProvider extends ServiceProvider
1313
{
1414
public function boot()
1515
{
16-
$this->mergeConfigFrom(__DIR__.'/../config/config.php', 'typicms.blocks');
17-
$this->mergeConfigFrom(__DIR__.'/../config/permissions.php', 'typicms.permissions');
16+
$this->mergeConfigFrom(__DIR__.'/../../config/config.php', 'typicms.blocks');
17+
$this->mergeConfigFrom(__DIR__.'/../../config/permissions.php', 'typicms.permissions');
1818

1919
$modules = $this->app['config']['typicms']['modules'];
2020
$this->app['config']->set('typicms.modules', array_merge(['blocks' => []], $modules));
2121

22-
$this->loadViewsFrom(__DIR__.'/../resources/views/', 'blocks');
22+
$this->loadViewsFrom(__DIR__.'/../../resources/views/', 'blocks');
2323

2424
$this->publishes([
25-
__DIR__.'/../database/migrations/create_blocks_table.php.stub' => getMigrationFileName('create_blocks_table'),
25+
__DIR__.'/../../database/migrations/create_blocks_table.php.stub' => getMigrationFileName('create_blocks_table'),
2626
], 'migrations');
2727

2828
$this->publishes([
29-
__DIR__.'/../resources/views' => resource_path('views/vendor/blocks'),
29+
__DIR__.'/../../resources/views' => resource_path('views/vendor/blocks'),
3030
], 'views');
3131

3232
AliasLoader::getInstance()->alias('Blocks', Blocks::class);

tests/BlocksControllerTest.php

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)