Added livewire

JustinByrne · Nov 25, 2020 · 0d8e5c4 · 0d8e5c4
1 parent 033005f
commit 0d8e5c4
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 7 deletions.
diff --git a/TODO.md b/TODO.md
@@ -13,10 +13,14 @@
 - Implement livewire to improve UX
 - Add 2fa
 - Add email verification
-- Change profile picture on nav to a dropdown with extra links
 - Add profile page for user to do the following
   - Change password
   - Change email
     - This email will need to be verified
   - Change name
-- Create a good README.md file
+- Create a good README.md file
+- Ratings for meals
+- Search for meals/ingredients
+- Comments for meals
+- Dietary tagging
+- Meal Categories (dinner/lunch/pudding/savoury/sweet)
diff --git a/composer.json b/composer.json
@@ -15,7 +15,8 @@
         "google/recaptcha": "^1.2",
         "guzzlehttp/guzzle": "^7.0.1",
         "laravel/framework": "^8.0",
-        "laravel/tinker": "^2.0"
+        "laravel/tinker": "^2.0",
+        "livewire/livewire": "^2.3"
     },
     "require-dev": {
         "facade/ignition": "^2.3.6",

diff --git a/composer.lock b/composer.lock
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -17,9 +17,12 @@
                     </ul>
                 </div>
             </div>
-            <div class="w-full p-8 mt-6 text-gray-900 leading-normal shadow-lg bg-white rounded lg:mt-0 lg:w-4/5">
-                @yield('content')
-            </div>
+            @if (trim($__env->yieldContent('content')))
+                <div class="w-full p-8 mt-6 text-gray-900 leading-normal shadow-lg bg-white rounded lg:mt-0 lg:w-4/5">
+                    @yield('content')
+                </div>
+            @endif
         </div>
+        @livewireScripts
     </body>
 </html>
diff --git a/resources/views/layouts/auth.blade.php b/resources/views/layouts/auth.blade.php
@@ -6,5 +6,6 @@
 
     <body class="antialiased bg-gray-800">
         @yield('content')
+        @livewireScripts
     </body>
 </html>
diff --git a/resources/views/layouts/head.blade.php b/resources/views/layouts/head.blade.php
@@ -1,6 +1,7 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 <title>Mealing @if (trim($__env->yieldContent('title'))) | @yield('title') @endif</title>
+@livewireStyles
 <link rel="stylesheet" href="{{ asset('css/app.css') }}">
 <script src="https://kit.fontawesome.com/a357069ed8.js" crossorigin="anonymous"></script>
 <script src="{{ asset('js/app.js') }}"></script>