diff --git a/README.md b/README.md index ede17fc..6192179 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This is a package create to generate and control channel list m3u8 using php Lar -![Screenshot Feipe Mateus IPTV Channels](https://felipemateus.com/wp-content/uploads/2021/09/list_channel2.png) +![Screenshot Feipe Mateus IPTV Channels](/screenshots/channel_list.jpg?raw=true) ## Instaling diff --git a/composer.json b/composer.json index e8fcbe3..9eca742 100755 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "felipemateus/iptv-channels", - "version": "2.1.0", + "version": "3.0.0", "description": "This package controls the IPTV channel list and generates an m3u8 file using laravel.", "type": "library", "license": "MIT", @@ -31,7 +31,7 @@ "require": { "php": "^7.4|^8.0", "laravel/framework": "^8.54", - "felipemateus/iptv-core":"^0.0.1" + "felipemateus/iptv-core":"^1.0.0" }, "autoload": { "psr-4": { diff --git a/screenshots/channel_list.jpg b/screenshots/channel_list.jpg new file mode 100644 index 0000000..75fd86e Binary files /dev/null and b/screenshots/channel_list.jpg differ diff --git a/src/IPTVProvider.php b/src/IPTVProvider.php index c1f17ec..c1b96e7 100755 --- a/src/IPTVProvider.php +++ b/src/IPTVProvider.php @@ -5,8 +5,10 @@ use Illuminate\Routing\Router; use Illuminate\Support\ServiceProvider; use FelipeMateus\IPTVChannels\Middleware\PublicCdnMiddleware; +use FelipeMateus\IPTVCore\Class\IPTVProviderBase; -class IPTVProvider extends ServiceProvider { + +class IPTVProvider extends IPTVProviderBase { /** @@ -17,9 +19,10 @@ class IPTVProvider extends ServiceProvider { public function boot(){ $this->registerMidleware(); $this->loadMigrationsFrom(__DIR__.'/database/migrations/'); - $this->loadJSONTranslationsFrom(__DIR__.'/translations'); - $this->loadViewsFrom(__DIR__.'/views', 'IPTV'); + $this->loadJSONTranslationsFrom(__DIR__.'/resources/translations'); + $this->loadViewsFrom(__DIR__.'/resources/views', 'IPTV'); $this->loadRoutesFrom(__DIR__.'/routes.php'); + $this->loadMenusFrom(__DIR__.'/resources/menu'); } diff --git a/src/resources/menu.json b/src/resources/menu.json new file mode 100644 index 0000000..bf257ae --- /dev/null +++ b/src/resources/menu.json @@ -0,0 +1,22 @@ +{ + + "title":"Channels", + "menus":[ + { + "name":"Channels", + "icon": "tv", + "route": "list_channel" + }, + { + "name":"Groups", + "icon": "tv", + "route": "list_group" + }, + { + "name":"CDN", + "icon": "server", + "route": "list_cdn" + } + ] +} + diff --git a/src/translations/br.json b/src/resources/translations/br.json similarity index 95% rename from src/translations/br.json rename to src/resources/translations/br.json index 8e3b08f..586a8d1 100644 --- a/src/translations/br.json +++ b/src/resources/translations/br.json @@ -1,5 +1,5 @@ { - + "Channel": "Canal", "Channel List": "Lista Canais", "Groups List": "Lista Grupos", @@ -9,6 +9,7 @@ "Channels": "Canais", "Add Channel": "Adicionar Canal", + "Groups": "Grupos", "edit": "Editar", "delete": "Excluir", diff --git a/src/translations/en.json b/src/resources/translations/en.json similarity index 100% rename from src/translations/en.json rename to src/resources/translations/en.json diff --git a/src/views/cdn.blade.php b/src/resources/views/cdn.blade.php similarity index 80% rename from src/views/cdn.blade.php rename to src/resources/views/cdn.blade.php index e05fbfd..eeb1038 100644 --- a/src/views/cdn.blade.php +++ b/src/resources/views/cdn.blade.php @@ -9,17 +9,17 @@ @endsection @section('content') + +
+

{{ __('CDN') }}

+
-
+
diff --git a/src/views/cdn_list.blade.php b/src/resources/views/cdn_list.blade.php similarity index 59% rename from src/views/cdn_list.blade.php rename to src/resources/views/cdn_list.blade.php index 124be9e..a488907 100644 --- a/src/views/cdn_list.blade.php +++ b/src/resources/views/cdn_list.blade.php @@ -1,17 +1,19 @@ @extends('IPTV::app') @section('content') + +
+

{{ __('CDN') }}

+ {{ __('Add CDN')}} +
-
+
@if($url_cdn) -
+ @endif -
+ - diff --git a/src/views/channel.blade.php b/src/resources/views/channel.blade.php similarity index 95% rename from src/views/channel.blade.php rename to src/resources/views/channel.blade.php index 4325b02..f7ba1f4 100644 --- a/src/views/channel.blade.php +++ b/src/resources/views/channel.blade.php @@ -32,16 +32,18 @@ @endsection @section('content') + +
+

{{ __('Channels') }}

+
+
-
+
diff --git a/src/views/channel_list.blade.php b/src/resources/views/channel_list.blade.php similarity index 64% rename from src/views/channel_list.blade.php rename to src/resources/views/channel_list.blade.php index b064345..913e8e5 100644 --- a/src/views/channel_list.blade.php +++ b/src/resources/views/channel_list.blade.php @@ -1,17 +1,19 @@ @extends('IPTV::app') @section('content') + +
+

{{ __('Channels') }}

+ {{ __('Add Channel') }} +
-
+
-
{{ __('Channels') }}
- - - - +
{{ __('Channels List') }}
diff --git a/src/views/group.blade.php b/src/resources/views/group.blade.php similarity index 82% rename from src/views/group.blade.php rename to src/resources/views/group.blade.php index b7d9509..41e3a0e 100644 --- a/src/views/group.blade.php +++ b/src/resources/views/group.blade.php @@ -9,15 +9,17 @@ @endsection @section('content') + +
+

{{ __('Channels Groups') }}

+
-
+
diff --git a/src/views/group_list.blade.php b/src/resources/views/group_list.blade.php similarity index 61% rename from src/views/group_list.blade.php rename to src/resources/views/group_list.blade.php index daf26ab..95e5375 100644 --- a/src/views/group_list.blade.php +++ b/src/resources/views/group_list.blade.php @@ -1,18 +1,19 @@ @extends('IPTV::app') @section('content') + +
+

{{ __('Channels Groups') }}

+ {{ __('Add Group')}} +
-
+
-
{{ __('Channels Groups') }}
- - - - - +
{{ __('Groups List') }}
diff --git a/src/views/list_M3U.blade.php b/src/resources/views/list_M3U.blade.php similarity index 100% rename from src/views/list_M3U.blade.php rename to src/resources/views/list_M3U.blade.php