diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php index 2ba4c40..a6b24f5 100644 --- a/.phpstorm.meta.php +++ b/.phpstorm.meta.php @@ -46,7 +46,6 @@ namespace PHPSTORM_META { 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, - 'Livewire\LivewireComponentsFinder' => \Livewire\LivewireComponentsFinder::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, 'Whoops\Handler\HandlerInterface' => \Facade\Ignition\ErrorPage\IgnitionWhoopsHandler::class, 'auth' => \Illuminate\Auth\AuthManager::class, @@ -152,7 +151,6 @@ namespace PHPSTORM_META { 'flare.logger' => \Monolog\Logger::class, 'hash' => \Illuminate\Hashing\HashManager::class, 'hash.driver' => \Illuminate\Hashing\BcryptHasher::class, - 'livewire' => \Livewire\LivewireManager::class, 'log' => \Illuminate\Log\LogManager::class, 'mail.manager' => \Illuminate\Mail\MailManager::class, 'mailer' => \Illuminate\Mail\Mailer::class, @@ -215,7 +213,6 @@ namespace PHPSTORM_META { 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, - 'Livewire\LivewireComponentsFinder' => \Livewire\LivewireComponentsFinder::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, 'Whoops\Handler\HandlerInterface' => \Facade\Ignition\ErrorPage\IgnitionWhoopsHandler::class, 'auth' => \Illuminate\Auth\AuthManager::class, @@ -321,7 +318,6 @@ namespace PHPSTORM_META { 'flare.logger' => \Monolog\Logger::class, 'hash' => \Illuminate\Hashing\HashManager::class, 'hash.driver' => \Illuminate\Hashing\BcryptHasher::class, - 'livewire' => \Livewire\LivewireManager::class, 'log' => \Illuminate\Log\LogManager::class, 'mail.manager' => \Illuminate\Mail\MailManager::class, 'mailer' => \Illuminate\Mail\Mailer::class, @@ -384,7 +380,6 @@ namespace PHPSTORM_META { 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, - 'Livewire\LivewireComponentsFinder' => \Livewire\LivewireComponentsFinder::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, 'Whoops\Handler\HandlerInterface' => \Facade\Ignition\ErrorPage\IgnitionWhoopsHandler::class, 'auth' => \Illuminate\Auth\AuthManager::class, @@ -490,7 +485,6 @@ namespace PHPSTORM_META { 'flare.logger' => \Monolog\Logger::class, 'hash' => \Illuminate\Hashing\HashManager::class, 'hash.driver' => \Illuminate\Hashing\BcryptHasher::class, - 'livewire' => \Livewire\LivewireManager::class, 'log' => \Illuminate\Log\LogManager::class, 'mail.manager' => \Illuminate\Mail\MailManager::class, 'mailer' => \Illuminate\Mail\Mailer::class, @@ -553,7 +547,6 @@ namespace PHPSTORM_META { 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, - 'Livewire\LivewireComponentsFinder' => \Livewire\LivewireComponentsFinder::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, 'Whoops\Handler\HandlerInterface' => \Facade\Ignition\ErrorPage\IgnitionWhoopsHandler::class, 'auth' => \Illuminate\Auth\AuthManager::class, @@ -659,7 +652,6 @@ namespace PHPSTORM_META { 'flare.logger' => \Monolog\Logger::class, 'hash' => \Illuminate\Hashing\HashManager::class, 'hash.driver' => \Illuminate\Hashing\BcryptHasher::class, - 'livewire' => \Livewire\LivewireManager::class, 'log' => \Illuminate\Log\LogManager::class, 'mail.manager' => \Illuminate\Mail\MailManager::class, 'mailer' => \Illuminate\Mail\Mailer::class, @@ -722,7 +714,6 @@ namespace PHPSTORM_META { 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, - 'Livewire\LivewireComponentsFinder' => \Livewire\LivewireComponentsFinder::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, 'Whoops\Handler\HandlerInterface' => \Facade\Ignition\ErrorPage\IgnitionWhoopsHandler::class, 'auth' => \Illuminate\Auth\AuthManager::class, @@ -828,7 +819,6 @@ namespace PHPSTORM_META { 'flare.logger' => \Monolog\Logger::class, 'hash' => \Illuminate\Hashing\HashManager::class, 'hash.driver' => \Illuminate\Hashing\BcryptHasher::class, - 'livewire' => \Livewire\LivewireManager::class, 'log' => \Illuminate\Log\LogManager::class, 'mail.manager' => \Illuminate\Mail\MailManager::class, 'mailer' => \Illuminate\Mail\Mailer::class, @@ -891,7 +881,6 @@ namespace PHPSTORM_META { 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, - 'Livewire\LivewireComponentsFinder' => \Livewire\LivewireComponentsFinder::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, 'Whoops\Handler\HandlerInterface' => \Facade\Ignition\ErrorPage\IgnitionWhoopsHandler::class, 'auth' => \Illuminate\Auth\AuthManager::class, @@ -997,7 +986,6 @@ namespace PHPSTORM_META { 'flare.logger' => \Monolog\Logger::class, 'hash' => \Illuminate\Hashing\HashManager::class, 'hash.driver' => \Illuminate\Hashing\BcryptHasher::class, - 'livewire' => \Livewire\LivewireManager::class, 'log' => \Illuminate\Log\LogManager::class, 'mail.manager' => \Illuminate\Mail\MailManager::class, 'mailer' => \Illuminate\Mail\Mailer::class, @@ -1060,7 +1048,6 @@ namespace PHPSTORM_META { 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, - 'Livewire\LivewireComponentsFinder' => \Livewire\LivewireComponentsFinder::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, 'Whoops\Handler\HandlerInterface' => \Facade\Ignition\ErrorPage\IgnitionWhoopsHandler::class, 'auth' => \Illuminate\Auth\AuthManager::class, @@ -1166,7 +1153,6 @@ namespace PHPSTORM_META { 'flare.logger' => \Monolog\Logger::class, 'hash' => \Illuminate\Hashing\HashManager::class, 'hash.driver' => \Illuminate\Hashing\BcryptHasher::class, - 'livewire' => \Livewire\LivewireManager::class, 'log' => \Illuminate\Log\LogManager::class, 'mail.manager' => \Illuminate\Mail\MailManager::class, 'mailer' => \Illuminate\Mail\Mailer::class, @@ -1229,7 +1215,6 @@ namespace PHPSTORM_META { 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, - 'Livewire\LivewireComponentsFinder' => \Livewire\LivewireComponentsFinder::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, 'Whoops\Handler\HandlerInterface' => \Facade\Ignition\ErrorPage\IgnitionWhoopsHandler::class, 'auth' => \Illuminate\Auth\AuthManager::class, @@ -1335,7 +1320,6 @@ namespace PHPSTORM_META { 'flare.logger' => \Monolog\Logger::class, 'hash' => \Illuminate\Hashing\HashManager::class, 'hash.driver' => \Illuminate\Hashing\BcryptHasher::class, - 'livewire' => \Livewire\LivewireManager::class, 'log' => \Illuminate\Log\LogManager::class, 'mail.manager' => \Illuminate\Mail\MailManager::class, 'mailer' => \Illuminate\Mail\Mailer::class, @@ -1398,7 +1382,6 @@ namespace PHPSTORM_META { 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, - 'Livewire\LivewireComponentsFinder' => \Livewire\LivewireComponentsFinder::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, 'Whoops\Handler\HandlerInterface' => \Facade\Ignition\ErrorPage\IgnitionWhoopsHandler::class, 'auth' => \Illuminate\Auth\AuthManager::class, @@ -1504,7 +1487,6 @@ namespace PHPSTORM_META { 'flare.logger' => \Monolog\Logger::class, 'hash' => \Illuminate\Hashing\HashManager::class, 'hash.driver' => \Illuminate\Hashing\BcryptHasher::class, - 'livewire' => \Livewire\LivewireManager::class, 'log' => \Illuminate\Log\LogManager::class, 'mail.manager' => \Illuminate\Mail\MailManager::class, 'mailer' => \Illuminate\Mail\Mailer::class, @@ -1567,7 +1549,6 @@ namespace PHPSTORM_META { 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, - 'Livewire\LivewireComponentsFinder' => \Livewire\LivewireComponentsFinder::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, 'Whoops\Handler\HandlerInterface' => \Facade\Ignition\ErrorPage\IgnitionWhoopsHandler::class, 'auth' => \Illuminate\Auth\AuthManager::class, @@ -1673,7 +1654,6 @@ namespace PHPSTORM_META { 'flare.logger' => \Monolog\Logger::class, 'hash' => \Illuminate\Hashing\HashManager::class, 'hash.driver' => \Illuminate\Hashing\BcryptHasher::class, - 'livewire' => \Livewire\LivewireManager::class, 'log' => \Illuminate\Log\LogManager::class, 'mail.manager' => \Illuminate\Mail\MailManager::class, 'mailer' => \Illuminate\Mail\Mailer::class, @@ -1736,7 +1716,6 @@ namespace PHPSTORM_META { 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, - 'Livewire\LivewireComponentsFinder' => \Livewire\LivewireComponentsFinder::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, 'Whoops\Handler\HandlerInterface' => \Facade\Ignition\ErrorPage\IgnitionWhoopsHandler::class, 'auth' => \Illuminate\Auth\AuthManager::class, @@ -1842,7 +1821,6 @@ namespace PHPSTORM_META { 'flare.logger' => \Monolog\Logger::class, 'hash' => \Illuminate\Hashing\HashManager::class, 'hash.driver' => \Illuminate\Hashing\BcryptHasher::class, - 'livewire' => \Livewire\LivewireManager::class, 'log' => \Illuminate\Log\LogManager::class, 'mail.manager' => \Illuminate\Mail\MailManager::class, 'mailer' => \Illuminate\Mail\Mailer::class, diff --git a/_ide_helper.php b/_ide_helper.php index 586101e..01241ef 100644 --- a/_ide_helper.php +++ b/_ide_helper.php @@ -14767,188 +14767,6 @@ } -} - - namespace Livewire { - /** - * - * - * @see \Livewire\LivewireManager - */ - class Livewire { - /** - * - * - * @static - */ - public static function component($alias, $viewClass = null) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->component($alias, $viewClass); - } - /** - * - * - * @static - */ - public static function getAlias($class, $default = null) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->getAlias($class, $default); - } - /** - * - * - * @static - */ - public static function getClass($alias) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->getClass($alias); - } - /** - * - * - * @static - */ - public static function getInstance($component, $id) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->getInstance($component, $id); - } - /** - * - * - * @static - */ - public static function mount($name, $params = []) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->mount($name, $params); - } - /** - * - * - * @static - */ - public static function dummyMount($id, $tagName) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->dummyMount($id, $tagName); - } - /** - * - * - * @static - */ - public static function test($name, $params = []) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->test($name, $params); - } - /** - * - * - * @static - */ - public static function visit($browser, $class, $queryString = '') - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->visit($browser, $class, $queryString); - } - /** - * - * - * @static - */ - public static function actingAs($user, $driver = null) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->actingAs($user, $driver); - } - /** - * - * - * @static - */ - public static function styles($options = []) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->styles($options); - } - /** - * - * - * @static - */ - public static function scripts($options = []) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->scripts($options); - } - /** - * - * - * @static - */ - public static function isLivewireRequest() - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->isLivewireRequest(); - } - /** - * - * - * @static - */ - public static function getRootElementTagName($dom) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->getRootElementTagName($dom); - } - /** - * - * - * @static - */ - public static function dispatch($event, ...$params) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->dispatch($event, ...$params); - } - /** - * - * - * @static - */ - public static function listen($event, $callback) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->listen($event, $callback); - } - /** - * - * - * @static - */ - public static function isOnVapor() - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->isOnVapor(); - } - /** - * - * - * @static - */ - public static function withQueryParams($queryParams) - { - /** @var \Livewire\LivewireManager $instance */ - return $instance->withQueryParams($queryParams); - } - - } - } namespace Illuminate\Http { @@ -15006,115 +14824,6 @@ } -} - - namespace Illuminate\Testing { - /** - * - * - * @mixin \Illuminate\Http\Response - */ - class TestResponse { - /** - * - * - * @see \Livewire\LivewireServiceProvider::registerTestMacros() - * @param mixed $component - * @static - */ - public static function assertSeeLivewire($component) - { - return \Illuminate\Testing\TestResponse::assertSeeLivewire($component); - } - /** - * - * - * @see \Livewire\LivewireServiceProvider::registerTestMacros() - * @param mixed $component - * @static - */ - public static function assertDontSeeLivewire($component) - { - return \Illuminate\Testing\TestResponse::assertDontSeeLivewire($component); - } - - } - -} - - namespace Illuminate\View { - /** - * - * - */ - class ComponentAttributeBag { - /** - * - * - * @see \Livewire\LivewireServiceProvider::registerViewMacros() - * @param mixed $name - * @static - */ - public static function wire($name) - { - return \Illuminate\View\ComponentAttributeBag::wire($name); - } - - } - /** - * - * - */ - class View { - /** - * - * - * @see \Livewire\Macros\ViewMacros::extends() - * @param mixed $view - * @param mixed $params - * @static - */ - public static function extends($view, $params = []) - { - return \Illuminate\View\View::extends($view, $params); - } - /** - * - * - * @see \Livewire\Macros\ViewMacros::layout() - * @param mixed $view - * @param mixed $params - * @static - */ - public static function layout($view, $params = []) - { - return \Illuminate\View\View::layout($view, $params); - } - /** - * - * - * @see \Livewire\Macros\ViewMacros::section() - * @param mixed $section - * @static - */ - public static function section($section) - { - return \Illuminate\View\View::section($section); - } - /** - * - * - * @see \Livewire\Macros\ViewMacros::slot() - * @param mixed $slot - * @static - */ - public static function slot($slot) - { - return \Illuminate\View\View::slot($slot); - } - - } - } @@ -18229,7 +17938,6 @@ namespace { class Validator extends \Illuminate\Support\Facades\Validator {} class View extends \Illuminate\Support\Facades\View {} class Flare extends \Facade\Ignition\Facades\Flare {} - class Livewire extends \Livewire\Livewire {} } diff --git a/app/Http/Livewire/FoodPicker.php b/app/Http/Livewire/FoodPicker.php deleted file mode 100644 index 19f5cc3..0000000 --- a/app/Http/Livewire/FoodPicker.php +++ /dev/null @@ -1,37 +0,0 @@ -term = $this->defaultName; - } - - /** - * Get the view / contents that represent the component. - * - * @return \Illuminate\Contracts\View\View|string - */ - public function render() - { - if (!empty($this->term)) { - $foods = Food::search($this->term); - } else { - $foods = []; - } - return view('livewire.food-picker') - ->with('foods', $foods); - } -} diff --git a/app/Models/Food.php b/app/Models/Food.php index d95a2a0..9d89006 100644 --- a/app/Models/Food.php +++ b/app/Models/Food.php @@ -54,6 +54,7 @@ use Illuminate\Support\Collection; * @method static \Illuminate\Database\Eloquent\Builder|Food whereSodium($value) * @method static \Illuminate\Database\Eloquent\Builder|Food whereUpdatedAt($value) * @mixin \Eloquent + * @property-read string $serving_size_formatted */ class Food extends Model { diff --git a/composer.json b/composer.json index 059a464..cbac5de 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,6 @@ "guzzlehttp/guzzle": "^7.0.1", "laravel/framework": "^8.12", "laravel/tinker": "^2.5", - "livewire/livewire": "^2.3", "phospr/fraction": "^1.2" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 8ab85b7..a391417 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2444634e1b5e5d38a38dca7c11f43824", + "content-hash": "7054301f9158e201ddff5b37f41a1c5a", "packages": [ { "name": "asm89/stack-cors", @@ -1519,78 +1519,6 @@ ], "time": "2020-10-18T11:50:25+00:00" }, - { - "name": "livewire/livewire", - "version": "v2.3.6", - "source": { - "type": "git", - "url": "https://github.com/livewire/livewire.git", - "reference": "8663232c198ef12964b62559e9bb2023eb86701d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/livewire/livewire/zipball/8663232c198ef12964b62559e9bb2023eb86701d", - "reference": "8663232c198ef12964b62559e9bb2023eb86701d", - "shasum": "" - }, - "require": { - "illuminate/database": "^7.0|^8.0", - "illuminate/support": "^7.0|^8.0", - "illuminate/validation": "^7.0|^8.0", - "php": "^7.2.5|^8.0", - "symfony/http-kernel": "^5.0" - }, - "require-dev": { - "calebporzio/sushi": "^2.1", - "laravel/framework": "^7.0|^8.0", - "mockery/mockery": "^1.3.1", - "orchestra/testbench": "^5.0|^6.0", - "orchestra/testbench-dusk": "^5.2|^6.0", - "phpunit/phpunit": "^8.4|^9.0", - "psy/psysh": "@stable" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Livewire\\LivewireServiceProvider" - ], - "aliases": { - "Livewire": "Livewire\\Livewire" - } - } - }, - "autoload": { - "files": [ - "src/helpers.php" - ], - "psr-4": { - "Livewire\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Caleb Porzio", - "email": "calebporzio@gmail.com" - } - ], - "description": "A front-end framework for Laravel.", - "support": { - "issues": "https://github.com/livewire/livewire/issues", - "source": "https://github.com/livewire/livewire/tree/v2.3.6" - }, - "funding": [ - { - "url": "https://github.com/calebporzio", - "type": "github" - } - ], - "time": "2021-01-08T17:33:29+00:00" - }, { "name": "monolog/monolog", "version": "2.2.0", diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 87ee584..39b3d53 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -17,7 +17,6 @@ @isset($styles) {{ $styles }} @endisset - @livewireStyles