Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"vue-analytics": "^5.16.1",
"vue-axios": "^2.1.4",
"vue-clipboard2": "^0.2.1",
"vue-infinite-scroll": "^2.0.2",
"vue-moment": "^4.0.0",
"vue-router": "^3.0.2",
"vuetify": "^1.3.11",
Expand Down
4 changes: 2 additions & 2 deletions src/services/gitlab/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ export default class Client {
.then(result => result.data);
}

fetchTodos() {
return this.client.get("/api/v4/todos");
fetchTodos(page = 1) {
return this.client.get(`/api/v4/todos?page=${page}`);
}

fetchIssues() {
Expand Down
30 changes: 30 additions & 0 deletions src/store/modules/todo.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,32 @@ import gitlab from "@/gitlab";

const state = {
todos: {},
lastLoadedPage: 1,
isDataLoading: false,
todoSize: 0
};

const actions = {
loadNexPageTodos({ state, commit }){
if(state.todos.length === 0){
commit("setLastLoadedPage", 1);
}
commit("setIsDataLoading", true);
gitlab
.get()
.client.fetchTodos(state.lastLoadedPage + 1)
.then(nextPageTodos => {
if(nextPageTodos.data.length > 0){
nextPageTodos.data.forEach(todo => {
commit("addTodo", todo);
});
commit("setLastLoadedPage", state.lastLoadedPage + 1);
}
}).finally(() => {
commit("setIsDataLoading", false);
});
},

addTodo({ commit }, todo) {
commit("addTodo", todo);
},
Expand Down Expand Up @@ -58,6 +80,14 @@ const mutations = {

setTodoSize(state, size) {
state.todoSize = parseInt(size);
},

setIsDataLoading(state, value){
state.isDataLoading = value;
},

setLastLoadedPage(state, value){
state.lastLoadedPage = value;
}
};

Expand Down
14 changes: 11 additions & 3 deletions src/views/Todos.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
<v-icon right>done_all</v-icon>
</v-btn>
</v-layout>
<v-list v-if="todosSize" two-line>
<v-list v-if="todosSize" two-line
v-infinite-scroll="loadMore" infinite-scroll-disabled="isDataLoading" infinite-scroll-distance="10">
<template v-for="(todo, index) in todos">
<todo :item="todo" :key="todo.id"/>
<v-divider v-if="index + 1 < todos.length" :key="index" ></v-divider>
Expand All @@ -21,23 +22,30 @@
</template>

<script>
import { mapGetters } from "vuex";
import { mapGetters, mapActions } from "vuex";
import Todo from "@/components/Todo.vue";
import infiniteScroll from 'vue-infinite-scroll';

export default {
name: "todos",
components: {
Todo
},
directives: {infiniteScroll},
computed: {
...mapGetters({
todos: "getTodos",
todosSize: "getTodosSize"
todosSize: "getTodosSize",
isDataLoading: "isDataLoading"
})
},
methods: {
...mapActions(['loadNexPageTodos']),
markAllAsRead: function() {
this.$store.dispatch("markAllTodosAsDone");
},
loadMore(){
this.loadNexPageTodos();
}
}
};
Expand Down