From 5ef8c424fd109639491e8bfdbdfe6d7958246eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Viricel?= <noe.viricel@wazo-lab.io>
Date: Mon, 7 Dec 2020 12:48:06 +0100
Subject: [PATCH] Add Skeleton for GridItem and Image + Refactor components
 architecture with more modularity + Delete Fruit feature

---
 package.json                                  |   1 +
 src/App.vue                                   |   6 +-
 src/components/{Modal.vue => AddFruit.vue}    | 141 +++++-------------
 .../Form/ImageUnsplash/ImageSkeleton.vue      |  23 +++
 .../Form/ImageUnsplash/ImageUnsplash.vue      | 125 ++++++++++++++++
 src/components/Grid.vue                       |  40 -----
 src/components/Grid/DeleteItem.vue            |  93 ++++++++++++
 src/components/Grid/Grid.vue                  |  83 +++++++++++
 src/components/{ => Grid}/GridItem.vue        |   7 +
 src/components/Grid/GridItemSkeleton.vue      |  26 ++++
 src/components/Skeleton.vue                   |  77 ----------
 src/store/actions.js                          |  32 ++--
 src/store/getters.js                          |   6 +-
 src/store/index.js                            |   3 +-
 src/store/mutations.js                        |   3 +
 src/views/Fruit.vue                           |   5 +
 src/views/Fruits.vue                          |   2 +-
 tests/unit/mutations.spec.js                  |   2 +-
 yarn.lock                                     |   9 +-
 19 files changed, 435 insertions(+), 249 deletions(-)
 rename src/components/{Modal.vue => AddFruit.vue} (50%)
 create mode 100644 src/components/Form/ImageUnsplash/ImageSkeleton.vue
 create mode 100644 src/components/Form/ImageUnsplash/ImageUnsplash.vue
 delete mode 100644 src/components/Grid.vue
 create mode 100644 src/components/Grid/DeleteItem.vue
 create mode 100644 src/components/Grid/Grid.vue
 rename src/components/{ => Grid}/GridItem.vue (92%)
 create mode 100644 src/components/Grid/GridItemSkeleton.vue
 delete mode 100644 src/components/Skeleton.vue

diff --git a/package.json b/package.json
index 0073533..d02831d 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "core-js": "^3.6.5",
     "fruit-api": "^1.1.3",
     "vue": "^2.6.11",
+    "vue-content-loading": "^1.6.0",
     "vue-moment": "^4.1.0",
     "vue-router": "^3.2.0",
     "vuex": "^3.4.0"
diff --git a/src/App.vue b/src/App.vue
index c71b823..beaf97c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,7 +4,7 @@
     <main>
       <router-view />
     </main>
-    <Modal v-if="modalIsOpen" />
+    <AddFruit v-if="modalIsOpen" />
     <Footer />
   </div>
 </template>
@@ -13,14 +13,14 @@
 import { mapState } from "vuex";
 import Footer from "@/components/Footer";
 import Header from "@/components/Header";
-import Modal from "@/components/Modal";
+import AddFruit from "@/components/AddFruit";
 
 export default {
   name: "App",
   components: {
     Footer,
     Header,
-    Modal
+    AddFruit
   },
   computed: {
     ...mapState(["modalIsOpen"])
diff --git a/src/components/Modal.vue b/src/components/AddFruit.vue
similarity index 50%
rename from src/components/Modal.vue
rename to src/components/AddFruit.vue
index 7606412..70b613f 100644
--- a/src/components/Modal.vue
+++ b/src/components/AddFruit.vue
@@ -4,45 +4,23 @@
     <form id="new-fruit">
       <!-- name -->
       <p>
-        <input type="text" v-model="fruit.name" placeholder="Name" />
+        <input ref="autofocus" type="text" v-model="fruit.name" placeholder="Name" />
       </p>
 
       <!-- image finder (with Unsplash API) -->
-      <div class="image-uploader">
-        <label for="fruit-thumbnail">Image</label>
-        <!-- Loading placeholder -->
-        <Skeleton v-if="loading" width="100%" height="180px" />
+      <ImageUnsplash
+        @getValue="getImage"
+        label="Image"
+        placeholder="Search: strawberry, apple ..."
+      />
 
-        <!-- Image preview -->
-        <img
-          class="preview"
-          v-if="!loading && imagePreview"
-          :src="imagePreview.urls.regular"
-          :alt="imagePreview.alt_description"
-        />
-
-        <!-- API error messages -->
-        <p class="error" v-if="error">{{ error }}</p>
-
-        <!-- Search input -->
-        <div class="search-box">
-          <input
-            id="fruit-thumbnail"
-            type="search"
-            placeholder="Search: strawberry, orange ..."
-            @change="handleSearch"
-          />
-        </div>
-      </div>
-      <!-- taste -->
-      <p>
+      <div class="input-group">
+        <!-- taste -->
         <input type="text" v-model="fruit.taste" placeholder="Taste" />
-      </p>
 
-      <!-- color -->
-      <p>
+        <!-- color -->
         <input type="color" v-model="fruit.color" placeholder="Color" />
-      </p>
+      </div>
 
       <!-- price -->
       <p>
@@ -63,39 +41,28 @@
 </template>
 
 <script>
-import Skeleton from "./Skeleton";
+import ImageUnsplash from "./Form/ImageUnsplash/ImageUnsplash";
 
 export default {
-  name: "Modal",
-  components: { Skeleton },
+  name: "AddFruit",
+  components: { ImageUnsplash },
   data() {
     return {
-      loading: false,
-      fruit: {},
-      error: null,
-      imagePreview: null
+      fruit: {}
     };
   },
+  mounted() {
+    this.$refs["autofocus"].focus();
+  },
   methods: {
-    handleUpload(e) {
-      console.log(e);
-    },
-    async handleSearch(e) {
-      this.error = null;
-      if (e.target.value != "") {
-        this.loading = true;
-        this.$store
-          .dispatch("getImageFromUnsplash", e.target.value)
-          .then(res => (this.imagePreview = res))
-          .catch(err => (this.error = err.message))
-          .finally(() => (this.loading = false));
-      } else this.imagePreview = null;
+    getImage(url) {
+      this.fruit.image = url;
     }
   }
 };
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
 .modal {
   position: absolute;
   top: @headerHeight;
@@ -116,14 +83,23 @@ export default {
     box-shadow: 0 1px 4px 1px #d2d2f2;
     padding: 1rem;
 
-    label {
-      display: block;
-      font-weight: bold;
-      margin-bottom: 0.5rem;
+    .input-group {
+      display: flex;
+      align-items: center;
+      margin: 1rem 0;
+
+      [type="color"] {
+        width: 35%;
+        height: 48px;
+      }
+
+      :first-child {
+        margin-right: 1rem;
+      }
     }
 
     input,
-    .image-uploader {
+    .image-unsplash {
       box-sizing: border-box;
       width: 100%;
       border-radius: 4px;
@@ -131,55 +107,6 @@ export default {
       background-color: @color-2;
       padding: 0.75rem 1rem;
     }
-
-    .image-uploader {
-      .preview,
-      .skeleton {
-        margin-bottom: 1rem;
-      }
-
-      .preview {
-        width: 100%;
-        object-fit: scale-down;
-        height: 180px;
-      }
-
-      .error {
-        color: #d63031;
-        text-align: center;
-      }
-
-      .search-box {
-        position: relative;
-        z-index: 0;
-
-        &:focus-within::after {
-          opacity: 1;
-        }
-
-        &::after {
-          content: url("data:image/svg+xml,%3Csvg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='0 0 350.439 350.439' style='enable-background:new 0 0 350.439 350.439;' xml:space='preserve'%3E%3Cg%3E%3Cpath d='M312.856,36.464H202.507c-4.87,0-8.83,3.961-8.83,8.832v138.422H52.371c-4.87,0-8.832,3.973-8.832,8.843v108.023 c0,4.87,3.961,8.831,8.832,8.831l260.474-0.071c4.873,0,8.838-3.962,8.838-8.843l0.011-255.211 C321.701,40.425,317.737,36.464,312.856,36.464z M175.216,253.617c0,5.724-4.635,10.353-10.356,10.353h-57.814 c-0.392,0-0.775-0.022-1.155-0.065v0.887l8.294,21.002c0.281,0.7,0.057,1.51-0.551,1.965c-0.301,0.229-0.658,0.344-1.013,0.344 c-0.364,0-0.722-0.12-1.025-0.355l-41.251-31.715c-0.416-0.318-0.657-0.816-0.657-1.33c0-0.531,0.241-1.023,0.657-1.345 l41.251-31.712c0.6-0.463,1.433-0.463,2.038-0.011c0.603,0.459,0.827,1.258,0.551,1.958l-7.776,19.694 c0.21-0.011,0.418-0.033,0.637-0.033h47.462v-34.715c0-5.724,4.637-10.353,10.352-10.353c5.721,0,10.356,4.629,10.356,10.353 V253.617z M332.215,7.41H174.623c-10.062,0-18.221,8.159-18.221,18.225v126.679H18.223C8.159,152.314,0,160.479,0,170.541v154.267 c0,10.063,8.159,18.222,18.223,18.222h157.588c0.346,0,0.667-0.087,1.008-0.099h155.375c10.065,0,18.228-8.164,18.228-18.232 V180.074c0-0.066,0.018-0.121,0.018-0.176V25.635C350.439,15.569,342.273,7.41,332.215,7.41z M329.535,300.512 c0,9.205-7.483,16.69-16.69,16.69H204.052c-0.078,0.043-0.383,0.076-0.705,0.076H52.371c-9.202,0-16.688-7.485-16.688-16.689 V192.571c0-9.209,7.485-16.689,16.688-16.689h133.453V45.295c0-9.201,7.485-16.687,16.684-16.687h110.349 c9.204,0,16.689,7.486,16.689,16.687L329.535,300.512z'/%3E%3C/g%3E%3C/svg%3E");
-          position: absolute;
-          z-index: 1;
-          top: 50%;
-          right: 0.3rem;
-          width: 24px;
-          height: 24px;
-          transform: translateY(-50%);
-          opacity: 0.4;
-        }
-
-        [type="search"] {
-          padding-right: 2.35rem;
-          border: none;
-          background-color: lighten(#cecece, 15%);
-        }
-      }
-
-      [type="file"] {
-        border: none;
-      }
-    }
   }
 }
 </style>
diff --git a/src/components/Form/ImageUnsplash/ImageSkeleton.vue b/src/components/Form/ImageUnsplash/ImageSkeleton.vue
new file mode 100644
index 0000000..838a598
--- /dev/null
+++ b/src/components/Form/ImageUnsplash/ImageSkeleton.vue
@@ -0,0 +1,23 @@
+<template>
+  <VueContentLoading
+    :style="{ backgroundColor: '#ffffff', padding: '1rem', borderRadius: '10px' }"
+    primary="#cecece"
+    :width="300"
+    :height="180"
+  >
+    <rect x="0" y="0" rx="4" ry="4" width="300" height="180" />
+  </VueContentLoading>
+</template>
+
+<script>
+import VueContentLoading from "vue-content-loading";
+
+export default {
+  name: "ImageSkeleton",
+  components: {
+    VueContentLoading
+  }
+};
+</script>
+
+<style lang="less"></style>
diff --git a/src/components/Form/ImageUnsplash/ImageUnsplash.vue b/src/components/Form/ImageUnsplash/ImageUnsplash.vue
new file mode 100644
index 0000000..daedb33
--- /dev/null
+++ b/src/components/Form/ImageUnsplash/ImageUnsplash.vue
@@ -0,0 +1,125 @@
+<template>
+  <div class="image-unsplash">
+    <label for="search-unsplash">{{ label }}</label>
+    <!-- Loading placeholder -->
+    <ImageSkeleton v-if="loading" />
+
+    <!-- Image preview -->
+    <img
+      class="preview"
+      v-if="!loading && !error && preview"
+      :src="preview.urls.regular"
+      :alt="preview.alt_description"
+    />
+
+    <!-- API error messages -->
+    <p class="error" v-if="error">{{ error }}</p>
+
+    <!-- Search input -->
+    <div class="search-box">
+      <input id="search-unsplash" type="search" :placeholder="placeholder" @change="handleSearch" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from "vuex";
+import ImageSkeleton from "./ImageSkeleton";
+
+export default {
+  name: "ImageUnsplash",
+  components: {
+    ImageSkeleton
+  },
+  props: {
+    label: {
+      type: String,
+      default: "Image (from Unsplash)"
+    },
+    placeholder: {
+      type: String,
+      default: "Type anything !"
+    }
+  },
+  data() {
+    return {
+      error: null,
+      preview: null
+    };
+  },
+  computed: {
+    ...mapState(["loading"])
+  },
+  methods: {
+    async handleSearch(e) {
+      this.error = null;
+      if (e.target.value != "") {
+        await this.$store
+          .dispatch("getImageFromUnsplash", e.target.value)
+          .then(res => {
+            this.preview = res;
+            this.$emit("getValue", res.urls.regular);
+          })
+          .catch(err => (this.error = err.message));
+      } else this.preview = null;
+    }
+  }
+};
+</script>
+
+<style scoped lang="less">
+.image-unsplash {
+  label {
+    display: block;
+    font-weight: bold;
+    margin-bottom: 0.5rem;
+  }
+
+  .preview,
+  .skeleton {
+    margin-bottom: 1rem;
+  }
+
+  .preview {
+    width: 100%;
+    object-fit: scale-down;
+    height: 180px;
+  }
+
+  .error {
+    color: #d63031;
+    text-align: center;
+  }
+
+  .search-box {
+    position: relative;
+    z-index: 0;
+
+    &:focus-within::after {
+      opacity: 1;
+    }
+
+    &::after {
+      content: url("data:image/svg+xml,%3Csvg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='0 0 350.439 350.439' style='enable-background:new 0 0 350.439 350.439;' xml:space='preserve'%3E%3Cg%3E%3Cpath d='M312.856,36.464H202.507c-4.87,0-8.83,3.961-8.83,8.832v138.422H52.371c-4.87,0-8.832,3.973-8.832,8.843v108.023 c0,4.87,3.961,8.831,8.832,8.831l260.474-0.071c4.873,0,8.838-3.962,8.838-8.843l0.011-255.211 C321.701,40.425,317.737,36.464,312.856,36.464z M175.216,253.617c0,5.724-4.635,10.353-10.356,10.353h-57.814 c-0.392,0-0.775-0.022-1.155-0.065v0.887l8.294,21.002c0.281,0.7,0.057,1.51-0.551,1.965c-0.301,0.229-0.658,0.344-1.013,0.344 c-0.364,0-0.722-0.12-1.025-0.355l-41.251-31.715c-0.416-0.318-0.657-0.816-0.657-1.33c0-0.531,0.241-1.023,0.657-1.345 l41.251-31.712c0.6-0.463,1.433-0.463,2.038-0.011c0.603,0.459,0.827,1.258,0.551,1.958l-7.776,19.694 c0.21-0.011,0.418-0.033,0.637-0.033h47.462v-34.715c0-5.724,4.637-10.353,10.352-10.353c5.721,0,10.356,4.629,10.356,10.353 V253.617z M332.215,7.41H174.623c-10.062,0-18.221,8.159-18.221,18.225v126.679H18.223C8.159,152.314,0,160.479,0,170.541v154.267 c0,10.063,8.159,18.222,18.223,18.222h157.588c0.346,0,0.667-0.087,1.008-0.099h155.375c10.065,0,18.228-8.164,18.228-18.232 V180.074c0-0.066,0.018-0.121,0.018-0.176V25.635C350.439,15.569,342.273,7.41,332.215,7.41z M329.535,300.512 c0,9.205-7.483,16.69-16.69,16.69H204.052c-0.078,0.043-0.383,0.076-0.705,0.076H52.371c-9.202,0-16.688-7.485-16.688-16.689 V192.571c0-9.209,7.485-16.689,16.688-16.689h133.453V45.295c0-9.201,7.485-16.687,16.684-16.687h110.349 c9.204,0,16.689,7.486,16.689,16.687L329.535,300.512z'/%3E%3C/g%3E%3C/svg%3E");
+      position: absolute;
+      z-index: 1;
+      top: 50%;
+      right: 0.3rem;
+      width: 24px;
+      height: 24px;
+      transform: translateY(-50%);
+      opacity: 0.4;
+    }
+
+    [type="search"] {
+      padding-right: 2.35rem;
+      border: none;
+      background-color: lighten(#cecece, 15%);
+    }
+  }
+
+  [type="file"] {
+    border: none;
+  }
+}
+</style>
diff --git a/src/components/Grid.vue b/src/components/Grid.vue
deleted file mode 100644
index c42b23a..0000000
--- a/src/components/Grid.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
-  <div class="grid">
-    <GridItem :key="item.id" v-for="item in data" :item="item" />
-  </div>
-</template>
-
-<script>
-import GridItem from "./GridItem";
-
-export default {
-  name: "Grid",
-  components: {
-    GridItem
-  },
-  props: {
-    data: Array
-  }
-};
-</script>
-
-<style scoped lang="less">
-.grid {
-  display: grid;
-  grid-template-columns: 1fr;
-  column-gap: 1rem;
-  row-gap: 1.5rem;
-
-  @media screen and (min-width: @md) {
-    grid-template-columns: repeat(2, 1fr);
-  }
-
-  @media screen and (min-width: @lg) {
-    grid-template-columns: repeat(3, 1fr);
-  }
-
-  @media screen and (min-width: @xl) {
-    grid-template-columns: repeat(4, 1fr);
-  }
-}
-</style>
diff --git a/src/components/Grid/DeleteItem.vue b/src/components/Grid/DeleteItem.vue
new file mode 100644
index 0000000..498e395
--- /dev/null
+++ b/src/components/Grid/DeleteItem.vue
@@ -0,0 +1,93 @@
+<template>
+  <div>
+    <button class="delete-btn" @click="showPrompt">
+      🚮
+    </button>
+    <div v-if="openPrompt" :class="{ open: openPrompt }" class="prompt">
+      <h3>You will delete '{{ item.name }}'?</h3>
+      <div class="actions">
+        <button class="btn btn-cancel" @click="openPrompt = false">No</button>
+        <button class="btn btn-success" @click="removeFruit(item.id)">Yes</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "DeleteItem",
+  props: {
+    item: Object,
+    redirect: {
+      type: Function,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      openPrompt: false
+    };
+  },
+  methods: {
+    showPrompt() {
+      this.openPrompt = true;
+    },
+    removeFruit(id) {
+      this.$store.dispatch("removeFruit", id).then(() => this.redirect());
+    }
+  }
+};
+</script>
+
+<style scoped lang="less">
+.prompt {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 2;
+  background: rgb(230, 107, 107);
+  background: linear-gradient(90deg, rgba(230, 107, 107, 1) 0%, rgba(214, 48, 49, 1) 100%);
+  width: 0;
+  height: 0;
+  transition: all 0.4s ease-in-out;
+  color: @color-2;
+  display: flex;
+  flex-flow: column;
+  align-items: center;
+  justify-content: center;
+
+  &.open {
+    width: 100%;
+    height: 100%;
+  }
+
+  .btn {
+    border: none;
+    border-radius: 4px;
+    color: @color-2;
+    padding: 0.5rem 1.35rem;
+    margin: 0 0.5rem;
+  }
+
+  .btn-success {
+    background-color: #2ecc71;
+  }
+
+  .btn-cancel {
+    background-color: darken(#cecece, 15%);
+  }
+}
+
+.delete-btn {
+  position: absolute;
+  z-index: 1;
+  top: 0;
+  right: 0;
+  width: 55px;
+  padding: 0.75rem 0.75rem 1.35rem 1.35rem;
+  background: rgb(230, 107, 107);
+  background: linear-gradient(180deg, rgba(230, 107, 107, 0.6) 0%, rgba(214, 48, 49, 1) 100%);
+  border: none;
+  border-bottom-left-radius: 100%;
+}
+</style>
diff --git a/src/components/Grid/Grid.vue b/src/components/Grid/Grid.vue
new file mode 100644
index 0000000..517a904
--- /dev/null
+++ b/src/components/Grid/Grid.vue
@@ -0,0 +1,83 @@
+<template>
+  <div :class="{ error: !loading && !data.length }" class="grid">
+    <!-- Loading placeholder -->
+    <GridItemSkeleton v-if="loading" />
+    <GridItemSkeleton v-if="loading" />
+
+    <!-- Items -->
+    <GridItem v-else :key="item.id" v-for="item in data" :item="item" />
+
+    <!-- Error messages -->
+    <p v-if="!loading && !data.length" class="alert"><b>💡 Restart API</b>: 0 fruits !</p>
+  </div>
+</template>
+
+<script>
+import { mapState } from "vuex";
+import GridItemSkeleton from "./GridItemSkeleton";
+import GridItem from "./GridItem";
+
+export default {
+  name: "Grid",
+  components: {
+    GridItemSkeleton,
+    GridItem
+  },
+  props: {
+    data: Array
+  },
+  computed: {
+    ...mapState(["loading"])
+  }
+};
+</script>
+
+<style scoped lang="less">
+.grid {
+  display: grid;
+  grid-template-columns: 1fr;
+  column-gap: 1rem;
+  row-gap: 1.5rem;
+
+  &.error {
+    display: block;
+  }
+
+  @media screen and (min-width: @md) {
+    grid-template-columns: repeat(2, 1fr);
+  }
+
+  @media screen and (min-width: @lg) {
+    grid-template-columns: repeat(3, 1fr);
+  }
+
+  @media screen and (min-width: @xl) {
+    grid-template-columns: repeat(4, 1fr);
+  }
+
+  .alert {
+    box-sizing: border-box;
+    margin: 0 auto;
+    width: 80%;
+    background-color: @color-3;
+    color: @color-2;
+    padding: 1rem 1.5rem;
+    border-radius: 4px;
+
+    @media screen and (min-width: @sm) {
+      width: 50%;
+      max-width: 535px;
+    }
+
+    pre {
+      padding: 1rem;
+      border-radius: 4px;
+      background-color: rgb(45, 48, 55);
+
+      span {
+        color: @color-3;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/GridItem.vue b/src/components/Grid/GridItem.vue
similarity index 92%
rename from src/components/GridItem.vue
rename to src/components/Grid/GridItem.vue
index 834e90c..f5ae988 100644
--- a/src/components/GridItem.vue
+++ b/src/components/Grid/GridItem.vue
@@ -1,5 +1,6 @@
 <template>
   <article class="grid-item">
+    <DeleteItem :item="item" />
     <router-link :to="`/fruit/${item.id}`">
       <div class="thumbnail">
         <img :src="item.image" :alt="item.name" />
@@ -19,7 +20,11 @@
 </template>
 
 <script>
+import DeleteItem from "./DeleteItem";
+
 export default {
+  name: "GridItem",
+  components: { DeleteItem },
   props: {
     item: Object
   },
@@ -33,6 +38,8 @@ export default {
 
 <style scoped lang="less">
 .grid-item {
+  position: relative;
+  z-index: 0;
   background-color: @color-2;
   border-radius: 10px;
   overflow: hidden;
diff --git a/src/components/Grid/GridItemSkeleton.vue b/src/components/Grid/GridItemSkeleton.vue
new file mode 100644
index 0000000..c664889
--- /dev/null
+++ b/src/components/Grid/GridItemSkeleton.vue
@@ -0,0 +1,26 @@
+<template>
+  <VueContentLoading
+    :style="{ backgroundColor: '#ffffff', padding: '1rem', borderRadius: '10px' }"
+    primary="#cecece"
+    :width="300"
+    :height="220"
+  >
+    <rect x="0" y="0" rx="4" ry="4" width="100%" height="100" />
+    <rect x="30" y="110" rx="4" ry="4" width="80%" height="15" />
+    <rect x="100px" y="150" width="100" height="2" />
+    <rect x="100px" y="175" rx="4" ry="4" width="100" height="35" />
+  </VueContentLoading>
+</template>
+
+<script>
+import VueContentLoading from "vue-content-loading";
+
+export default {
+  name: "GridItemSkeleton",
+  components: {
+    VueContentLoading
+  }
+};
+</script>
+
+<style lang="less"></style>
diff --git a/src/components/Skeleton.vue b/src/components/Skeleton.vue
deleted file mode 100644
index 2807fb2..0000000
--- a/src/components/Skeleton.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <span :style="{ height, width: computedWidth }" class="skeleton" />
-</template>
-
-<script>
-export default {
-  name: "Skeleton",
-  props: {
-    maxWidth: {
-      // The default maxiumum width is 100%.
-      default: 100,
-      type: Number
-    },
-    minWidth: {
-      // Lines have a minimum width of 80%.
-      default: 80,
-      type: Number
-    },
-    height: {
-      // Make lines the same height as text.
-      default: "1em",
-      type: String
-    },
-    width: {
-      // Make it possible to define a fixed
-      // width instead of using a random one.
-      default: null,
-      type: String
-    }
-  },
-  computed: {
-    computedWidth() {
-      // Either use the given fixed width or
-      // a random width between the given min
-      // and max values.
-      return (
-        this.width ||
-        `${Math.floor(Math.random() * (this.maxWidth - this.minWidth) + this.minWidth)}%`
-      );
-    }
-  }
-};
-</script>
-
-<style lang="less">
-.skeleton {
-  display: inline-block;
-  position: relative;
-  overflow: hidden;
-  vertical-align: middle;
-  background-color: darken(#dddbdd, 8%);
-
-  &::after {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    transform: translateX(-100%);
-    background-image: linear-gradient(
-      90deg,
-      rgba(#fff, 0) 0,
-      rgba(#fff, 0.2) 20%,
-      rgba(#fff, 0.5) 60%,
-      rgba(#fff, 0)
-    );
-    animation: shimmer 5s infinite;
-    content: "";
-  }
-
-  @keyframes shimmer {
-    100% {
-      transform: translateX(100%);
-    }
-  }
-}
-</style>
diff --git a/src/store/actions.js b/src/store/actions.js
index 1daf38c..489861a 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -9,25 +9,31 @@ export default {
       })
       .catch(err => {
         if (err.message === "Network Error") throw "Check API connectivity ...";
-      });
+      })
+      .finally(() => commit("setLoading", false));
   },
   getFruit: async ({ commit }, id) => {
-    const response = await axios.get(`http://localhost:3000/fruit/${id}`);
-    commit("setFruit", response.data);
+    await axios.get(`http://localhost:3000/fruit/${id}`).then(res => commit("setFruit", res.data));
   },
-  getImageFromUnsplash: async (_, keyword) => {
-    const response = await axios.get(
-      `https://api.unsplash.com/search/photos?query=${keyword}&w=800&h=400`,
-      {
+  removeFruit: async ({ commit }, id) => {
+    await axios
+      .delete(`http://localhost:3000/fruit/${id}`)
+      .then(() => commit("removeFruit", id))
+      .catch(err => console.log(err));
+  },
+  getImageFromUnsplash: async ({ commit }, keyword) => {
+    commit("setLoading", true);
+    return await axios
+      .get(`https://api.unsplash.com/search/photos?query=${keyword}&w=800&h=400`, {
         headers: {
           Authorization: "Client-ID NjFwGYsnksnzH2uh12W55aobUpTe0h06oSVACd5cWt0",
           "X-Total": 1
         }
-      }
-    );
-
-    if (response.data.total === 0) throw new Error("0 found.");
-
-    return response.data.results[0];
+      })
+      .then(res => {
+        if (res.data.total === 0) throw new Error("0 found.");
+        return res.data.results[0];
+      })
+      .finally(() => commit("setLoading", false));
   }
 };
diff --git a/src/store/getters.js b/src/store/getters.js
index 89677ad..ff8b4c5 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,5 +1 @@
-export default {
-  parsedFruits: () => {
-    return [{ id: 1 }];
-  }
-};
+export default {};
diff --git a/src/store/index.js b/src/store/index.js
index 5ca38c7..a451fa7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -7,7 +7,8 @@ import getters from "./getters";
 export const state = {
   fruits: [],
   fruit: {},
-  modalIsOpen: false
+  modalIsOpen: false,
+  loading: true
 };
 
 Vue.use(Vuex);
diff --git a/src/store/mutations.js b/src/store/mutations.js
index 5baaa7d..e917e73 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -15,5 +15,8 @@ export default {
   },
   toggleModal: state => {
     state.modalIsOpen = !state.modalIsOpen;
+  },
+  setLoading: (state, loading) => {
+    state.loading = loading;
   }
 };
diff --git a/src/views/Fruit.vue b/src/views/Fruit.vue
index 30c6deb..199b5fa 100644
--- a/src/views/Fruit.vue
+++ b/src/views/Fruit.vue
@@ -5,6 +5,7 @@
     <article>
       <img :src="fruit.image" :alt="fruit.name" />
       <section>
+        <DeleteItem :item="fruit" :redirect="() => $router.push('/')" />
         <h3>
           {{ fruit.name }}
           <span class="tag" :style="{ backgroundColor: fruit.color }">{{ fruit.taste }}</span>
@@ -25,9 +26,11 @@
 
 <script>
 import { mapState } from "vuex";
+import DeleteItem from "@/components/Grid/DeleteItem";
 
 export default {
   name: "FruitDetails",
+  components: { DeleteItem },
   data() {
     return {
       modalOpen: true
@@ -69,6 +72,8 @@ article {
   }
 
   section {
+    position: relative;
+    z-index: 0;
     padding: 1.5rem 2rem;
     background-color: @color-2;
 
diff --git a/src/views/Fruits.vue b/src/views/Fruits.vue
index 989e57e..3e13ecf 100644
--- a/src/views/Fruits.vue
+++ b/src/views/Fruits.vue
@@ -11,7 +11,7 @@
 
 <script>
 import { mapState } from "vuex";
-import Grid from "@/components/Grid";
+import Grid from "@/components/Grid/Grid";
 
 export default {
   name: "Fruits",
diff --git a/tests/unit/mutations.spec.js b/tests/unit/mutations.spec.js
index 228fb1c..bfea558 100644
--- a/tests/unit/mutations.spec.js
+++ b/tests/unit/mutations.spec.js
@@ -15,7 +15,7 @@ let fruit = {
   expires: "2021-04-11T08:54:24.588Z"
 };
 
-describe("Test Vuex mutations.", () => {
+describe("Vuex mutations.", () => {
   it("tests setFruits mutation.", () => {
     setFruits(state, [fruit]);
     expect(state.fruits[0].id).toBe(3);
diff --git a/yarn.lock b/yarn.lock
index f0c1a1b..e6ae8dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11032,6 +11032,13 @@ vm-browserify@^1.0.1:
   resolved "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha1-eGQcSIuObKkadfUR56OzKobl3aA=
 
+vue-content-loading@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/vue-content-loading/-/vue-content-loading-1.6.0.tgz#8ba1e21e27b8932712bea62b5a00320277a98fdd"
+  integrity sha512-D8vVW8eUhDE1VsX/gMRKjgNEVlPG4E4jKCuQjiv75VwnznFRjCGpoU2LABrSzmf6V/hb8ow8rHrFPuz3jVNsqA==
+  dependencies:
+    vue "^2.5.13"
+
 vue-eslint-parser@^7.0.0:
   version "7.2.0"
   resolved "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-7.2.0.tgz?cache=0&sync_timestamp=1606966106135&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-7.2.0.tgz#1e17ae94ca71e617025e05143c8ac5593aacb6ef"
@@ -11119,7 +11126,7 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
   resolved "https://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=
 
-vue@^2.6.11:
+vue@^2.5.13, vue@^2.6.11:
   version "2.6.12"
   resolved "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1606946138346&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123"
   integrity sha1-9evU+mvShpQD4pqJau1JBEVskSM=