From: Louis Jeckel Date: Thu, 6 Aug 2020 13:48:01 +0000 (+0200) Subject: settings + not registered X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3a7c4eb9ec8cb3a7f29785e285ff9016cda563dc;p=psq.git settings + not registered --- diff --git a/app/Http/Controllers/Admin/SettingController.php b/app/Http/Controllers/Admin/SettingController.php new file mode 100644 index 0000000..eb6ac09 --- /dev/null +++ b/app/Http/Controllers/Admin/SettingController.php @@ -0,0 +1,20 @@ +index('strings'); + } + + public function podcasts() + { + return $this->index('podcasts'); + } + + +} diff --git a/app/Http/Controllers/Auth/NotRegisteredYet.php b/app/Http/Controllers/Auth/NotRegisteredYet.php new file mode 100644 index 0000000..a15f47c --- /dev/null +++ b/app/Http/Controllers/Auth/NotRegisteredYet.php @@ -0,0 +1,16 @@ + [ 'title' => 'Podcasts', 'module' => true - ] - - - ] + ], + ], ], + 'staticcontent' => [ + 'title' => 'Contenu statique', + 'route' => 'admin.stat.strings', + 'primary_navigation' => [ + 'strings' => [ + 'title' => 'Texte', + 'route' => 'admin.stat.strings', + ], + 'podcasts' => [ + 'title' => 'Texte', + 'route' => 'admin.stat.podcasts', + ] + ] + ] diff --git a/config/twill.php b/config/twill.php index dccbd52..4a7ebc4 100644 --- a/config/twill.php +++ b/config/twill.php @@ -14,8 +14,10 @@ return [ 'enabled' => [ 'buckets' => true, + 'settings' => true, ], + 'bucketsRoutes' => [ 'homepage' => 'content' ], diff --git a/database/migrations/2020_08_06_000005_create_twill_default_settings_table.php b/database/migrations/2020_08_06_000005_create_twill_default_settings_table.php new file mode 100644 index 0000000..3b13040 --- /dev/null +++ b/database/migrations/2020_08_06_000005_create_twill_default_settings_table.php @@ -0,0 +1,49 @@ +{twillIncrementsMethod()}('id'); + $table->timestamps(); + $table->softDeletes(); + $table->string('key')->nullable()->index(); + $table->string('section')->nullable()->index(); + }); + } + + if (!Schema::hasTable(Str::singular($twillSettingsTable) . '_translations')) { + Schema::create(Str::singular($twillSettingsTable) . '_translations', function (Blueprint $table) use ($twillSettingsTable) { + createDefaultTranslationsTableFields($table, Str::singular($twillSettingsTable)); + $table->text('value')->nullable(); + }); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + $twillSettingsTable = config('twill.settings_table', 'twill_settings'); + + Schema::dropIfExists(Str::singular($twillSettingsTable) . '_translations'); + Schema::dropIfExists($twillSettingsTable); + } +} diff --git a/public/css/app.css b/public/css/app.css index bb2a315..1d1e25b 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -11304,6 +11304,10 @@ div.pill-box div > a { display: block; } +.small-text { + font-size: xx-small; +} + .spotlight-news { background-color: rgba(7, 78, 156, 0.25); padding: 0.5rem; diff --git a/public/img/not-registered.jpg b/public/img/not-registered.jpg new file mode 100644 index 0000000..d0c1f41 Binary files /dev/null and b/public/img/not-registered.jpg differ diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 7f67392..07b519c 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -38,6 +38,10 @@ a { display: block; } +.small-text { + font-size: xx-small; +} + //Spotlight news diff --git a/resources/views/admin/settings/podcasts.blade.php b/resources/views/admin/settings/podcasts.blade.php new file mode 100644 index 0000000..e660370 --- /dev/null +++ b/resources/views/admin/settings/podcasts.blade.php @@ -0,0 +1,12 @@ +@extends('twill::layouts.settings', ['contentFieldsetLabel' => 'Modification de la page podcatss']) + +@section('contentFields') + @formField('wysiwyg', [ + 'label' => 'Texte page pas encore abonné', + 'name' => 'not_registered_text', + 'maxlength' => 1000, + 'required' => true, + 'toolbarOptions' => [ [ 'header' => [2, 3, false] ], 'bold', 'italic', 'underline', 'strike', 'list-ordered', 'list-unordered', [ 'indent' => '-1'], [ 'indent' => '+1' ] ], + + ]) +@stop diff --git a/resources/views/admin/settings/strings.blade.php b/resources/views/admin/settings/strings.blade.php new file mode 100644 index 0000000..a2db18a --- /dev/null +++ b/resources/views/admin/settings/strings.blade.php @@ -0,0 +1,12 @@ +@extends('twill::layouts.settings', ['contentFieldsetLabel' => 'Modification du contenu statique']) + +@section('contentFields') + @formField('wysiwyg', [ + 'label' => 'Texte page pas encore abonné', + 'name' => 'not_registered_text', + 'maxlength' => 1000, + 'required' => true, + 'toolbarOptions' => [ [ 'header' => [2, 3, false] ], 'bold', 'italic', 'underline', 'strike', 'list-ordered', 'list-unordered', [ 'indent' => '-1'], [ 'indent' => '+1' ] ], + + ]) +@stop diff --git a/resources/views/not-registered.blade.php b/resources/views/not-registered.blade.php new file mode 100644 index 0000000..7d57e23 --- /dev/null +++ b/resources/views/not-registered.blade.php @@ -0,0 +1,20 @@ +@extends('layouts.app') +@inject('settings', \A17\Twill\Repositories\SettingRepository) + +@section('content') +
+

Pas encore abonné ?

+ +
+
+ Image pas encore abonné +
+
+ {!! $settings->byKey('not_registered_text') !!} +
+ +
+
+ + +@endsection diff --git a/resources/views/podcasts/index.blade.php b/resources/views/podcasts/index.blade.php index b2b8bcf..54c1f28 100644 --- a/resources/views/podcasts/index.blade.php +++ b/resources/views/podcasts/index.blade.php @@ -6,10 +6,16 @@
+ + +{{-- Static Mic Logo --}}
Image microhpone Cliquez ici pour écouter l'émission
+ + +{{-- Description + weekly sponsor --}}
{!! $podcast->description !!} @@ -23,13 +29,15 @@ Logo partenaire +

Cliquez sur le logo pour accéder au site de notre partenaire

+
- +{{-- Guests --}}
-

Nos débatteurs

+

Nos « débatteurs »

@foreach($podcast->guests as $guest)
@@ -48,6 +56,23 @@
+
+
+

Nos rubriques du mois

+
+ +
+
+ +
+
+ + +
+ + + +
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php deleted file mode 100644 index 3fb48cc..0000000 --- a/resources/views/welcome.blade.php +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - Laravel - - - - - - - - -
- @if (Route::has('login')) -
- @auth - Home - @else - Login - - @if (Route::has('register')) - Register - @endif - @endauth -
- @endif - -
-
- Laravel -
- -
- Docs - Laracasts - News - Blog - Nova - Forge - Vapor - GitHub -
-
-
- - diff --git a/routes/admin.php b/routes/admin.php index f8df3d2..6c059ab 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -2,34 +2,43 @@ Route::module('pdfFiles'); -Route::group(['prefix' => 'content'], function() { + +/** Dynamic content */ +Route::prefix('content')->group(function() { Route::module('articles'); Route::module('adCampaigns'); Route::module('events'); Route::module('podcasts'); Route::module('guests'); + Route::get('settings/{section}', '\A17\Twill\Http\Controllers\Admin\SettingController@index')->name('content.settings'); }); +/** Static content */ +Route::prefix('stat')->group(function() { + Route::get('strings', 'SettingController@strings' )->name('stat.strings'); + Route::get('podcasts', 'SettingController@podcasts' )->name('stat.podcasts'); +}); - /** Publishing and mass sending process */ - Route::prefix('/publish')->group(function() { - Route::get('', 'PublishController@index')->name('publish'); - Route::post('', 'PublishController@publish'); - Route::post('/upload-file', 'PublishController@uploadFile'); - Route::post('/preview', 'PublishController@previewEmail'); +/** Publishing and mass sending process */ +Route::prefix('publish')->group(function() { + Route::get('', 'PublishController@index')->name('publish'); + Route::post('', 'PublishController@publish'); - Route::get('/collections', 'PublishController@collections'); - Route::get('/tags', 'PublishController@tags'); - Route::get('/recipients', 'PublishController@recipientsCount'); + Route::post('upload-file', 'PublishController@uploadFile'); + Route::post('preview', 'PublishController@previewEmail'); - }); + Route::get('collections', 'PublishController@collections'); + Route::get('tags', 'PublishController@tags'); + Route::get('recipients', 'PublishController@recipientsCount'); - Route::prefix('/statistics')->group(function () { - Route::get('', 'StatisticsController@index'); - Route::get('/batches', 'StatisticsController@batches'); - Route::get('/batches/{batch}/stats', 'StatisticsController@batchStatistics'); +}); - }); +Route::prefix('statistics')->group(function () { + Route::get('', 'StatisticsController@index'); + Route::get('batches', 'StatisticsController@batches'); + Route::get('batches/{batch}/stats', 'StatisticsController@batchStatistics'); + +}); - Route::namespace('')->get('/preview/{file:slug}', '\\App\\Http\\Controllers\\FlowpaperController@preview')->name('preview'); +Route::namespace('')->get('/preview/{file:slug}', '\\App\\Http\\Controllers\\FlowpaperController@preview')->name('preview'); diff --git a/routes/web.php b/routes/web.php index 86fdcb1..c230a02 100644 --- a/routes/web.php +++ b/routes/web.php @@ -36,7 +36,7 @@ Route::domain(env('CLIENT_DOMAIN_NAME'))->group(function() { /** Home */ Route::get('/', 'HomeController@index')->name('home'); - Route::prefix('/account')->middleware(['login.token:false', 'auth'])->group(function() { + Route::prefix('/compte')->middleware(['login.token:false', 'auth'])->group(function() { Route::get('/', 'AccountController@index')->name('account.index'); Route::post('/', 'AccountController@update')->name('account.update'); @@ -51,15 +51,16 @@ Route::domain(env('CLIENT_DOMAIN_NAME'))->group(function() { Route::get('/search', 'FileController@search'); - Route::get('/campaigns', 'AdCampaignController@index'); - Route::get('/campaigns/search', 'AdCampaignController@search'); + Route::get('/campagnes-et-communication', 'AdCampaignController@index'); + Route::get('/campagnes-et-communication/archives', 'AdCampaignController@search'); Route::get('/podcasts', 'PodcastController@index'); + Route::get('/pas-encore-inscrit', 'Auth\NotRegisteredYet@index'); + /** Metadata */ Route::prefix('/files/{file:slug}')->group(function () { Route::get('/cover', 'FileController@cover'); - }); Route::get('/l/{link:slug}', 'TrackedLinkController@redirect')->name('track');