diff --git a/app/Http/Controllers/MemosController.php b/app/Http/Controllers/MemosController.php
index e196bd4..4df0b91 100644
--- a/app/Http/Controllers/MemosController.php
+++ b/app/Http/Controllers/MemosController.php
@@ -63,12 +63,10 @@ class MemosController extends Controller
$created = $memos->sortByDesc('created_at')->first();
$updated = $memos->sortByDesc('updated_at')->first();
-// dd($count, $created, $updated);
-
return response(['data' => [
'count' => $count,
- 'last_created' => new MemoResource($created),
- 'last_updated' => new MemoResource($updated),
+ 'last_created' => ($created !== null) ? new MemoResource($created) : null,
+ 'last_updated' => ($updated !== null) ? new MemoResource($updated) : null,
]]);
}
diff --git a/resources/js/views/Memo/MemoEdit.vue b/resources/js/views/Memo/MemoEdit.vue
index 92e0465..068a3f2 100755
--- a/resources/js/views/Memo/MemoEdit.vue
+++ b/resources/js/views/Memo/MemoEdit.vue
@@ -10,7 +10,7 @@
:author="form.attributes.posted_by"
:id="form.memo_id"
:model="form.type"
- classes="cover"
+ classes="w-full"
:alt="form.name"/>
diff --git a/resources/js/views/Memo/MemoHome.vue b/resources/js/views/Memo/MemoHome.vue
index 95ce07c..09e7c2e 100644
--- a/resources/js/views/Memo/MemoHome.vue
+++ b/resources/js/views/Memo/MemoHome.vue
@@ -5,6 +5,12 @@
Memos
+
+
No Memo
+
+ Add Memos
+
+
{{ memos.count }} Memos
@@ -45,13 +51,13 @@ export default {
// eslint-disable-next-line no-undef
axios.get('/api/memos/home')
.then(response => {
- this.memos = response.data.data
- console.log(this.memos)
+ if (response.data.data.count !== 0) {
+ this.memos = response.data.data
+ }
this.loading = false
})
.catch(() => {
this.loading = false
- console.log('Unable to fetch memos.')
})
}
}
diff --git a/resources/js/views/Memo/MemoIndex.vue b/resources/js/views/Memo/MemoIndex.vue
index 0c50821..dd7e995 100755
--- a/resources/js/views/Memo/MemoIndex.vue
+++ b/resources/js/views/Memo/MemoIndex.vue
@@ -16,8 +16,8 @@
-
-
No memos yet. Get Started >
+
+
No memos yet. Get Started >
diff --git a/resources/js/views/Memo/MemoShow.vue b/resources/js/views/Memo/MemoShow.vue
index 5d1607d..ea52fc5 100755
--- a/resources/js/views/Memo/MemoShow.vue
+++ b/resources/js/views/Memo/MemoShow.vue
@@ -13,7 +13,7 @@