comment out RSS stuff for now

This commit is contained in:
Nabeel Shahzad
2017-08-17 14:01:47 -05:00
parent b2dba02615
commit bec2bbf646
7 changed files with 59 additions and 21 deletions

1
.gitignore vendored
View File

@@ -13,6 +13,7 @@ public/storage
public/hot public/hot
storage/*.key storage/*.key
storage/settings.json storage/settings.json
storage/*.sqlite
.env.*.php .env.*.php
.env.php .env.php
.env .env

View File

@@ -3,8 +3,6 @@
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Feed;
class DashboardController extends BaseController class DashboardController extends BaseController
{ {
@@ -13,10 +11,11 @@ class DashboardController extends BaseController
*/ */
public function index(Request $request) public function index(Request $request)
{ {
Feed::$cacheDir = storage_path('app'); /*Feed::$cacheDir = storage_path('app');
Feed::$cacheExpire = '5 hours'; Feed::$cacheExpire = '5 hours';
$feed = Feed::loadRss(config('phpvms.feed_url')); $feed = Feed::loadRss(config('phpvms.feed_url'));*/
$feed = [];
return view('admin.dashboard', [ return view('admin.dashboard', [
'feed' => $feed, 'feed' => $feed,
]); ]);

View File

@@ -8,7 +8,7 @@
"url": "https://github.com/nabeelio/phpvms.git", "url": "https://github.com/nabeelio/phpvms.git",
"require": { "require": {
"php": ">=7.0", "php": ">=7.0",
"laravel/framework": "v5.4.30", "laravel/framework": "v5.4.*",
"barryvdh/laravel-ide-helper": "v2.4.0", "barryvdh/laravel-ide-helper": "v2.4.0",
"yajra/laravel-datatables-oracle": "~6.0", "yajra/laravel-datatables-oracle": "~6.0",
"infyomlabs/laravel-generator": "dev-master", "infyomlabs/laravel-generator": "dev-master",
@@ -32,7 +32,7 @@
"anlutro/l4-settings": "^0.5.0", "anlutro/l4-settings": "^0.5.0",
"webpatser/laravel-uuid": "^2.0", "webpatser/laravel-uuid": "^2.0",
"chrisbjr/api-guard": "^4.0", "chrisbjr/api-guard": "^4.0",
"spatie/laravel-fractal": "4.2.0", "spatie/laravel-fractal": "4.2.*",
"composer/semver": "^1.4", "composer/semver": "^1.4",
"dg/rss-php": "^1.2", "dg/rss-php": "^1.2",
"makinacorpus/php-bloom": "dev-master" "makinacorpus/php-bloom": "dev-master"
@@ -77,8 +77,7 @@
"Illuminate\\Foundation\\ComposerScripts::postUpdate", "Illuminate\\Foundation\\ComposerScripts::postUpdate",
"php artisan ide-helper:generate", "php artisan ide-helper:generate",
"php artisan ide-helper:meta", "php artisan ide-helper:meta",
"php artisan optimize", "php artisan optimize"
"php artisan migrate:refresh --seed"
] ]
}, },
"config": { "config": {

55
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "6670bd43fd45f02d826746301d352864", "content-hash": "181da7f1bb73299cdb05da4add9052dd",
"packages": [ "packages": [
{ {
"name": "anlutro/l4-settings", "name": "anlutro/l4-settings",
@@ -1185,7 +1185,7 @@
"laravel", "laravel",
"templates" "templates"
], ],
"time": "2017-05-20T10:43:37+00:00" "time": "2017-05-20 10:43:37"
}, },
{ {
"name": "infyomlabs/laravel-generator", "name": "infyomlabs/laravel-generator",
@@ -1240,7 +1240,7 @@
"test", "test",
"view" "view"
], ],
"time": "2016-08-18T14:19:50+00:00" "time": "2016-08-18 14:19:50"
}, },
{ {
"name": "infyomlabs/swagger-generator", "name": "infyomlabs/swagger-generator",
@@ -1277,7 +1277,7 @@
"swagger", "swagger",
"templates" "templates"
], ],
"time": "2016-02-14T10:41:03+00:00" "time": "2016-02-14 10:41:03"
}, },
{ {
"name": "jeremeamia/SuperClosure", "name": "jeremeamia/SuperClosure",
@@ -1380,7 +1380,7 @@
"laravel", "laravel",
"swagger" "swagger"
], ],
"time": "2016-01-25T15:38:17+00:00" "time": "2016-01-25 15:38:17"
}, },
{ {
"name": "laracasts/flash", "name": "laracasts/flash",
@@ -1907,6 +1907,46 @@
], ],
"time": "2017-07-02T07:00:56+00:00" "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", "name": "monolog/monolog",
"version": "1.23.0", "version": "1.23.0",
@@ -4695,7 +4735,7 @@
"permission", "permission",
"roles" "roles"
], ],
"time": "2016-12-29T06:25:06+00:00" "time": "2016-12-29 06:25:06"
} }
], ],
"packages-dev": [ "packages-dev": [
@@ -6153,7 +6193,8 @@
"infyomlabs/swagger-generator": 20, "infyomlabs/swagger-generator": 20,
"jlapp/swaggervel": 20, "jlapp/swaggervel": 20,
"zizaco/entrust": 20, "zizaco/entrust": 20,
"league/geotools": 0 "league/geotools": 0,
"makinacorpus/php-bloom": 20
}, },
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,

View File

@@ -23,13 +23,13 @@ return [
'local' => [ 'local' => [
'driver' => 'sqlite', 'driver' => 'sqlite',
'database' => database_path('testing.sqlite'), 'database' => storage_path('testing.sqlite'),
'prefix' => '', 'prefix' => '',
], ],
'unittest' => [ 'unittest' => [
'driver' => 'sqlite', 'driver' => 'sqlite',
'database' => database_path('unittest.sqlite'), 'database' => storage_path('unittest.sqlite'),
'prefix' => '', 'prefix' => '',
], ],

View File

@@ -45,7 +45,6 @@
<CLASSES> <CLASSES>
<root url="file://$APPLICATION_HOME_DIR$/bin" /> <root url="file://$APPLICATION_HOME_DIR$/bin" />
<root url="file://$MODULE_DIR$/vendor/chrisbjr/api-guard" /> <root url="file://$MODULE_DIR$/vendor/chrisbjr/api-guard" />
<root url="file://$MODULE_DIR$/vendor/dg/rss-php" />
<root url="file://$MODULE_DIR$/vendor/doctrine/cache" /> <root url="file://$MODULE_DIR$/vendor/doctrine/cache" />
<root url="file://$MODULE_DIR$/vendor/doctrine/collections" /> <root url="file://$MODULE_DIR$/vendor/doctrine/collections" />
<root url="file://$MODULE_DIR$/vendor/doctrine/common" /> <root url="file://$MODULE_DIR$/vendor/doctrine/common" />
@@ -71,7 +70,6 @@
<SOURCES> <SOURCES>
<root url="file://$APPLICATION_HOME_DIR$/bin" /> <root url="file://$APPLICATION_HOME_DIR$/bin" />
<root url="file://$MODULE_DIR$/vendor/chrisbjr/api-guard" /> <root url="file://$MODULE_DIR$/vendor/chrisbjr/api-guard" />
<root url="file://$MODULE_DIR$/vendor/dg/rss-php" />
<root url="file://$MODULE_DIR$/vendor/doctrine/cache" /> <root url="file://$MODULE_DIR$/vendor/doctrine/cache" />
<root url="file://$MODULE_DIR$/vendor/doctrine/collections" /> <root url="file://$MODULE_DIR$/vendor/doctrine/collections" />
<root url="file://$MODULE_DIR$/vendor/doctrine/common" /> <root url="file://$MODULE_DIR$/vendor/doctrine/common" />

View File

@@ -32,14 +32,14 @@
<div class="box-body"> <div class="box-body">
<div class="col-sm-12"> <div class="col-sm-12">
<h3>announcements</h3> <h3>announcements</h3>
@foreach($feed->item as $item) {{--@foreach($feed->item as $item)
<div> <div>
<strong>{!! $item->title !!}</strong> <strong>{!! $item->title !!}</strong>
<p>{!! $item->description !!}</p> <p>{!! $item->description !!}</p>
<p class="pull-right">{!! Carbon::now()->diffForHumans(new Carbon($item->pubDate), true) !!}</p> <p class="pull-right">{!! Carbon::now()->diffForHumans(new Carbon($item->pubDate), true) !!}</p>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
@endforeach @endforeach--}}
</div> </div>
</div> </div>
</div> </div>