From 5350c5c46baef0f3215a127c1614cda16a5d30bf Mon Sep 17 00:00:00 2001
From: krzysiej <krzysztofplaczek@techtube.pl>
Date: Tue, 14 Jun 2022 15:19:21 +0200
Subject: [PATCH] Migrated progress bar and progress editor to vuex.

---
 assets/js/api/book.js                   | 13 +++++
 assets/js/files.js                      |  3 +-
 assets/js/pages/booklisting.vue         |  3 +-
 assets/js/pages/booklistingheader.vue   |  5 +-
 assets/js/pages/progressbar.vue         | 28 ++++------
 assets/js/pages/progresseditor.vue      | 33 +++++-------
 assets/js/store/index.js                | 12 ++---
 assets/js/store/modules/bookprogress.js | 70 +++++++++++++++++++++++++
 assets/js/store/modules/books.js        | 13 +++--
 assets/js/store/mutation-types.js       |  7 +++
 10 files changed, 131 insertions(+), 56 deletions(-)
 create mode 100644 assets/js/store/modules/bookprogress.js
 create mode 100644 assets/js/store/mutation-types.js

diff --git a/assets/js/api/book.js b/assets/js/api/book.js
index ac81b15..ab20e5d 100644
--- a/assets/js/api/book.js
+++ b/assets/js/api/book.js
@@ -6,5 +6,18 @@ export default {
             params: {title: searchTitle},
             headers: {'accept': 'application/json'}
         })
+    },
+    bookUpdateProgress(bookId, progress) {
+        console.info(bookId);
+        console.info(progress);
+        return axios.post('/progress/update', {
+            bookId: bookId,
+            progress: progress
+        }, {
+            headers: {
+                'content-type': 'text/json'
+            }
+        })
     }
+
 }
\ No newline at end of file
diff --git a/assets/js/files.js b/assets/js/files.js
index aaaf5e4..c4a8e8c 100644
--- a/assets/js/files.js
+++ b/assets/js/files.js
@@ -2,8 +2,9 @@ import Vue from 'vue';
 import Files from "./pages/files";
 import Progressbar from "./pages/progressbar";
 import Progresseditor from "./pages/progresseditor";
+import store from "./store/index";
 
 Vue.component('Files', Files);
 Vue.component('Progressbar', Progressbar);
 Vue.component('Progresseditor', Progresseditor);
-new Vue().$mount('#app');
\ No newline at end of file
+new Vue({store}).$mount('#app');
\ No newline at end of file
diff --git a/assets/js/pages/booklisting.vue b/assets/js/pages/booklisting.vue
index 86fac22..4f350d3 100644
--- a/assets/js/pages/booklisting.vue
+++ b/assets/js/pages/booklisting.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <input type="text" class="form-control" v-model="searchTerm" @keydown.enter="search"/>
+    <input type="text" class="form-control" placeholder="search by title" v-model="searchTerm" @keydown.enter="search"/>
     <table class="table">
       <thead>
       <tr>
@@ -58,7 +58,6 @@ export default {
       'findAll'
     ]),
     search: function () {
-      this.$store.commit('increment')
       this.updateHistory();
       this.findAll(this.searchTerm);
     },
diff --git a/assets/js/pages/booklistingheader.vue b/assets/js/pages/booklistingheader.vue
index 0f2d6aa..0ae8c2c 100644
--- a/assets/js/pages/booklistingheader.vue
+++ b/assets/js/pages/booklistingheader.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
-    <h1 v-if="searchTitle" v-html="'Book search: '+searchTitle"></h1>
+    <h1 v-if="isSearching" v-html="'Book search: '+searchTitle"></h1>
     <h1 v-else>Book list</h1>
   </div>
 </template>
 
 <script>
-import {mapState} from "vuex";
+import {mapGetters, mapState} from "vuex";
 
 export default {
   name: 'BookListingHeader',
@@ -17,6 +17,7 @@ export default {
   },
   computed: {
     ...mapState('booksmodule', ['searchTitle']),
+    ...mapGetters('booksmodule', ['isSearching'])
   },
 }
 </script>
\ No newline at end of file
diff --git a/assets/js/pages/progressbar.vue b/assets/js/pages/progressbar.vue
index ff38ae7..e361b6e 100644
--- a/assets/js/pages/progressbar.vue
+++ b/assets/js/pages/progressbar.vue
@@ -1,41 +1,31 @@
 <template>
   <div>
     <div class="progress" style="height: 2px;">
-      <div class="progress-bar" role="progressbar" :style="{width:progress+'%'}"></div>
-      <div class="progress-bar bg-secondary bg-opacity-10" role="progressbar" :style="{width:100-progress+'%'}"></div>
+      <div class="progress-bar" role="progressbar" :style="{width:progressPercent+'%'}"></div>
+      <div class="progress-bar bg-secondary bg-opacity-10" role="progressbar"
+           :style="{width:100-progressPercent+'%'}"></div>
     </div>
   </div>
 </template>
 
 <script>
-import {EventBus} from "../event-bus";
+import {UPDATING_PROGRESS_SUCCESS} from '../store/mutation-types'
+import {mapState} from "vuex";
 
 export default {
   name: 'Progressbar',
-  components: {
-    EventBus
-  },
   props: {
     totalPages: Number,
     readPages: Number
   },
-  data() {
-    return {
-      newProgress: this.readPages
-    }
-  },
   computed: {
-    progress() {
-      return Math.round(this.newProgress / this.totalPages * 100);
+    ...mapState('bookprogressmodule', ['progress']),
+    progressPercent() {
+      return Math.round(this.progress / this.totalPages * 100);
     }
   },
-  mounted() {
-  },
   created() {
-    window.EventBus.$on('updateProgress', (data) => {
-      this.newProgress = data.readPages;
-    });
+    this.$store.commit('bookprogressmodule/' + UPDATING_PROGRESS_SUCCESS, this.readPages);
   },
-  methods: {}
 }
 </script>
\ No newline at end of file
diff --git a/assets/js/pages/progresseditor.vue b/assets/js/pages/progresseditor.vue
index 8f2c350..a59bd10 100644
--- a/assets/js/pages/progresseditor.vue
+++ b/assets/js/pages/progresseditor.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
-    <span @click="edit" v-if="!editmode">
+    <span @click="edit" v-if="!isEditMode">
       {{ newProgress }} pages | {{ progress }}%
     </span>
-    <span v-show="editmode">
+    <span v-show="isEditMode">
       <input type="number" @keydown.esc="cancelEdit" @keydown.enter="submit" ref="readPagesInput" min="0"
              :max="totalPages" v-model.number="newProgress"/>
     </span>
@@ -12,7 +12,8 @@
 
 <script>
 import {EventBus} from "../event-bus";
-import axios from "axios";
+import {mapActions, mapGetters} from "vuex";
+import {TURN_ON_EDIT_MODE, TURN_OFF_EDIT_MODE} from '../store/mutation-types'
 
 export default {
   name: 'Progresseditor',
@@ -26,40 +27,32 @@ export default {
   },
   data() {
     return {
-      editmode: false,
       newProgress: this.readPages
     }
   },
   computed: {
     progress() {
       return Math.round(this.newProgress / this.totalPages * 100);
-    }
-  },
-  mounted() {
+    },
+    ...mapGetters('bookprogressmodule', ['isEditMode'])
   },
   created() {
     this.newProgress = this.readPages;
   },
   methods: {
+    ...mapActions('bookprogressmodule', [
+      'updateProgress'
+    ]),
     edit: function () {
-      this.editmode = true;
+      this.$store.commit('bookprogressmodule/' + TURN_ON_EDIT_MODE);
       setTimeout(() => this.$refs.readPagesInput.focus(), 1)
     },
     cancelEdit: function () {
-      this.editmode = false;
+      this.$store.commit('bookprogressmodule/' + TURN_OFF_EDIT_MODE);
     },
     submit: function () {
-      this.editmode = false;
-      axios.post('/progress/update', {
-        bookId: this.bookId,
-        progress: this.newProgress
-      }, {
-        headers: {
-          'content-type': 'text/json'
-        }
-      }).then(() => {
-        window.EventBus.$emit('updateProgress', {readPages: this.newProgress});
-      })
+      this.$store.commit('bookprogressmodule/' + TURN_OFF_EDIT_MODE);
+      this.updateProgress({'bookId': this.bookId, 'progress': this.newProgress});
     }
   }
 }
diff --git a/assets/js/store/index.js b/assets/js/store/index.js
index 7cf58a1..65bcf31 100644
--- a/assets/js/store/index.js
+++ b/assets/js/store/index.js
@@ -1,20 +1,14 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import booksmodule from './modules/books';
+import bookprogressmodule from './modules/bookprogress';
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
-    state: {
-        count: 0
-    },
-    mutations: {
-        increment(state) {
-            state.count++
-        }
-    },
     modules:{
-        booksmodule
+        booksmodule,
+        bookprogressmodule
     }
 })
 
diff --git a/assets/js/store/modules/bookprogress.js b/assets/js/store/modules/bookprogress.js
new file mode 100644
index 0000000..5ae94db
--- /dev/null
+++ b/assets/js/store/modules/bookprogress.js
@@ -0,0 +1,70 @@
+import BookApi from "../../api/book";
+import {
+    UPDATING_PROGRESS,
+    UPDATING_PROGRESS_SUCCESS,
+    UPDATING_PROGRESS_ERROR,
+    TURN_ON_EDIT_MODE,
+    TURN_OFF_EDIT_MODE
+} from '../mutation-types.js'
+
+export default {
+    namespaced: true,
+    state: {
+        isUpdating: false,
+        error: null,
+        progress: null,
+        editMode: false
+    },
+    getters: {
+        isEditMode(state) {
+            return state.editMode;
+        },
+        isUpdating(state) {
+            return state.isUpdating;
+        },
+        hasError(state) {
+            return state.error !== null;
+        },
+        error(state) {
+            return state.error;
+        },
+        progress(state) {
+            return state.progress;
+        },
+    },
+    mutations: {
+        [UPDATING_PROGRESS](state) {
+            state.isUpdating = true;
+            state.error = null;
+            state.progress = null;
+        },
+        [UPDATING_PROGRESS_SUCCESS](state, progress) {
+            state.isLoading = false;
+            state.error = null;
+            state.progress = progress;
+        },
+        [UPDATING_PROGRESS_ERROR](state, error) {
+            state.isLoading = false;
+            state.error = error;
+            state.progress = null;
+        },
+        [TURN_ON_EDIT_MODE](state) {
+            state.editMode = true;
+        },
+        [TURN_OFF_EDIT_MODE](state) {
+            state.editMode = false;
+        }
+    },
+    actions: {
+        async updateProgress({commit}, data) {
+            commit(UPDATING_PROGRESS);
+            try {
+                let response = await BookApi.bookUpdateProgress(data.bookId, data.progress);
+                commit(UPDATING_PROGRESS_SUCCESS, response.data.progress);
+                return response.data;
+            } catch (error) {
+                commit(UPDATING_PROGRESS_ERROR, error);
+            }
+        },
+    }
+};
\ No newline at end of file
diff --git a/assets/js/store/modules/books.js b/assets/js/store/modules/books.js
index e17473b..6a8b095 100644
--- a/assets/js/store/modules/books.js
+++ b/assets/js/store/modules/books.js
@@ -3,7 +3,9 @@ import BookApi from "../../api/book";
 const
     FETCHING_BOOKS = "FETCHING_BOOKS",
     FETCHING_BOOKS_SUCCESS = "FETCHING_BOOKS_SUCCESS",
-    FETCHING_BOOKS_ERROR = "FETCHING_BOOKS_ERROR";
+    FETCHING_BOOKS_ERROR = "FETCHING_BOOKS_ERROR",
+    SETTING_SEARCH_TERM = "SETTING_SEARCH_TERM"
+;
 
 export default {
     namespaced: true,
@@ -28,9 +30,15 @@ export default {
         },
         books(state) {
             return state.books;
+        },
+        isSearching(state) {
+            return !!state.searchTitle;
         }
     },
     mutations: {
+        [SETTING_SEARCH_TERM](state, searchTitle) {
+            state.searchTitle = searchTitle;
+        },
         [FETCHING_BOOKS](state) {
             state.isLoading = true;
             state.error = null;
@@ -51,8 +59,7 @@ export default {
         async findAll({commit, state}, searchTitle) {
             commit(FETCHING_BOOKS);
             try {
-                state.searchTitle = searchTitle;
-                console.info(state.searchTitle);
+                commit(SETTING_SEARCH_TERM, searchTitle);
                 let response = await BookApi.booksFetch(state.searchTitle);
                 commit(FETCHING_BOOKS_SUCCESS, response.data);
                 return response.data;
diff --git a/assets/js/store/mutation-types.js b/assets/js/store/mutation-types.js
new file mode 100644
index 0000000..d6f1696
--- /dev/null
+++ b/assets/js/store/mutation-types.js
@@ -0,0 +1,7 @@
+export const
+    UPDATING_PROGRESS = "UPDATING_PROGRESS",
+    UPDATING_PROGRESS_SUCCESS = "UPDATING_PROGRESS_SUCCESS",
+    UPDATING_PROGRESS_ERROR = "UPDATING_PROGRESS_ERROR",
+    TURN_ON_EDIT_MODE = "TURN_ON_EDIT_MODE",
+    TURN_OFF_EDIT_MODE = "TURN_OFF_EDIT_MODE"
+;
\ No newline at end of file