Fixed bug were waiting icons weren't showing

elrumo · May 24, 2021 · fff1314 · fff1314 · vercel · May 24, 2021
1 parent a8dad9b
commit fff1314
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 36 deletions.
diff --git 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 @@
 <template>
     <div>
-
-
 
         <div class="h3-description m-t-20" v-if="!text.isCenter">
             <h1 class="coral-Heading--XL resource-heading">
@@ -17,17 +15,9 @@
                 <p class="coral-Body--XS">
                     Sponsored by
                 </p>
-
                 <NativeAd :adId="'iconbar-js-h3'" :key="$route.fullPath + 'ad'"/>
-                <!-- <div class="" id="iconbar-js"></div> -->
             </div>
-            <!-- <div class="text-and-ad-wrapper">
-                <p class="coral-Body--L f-w-500 " v-html="markItDown">
-                </p>
-                <div class="single-ad mobile-ad">
-                    <script async type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&placement=macosiconscom" id="_carbonads_js"></script>
-                </div>
-            </div> -->
+
         </div>
 
         <div v-else class="h3-description h3-description-center">
@@ -44,7 +34,7 @@
                 <div v-else class="text-and-ad-wrapper">
                     <p class="coral-Body--XL" v-html="markItDown">
                     </p>
-                    <div class="single-ad mobile-ad">
+                    <div @click="adClick" class="single-ad mobile-ad">
                         <script async type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&placement=macosiconscom" id="_carbonads_js"></script>
                     </div>
                 </div>
@@ -67,6 +57,7 @@
 </template>
 
 <script>
+import { mapActions, mapGetters } from 'vuex';
 import Marked from 'marked';
 import NativeAd from "./NativeAd.vue";
 
@@ -91,6 +82,8 @@ export default {
     },
     
     methods:{
+        ...mapActions(['adClick',]),
+
         logSubscription(){
             let parent = this
             let currentPath = parent.$router.currentRoute.name;

diff --git a/website/macos-big-sur-icons/src/components/Home.vue b/website/macos-big-sur-icons/src/components/Home.vue
@@ -146,7 +146,7 @@
           <div class="card-hover relative coral-card">
 
             <div style="z-index: 1; height: 100%; width: 100%" class="absolute carbon-card-ad">
-              <script async type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&placement=macosiconscom" id="_carbonads_js"></script>
+              <script @click="adClick" async type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&placement=macosiconscom" id="_carbonads_js"></script>
             </div>
 
             <div style="z-index: 2" class="absolute card-grid-nativeAd">
@@ -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
@@ -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
@@ -37,7 +37,7 @@
         </div>
 
         <div class="single-ad m-b-20 p-b-50 p-t-30">
-          <script async="async" type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&amp;placement=macosiconscom" id="_carbonads_js"></script>
+          <script @click="adClick" async="async" type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&amp;placement=macosiconscom" id="_carbonads_js"></script>
         </div>
 
       </div>
@@ -47,7 +47,7 @@
 </template>
 
 <script>
-// @ is an alias to /src
+import { mapActions, mapGetters } from 'vuex';
 import { getPosts } from '@/api/posts';
 import H3Description from '@/components/H3_Description.vue'
 import NativeAd from "@/components/NativeAd.vue";
@@ -91,6 +91,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/BlogPost.vue b/website/macos-big-sur-icons/src/views/BlogPost.vue
@@ -43,7 +43,7 @@
 
 
         <div class="single-ad p-b-20 p-t-30">
-          <script async="async" type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&amp;placement=macosiconscom" id="_carbonads_js"></script>
+          <script @click="adClick" async="async" type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&amp;placement=macosiconscom" id="_carbonads_js"></script>
         </div>
 
 
@@ -67,6 +67,7 @@
 
 <script>
 // @ is an alias to /src
+import { mapActions, mapGetters } from 'vuex';
 import H3Description from '@/components/H3_Description.vue'
 import NativeAd from '@/components/NativeAd.vue'
 
@@ -142,6 +143,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/HowTo.vue b/website/macos-big-sur-icons/src/views/HowTo.vue
@@ -1,17 +1,13 @@
 <template>
   <div>
-    <!-- <div class="single-ad"> -->
-      <!-- <script v-if="isMobile" async type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&placement=macosiconscom" id="_carbonads_js"></script> -->
-    <!-- </div> -->
-
     <main class="content-wrapper-compact">
+
       <router-link to="/resources">
         <p class="coral-Detail read-more read-more-left coral-Detail--XL m-t-30 coral-Link">
           All Resources
         </p>
       </router-link>
-      <!-- <div class="text-and-ad-wrapper"> -->
-      <!-- <script async type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&placement=macosiconscom" id="_carbonads_js"></script> -->
+
       <H3-Description :text="introText"/>
 
       <div class="instructions-grid card-grid" id="how-to-install">        

diff --git a/website/macos-big-sur-icons/src/views/ResourceView.vue b/website/macos-big-sur-icons/src/views/ResourceView.vue
@@ -71,7 +71,7 @@
           </div>
 
           <div class="card-hover relative coral-card resources-card-ad">            
-              <script async="async" type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&amp;placement=macosiconscom" id="_carbonads_js"></script>
+              <script @click="adClick" async="async" type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&amp;placement=macosiconscom" id="_carbonads_js"></script>
             <div class="card-no-ad">
               <p class="coral-Body--M">
                 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
@@ -19,7 +19,7 @@
         />
 
         <div class="card-hover relative coral-card resources-card-ad">            
-            <script async="async" type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&amp;placement=macosiconscom" id="_carbonads_js"></script>
+            <script @click="adClick" async="async" type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&amp;placement=macosiconscom" id="_carbonads_js"></script>
           <a
               class="card-no-ad relative"
               href="https://www.paypal.com/donate/?hosted_button_id=5PMNX4DPW83KN"
@@ -147,7 +147,8 @@ export default {
 
   methods: {
     ...mapActions([
-      'getPageData,'  
+      'getPageData',
+      'adClick'
     ]),
 
     async getPages(){

diff --git a/website/macos-big-sur-icons/src/views/UserProfile.vue b/website/macos-big-sur-icons/src/views/UserProfile.vue
@@ -56,7 +56,7 @@
 
           <a v-if="user.credit" target="_blank" :href="user.credit" class="margin-auto relative">
             <!-- <p class="coral-Body--XS"> -->
-              <IconUI class="absolute-center-vertical" width="14px" :img="resources.link" alt="Twitter Logo"/>
+              <IconUI class="absolute-center-vertical" width="14px" :img="resources.link" alt="Credit link"/>
               <span class="p-l-20">
                 {{ user.credit.replace("https://", "") }}
               </span>
@@ -127,7 +127,7 @@
         v-else
       >
         <div style="z-index: 2; height: 100%; min-heigh: 210px" class="card-wrapper card-hover coral-card">
-          <script async type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&placement=macosiconscom" id="_carbonads_js2"></script>
+          <script @click="adClick" type="application/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBIK27J&placement=macosiconscom" id="_carbonads_js2"></script>
         </div>
         <UserIconCardLoading v-for="num in placeholderCount" :key="num+Math.floor(Math.random() * 10000000 + 1)" :icon="iconsCount"/>
       </div>
@@ -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;
   }