Skip to content

Commit

Permalink
Merge branch 'main' into test/fee
Browse files Browse the repository at this point in the history
  • Loading branch information
zj9495 committed Mar 14, 2023
2 parents 6751666 + ffd44de commit fcf2af1
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 23 deletions.
5 changes: 2 additions & 3 deletions components/explore/FilterMenuButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ const numOfActiveFilters = computed(() => {
})
const toggleSidebarFilters = () =>
(preferencesStore.sidebarFilterCollapseOpen = !isSidebarFiltersOpen.value)
preferencesStore.setSidebarFilterCollapse(!isSidebarFiltersOpen.value)
const openMobileFilters = () =>
(preferencesStore.mobileFilterCollapseOpen = true)
const openMobileFilters = () => preferencesStore.setMobileFilterCollapse(true)
</script>

<style lang="scss" scoped>
Expand Down
3 changes: 1 addition & 2 deletions components/explore/MobileFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ const onClose = () => {
closeFilterModal()
}
const closeFilterModal = () =>
(preferencesStore.mobileFilterCollapseOpen = false)
const closeFilterModal = () => preferencesStore.setMobileFilterCollapse(false)
const syncFromUrl = () => {
const listed = route.query?.listed?.toString() === 'true',
Expand Down
2 changes: 1 addition & 1 deletion components/rmrk/Gallery/Holder/Holder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ export default class CommonHolderTable extends mixins(
}
get itemsPerPage(): number {
return preferencesStore.getHistoryItemsPerPage
return this.preferencesStore.getHistoryItemsPerPage
}
get showList(): TableRow[] {
Expand Down
2 changes: 1 addition & 1 deletion components/rmrk/Gallery/Layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default class Layout extends Vue {
set preferenceLayout(data) {
this.$emit('change')
this.preferencesStore.layoutClass = data
this.preferencesStore.setLayoutClass(data)
}
}
</script>
32 changes: 16 additions & 16 deletions stores/preferences.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@ export const usePreferencesStore = defineStore('preferences', {
},
actions: {
setSidebarFilterCollapse(payload) {
this.setSidebarFilterCollapse = payload
this.sidebarFilterCollapseOpen = payload
},
setMobileFilterCollapse(payload) {
this.setMobileFilterCollapse = payload
this.mobileFilterCollapseOpen = payload
},
setLayoutClass(payload) {
this.setLayoutClass = payload
this.layoutClass = payload
},
setGalleryLayoutClass(payload) {
this.setGalleryLayoutClass = payload
this.galleryLayoutClass = payload
},
setAdvancedUI(payload) {
// if set to false reset state back to default
Expand All @@ -105,40 +105,40 @@ export const usePreferencesStore = defineStore('preferences', {
this.theatreView = payload ? 'theatre' : 'default'
},
setCompactGalleryItem(payload) {
this.setCompactGalleryItem = payload
this.compactGalleryItem = payload
},
setCompactCollection(payload) {
this.setCompactCollection = payload
this.compactCollection = payload
},
setShowPriceValue(payload) {
this.setShowPriceValue = payload
this.showPriceGallery = payload
},
setShowMintTime(payload) {
this.setShowMintTime = payload
this.showMintTimeCollection = payload
},
setGalleryItemsPerPage(payload) {
this.setGalleryItemsPerPage = payload
this.galleryItemsPerPage = payload
},
setCollectionsPerPage(payload) {
this.setCollectionsPerPage = payload
this.collectionsPerPage = payload
},
setExploreTabOrder(payload) {
this.setExploreTabOrder = payload
this.exploreTabOrder = payload
},
setReplaceBuyNowWithYolo(payload) {
this.setReplaceBuyNowWithYolo = payload
this.replaceBuyNowWithYolo = payload
},
setHasSupport(payload) {
this.setHasSupport = payload
this.hasSupport = payload
},
setHasCarbonOffset(payload) {
this.setHasCarbonOffset = payload
this.hasCarbonOffset = payload
},
setArweaveUpload(payload) {
this.setArweaveUpload = payload
this.arweaveUpload = payload
},
setAllArtworkVisible(payload) {
this.setAllArtworkVisible = payload
this.enableAllArtwork = payload
},
setEnableGyroEffect(payload) {
this.enableGyroEffect = payload
Expand Down

0 comments on commit fcf2af1

Please sign in to comment.