.history-item {
@apply flex items-center relative
+ text-sm sm:text-base
text-gray-800 dark:text-gray-200
bg-gray-50 dark:bg-gray-700
- px-4 py-4 sm:px-7 md:px-4
+ pl-4 pr-10 py-3 sm:py-4
space-x-4 rounded-md font-medium;
}
@@ -83,7 +84,7 @@ export default {
}
.remove-button {
- @apply absolute right-3 sm:right-6 md:right-3 p-1 rounded
+ @apply absolute right-3 p-1 rounded
text-gray-500 dark:text-gray-400;
}
diff --git a/src/composables/useBookDeleter.js b/src/composables/useBookDeleter.js
index bf483f61..768e255f 100644
--- a/src/composables/useBookDeleter.js
+++ b/src/composables/useBookDeleter.js
@@ -14,7 +14,7 @@ export default function useBookDeleter (book) {
store.commit(MutationTypes.SHEET_UPDATE_LOADING, true)
await sheetDeleteBook(store.state.sheet.sheetId, book.value)
- await store.dispatch('sheet/loadSheetData')
+ await store.dispatch('sheet/loadSheetData', true)
await store.dispatch('collection/fetchGroups')
await store.dispatch('collection/fetchIdMap')
store.commit(MutationTypes.COLLECTION_UPDATE_LAST_ADDED, { items: [] })
diff --git a/src/composables/useBookEditor.js b/src/composables/useBookEditor.js
index ca36a7bf..587308ec 100644
--- a/src/composables/useBookEditor.js
+++ b/src/composables/useBookEditor.js
@@ -28,7 +28,7 @@ export default function useBookEditor (book) {
}
const bookId = await sheetUpdateBook(store.state.sheet.sheetId, bookToUpdate)
- await store.dispatch('sheet/loadSheetData')
+ await store.dispatch('sheet/loadSheetData', true)
await store.dispatch('collection/fetchGroups')
store.commit(MutationTypes.COLLECTION_UPDATE_LAST_ADDED, { items: [] })
store.commit(MutationTypes.COLLECTION_UPDATE_LATEST_READINGS, { items: [] })
diff --git a/src/composables/useBookInserter.js b/src/composables/useBookInserter.js
index 3e4dc841..7614d5c6 100644
--- a/src/composables/useBookInserter.js
+++ b/src/composables/useBookInserter.js
@@ -50,13 +50,11 @@ export default function useBookInserter (book) {
}
const bookId = await sheetInsertBook(store.state.sheet.sheetId, bookToInsert)
- await store.dispatch('sheet/loadSheetData')
+ await store.dispatch('sheet/loadSheetData', true)
await store.dispatch('collection/fetchGroups')
await store.dispatch('collection/fetchIdMap')
await store.dispatch('collection/fetchBooks')
await store.dispatch('collection/fetchLastAdded')
- // store.commit(MutationTypes.COLLECTION_UPDATE_LAST_ADDED, { items: [] })
- // store.commit(MutationTypes.COLLECTION_UPDATE_BOOKS, { items: [] })
inserting.value = false
store.commit(MutationTypes.SHEET_UPDATE_LOADING, false)
diff --git a/src/services/sheet.js b/src/services/sheet.js
index 14b73d75..9f01a638 100644
--- a/src/services/sheet.js
+++ b/src/services/sheet.js
@@ -200,7 +200,9 @@ export async function getBooks (sheetId, idMap, page = 1, options = {}) {
limit ${limit} offset ${offset}
`
- const totalResults = await countTotalResults(sheetId, queryStr)
+ const totalResults = options.dontCount
+ ? null
+ : await countTotalResults(sheetId, queryStr)
const query = new window.google.visualization.Query(sheetUrl)
query.setQuery(queryStr)
@@ -236,7 +238,8 @@ export async function getLatestReadings (sheetId, idMap, options = {}) {
select *
where ${CollectionColumns.READ_AT} is not null
and ${CollectionColumns.STATUS} = "${BookStatus.READ}"
- order by ${CollectionColumns.READ_AT} desc
+ order by ${CollectionColumns.READ_AT} desc,
+ ${CollectionColumns.UPDATED_AT} desc
limit ${limit}
`)
diff --git a/src/store/modules/collection.js b/src/store/modules/collection.js
index b8526b00..336be5fd 100644
--- a/src/store/modules/collection.js
+++ b/src/store/modules/collection.js
@@ -286,7 +286,10 @@ export default {
await dispatch('fetchIdMap')
}
- const lastAdded = await getBooks(sheetId, state.idMap, 1, { limit: 6 })
+ const lastAdded = await getBooks(sheetId, state.idMap, 1, {
+ limit: 6,
+ dontCount: true
+ })
commit(CollectionMutations.UPDATE_LAST_ADDED, { items: lastAdded.books })
} finally {
commit(CollectionMutations.UPDATE_LAST_ADDED, { loading: false })
diff --git a/src/views/dashboard/Home.vue b/src/views/dashboard/Home.vue
index 37e792e3..eee1832b 100644
--- a/src/views/dashboard/Home.vue
+++ b/src/views/dashboard/Home.vue
@@ -15,7 +15,7 @@