diff --git a/app/Http/Controllers/ConfigController.php b/app/Http/Controllers/ConfigController.php index 7596e9b9..f94e20be 100644 --- a/app/Http/Controllers/ConfigController.php +++ b/app/Http/Controllers/ConfigController.php @@ -72,6 +72,19 @@ class ConfigController extends Controller $configs = [ 'is_schedule_public', 'is_schedule_build', + 'escadron_name_full', + 'escadron_name_short', + 'escadron_number', + 'escadron_phone', + 'escadron_element', + 'element_title', + 'escadron_address', + 'escadron_direct_googlemap_link', + 'media_facebook', + 'media_twitter', + 'media_instagram', + 'media_email', + ]; foreach ($configs as $config) { diff --git a/database/seeds/ConfigsTableSeeder.php b/database/seeds/ConfigsTableSeeder.php index 7556d947..d7ae4183 100644 --- a/database/seeds/ConfigsTableSeeder.php +++ b/database/seeds/ConfigsTableSeeder.php @@ -216,6 +216,11 @@ class ConfigsTableSeeder extends Seeder 'name' => 'admin_level_in_schedule_nb', 'state' => 0, 'data' => '["3"]' + ], + [ + 'name' => 'public_index_img_url', + 'state' => 0, + 'data' => '["./assets/img/bg2.jpg"]' ] ]; diff --git a/public/css/custom.css b/public/css/custom.css index 58980a77..2edb8067 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -2,6 +2,21 @@ margin-top: 50px; } +.news-body-small { + height: 15rem; + overflow: hidden; +} + +.picture-desc-small { + height: 5rem; + overflow: hidden; +} + +.a-without-effect { + text-decoration: none; + color: inherit; +} + .calendar-body-column { display: flex; } diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index e69de29b..00000000 diff --git a/public/favicon.png b/public/favicon.png new file mode 100644 index 00000000..fa002003 Binary files /dev/null and b/public/favicon.png differ diff --git a/resources/custom.css b/resources/custom.css index 58980a77..2edb8067 100644 --- a/resources/custom.css +++ b/resources/custom.css @@ -2,6 +2,21 @@ margin-top: 50px; } +.news-body-small { + height: 15rem; + overflow: hidden; +} + +.picture-desc-small { + height: 5rem; + overflow: hidden; +} + +.a-without-effect { + text-decoration: none; + color: inherit; +} + .calendar-body-column { display: flex; } diff --git a/resources/views/admin/configs/general.blade.php b/resources/views/admin/configs/general.blade.php index 2b4922a5..a62efe58 100644 --- a/resources/views/admin/configs/general.blade.php +++ b/resources/views/admin/configs/general.blade.php @@ -8,11 +8,99 @@
- @csrf -
-
+
+
+ + + Nom complet du CC. +
+
+
+
+ + + Nom court du CC. +
+
+
+
+ + + Numéro du CC. +
+
+
+
+ + + Numéro de téléphone du CC. +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + + Adresse du CC. +
+
+
+
+ + + Lien Google Map du CC. +
+
+
+
+ + + Lien vers la page Facebook du CC. Laisser vide si aucun +
+
+
+
+ + + Lien vers le compte twitter du CC. Laisser vide si aucun +
+
+
+
+ + + Lien vers le compte instagram du CC. Laisser vide si aucun +
+
+
+
+ + + Email du CC. Laisser vide si aucun +
+
+
-
+
-
+
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 152fe0d1..0d94cb8c 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -18,11 +18,10 @@ - - + - Material Dashboard PRO by Creative Tim + Connexion - C-CMS diff --git a/resources/views/layouts/admin/head.blade.php b/resources/views/layouts/admin/head.blade.php index 2bd89dfd..17787080 100644 --- a/resources/views/layouts/admin/head.blade.php +++ b/resources/views/layouts/admin/head.blade.php @@ -7,6 +7,7 @@ C-CMS - Espace Administration + diff --git a/resources/views/layouts/public/banner.blade.php b/resources/views/layouts/public/banner.blade.php index 388a2553..832b49c8 100644 --- a/resources/views/layouts/public/banner.blade.php +++ b/resources/views/layouts/public/banner.blade.php @@ -1,4 +1,4 @@ - @endsection \ No newline at end of file