diff --git a/website/macos-big-sur-icons/src/components/H3_Description.vue b/website/macos-big-sur-icons/src/components/H3_Description.vue index abdeb9d6..26b47b38 100644 --- a/website/macos-big-sur-icons/src/components/H3_Description.vue +++ b/website/macos-big-sur-icons/src/components/H3_Description.vue @@ -1,7 +1,5 @@ +
@@ -596,13 +596,18 @@ export default { let parent = this function handleParseError(err){ + console.log(err.code); switch (err.code) { case Parse.Error.INVALID_SESSION_TOKEN: Parse.User.logOut(); window.location.reload() break; + + case 100: + break; default: + parent.loadingError = "true" break; } } @@ -670,7 +675,6 @@ export default { parent.scroll() } catch (error) { - parent.loadingError = "true" handleParseError(error) console.log("loadingError: ", error); } diff --git a/website/macos-big-sur-icons/src/store/store.js b/website/macos-big-sur-icons/src/store/store.js index bbbb7815..6b17f459 100644 --- a/website/macos-big-sur-icons/src/store/store.js +++ b/website/macos-big-sur-icons/src/store/store.js @@ -225,6 +225,7 @@ export default new Vuex.Store({ let IconsBase = Parse.Object.extend("Icons2"); let approvedQuery = new Parse.Query(IconsBase); + let notApprovedQuery = new Parse.Query(IconsBase); let numToLoad = 15 // Approved Count @@ -269,9 +270,14 @@ export default new Vuex.Store({ iconResults.forEach((result)=>{ returnIconData(result, "approved"); }) - - approvedQuery.equalTo("approved", false); - let notApproved = await approvedQuery.find(); + + notApprovedQuery.limit(numToLoad) + notApprovedQuery.equalTo("user", userObj); + notApprovedQuery.skip(store.state.userIcons.toSkip) + notApprovedQuery.descending("createdAt"); + approvedQuery.exists("highResPngFile"); + notApprovedQuery.equalTo("approved", false); + let notApproved = await notApprovedQuery.find(); notApproved.forEach((result)=>{ returnIconData(result, "notApproved"); @@ -345,7 +351,7 @@ export default new Vuex.Store({ console.log("error: ", error); }) } - + }, diff --git a/website/macos-big-sur-icons/src/views/BlogHome.vue b/website/macos-big-sur-icons/src/views/BlogHome.vue index d0ec33a7..26066bdc 100644 --- a/website/macos-big-sur-icons/src/views/BlogHome.vue +++ b/website/macos-big-sur-icons/src/views/BlogHome.vue @@ -37,7 +37,7 @@
- +
@@ -47,7 +47,7 @@ + @@ -67,6 +67,7 @@ +

Support for .icns is on my (long) todo list. @@ -121,6 +121,8 @@ export default { }, methods:{ + ...mapActions(['adClick']), + getDate(dateString){ // var date = dateString; let date = new Date(dateString); diff --git a/website/macos-big-sur-icons/src/views/Resources.vue b/website/macos-big-sur-icons/src/views/Resources.vue index bc68e481..831b29ba 100644 --- a/website/macos-big-sur-icons/src/views/Resources.vue +++ b/website/macos-big-sur-icons/src/views/Resources.vue @@ -19,7 +19,7 @@ />

- + - + {{ user.credit.replace("https://", "") }} @@ -127,7 +127,7 @@ v-else >
- +
@@ -210,18 +210,19 @@ export default { 'fetchAppCategories', 'emptyArr', 'showToast', - 'setDataToArr' + 'setDataToArr', + 'adClick' ]), async copyUserUrl(){ let parent = this; - let toCopy = "https://macosicons.com/user/" + parent.$route.params.user + let toCopy = "https://macosicons.com/u/" + parent.$route.params.user await navigator.clipboard.writeText(toCopy); parent.showToast({ id: "toastMessage", - message: "✅ User profile URL copied to your clipboard", + message: "User profile URL copied to your clipboard", variant: "success" }) }, @@ -425,7 +426,7 @@ export default { gap: 25px; width: 80%; max-width: 480px; - padding-top: 80px; + padding-top: 50px; padding-bottom: 20px; text-align: left; }