Back to basics. We will support videos only.

Jonas Siewertsen · Jonas Siewertsen · commit 7ff5e9a7857f · 2020-06-27T12:35:27.000+02:00
diff --git a/config/config.php b/config/config.php
@@ -13,14 +13,7 @@
     |
     */
 
-    'collection' => [
-        'videos'        => 'how_to_addon_videos',
-        'documentation' => 'how_to_addon_documentation',
-    ],
-
-    'blueprint' => [
-        'videos'        => 'how_to_addon_videos',
-        'documentation' => 'how_to_addon_documentation',
-    ],
+    'collection' => 'how_to_addon_documentation',
+    'blueprint'  => 'how_to_addon_documentation',
 
 ];
diff --git a/resources/js/fieldtype.js b/resources/js/fieldtype.js
diff --git a/resources/lang/de/general.php b/resources/lang/de/general.php
@@ -11,9 +11,10 @@
     |
     */
 
-    'back' => 'zurück',
-    'footer' => [
-        'createdBy' => 'Addon erstellt von',
-    ]
+    'back'   => 'zurück',
+    'title'  => 'Videos',
+    'intro'  => 'Mit diesen Videos kannst Du schnell und gut durchstarten.',
+    'manage' => 'Verwalten',
+    'empty'  => 'Es wurden noch keine Videos hinzugefügt.',
 
 ];
diff --git a/resources/lang/de/menu.php b/resources/lang/de/menu.php
diff --git a/resources/lang/de/videos.php b/resources/lang/de/videos.php
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
@@ -11,9 +11,10 @@
     |
     */
 
-    'back' => 'back',
-    'footer' => [
-        'createdBy' => 'Addon created by',
-    ]
+    'back'   => 'back',
+    'empty'  => 'No videos added jet.',
+    'intro'  => 'Check out our videos, to get you started as good as possible.',
+    'manage' => 'Manage',
+    'title'  => 'Videos',
 
 ];
diff --git a/resources/lang/en/menu.php b/resources/lang/en/menu.php
diff --git a/resources/lang/en/videos.php b/resources/lang/en/videos.php
diff --git a/resources/views/videos/index.blade.php b/resources/views/videos/index.blade.php
@@ -8,8 +8,8 @@
     <div class="flex flex-wrap card">
 
         <div class="p-3 -mt-1 w-full">
-            <h1>{{ __('howToAddon::videos.title') }}</h1>
-            <p class="text-grey-80">{{ __('howToAddon::videos.intro') }}</p>
+            <h1>{{ __('howToAddon::general.title') }}</h1>
+            <p class="text-grey-80">{{ __('howToAddon::general.intro') }}</p>
         </div>
 
         @forelse ($videos as $video)
@@ -38,7 +38,7 @@
                 </svg>
             </div>
 
-            <p class="text-grey-80 mt-2">{{ __('howToAddon::videos.empty') }}</p>
+            <p class="text-grey-80 mt-2">{{ __('howToAddon::general.empty') }}</p>
         @endforelse
 
 
diff --git a/resources/views/widgets/howToVideos.blade.php b/resources/views/widgets/howToVideos.blade.php
@@ -2,7 +2,7 @@
 
     <div class="p-3 -mt-1 w-full">
         <h1>How To</h1>
-        <p class="text-grey-80">{{ __('howToAddon::videos.intro') }}</p>
+        <p class="text-grey-80">{{ __('howToAddon::general.intro') }}</p>
     </div>
 
     @forelse ($videos as $video)
@@ -31,8 +31,8 @@
             </svg>
         </div>
 
-        <p class="text-grey-80 mt-2">{{ __('howToAddon::videos.empty') }}</p>
+        <p class="text-grey-80 mt-2">{{ __('howToAddon::general.empty') }}</p>
     @endforelse
 
 
-</div>
+</div>
diff --git a/src/Commands/Setup.php b/src/Commands/Setup.php
@@ -23,7 +23,7 @@ class Setup extends Command
      *
      * @var string
      */
-    protected $description = 'Setup Collections and stuff for the "How To Addon"';
+    protected $description = 'Setting up the collection and blueprint for the "How To Addon"';
 
     /**
      * Create a new command instance.
@@ -42,26 +42,20 @@ public function __construct()
      */
     public function handle()
     {
-        $this->createCollections();
-        $this->createBlueprints();
+        $this->createCollection();
+        $this->createBlueprint();
 
         $this->info('Everything has been setup for you. Cheers!');
     }
 
-    private function createCollections() {
+    private function createCollection() {
         Collection::make(Video::collectionName())
             ->entryBlueprints(Video::collectionName())
             ->title('How to videos')
             ->save();
-
-        Collection::make(Documentation::collectionName())
-            ->entryBlueprints(Documentation::collectionName())
-            ->title('How to documentation')
-            ->structure((new CollectionStructure)->maxDepth(2))
-            ->save();
     }
 
-    protected function createBlueprints()
+    protected function createBlueprint()
     {
         (new Blueprint)
             ->setHandle(Video::collectionName())
@@ -96,41 +90,5 @@ protected function createBlueprints()
                     ],
                 ]
             ])->save();
-
-        (new Blueprint)
-            ->setHandle(Documentation::collectionName())
-            ->setContents([
-                'title' => 'How to documentation',
-                'sections' => [
-                    'main' => [
-                        'fields' => [
-                            ['handle' => 'content', 'field' =>[
-                                'restrict'              => false,
-                                'automatic_line_breaks' => true,
-                                'automatic_links'       => false,
-                                'escape_markup'         => false,
-                                'smartypants'           => false,
-                                'type'                  => 'markdown',
-                                'localizable'           => false,
-                                'listable'              => 'hidden',
-                                'display'               => 'Content',
-                                'validate'              => 'required',
-                            ]]
-                        ]
-                    ],
-                    'sidebar' => [
-                        'fields' => [
-                            ['handle' => 'slug', 'field' => [
-                                'type'          => 'slug',
-                                'localizable'   => false,
-                                'listable'      => 'hidden',
-                                'display'       => 'Slug',
-                                'validate'      => 'required',
-                            ]],
-                        ],
-                    ],
-                ]
-            ])->save();
-
     }
 }
diff --git a/src/Http/Controllers/VideosController.php b/src/Http/Controllers/VideosController.php
@@ -2,12 +2,13 @@
 
 namespace Jonassiewertsen\Statamic\HowTo\Http\Controllers;
 
+use Jonassiewertsen\Statamic\HowTo\Helper\Video;
 use Statamic\Facades\Entry;
 
 class VideosController {
     public function index()
     {
-        $videos = Entry::whereCollection('how_to_addon_videos');
+        $videos = Entry::whereCollection(Video::collectionName());
 
         $videos = $this->sortByTitle($videos);
 
@@ -16,7 +17,7 @@ public function index()
 
     public function show($slug)
     {
-        $video = Entry::findBySlug($slug, config('howToAddon.blueprint.videos', 'how_to_addon_videos'));
+        $video = Entry::findBySlug($slug, Video::collectionName());
 
         // TODO: Should be replaced by Asset::findByPath later.
         // https://github.com/statamic/cms/issues/1155
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Support\Facades\Gate;
 use Jonassiewertsen\Statamic\HowTo\Commands\Setup;
-use Jonassiewertsen\Statamic\HowTo\Helper\Documentation;
 use Jonassiewertsen\Statamic\HowTo\Helper\Video;
 use Statamic\Facades\Collection;
 use Statamic\Facades\CP\Nav;
@@ -34,7 +33,7 @@ public function boot()
 
         if ($this->app->runningInConsole()) {
             $this->publishes([
-                __DIR__ . '/../resources/lang' => resource_path('lang/vendor/jonassiewertsen/howToAddon/'),
+                __DIR__.'/../resources/lang' => resource_path('lang/vendor/jonassiewertsen/howToAddon/'),
             ], 'How To Addon lang file');
 
             $this->publishes([
@@ -48,50 +47,31 @@ public function boot()
     private function createNavigation(): void
     {
         Nav::extend(function ($nav) {
-            $nav->create(__('howToAddon::menu.videos'))
+            $nav->create(__('howToAddon::general.videos'))
                 ->icon('assets')
                 ->section('How To')
-                ->route('howToAddon.videos.index');
+                ->route('howToAddon.index');
 
             // Only show the Manage button, if the permissions have been set
             if (Gate::allows('edit', Collection::findByHandle(Video::collectionName()))) {
-                $nav->create(__('howToAddon::menu.manage'))
+                $nav->create(__('howToAddon::general.manage'))
                     ->icon('settings-slider')
                     ->section('How To')
                     ->route('collections.show', [
-                        'collection' => Video::collectionName(),
-                    ]);
-            }
-        });
-
-        Nav::extend(function ($nav) {
-
-            if (Documentation::exists()) {
-                Documentation::tree()->map(function ($tree) use ($nav) {
-                    return $nav->create(Documentation::entryTitle($tree['entry']))
-                               ->route('howToAddon.documentation.show', Documentation::entrySlug($tree['entry']))
-                               ->icon('drawer-file')
-                               ->section('Documentation')
-                               ->children(Documentation::entryChildren($tree, $nav));
-                });
-            }
-
-            // Only show the Manage button, if the permissions have been set
-            if (Gate::allows('edit', Collection::findByHandle(Documentation::collectionName()))) {
-                $nav->create(__('howToAddon::menu.manage'))
-                    ->icon('settings-slider')
-                    ->section('Documentation')
-                    ->route('collections.show', [
-                        'collection' => Documentation::collectionName(),
+                        'collection' => $this->videoCollectionName(),
                     ]);
             }
         });
     }
 
-    private function loadCommands(array $commands)
-    {
+    private function loadCommands(array $commands) {
         if ($this->app->runningInConsole()) {
             $this->commands($commands);
         }
     }
+
+    private function videoCollectionName()
+    {
+        return config('howToAddon.collection.videos', 'how_to_addon_videos');
+    }
 }
diff --git a/src/Widgets/HowToVideos.php b/src/Widgets/HowToVideos.php
@@ -2,6 +2,7 @@
 
 namespace Jonassiewertsen\Statamic\HowTo\Widgets;
 
+use Jonassiewertsen\Statamic\HowTo\Helper\Video;
 use Statamic\Facades\Entry;
 use Statamic\Widgets\Widget;
 
@@ -14,7 +15,7 @@ class HowToVideos extends Widget
      */
     public function html()
     {
-        $videos = Entry::whereCollection('how_to_addon_videos');
+        $videos = Entry::whereCollection(Video::collectionName());
 
         return view('howToAddon::widgets.howToVideos', compact('videos'));
     }
diff --git a/src/routes/cp.php b/src/routes/cp.php
@@ -3,7 +3,3 @@
 /** Videos */
 Route::get('/how-to/videos', 'VideosController@index')->name('howToAddon.videos.index');
 Route::get('/how-to/video/{video}', 'VideosController@show')->name('howToAddon.videos.show');
-
-/** Documentation */
-Route::get('/how-to/documentation/{slug}', 'DocumentationController@show')->name('howToAddon.documentation.show');
-Route::get('/how-to/documentation/{parent}/{slug}', 'DocumentationController@showChild')->name('howToAddon.documentation.child.show');
