update OpInstaController
This commit is contained in:
parent
a1e73aefc0
commit
d3046c0b9e
3 changed files with 17 additions and 18 deletions
|
|
@ -21,8 +21,10 @@ class OpInstaController extends Controller
|
|||
{
|
||||
$this->assertConfigIsValid();
|
||||
$has_started = $this->hasStarted();
|
||||
$instaMediaList = [];
|
||||
|
||||
$instaMediaList = InstaMedia::query()->orderBy('id')->get()
|
||||
if ($has_started) {
|
||||
$instaMediaList = InstaMedia::query()->orderBy('id')->get()
|
||||
->map(function (InstaMedia $media) {
|
||||
$path = \explode('/', \rtrim(\parse_url(
|
||||
$media->permalink,
|
||||
|
|
@ -32,6 +34,7 @@ class OpInstaController extends Controller
|
|||
$media->pictures = $this->fetchPicture(\collect($path)->last());
|
||||
return $media;
|
||||
});
|
||||
};
|
||||
|
||||
return \view('front.opinsta.index', \compact('instaMediaList', 'has_started'));
|
||||
}
|
||||
|
|
@ -53,8 +56,8 @@ class OpInstaController extends Controller
|
|||
'start' => $start,
|
||||
'end' => $end,
|
||||
], [
|
||||
'start' => 'date_format:d-m-Y|before:end',
|
||||
'end' => 'date_format:d-m-Y|after:start',
|
||||
'start' => 'date_format:d-m-Y|before:end|required',
|
||||
'end' => 'date_format:d-m-Y|after:start|required',
|
||||
]);
|
||||
} catch (ValidationException $e) {
|
||||
$message = \collect($e->errors())->map(function ($el) {
|
||||
|
|
|
|||
24
package-lock.json
generated
24
package-lock.json
generated
|
|
@ -6,7 +6,7 @@
|
|||
"": {
|
||||
"dependencies": {
|
||||
"@fancyapps/fancybox": "^3.5.7",
|
||||
"@ldc-web/cookie-notice": "^3.0.3",
|
||||
"@ldc-web/cookie-notice": "^3.0.8",
|
||||
"animate.css": "^3.7.2",
|
||||
"detect-element-overflow": "^1.2.0",
|
||||
"hooper2": "^0.3.6",
|
||||
|
|
@ -1870,12 +1870,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"node_modules/@ldc-web/cookie-notice": {
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-3.0.3.tgz",
|
||||
"integrity": "sha1-9zBm0372Tl+Q+p2FxG073/wHApQ=",
|
||||
"dependencies": {
|
||||
"core-js": "^3.30.0"
|
||||
}
|
||||
"version": "3.0.8",
|
||||
"resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-3.0.8.tgz",
|
||||
"integrity": "sha1-FOc6hEv1L9NOnRDOdyBnbIsd31A="
|
||||
},
|
||||
"node_modules/@leichtgewicht/ip-codec": {
|
||||
"version": "2.0.4",
|
||||
|
|
@ -3733,6 +3730,7 @@
|
|||
"version": "3.30.1",
|
||||
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.30.1.tgz",
|
||||
"integrity": "sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
|
|
@ -11481,12 +11479,9 @@
|
|||
}
|
||||
},
|
||||
"@ldc-web/cookie-notice": {
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-3.0.3.tgz",
|
||||
"integrity": "sha1-9zBm0372Tl+Q+p2FxG073/wHApQ=",
|
||||
"requires": {
|
||||
"core-js": "^3.30.0"
|
||||
}
|
||||
"version": "3.0.8",
|
||||
"resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-3.0.8.tgz",
|
||||
"integrity": "sha1-FOc6hEv1L9NOnRDOdyBnbIsd31A="
|
||||
},
|
||||
"@leichtgewicht/ip-codec": {
|
||||
"version": "2.0.4",
|
||||
|
|
@ -13044,7 +13039,8 @@
|
|||
"core-js": {
|
||||
"version": "3.30.1",
|
||||
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.30.1.tgz",
|
||||
"integrity": "sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ=="
|
||||
"integrity": "sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ==",
|
||||
"dev": true
|
||||
},
|
||||
"core-js-compat": {
|
||||
"version": "3.30.1",
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@fancyapps/fancybox": "^3.5.7",
|
||||
"@ldc-web/cookie-notice": "^3.0.3",
|
||||
"@ldc-web/cookie-notice": "^3.0.8",
|
||||
"animate.css": "^3.7.2",
|
||||
"detect-element-overflow": "^1.2.0",
|
||||
"hooper2": "^0.3.6",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue