@everymatrix/casino-tournaments-controller 0.0.265 → 0.0.269

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/casino-tournaments-controller",
-  "version": "0.0.265",
+  "version": "0.0.269",
   "main": "dist/casino-tournaments-controller.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -29,11 +29,6 @@
     "typescript": "^3.9.3"
   },
   "dependencies": {
-    "@everymatrix/casino-tournaments-details": "^0.0.265",
-    "@everymatrix/casino-tournaments-filter-controller": "^0.0.265",
-    "@everymatrix/casino-tournaments-list-controller": "^0.0.265",
-    "@everymatrix/casino-tournaments-page-controller": "^0.0.265",
-    "@everymatrix/casino-tournaments-thumbnail-controller": "^0.0.265",
     "cross-env": "^7.0.3",
     "sirv-cli": "^1.0.0",
     "svelte": "^3.0.0"
@@ -41,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "90b1bab32edc865bbff30a158a011715e91a5799"
+  "gitHead": "f99063bddeebbe083973aa77500fc3ee5d9de894"
 }

package/src/CasinoTournamentsController.svelte

@@ -88,10 +88,27 @@
     return 'Closing|Closed';
   }
 
-  const getData = (url:string, offset:number, limit:number) => {
+  const getData = async (url:string, offset:number, limit:number) => {
     isLoading = true;
     tournamentsNumber = 0;
 
+    const res = await fetcher(url, offset, limit)
+
+    setTimeout(() => {
+      window.postMessage({ type: 'TournamentList', tournamentList: res.items }, window.location.href);
+    }, 50)
+
+    isLoading = false;
+  }
+
+  const getDataWithoutfresh = async (url:string, offset:number, limit:number) => {
+    const res = await fetcher(url, offset, limit)
+    
+    window.postMessage({ type: 'TournamentListShowMore', tournamentList: res.items }, window.location.href);
+  }
+
+  const fetcher = async (url:string, offset:number, limit:number) => {
+
     let tournamentsUrl:URL = new URL(`${url}/tournaments`);
     let reqHeaders:Headers = new Headers();
 
@@ -122,13 +139,11 @@
       cache: 'no-cache'
     };
 
-    fetch(tournamentsUrl, requestOptions)
+    return fetch(tournamentsUrl, requestOptions)
       .then((res:any) => res.json())
       .then((res:any) => {
-        tournamentsNumber = 0;
         tournamentsSearchParams = tournamentsUrl.searchParams.toString();
 
-        setTimeout(() => {
           tournamentsNumber = res.total;
 
           if (tournamentsShownNumber >= tournamentsNumber) {
@@ -139,10 +154,8 @@
           if(!startingTournamentUpdater){
             startupTouramentDataChangeListener();
           }
-          window.postMessage({ type: 'TournamentList', tournamentList: res.items }, window.location.href);
-          isLoading = false;
-        }, 50);
-      });
+        return res
+    });
   }
   const tournamentsUpdateMessageHandler = (message: any)=>{
     if(message.type != 'message'){
@@ -189,13 +202,16 @@
     }
   }
 
-  const showMoreAction = () => {
-    tournamentsShownNumber += parseInt(showmorestep, 10);
+  const showMoreAction = async () => {
+    let previousNumber = tournamentsShownNumber
 
-    window.postMessage({ type: 'TournamentsPagination', offset: 0, limit: tournamentsShownNumber }, window.location.href);
+    const _showmorestep = parseInt(showmorestep, 10);
+    tournamentsShownNumber += _showmorestep
 
-    getData(endpoint, 0, tournamentsShownNumber);
+    window.postMessage({ type: 'TournamentsPagination', offset: 0, limit: tournamentsShownNumber }, window.location.href);
 
+    await getDataWithoutfresh(endpoint, previousNumber, _showmorestep)
+    
     if (tournamentsShownNumber >= tournamentsNumber) {
       allTournamentsShown = true;
     }
@@ -229,6 +245,10 @@
     }
   }
 
+  const setActiveLanguage = ():void => {
+    setLocale(lang);
+  }
+
   const setActiveFilters = () => {
     activeFilters = filters.split(',');
     filtersLoaded = true;
@@ -262,6 +282,7 @@
   $: session && setSession();
   $: userid && setPlayerID();
   $: filters && setActiveFilters();
+  $: lang && setActiveLanguage();
   $: initialParameters = endpoint && numberoftournaments && showmorestep && lang;
   $: readyToLoad = session ? initialParameters && session : initialParameters;
   $: readyToLoad && initialLoad();
@@ -278,6 +299,7 @@
           <casino-tournaments-filter-controller
                   filters={filtersArray}
                   activefilters={filters}
+                  exportparts="FiltersController, MobileClass, Non-MobileClass/empty, Active, FilterButton, "
           ></casino-tournaments-filter-controller>
         {/if}
       </div>
@@ -300,6 +322,10 @@
                   registerevent={registerevent}
                   {lang}
                   {currency}
+                  exportparts="Thumbnail, Status, Enrolled, CardImg, CardImgFinished, Details, Title, Date, ScoreCriteria, Games, TournamentPrizes, PrizesTitle, Prizes, Prize,
+                  TournamentDuration, TournamentDates, StartDate, EndDate, ProgressBar, ProgressBarFillEnd, Finished, ProgressBarFillStarting, Remaining, ProgressBarFill,
+                  TournamentsGamesSlider, SliderNavButton, items, item, PlayNowButton, itemHover, SliderNavButton
+                  TournamentCard, CardMaxWidth, CardFullSize, elementToFadeOut, elementToFadeIn, ph-item, ph-col-12, ph-picture, ph-row, ph-col-6, big, ph-col-4, empty, ph-col-8, TournamentButtons, LoginButton, RegisterButton, DetailsButton, EnrolledButton, JoinButton, JoinButtonFullSize, spinner, DetailsLargeButton, ErrorText"
           ></casino-tournaments-list-controller>
         {/if}
       </div>