#1387: Rename namespaces.

Author: haringsrob

CHANGELOG.md

@@ -363,7 +363,7 @@ All notable changes to `twill` will be documented in this file.
 - **Self-contained blocks** (#597) [`1e95b0ac`](https://github.com/area17/twill/commit/1e95b0ac) [`9ae502a4`](https://github.com/area17/twill/commit/9ae502a46ed31f82ebda5426dbff5f56228e2d25) [`948985ef`](https://github.com/area17/twill/commit/948985ef22d70a08287ccdf7583ca802f6182833) [`66fa7c5e`](https://github.com/area17/twill/commit/66fa7c5e16c0ce34f0edc1aab74a52ef0d232401) [`c00759ee`](https://github.com/area17/twill/commit/c00759ee7cad76aea16ec7f04c693ba1cd046b9d)
   - This change allows defining blocks without adding them to the `twill.block_editor` configuration
   - This is backwards compatible with blocks already defined in configuration
-  - Repeaters are now created in a dedicated folder: `views/admin/repeaters` by default, but your existing repeaters in the `views/admin/blocks` file will still work
+  - Repeaters are now created in a dedicated folder: `views/twill/admin/repeaters` by default, but your existing repeaters in the `views/twill/admin/blocks` file will still work
   - Annotations are now supported in blocks and repeaters Blade files:
     - Provide a title with `@twillPropTitle` or `@twillBlockTitle` or `@twillRepeaterTitle`
     - Provide an icon with `@twillPropIcon` or `@twillBlockIcon` or `@twillRepeaterIcon`

config/blocks.php

@@ -64,14 +64,14 @@
                     'source' => A17\Twill\Services\Blocks\Block::SOURCE_TWILL,
                 ],
                 [
-                    'path' => resource_path('views/admin/blocks'),
+                    'path' => resource_path('views/twill/admin/blocks'),
                     'source' => A17\Twill\Services\Blocks\Block::SOURCE_APP,
                 ],
             ],
 
             'repeaters' => [
                 [
-                    'path' => resource_path('views/admin/repeaters'),
+                    'path' => resource_path('views/twill/admin/repeaters'),
                     'source' => A17\Twill\Services\Blocks\Block::SOURCE_APP,
                 ],
                 [
@@ -82,16 +82,16 @@
 
             'icons' => [
                 base_path('vendor/area17/twill/frontend/icons'),
-                resource_path('views/admin/icons'),
+                resource_path('views/twill/admin/icons'),
             ],
         ],
 
         'destination' => [
             'make_dir' => true,
 
-            'blocks' => resource_path('views/admin/blocks'),
+            'blocks' => resource_path('views/twill/admin/blocks'),
 
-            'repeaters' => resource_path('views/admin/repeaters'),
+            'repeaters' => resource_path('views/twill/admin/repeaters'),
         ],
     ],
 ];

config/capsules.php

@@ -57,7 +57,7 @@
 //                    '/app-dir/vendor/area17/twill/vendor/orchestra/testbench-core/laravel/app/Twill/Capsules/Posts/resources/views',
 //                'view_prefix' => 'Posts.resources.views.admin',
 //                'routes_file' =>
-//                    '/app-dir/vendor/area17/twill/vendor/orchestra/testbench-core/laravel/app/Twill/Capsules/Posts/routes/admin.php',
+//                    '/app-dir/vendor/area17/twill/vendor/orchestra/testbench-core/laravel/app/Twill/Capsules/Posts/routes/twill.php',
 //                'models_dir' =>
 //                    '/app-dir/vendor/area17/twill/vendor/orchestra/testbench-core/laravel/app/Twill/Capsules/Posts/app/Data/Models',
 //                'translation' =>

docs/src/block-editor/adding-browser-fields-to-a-block.md

@@ -8,7 +8,7 @@ To attach other records inside of a block, it is possible to use the `browser` f
 
 - In a block, use the `browser` field:
 
-filename: ```views/admin/blocks/products.blade.php```
+filename: ```views/twill/admin/blocks/products.blade.php```
 ```php
     @twillBlockTitle('Products')
 

docs/src/block-editor/adding-repeater-fields-to-a-block.md

@@ -8,17 +8,17 @@ Inside a block, repeaters can be used too.
 
 - Create a *container* block file, using a repeater form field:
 
-  filename: ```views/admin/blocks/accordion.blade.php```
+  filename: ```views/twill/admin/blocks/accordion.blade.php```
 ```php
   @twillBlockTitle('Accordion')
   ...
   @formField('repeater', ['type' => 'accordion_item'])
 ```
 You can add other fields before or after your repeater, or even multiple repeaters to the same block.
 
-- Create an *item* block, the one that will be reapeated inside the *container* block
+- Create an *item* block, the one that will be repeated inside the *container* block
 
-filename: ```views/admin/repeaters/accordion_item.blade.php```
+filename: ```views/twill/admin/repeaters/accordion_item.blade.php```
 ```php
   @twillRepeaterTitle('Accordion item')
   @twillRepeaterMax('10')

docs/src/block-editor/creating-a-block-editor.md

@@ -31,7 +31,7 @@ By default, adding the `@formField('block_editor')` directive enables all availa
 
 #### Create and define blocks
 
-Blocks and Repeaters are built on the same Block model and are created and defined in their respective folders. By default, Twill will look for Blade templates in `views/admin/blocks` for blocks and `views/admin/repeaters` for repeaters.
+Blocks and Repeaters are built on the same Block model and are created and defined in their respective folders. By default, Twill will look for Blade templates in `views/twill/admin/blocks` for blocks and `views/twill/admin/repeaters` for repeaters.
 
 Note: Prior to Twill version 2.2, Blocks (and Repeaters) needed to be defined in the configuration file – this is no longer necessary and not recommended. This change is backward compatible, so your existing configuration should work as it used to. Defining blocks in the configuration file will be deprecated in a future release (see the section below [Legacy configuration](/block-editor/legacy-configuration-2-2.html).
 
@@ -49,7 +49,7 @@ Available annotations:
 
 e.g.:
 
-filename: ```views/admin/blocks/quote.blade.php```
+filename: ```views/twill/admin/blocks/quote.blade.php```
 ```php
 @twillBlockTitle('Quote')
 @twillBlockIcon('text')
@@ -65,7 +65,7 @@ filename: ```views/admin/blocks/quote.blade.php```
 
 A more complex example would look like this:
 
-filename: ```views/admin/blocks/media.blade.php```
+filename: ```views/twill/admin/blocks/media.blade.php```
 ```php
 @twillBlockTitle('Media')
 @twillBlockIcon('image')
@@ -147,7 +147,7 @@ In Twill >= 2.5, you can use the `@twillBlockTitleField` directive to include th
 
 Using `php artisan twill:make:block {name} {baseBlock} {icon}`, you can generate a new block based on a provided block as a base.
 
-This example would create `views/admin/blocks/exceptional-media.blade.php` from `views/admin/blocks/media.blade.php`:
+This example would create `views/twill/admin/blocks/exceptional-media.blade.php` from `views/twill/admin/blocks/media.blade.php`:
 
 ```
 $ php artisan twill:make:block ExceptionalMedia media image

docs/src/block-editor/default-configuration.md

@@ -67,13 +67,13 @@ return [
                     'source' => A17\Twill\Services\Blocks\Block::SOURCE_TWILL,
                 ],
                 [
-                    'path' => resource_path('views/admin/blocks'),
+                    'path' => resource_path('views/twill/admin/blocks'),
                     'source' => A17\Twill\Services\Blocks\Block::SOURCE_APP,
                 ],
             ],
             'repeaters' => [
                 [
-                    'path' => resource_path('views/admin/repeaters'),
+                    'path' => resource_path('views/twill/admin/repeaters'),
                     'source' => A17\Twill\Services\Blocks\Block::SOURCE_APP,
                 ],
                 [
@@ -83,13 +83,13 @@ return [
             ],
             'icons' => [
                 base_path('vendor/area17/twill/frontend/icons'),
-                resource_path('views/admin/icons'),
+                resource_path('views/twill/admin/icons'),
             ],
         ],
         'destination' => [
             'make_dir' => true,
-            'blocks' => resource_path('views/admin/blocks'),
-            'repeaters' => resource_path('views/admin/repeaters'),
+            'blocks' => resource_path('views/twill/admin/blocks'),
+            'repeaters' => resource_path('views/twill/admin/repeaters'),
         ],
     ],
 ];

docs/src/crud-modules/cli-generator.md

@@ -22,7 +22,7 @@ The command accepts several options:
 
 The `twill:module` command will generate a migration file, a model, a repository, a controller, a form request object and a form view.
 
-Add the route to your admin routes file(`routes/admin.php`).
+Add the route to your admin routes file(`routes/twill.php`).
 
 ```php
 <?php
@@ -73,7 +73,7 @@ The functionalities are exactly the same as that of regular modules. But they ar
 
 After generating your singleton via the command mentioned above:
 
-Add the route to your admin routes file(`routes/admin.php`).
+Add the route to your admin routes file(`routes/twill.php`).
 
 ```php
 <?php

docs/src/crud-modules/controllers.md

@@ -161,7 +161,7 @@ in `A17\Twill\Http\Controllers\Admin\ModuleController`.
 
 Let's say we have a controller with certain fields displayed:
 
-File: `app/Http/Controllers/Admin/PlayController.php`
+File: `app/Http/Controllers/Twill/PlayController.php`
 
 ```php
     protected $indexColumns = [
@@ -222,7 +222,7 @@ File: `app/Models/Play.php`
 
 You can override the `additionalTableActions()` method to add custom actions in your module's listing view:
 
-File: `app/Http/Controllers/Admin/NewsletterController.php`
+File: `app/Http/Controllers/Twill/NewsletterController.php`
 
 ```php
     public function additionalTableActions()

docs/src/crud-modules/form-requests.md

@@ -6,7 +6,7 @@ pageClass: twill-doc
 
 Classic Laravel 5 [form request validation](https://laravel.com/docs/5.5/validation#form-request-validation).
 
-Once you generated the module using Twill's CLI module generator, it will also prepare the `App/Http/Requests/Admin/ModuleNameRequest.php` for you to use.
+Once you generated the module using Twill's CLI module generator, it will also prepare the `App/Http/Requests/Twill/ModuleNameRequest.php` for you to use.
 You can choose to use different rules for creation and update by implementing the following 2 functions instead of the classic `rules` one:
 
 ```php

docs/src/crud-modules/nested-modules.md

@@ -191,7 +191,7 @@ class IssueController extends BaseModuleController
 }
 ```
 
-Add both modules to `routes/admin.php`:
+Add both modules to `routes/twill.php`:
 
 ```php
 Route::module('issues');
@@ -211,7 +211,7 @@ return [
 
 Then, rename and move the `articles/` views folder inside of the parent `issues/` folder:
 ```
-resources/views/admin/
+resources/views/twill/admin/
 └── issues
     ├── articles
     │   └── form.blade.php

docs/src/custom-cms-pages/index.md

@@ -8,7 +8,7 @@ Twill includes the ability to create fully custom pages that includes your navig
 
 #### Example
 
-- Create a route in `routes/admin.php`
+- Create a route in `routes/twill.php`
 
 ```php
   Route::name('customPage')->get('/customPage', 'MockController@show');

docs/src/form-fields/browser.md

@@ -65,7 +65,7 @@ class ArticleRepository extends ModuleRepository
 }
 ```
 
-- Add the browser field to `resources/views/admin/articles/form.blade.php`:
+- Add the browser field to `resources/views/twill/admin/articles/form.blade.php`:
 
 ```php
 @extends('twill::layouts.form')
@@ -95,7 +95,7 @@ class ArticleRepository extends ModuleRepository
 }
 ```
 
-- Add the browser field to `resources/views/admin/articles/form.blade.php`:
+- Add the browser field to `resources/views/twill/admin/articles/form.blade.php`:
 
 ```php
 @extends('twill::layouts.form')

docs/src/form-fields/index.md

@@ -4,7 +4,7 @@ pageClass: twill-doc
 
 # Form Fields
 
-Your module `form` view should look something like this (`resources/views/admin/moduleName/form.blade.php`):
+Your module `form` view should look something like this (`resources/views/twill/admin/moduleName/form.blade.php`):
 
 ```php
 @extends('twill::layouts.form')

docs/src/form-fields/repeater.md

@@ -110,7 +110,7 @@ class TeamRepository extends ModuleRepository
 
 - Add the repeater Blade template:
 
-Create file `resources/views/admin/repeaters/team-member.blade.php`:
+Create file `resources/views/twill/admin/repeaters/team-member.blade.php`:
 
 ```php
 @twillRepeaterTitle('Team Member')
@@ -128,7 +128,7 @@ Create file `resources/views/admin/repeaters/team-member.blade.php`:
 
 - Add the repeater field to the form:
 
-Update file `resources/views/admin/teams/form.blade.php`:
+Update file `resources/views/twill/admin/teams/form.blade.php`:
 
 ```php
 @extends('twill::layouts.form')
@@ -142,7 +142,7 @@ Update file `resources/views/admin/teams/form.blade.php`:
 
 - Finishing up:
 
-Add both modules to your `admin.php` routes. Add the `Team` module to your `twill-navigation.php` config and you are done!
+Add both modules to your `twill.php` routes. Add the `Team` module to your `twill-navigation.php` config and you are done!
 
 ## Dynamic repeater titles
 

docs/src/getting-started/installation.md

@@ -27,7 +27,7 @@ Make sure to setup your .env file with your database credentials and to run it w
 :::
 
 Twill's `install` command consists of:
-- creating an `admin.php` routes files in your application's `routes` directory. This is where you will declare your own admin console routes.
+- creating an `twill.php` routes files in your application's `routes` directory. This is where you will declare your own admin console routes.
 - migrating your database with Twill's migrations.
 - publishing Twill's configuration files to your application's `config` directory.
 - publishing Twill's assets for the admin console UI.

docs/src/settings-sections/index.md

@@ -10,7 +10,7 @@ Start by enabling the `settings` feature in your `config/twill.php` configuratio
 
 If you did not enable this feature before running the `twill:install` command, you need to copy the migration in `vendor/area17/twill/migrations/create_settings_table.php` to your own `database/migrations` directory and migrate your database before continuing.
 
-To create a new settings section, add a blade file to your `resources/views/admin/settings` folder. The name of this file is the name of your new settings section.
+To create a new settings section, add a blade file to your `resources/views/twill/admin/settings` folder. The name of this file is the name of your new settings section.
 
 In this file, you can use `@formField('input')` Blade directives to add new settings. The name attribute of each form field is the name of a setting. Wrap them like in the following example:
 
@@ -49,7 +49,7 @@ return [
 ];
 ```
 
-Each Blade file you create in `resources/views/admin/settings` creates a new section available for you to add in the `primary_navigation` array of your `config/twill-navigation.php` file.
+Each Blade file you create in `resources/views/twill/admin/settings` creates a new section available for you to add in the `primary_navigation` array of your `config/twill-navigation.php` file.
 
 You can then retrieve the value of a specific setting by its key, which is the name of the form field you defined in your settings form, either by directly using the `A17\Twill\Models\Setting` Eloquent model or by using the provided `byKey` helper in `A17\Twill\Repositories\SettingRepository`:
 

src/Commands/GenerateBlocks.php

@@ -58,7 +58,7 @@ public function __construct(Filesystem $filesystem, ViewFactory $viewFactory)
      */
     public function handle()
     {
-        if (!$this->filesystem->exists($path = resource_path('views/admin/blocks'))) {
+        if (!$this->filesystem->exists($path = resource_path('views/twill/admin/blocks'))) {
             $this->error(self::NO_BLOCKS_DEFINED);
 
             return;

src/Commands/Install.php

@@ -68,7 +68,7 @@ public function handle()
     }
 
     /**
-     * Creates the default `admin.php` route configuration file.
+     * Creates the default `twill.php` route configuration file.
      *
      * @return void
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
@@ -81,9 +81,9 @@ private function addRoutesFile()
             $this->files->makeDirectory($routesPath, 0755, true);
         }
 
-        if (!$this->files->exists($routesPath . '/admin.php')) {
+        if (!$this->files->exists($routesPath . '/twill.php')) {
             $stub = $this->files->get(__DIR__ . '/stubs/admin.stub');
-            $this->files->put($routesPath . '/admin.php', $stub);
+            $this->files->put($routesPath . '/twill.php', $stub);
         }
     }
 

src/Commands/ModuleMake.php

@@ -254,10 +254,10 @@ public function handle()
             $this->createCapsuleSeed($moduleName);
         } elseif ($this->isSingleton) {
             $this->createSingletonSeed($modelName);
-            $this->info("\nAdd to routes/admin.php:\n");
+            $this->info("\nAdd to routes/twill.php:\n");
             $this->info("    Route::singleton('{$singularModuleName}');\n");
         } else {
-            $this->info("\nAdd to routes/admin.php:\n");
+            $this->info("\nAdd to routes/twill.php:\n");
             $this->info("    Route::module('{$moduleName}');\n");
         }
 
@@ -523,7 +523,7 @@ private function createController($moduleName = 'items', $modelName = 'Item')
     {
         $controllerClassName = $modelName . 'Controller';
 
-        $dir = $this->isCapsule ? $this->capsule['controllers_dir'] : 'Http/Controllers/Admin';
+        $dir = $this->isCapsule ? $this->capsule['controllers_dir'] : 'Http/Controllers/Twill';
 
         if ($this->isSingleton) {
             $baseController = config('twill.base_singleton_controller');
@@ -537,7 +537,7 @@ private function createController($moduleName = 'items', $modelName = 'Item')
 
         $stub = str_replace(
             ['{{moduleName}}', '{{controllerClassName}}', '{{namespace}}', '{{baseController}}'],
-            [$moduleName, $controllerClassName, $this->namespace('controllers', 'Http\Controllers\Admin'), $baseController],
+            [$moduleName, $controllerClassName, $this->namespace('controllers', 'Http\Controllers\Twill'), $baseController],
             $this->files->get(__DIR__ . '/stubs/controller.stub')
         );
 
@@ -579,15 +579,15 @@ private function createController($moduleName = 'items', $modelName = 'Item')
      */
     private function createRequest($modelName = 'Item')
     {
-        $dir = $this->isCapsule ? $this->capsule['requests_dir'] : 'Http/Requests/Admin';
+        $dir = $this->isCapsule ? $this->capsule['requests_dir'] : 'Http/Requests/Twill';
 
         $this->makeTwillDirectory($dir);
 
         $requestClassName = $modelName . 'Request';
 
         $stub = str_replace(
             ['{{requestClassName}}', '{{namespace}}', '{{baseRequest}}'],
-            [$requestClassName, $this->namespace('requests', 'Http\Requests\Admin'), config('twill.base_request')],
+            [$requestClassName, $this->namespace('requests', 'Http\Requests\Twill'), config('twill.base_request')],
             $this->files->get(__DIR__ . '/stubs/request.stub')
         );
 
@@ -790,7 +790,7 @@ public function namespace ($type, $suffix, $class = null) {
     public function viewPath($moduleName)
     {
         if (!$this->isCapsule) {
-            return $viewsPath = $this->config->get('view.paths')[0] . '/admin/' . $moduleName;
+            return $viewsPath = $this->config->get('view.paths')[0] . '/twill/admin/' . $moduleName;
         }
 
         $this->makeDir($dir = "{$this->moduleBasePath}/resources/views/admin");