From a0c284e72f161d5a1a78855a9c999c2f5f21964e Mon Sep 17 00:00:00 2001 From: Jigar Lodaya Date: Sat, 24 Feb 2018 11:01:56 +0530 Subject: [PATCH 1/9] Icon with span class added --- src/Item.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Item.php b/src/Item.php index 4373e67..969a46f 100755 --- a/src/Item.php +++ b/src/Item.php @@ -230,8 +230,12 @@ public function icon($icon, $type = 'fontawesome') $html = ''; break; + case 'span': + $html = ''; + break; + default: - $html = ''; + $html = ''; break; } @@ -333,7 +337,7 @@ public function checkActiveStatus() list($path, $requestPath) = preg_replace('@^('.$base.')/@', '', [$path, $requestPath], 1); } - + if ($this->url() == Request::url() || $this->url() == \URL::secure(Request::path())) { $this->activate(); } @@ -370,7 +374,7 @@ public function active($pattern = null) return $this; } - + /** * Returns bool value if item is active or not. * From 1fe3dec165be690f49da3badea0845177452d9ae Mon Sep 17 00:00:00 2001 From: Jigar Lodaya Date: Sat, 24 Feb 2018 11:04:50 +0530 Subject: [PATCH 2/9] typo correected --- src/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Item.php b/src/Item.php index 969a46f..d1f55c1 100755 --- a/src/Item.php +++ b/src/Item.php @@ -235,7 +235,7 @@ public function icon($icon, $type = 'fontawesome') break; default: - $html = ''; + $html = ''; break; } From e387593f79f6a76cbd59c9ad8ae48a00674bd7a5 Mon Sep 17 00:00:00 2001 From: Jigar Lodaya Date: Sun, 4 Mar 2018 23:37:33 +0530 Subject: [PATCH 3/9] Changes made to push to packagist --- README.md | 2 ++ composer.json | 14 +++++++------- src/Builder.php | 8 ++++---- src/Collection.php | 2 +- src/Facades/Menu.php | 4 ++-- src/Item.php | 2 +- src/Link.php | 2 +- src/Menu.php | 2 +- src/MenusServiceProvider.php | 2 +- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 7349ba6..fe836c7 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +This is originally develeoped at [Caffeinated Menus](https://github.com/caffeinated/menus). Modified to acheive my needs. + Caffeinated Menus ================= [![Laravel 5.3](https://img.shields.io/badge/Laravel-5.3-orange.svg?style=flat-square)](http://laravel.com) diff --git a/composer.json b/composer.json index 5d3fc32..6c65beb 100755 --- a/composer.json +++ b/composer.json @@ -1,12 +1,12 @@ { - "name": "caffeinated/menus", + "name": "jigss1212/menus", "description": "Laravel 5 Menus", - "keywords": ["menu", "navigation", "laravel", "caffeinated"], + "keywords": ["menu", "navigation", "laravel", "caffeinated", "jigs1212"], "license": "MIT", "authors": [ { - "name": "Shea Lewis", - "email": "shea.lewis89@gmail.com" + "name": "Jigar Lodaya", + "email": "jigar.lodaya12@gmail.com" } ], "require": { @@ -19,7 +19,7 @@ }, "autoload": { "psr-4": { - "Caffeinated\\Menus\\": "src/" + "jigs1212\\Menus\\": "src/" } }, "extra": { @@ -28,10 +28,10 @@ }, "laravel": { "providers": [ - "Caffeinated\\Menus\\MenusServiceProvider" + "Jigs1212\\Menus\\MenusServiceProvider" ], "aliases": { - "Menu": "Caffeinated\\Menus\\Facades\\Menu" + "Menu": "Jigs1212\\Menus\\Facades\\Menu" } } } diff --git a/src/Builder.php b/src/Builder.php index 3f2fca7..1683c3d 100755 --- a/src/Builder.php +++ b/src/Builder.php @@ -1,5 +1,5 @@ data[$attribute]) && $item->data[$attribute] == $value) { return true; } - + if (! property_exists($item, $attribute)) { return false; } diff --git a/src/Collection.php b/src/Collection.php index a15c93d..7ac44ed 100755 --- a/src/Collection.php +++ b/src/Collection.php @@ -1,5 +1,5 @@ Date: Sun, 4 Mar 2018 23:39:53 +0530 Subject: [PATCH 4/9] Typo Corrected --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6c65beb..0ec0e0e 100755 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "jigss1212/menus", + "name": "jigs1212/menus", "description": "Laravel 5 Menus", "keywords": ["menu", "navigation", "laravel", "caffeinated", "jigs1212"], "license": "MIT", From 8f161af0adedc8c7c58e472b5fc600e80a7331e1 Mon Sep 17 00:00:00 2001 From: Jigar Lodaya Date: Mon, 5 Mar 2018 14:08:32 +0530 Subject: [PATCH 5/9] Updated readme --- README.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/README.md b/README.md index fe836c7..ec2c743 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,37 @@ + + This is originally develeoped at [Caffeinated Menus](https://github.com/caffeinated/menus). Modified to acheive my needs. + +For this package Installation guide +============================== + +Begin by installing the package through Composer. + +``` +composer require jigs1212/menus +``` + +Once this operation is complete, simply add the service provider class and facade alias to your project's `config/app.php` file: + +#### Service Provider +```php +Jigs1212\Menus\MenusServiceProvider::class, +``` + +#### Facade +```php +'Menu' => Jigs1212\Menus\Facades\Menu::class, +``` + +And that's it! With your coffee in reach, start building out some awesome menus! + + + + +ORIGINAL PACKAGE +================= + Caffeinated Menus ================= [![Laravel 5.3](https://img.shields.io/badge/Laravel-5.3-orange.svg?style=flat-square)](http://laravel.com) From f7f44b68c374e317defbba87e0d547c62e3bc3dd Mon Sep 17 00:00:00 2001 From: Jigar Lodaya Date: Mon, 5 Mar 2018 14:40:57 +0530 Subject: [PATCH 6/9] Updated Composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0ec0e0e..4c44a84 100755 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ }, "autoload": { "psr-4": { - "jigs1212\\Menus\\": "src/" + "Jigs1212\\Menus\\": "src/" } }, "extra": { From 5da98afcbcb3d3c2fc93a731566b32cd95cf718e Mon Sep 17 00:00:00 2001 From: Jigar Lodaya Date: Mon, 5 Mar 2018 15:02:55 +0530 Subject: [PATCH 7/9] Set span as default --- src/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Item.php b/src/Item.php index 3cc6261..72706b6 100755 --- a/src/Item.php +++ b/src/Item.php @@ -215,7 +215,7 @@ public function append($html) * @param string $type Can be either "fontawesome" or "glyphicon" * @return \Caffeinated\Menus\Item */ - public function icon($icon, $type = 'fontawesome') + public function icon($icon, $type = 'span') { switch ($type) { case 'fontawesome': From 48fb2500b4a1faaa9de1eb96d76952bbe1d2f4fe Mon Sep 17 00:00:00 2001 From: Jigar Lodaya Date: Tue, 24 Apr 2018 23:06:53 +0530 Subject: [PATCH 8/9] supports 5.3 and above --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 4c44a84..4080a3b 100755 --- a/composer.json +++ b/composer.json @@ -11,11 +11,11 @@ ], "require": { "php": ">=5.6.4", - "illuminate/support": "5.3.*|5.4.*|5.5.*", - "illuminate/config": "5.3.*|5.4.*|5.5.*", - "illuminate/routing": "5.3.*|5.4.*|5.5.*", - "illuminate/view": "5.3.*|5.4.*|5.5.*", - "laravelcollective/html": "5.3.*|5.4.*|5.5.*" + "illuminate/support": "^5.3.*", + "illuminate/config": "^5.3.*", + "illuminate/routing": "^5.3.*", + "illuminate/view": "^5.3.*", + "laravelcollective/html": "^5.3.*" }, "autoload": { "psr-4": { From 1834fde350dfd365417618f727a6b7ca3c198cb1 Mon Sep 17 00:00:00 2001 From: Jigar Lodaya Date: Tue, 24 Apr 2018 23:12:33 +0530 Subject: [PATCH 9/9] supports 5.3 and above --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 4080a3b..c80afd4 100755 --- a/composer.json +++ b/composer.json @@ -11,11 +11,11 @@ ], "require": { "php": ">=5.6.4", - "illuminate/support": "^5.3.*", - "illuminate/config": "^5.3.*", - "illuminate/routing": "^5.3.*", - "illuminate/view": "^5.3.*", - "laravelcollective/html": "^5.3.*" + "illuminate/support": "^5.3", + "illuminate/config": "^5.3", + "illuminate/routing": "^5.3", + "illuminate/view": "^5.3", + "laravelcollective/html": "^5.3" }, "autoload": { "psr-4": {