From bec2bbf646e042ccdd9e2b5e5cc2bd39c456a529 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Thu, 17 Aug 2017 14:01:47 -0500 Subject: [PATCH] comment out RSS stuff for now --- .gitignore | 1 + .../Controllers/Admin/DashboardController.php | 7 +-- composer.json | 7 +-- composer.lock | 55 ++++++++++++++++--- config/database.php | 4 +- phpvms.iml | 2 - resources/views/admin/dashboard.blade.php | 4 +- 7 files changed, 59 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 77f4a6ed..2824c8fe 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ public/storage public/hot storage/*.key storage/settings.json +storage/*.sqlite .env.*.php .env.php .env diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index d893b385..2bcb1dd0 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -3,8 +3,6 @@ namespace App\Http\Controllers\Admin; use Illuminate\Http\Request; -use Feed; - class DashboardController extends BaseController { @@ -13,10 +11,11 @@ class DashboardController extends BaseController */ public function index(Request $request) { - Feed::$cacheDir = storage_path('app'); + /*Feed::$cacheDir = storage_path('app'); Feed::$cacheExpire = '5 hours'; - $feed = Feed::loadRss(config('phpvms.feed_url')); + $feed = Feed::loadRss(config('phpvms.feed_url'));*/ + $feed = []; return view('admin.dashboard', [ 'feed' => $feed, ]); diff --git a/composer.json b/composer.json index cbf53cd9..7f62445a 100755 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "url": "https://github.com/nabeelio/phpvms.git", "require": { "php": ">=7.0", - "laravel/framework": "v5.4.30", + "laravel/framework": "v5.4.*", "barryvdh/laravel-ide-helper": "v2.4.0", "yajra/laravel-datatables-oracle": "~6.0", "infyomlabs/laravel-generator": "dev-master", @@ -32,7 +32,7 @@ "anlutro/l4-settings": "^0.5.0", "webpatser/laravel-uuid": "^2.0", "chrisbjr/api-guard": "^4.0", - "spatie/laravel-fractal": "4.2.0", + "spatie/laravel-fractal": "4.2.*", "composer/semver": "^1.4", "dg/rss-php": "^1.2", "makinacorpus/php-bloom": "dev-master" @@ -77,8 +77,7 @@ "Illuminate\\Foundation\\ComposerScripts::postUpdate", "php artisan ide-helper:generate", "php artisan ide-helper:meta", - "php artisan optimize", - "php artisan migrate:refresh --seed" + "php artisan optimize" ] }, "config": { diff --git a/composer.lock b/composer.lock index 01d5070d..deb560d9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "6670bd43fd45f02d826746301d352864", + "content-hash": "181da7f1bb73299cdb05da4add9052dd", "packages": [ { "name": "anlutro/l4-settings", @@ -1185,7 +1185,7 @@ "laravel", "templates" ], - "time": "2017-05-20T10:43:37+00:00" + "time": "2017-05-20 10:43:37" }, { "name": "infyomlabs/laravel-generator", @@ -1240,7 +1240,7 @@ "test", "view" ], - "time": "2016-08-18T14:19:50+00:00" + "time": "2016-08-18 14:19:50" }, { "name": "infyomlabs/swagger-generator", @@ -1277,7 +1277,7 @@ "swagger", "templates" ], - "time": "2016-02-14T10:41:03+00:00" + "time": "2016-02-14 10:41:03" }, { "name": "jeremeamia/SuperClosure", @@ -1380,7 +1380,7 @@ "laravel", "swagger" ], - "time": "2016-01-25T15:38:17+00:00" + "time": "2016-01-25 15:38:17" }, { "name": "laracasts/flash", @@ -1907,6 +1907,46 @@ ], "time": "2017-07-02T07:00:56+00:00" }, + { + "name": "makinacorpus/php-bloom", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/makinacorpus/php-bloom.git", + "reference": "592a1f12de75af524b1755971ff2bdf32035a556" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/makinacorpus/php-bloom/zipball/592a1f12de75af524b1755971ff2bdf32035a556", + "reference": "592a1f12de75af524b1755971ff2bdf32035a556", + "shasum": "" + }, + "require-dev": { + "phpunit/phpunit": "^5.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "MakinaCorpus\\Bloom\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2" + ], + "authors": [ + { + "name": "Pierre Rineau", + "email": "pierre.rineau@makina-corpus.com" + }, + { + "name": "Makina Corpus", + "homepage": "http://makina-corpus.com" + } + ], + "description": "Bloom filter implementation", + "time": "2016-08-30 13:36:14" + }, { "name": "monolog/monolog", "version": "1.23.0", @@ -4695,7 +4735,7 @@ "permission", "roles" ], - "time": "2016-12-29T06:25:06+00:00" + "time": "2016-12-29 06:25:06" } ], "packages-dev": [ @@ -6153,7 +6193,8 @@ "infyomlabs/swagger-generator": 20, "jlapp/swaggervel": 20, "zizaco/entrust": 20, - "league/geotools": 0 + "league/geotools": 0, + "makinacorpus/php-bloom": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/config/database.php b/config/database.php index 6c47fb8d..2f9bf034 100755 --- a/config/database.php +++ b/config/database.php @@ -23,13 +23,13 @@ return [ 'local' => [ 'driver' => 'sqlite', - 'database' => database_path('testing.sqlite'), + 'database' => storage_path('testing.sqlite'), 'prefix' => '', ], 'unittest' => [ 'driver' => 'sqlite', - 'database' => database_path('unittest.sqlite'), + 'database' => storage_path('unittest.sqlite'), 'prefix' => '', ], diff --git a/phpvms.iml b/phpvms.iml index 1df61625..564ec025 100644 --- a/phpvms.iml +++ b/phpvms.iml @@ -45,7 +45,6 @@ - @@ -71,7 +70,6 @@ - diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index 3ab88b09..e153bb4f 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -32,14 +32,14 @@

announcements

- @foreach($feed->item as $item) + {{--@foreach($feed->item as $item)
{!! $item->title !!}

{!! $item->description !!}

{!! Carbon::now()->diffForHumans(new Carbon($item->pubDate), true) !!}

- @endforeach + @endforeach--}}