From 2a5dbfbe808c6b6a2d1ea97c235676db703b688d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 29 Apr 2019 20:57:48 -0600 Subject: [PATCH 1/4] Update BaseApiController --- app/Http/Controllers/Api/BaseApiController.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php index 2cc0cacdc..5ae8f9f68 100644 --- a/app/Http/Controllers/Api/BaseApiController.php +++ b/app/Http/Controllers/Api/BaseApiController.php @@ -44,15 +44,6 @@ class BaseApiController extends Controller $this->fractal->setSerializer(new ArraySerializer()); } - public function notification(Request $request, $id) - { - $notification = Notification::findOrFail($id); - $resource = new Fractal\Resource\Item($notification, new NotificationTransformer()); - $res = $this->fractal->createData($resource)->toArray(); - - return response()->json($res); - } - public function notifications(Request $request) { $pid = Auth::user()->profile->id; From d543087bc65f25fba3f38f46196fca3f27ba4bfc Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 29 Apr 2019 20:58:36 -0600 Subject: [PATCH 2/4] Update NotificationCard.vue --- resources/assets/js/components/NotificationCard.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/components/NotificationCard.vue b/resources/assets/js/components/NotificationCard.vue index 9c437bc8f..b5894f38d 100644 --- a/resources/assets/js/components/NotificationCard.vue +++ b/resources/assets/js/components/NotificationCard.vue @@ -70,7 +70,9 @@ }, mounted() { - this.fetchNotifications(); + if(window.outerWidth > 767) { + this.fetchNotifications(); + } }, updated() { From 6d256f5b2bca1a73859fee348970503e6a0b6a2b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 29 Apr 2019 20:59:12 -0600 Subject: [PATCH 3/4] Update Timeline.vue --- resources/assets/js/components/Timeline.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 34112e1e4..0d53b0b58 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -397,7 +397,9 @@ .then(res => { this.config = res.data; this.fetchTimelineApi(); - this.fetchProfile(); + if(window.outerWidth > 767) { + this.fetchProfile(); + } }); }, @@ -459,7 +461,9 @@ this.max_id = Math.min(...ids); $('.timeline .pagination').removeClass('d-none'); this.loading = false; - this.expRec(); + if(window.outerWidth > 767) { + this.expRec(); + } }).catch(err => { }); }, From 38e7bb84551416ca78e4fc2e616d389174accec9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 29 Apr 2019 20:59:41 -0600 Subject: [PATCH 4/4] Update compiled assets --- public/js/timeline.js | Bin 62136 -> 62205 bytes public/mix-manifest.json | Bin 845 -> 845 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/timeline.js b/public/js/timeline.js index 3a755cfea971ffb18bb5d1c388dc1c630fb0fead..095d723b321bfaa0abc1fa8db3e89abe83cd6e10 100644 GIT binary patch delta 298 zcmdn-l=<&d<_(jXS+spalqToRw48i|U5>*rB_+ko#K>s!EA}V^$A`lW!I{OOws{is z7v{|eI4%f_muKdsUybLWvSffw_g{W&`J) zo^Yc#f9yHOJvnRU9;MLmDpRYp(!Au7%=|o!5}j0?V$JHZ#3F@6+hPqRBcPKfKb+CY zrWB@cm|Bf$lN*Xp49rrK%*~9GCx7gb-8}KUx-tNH0cvvq delta 220 zcmezSlzGQf<_(jXnY{{fCp(JCZ+_2mk(t#vDJxTH^2ZsLlP@sKaTpnxn5UT-Bu)Ot z9EIRSu(%;O%UIMlAKK&8&){N-QN_-szj;oOgP{ z^=y{!J;%)w;v88p`M@P{_F@eskgbzX&+MH1cE+B~A+w^m7@a4tUn0ury!q%7UUndL udG#!Qut}3Y3aW#(Zl1II3FGGJd!>XpOpOgq(+n+4Cd>EAZoYP2T^RtaKTnzf diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 42118650227bcfeb1ce609c706224952fb69f6b0..414ff4f1d353b6c2b352c725a7d4c96c6da4ba7e 100644 GIT binary patch delta 32 ncmX@hc9v~}DYJx0a