Merge pull request #105 from simde-utc/develop

Première release officielle
simde-utc · Feb 28, 2019 · 6e28c58 · 6e28c58
2 parents e6d6099 + 1e9e8c2
commit 6e28c58
Show file tree

Hide file tree

Showing 95 changed files with 6,382 additions and 729 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -50,7 +50,7 @@
     "no-console": 0,
     "no-case-declarations": 1,
     "no-fallthrough": 0,
-    "no-plusplus": ["error", { "allowForLoopAfterthoughts": true }],
+    "no-plusplus": 0,
     "no-unused-vars": [1,
       { "vars": "local",
         "argsIgnorePattern": "^_",
@@ -92,6 +92,7 @@
     "jsx-a11y/no-static-element-interactions": 0,
     "jsx-a11y/anchor-is-valid": 0,
     "jsx-a11y/label-has-associated-control": 0,
-    "jsx-a11y/label-has-for": 0
+    "jsx-a11y/label-has-for": 0,
+	"react/no-direct-mutation-state": 0
   }
 }
diff --git a/...ollers/Resource/ReservationController.php → ...ontrollers/Resource/BookingController.php b/...ollers/Resource/ReservationController.php → ...ontrollers/Resource/BookingController.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Gère en admin les Reservation.
+ * Gère en admin les Booking.
  *
  * @author Samy Nastuzzi <samy@nastuzzi.fr>
  *
@@ -11,12 +11,12 @@
 namespace App\Admin\Controllers\Resource;
 
 use App\Models\{
-    Reservation, Room, ReservationType, Event, User
+    Booking, Room, BookingType, Event, User
 };
 
-class ReservationController extends ResourceController
+class BookingController extends ResourceController
 {
-    protected $model = Reservation::class;
+    protected $model = Booking::class;
 
     /**
      * Définition des champs à afficher.
@@ -28,7 +28,7 @@ protected function getFields(): array
         return [
             'id' => 'display',
             'room' => Room::with('location')->get(['id', 'location_id']),
-            'type' => ReservationType::get(['id', 'name']),
+            'type' => BookingType::get(['id', 'name']),
             'event' => Event::get(['id', 'name']),
             'description' => 'textarea',
             'created_by' => 'display',

diff --git a/...rs/Resource/ReservationTypeController.php → ...ollers/Resource/BookingTypeController.php b/...rs/Resource/ReservationTypeController.php → ...ollers/Resource/BookingTypeController.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Gère en admin les ReservationType.
+ * Gère en admin les BookingType.
  *
  * @author Samy Nastuzzi <samy@nastuzzi.fr>
  *
@@ -10,11 +10,11 @@
 
 namespace App\Admin\Controllers\Resource;
 
-use App\Models\ReservationType;
+use App\Models\BookingType;
 
-class ReservationTypeController extends ResourceController
+class BookingTypeController extends ResourceController
 {
-    protected $model = ReservationType::class;
+    protected $model = BookingType::class;
 
     /**
      * Définition des champs à afficher.