+
+
+ {#if viewType == 'confirm'}
+
+
+
+
+
+
+
From 769fbd6303b3fee2b8b397a5f29be415240223cf Mon Sep 17 00:00:00 2001
From: migbash <20924663+migbash@users.noreply.github.com>
Date: Mon, 16 Oct 2023 09:00:29 +0100
Subject: [PATCH 13/47] update :: decompression for fixture/competition w;
---
.../page/fixture/competition/Competition-Widget.svelte | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib/components/page/fixture/competition/Competition-Widget.svelte b/src/lib/components/page/fixture/competition/Competition-Widget.svelte
index 28121841c..c2c27b0b4 100755
--- a/src/lib/components/page/fixture/competition/Competition-Widget.svelte
+++ b/src/lib/components/page/fixture/competition/Competition-Widget.svelte
@@ -117,7 +117,10 @@
const response = await get
(
- `/api/data/fixture/competition?fixtureId=${miscFixturePageData?.data?.id}&decompress`
+ `/api/data/fixture/competition?fixtureId=${miscFixturePageData?.data?.id}&decompress`,
+ null,
+ true,
+ true,
) as B_FIX_COMP_D;
widgetDataMain = response;
@@ -212,6 +215,7 @@
-->
+ Confirm that you wish to Join Yes and be charged for + {balanceDeductAmount} BTA from your current balance. +
+ + +
+
+
+
+
+
+
+
+ {/if}
+
+
+ {#if viewType == 'insufficient'}
+
+
+ + You do not have enough balance to participate on this competition. +
+ + +
+
+
+
+
+ {/if}
+
+
+ {#if viewType == 'geo-restriction'}
+
+
+ + Please deposit to continue and be able to participate. +
+ + +
+
+
+
+
+
+
+
+
+
+ + The competitions are not yet available at your Geo location. +
+ + +
+
+
+
+
+ {/if}
+
+
+ {#if viewType == 'not-authenticated'}
+
+
+ + We will be launching new competitions + that will be available at your country. Be patient, thanks. +
+ + +
+
+
+
+
+
+ + Uh-oh! It looks like you are not a signed in. +
+ + +
+
+
+
+
+ {/if}
+
++ Please sign in to your Betarena Account and/or register to participate in competitions. +
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From d9b5059ffa7ae59b089c2e90a482a1506914fbf8 Mon Sep 17 00:00:00 2001
From: migbash <20924663+migbash@users.noreply.github.com>
Date: Mon, 16 Oct 2023 09:01:22 +0100
Subject: [PATCH 15/47] add :: (fixture) competition main (stable);
---
.../competition/Competition-Main.svelte | 933 ++++++++++++++++++
1 file changed, 933 insertions(+)
create mode 100755 src/lib/components/page/fixture/competition/Competition-Main.svelte
diff --git a/src/lib/components/page/fixture/competition/Competition-Main.svelte b/src/lib/components/page/fixture/competition/Competition-Main.svelte
new file mode 100755
index 000000000..4117af7bd
--- /dev/null
+++ b/src/lib/components/page/fixture/competition/Competition-Main.svelte
@@ -0,0 +1,933 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {#if
+ (!isJoinedThis || isJoinedNotThis)
+ && !['canceled', 'finished'].includes(competitionStatus)
+ }
+
+
+
+
+ {:else}
+
+
+
+
+
+
+
+
+ {#if competitionStatus == 'finished' && winnerGroup == viewType}
+ 
+ {/if}
+
+
+
+
+ {/if}
+
+ + {#if + isJoinedThis + && !['canceled', 'finished'].includes(competitionStatus) + } + {WIDGET_T_DATA?.title_joined ?? 'Joined'} + {:else if competitionStatus == 'canceled'} + {WIDGET_T_DATA?.title_canceled ?? 'Canceled'} + {:else if competitionStatus == 'finished'} + {winnerGroup == viewType ? (WIDGET_T_DATA?.title_won ?? 'WON') : (WIDGET_T_DATA?.title_lost ?? 'LOST')} + {/if} +
+ +
+
+
+
+ + {WIDGET_T_DATA?.title_pool_prize ?? translationObject?.pool_prize} +
+ ++ {toDecimalFix(totalPrize, 2, true)} BTA + + (${toDecimalFix(totalPrize, 2, true)}) + +
+ +
+
+
+
+
+
+
+
From 103a32d859ac122682ef13236b2a4fbbd39e13b2 Mon Sep 17 00:00:00 2001
From: migbash <20924663+migbash@users.noreply.github.com>
Date: Mon, 16 Oct 2023 09:01:47 +0100
Subject: [PATCH 16/47] add :: fixture layout competition widget;
---
src/lib/components/page/fixture/Layout.svelte | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/components/page/fixture/Layout.svelte b/src/lib/components/page/fixture/Layout.svelte
index de5cff8b5..61d50cd2d 100644
--- a/src/lib/components/page/fixture/Layout.svelte
+++ b/src/lib/components/page/fixture/Layout.svelte
@@ -29,6 +29,7 @@
import SvelteSeo from 'svelte-seo';
import FeatBetSiteWidget from '../home/feat-bet-site/FeatBetSite-Widget.svelte';
import Breadcrumb from './Breadcrumb.svelte';
+ import CompetitionWidget from './competition/Competition-Widget.svelte';
import LineupsWidget from './lineups/Lineups-Widget.svelte';
import StandingsWidget from './standings/Standings-Widget.svelte';
@@ -406,6 +407,7 @@ NOTE: [HINT] use (CTRL+SPACE) to select a (class) (id) style
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+ + {B_SAP_D3_TEAM_M?.[$sessionStore?.serverLang]} +
+ ++ {WIDGET_DATA?.team_name ?? ''} +
+ ++ {WIDGET_T_DATA?.term_is_going_to_a ?? 'is going to'} +
+ +
+
+
+
+
+
+ 
+
+
+
+ + {#if prediction_type == 'win'} + {WIDGET_T_DATA?.prediction?.[1] ?? 'Win'} + {:else if prediction_type == 'loose'} + {WIDGET_T_DATA?.prediction?.[2] ?? 'Lose'} + {:else} + {WIDGET_T_DATA?.prediction?.x ?? 'Draw'} + {/if} +
+ ++ {#if WIDGET_DATA?.competition?.data?.prediction == '1'} + {toDecimalFix(WIDGET_DATA?.fixture?.probabilities?.home, 0)}% + {:else if WIDGET_DATA?.competition?.data?.prediction == '2'} + {toDecimalFix(WIDGET_DATA?.fixture?.probabilities?.away, 0)}% + {:else} + {toDecimalFix(WIDGET_DATA?.fixture?.probabilities?.draw, 0)}% + {/if} + {WIDGET_T_DATA?.title_prob ?? 'probability'} +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ {`${langPrefix()}${miscFixturePageData1?.[$sessionStore?.serverLang]}`}
+
+
+
+ {widgetDataSeo?.data?.competition_url}
+
-{#if $sessionStore.isShowFixtureCompetitionJoinModal}
+{#if $sessionStore.isShowFixtureCompetitionJoinModal && showModal}
$sessionStore.isShowFixtureCompetitionJoinModal = false}
+ on:closeModal={() => { $sessionStore.isShowFixtureCompetitionJoinModal = false; showModal = false; }}
on:confirmEntry={() => joinCompetition()}
/>
{/if}
@@ -269,7 +273,7 @@
w-500
btn-primary-v2
"
- on:click={() => $sessionStore.isShowFixtureCompetitionJoinModal = true}
+ on:click={() => { $sessionStore.isShowFixtureCompetitionJoinModal = true; showModal = true; }}
class:disabled={isJoinedNotThis || competitionStatus != 'pending' || disabledJoinBtn}
class:color-grey={isJoinedNotThis || competitionStatus != 'pending' || disabledJoinBtn}
disabled={isJoinedNotThis || competitionStatus != 'pending' || disabledJoinBtn}
diff --git a/src/lib/components/shared/COMP-Modal-Multiple.svelte b/src/lib/components/shared/COMP-Modal-Multiple.svelte
index 5a1937f46..92a1524ab 100755
--- a/src/lib/components/shared/COMP-Modal-Multiple.svelte
+++ b/src/lib/components/shared/COMP-Modal-Multiple.svelte
@@ -29,6 +29,8 @@
import sessionStore from '$lib/store/session.js';
import userBetarenaSettings from '$lib/store/user-settings.js';
+ import type { B_C_COMP_DATA_Prediction_Group } from '@betarena/scores-lib/types/_HASURA_.js';
+
// #endregion ➤ 📦 Package Imports
// #region ➤ 📌 VARIABLES
@@ -47,7 +49,9 @@
/** @description competition (main) | amount entry fee */
balanceDeductAmount: number,
/** @description competition (main) | imposed geo-location restriction */
- geoLocationRestrictions: string[]
+ geoLocationRestrictions: string[],
+ /** @description target casted vote on competition by user */
+ targetVote: B_C_COMP_DATA_Prediction_Group
;
const
@@ -219,7 +223,7 @@ MODAL - DYNAMIC
color-black-2
"
>
- Confirm that you wish to Join Yes and be charged for
+ Confirm that you wish to Join {targetVote} and be charged for
{balanceDeductAmount} BTA from your current balance.
From 71f2c1b666f11ed6938ef52f18a32c5d384b2280 Mon Sep 17 00:00:00 2001
From: MigBash <20924663+migbash@users.noreply.github.com>
Date: Thu, 19 Oct 2023 20:09:19 +0100
Subject: [PATCH 43/47] #1788 :: fix
---
.../components/page/fixture/competition/Competition-Main.svelte | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/components/page/fixture/competition/Competition-Main.svelte b/src/lib/components/page/fixture/competition/Competition-Main.svelte
index a3a1d6485..b1de48c03 100755
--- a/src/lib/components/page/fixture/competition/Competition-Main.svelte
+++ b/src/lib/components/page/fixture/competition/Competition-Main.svelte
@@ -1329,7 +1329,7 @@
div#fixture⮕competition⮕w⮕main⮕participants img.participant-main-img
{
/* 🎨 style */
- margin-right: -15px;
+ margin-right: -9px;
border-radius: 32px;
border: 2px solid var(--whitev2);
}
From 25fdf5a7dcece42fab6862cc0aa4f0502fddaacf Mon Sep 17 00:00:00 2001
From: MigBash <20924663+migbash@users.noreply.github.com>
Date: Thu, 19 Oct 2023 22:50:47 +0100
Subject: [PATCH 44/47] fix :: #1765,#1785,#1767;
---
.../page/fixture/competition/Competition-Pool-Selection.svelte | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte b/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
index 7a1a3b1a5..f662d31df 100755
--- a/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
+++ b/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
@@ -545,7 +545,7 @@
.dark-background-1 .disabled
{
/* 🎨 style */
- background-color: var(--dark-theme-1-7-shade) !important;
+ background-color: rgba(49, 49, 49, 0.5) !important;
}
From d0e23df4d3fde107f73dbeeb6464f5ebd3810d1e Mon Sep 17 00:00:00 2001
From: MigBash <20924663+migbash@users.noreply.github.com>
Date: Sat, 21 Oct 2023 08:36:50 +0100
Subject: [PATCH 45/47] #1794 :: fix;
---
.../components/page/fixture/competition/Competition-Main.svelte | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/components/page/fixture/competition/Competition-Main.svelte b/src/lib/components/page/fixture/competition/Competition-Main.svelte
index b1de48c03..ddf913b84 100755
--- a/src/lib/components/page/fixture/competition/Competition-Main.svelte
+++ b/src/lib/components/page/fixture/competition/Competition-Main.svelte
@@ -81,7 +81,7 @@
/** @description 📱 MOBILE */
VIEWPORT_MOBILE_INIT = 581,
/** @description 💻 TABLET */
- VIEWPORT_TABLET_INIT = 658,
+ VIEWPORT_TABLET_INIT = 820,
/** @description 📌 `this` component **main** `id` and `data-testid` prefix. */
CNAME = 'fixture⮕competition⮕w⮕main'
;
From b36bbe0f42f2f99177d027f703b0ba63b1f66c0a Mon Sep 17 00:00:00 2001
From: MigBash <20924663+migbash@users.noreply.github.com>
Date: Sat, 21 Oct 2023 08:42:01 +0100
Subject: [PATCH 46/47] #1793 :: fix;
---
.../page/fixture/competition/Competition-Main.svelte | 4 ++--
.../fixture/competition/Competition-Pool-Selection.svelte | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/lib/components/page/fixture/competition/Competition-Main.svelte b/src/lib/components/page/fixture/competition/Competition-Main.svelte
index ddf913b84..395608fa2 100755
--- a/src/lib/components/page/fixture/competition/Competition-Main.svelte
+++ b/src/lib/components/page/fixture/competition/Competition-Main.svelte
@@ -1331,7 +1331,7 @@
/* 🎨 style */
margin-right: -9px;
border-radius: 32px;
- border: 2px solid var(--whitev2);
+ border: 1px solid var(--whitev2);
}
div#fixture⮕competition⮕w⮕main⮕participants img.participant-main-img:last-child
{
@@ -1443,7 +1443,7 @@
.dark-background-1 div#fixture⮕competition⮕w⮕main⮕participants img.participant-main-img
{
/* 🎨 style */
- border: 2px solid var(--dark-theme-1-4-shade);
+ border: 1px solid var(--dark-theme-1-4-shade);
}
diff --git a/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte b/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
index f662d31df..82fc6fbe7 100755
--- a/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
+++ b/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
@@ -399,6 +399,7 @@
class:row-space-out={!isViewTablet}
style=
"
+ {isViewMobile ? 'width: 50%;' : ''}
{isViewTablet ? 'align-items: flex-start;' : ''}
"
>
From dca3040556618bf70ad39595cb718fa8f811a8d7 Mon Sep 17 00:00:00 2001
From: MigBash <20924663+migbash@users.noreply.github.com>
Date: Sat, 21 Oct 2023 08:43:30 +0100
Subject: [PATCH 47/47] #1792 :: fix;
---
.../components/page/fixture/competition/Competition-Main.svelte | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/components/page/fixture/competition/Competition-Main.svelte b/src/lib/components/page/fixture/competition/Competition-Main.svelte
index 395608fa2..5ef8314f2 100755
--- a/src/lib/components/page/fixture/competition/Competition-Main.svelte
+++ b/src/lib/components/page/fixture/competition/Competition-Main.svelte
@@ -1121,7 +1121,7 @@
class:m-b-5={isViewMobile}
class:m-r-12={!isViewMobile}
>
- Type
+ {WIDGET_T_DATA?.title_type ?? 'Type'}
-
+ showModal = false}
on:confirmEntry={() => joinCompetition()}
/>
{/if}
From d22b8ecec15d74677491675ce8033767c541d522 Mon Sep 17 00:00:00 2001
From: migbash <20924663+migbash@users.noreply.github.com>
Date: Tue, 17 Oct 2023 13:32:56 +0200
Subject: [PATCH 22/47] feat :: pre-liminary modal shared comp. modal;
---
.../shared/COMP-Modal-Multiple.svelte | 168 ++++++++++--------
1 file changed, 93 insertions(+), 75 deletions(-)
diff --git a/src/lib/components/shared/COMP-Modal-Multiple.svelte b/src/lib/components/shared/COMP-Modal-Multiple.svelte
index 207721701..03aefcaaf 100755
--- a/src/lib/components/shared/COMP-Modal-Multiple.svelte
+++ b/src/lib/components/shared/COMP-Modal-Multiple.svelte
@@ -1,27 +1,27 @@
diff --git a/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte b/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
index 8f4d4c5f1..da26b7f1e 100755
--- a/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
+++ b/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
@@ -35,7 +35,9 @@
import CompModalMultiple from '../../../shared/COMP-Modal-Multiple.svelte';
+ import icon_thumbs_down_grey from './assets/icon-thumbs-down-grey.svg';
import icon_thumbs_down_white from './assets/icon-thumbs-down-white.svg';
+ import icon_thumbs_up_grey from './assets/icon-thumbs-up-grey.svg';
import icon_thumbs_up_white from './assets/icon-thumbs-up-white.svg';
import icon_trophy from './assets/icon-trophy.svg';
@@ -88,8 +90,6 @@
WIDGET_T_DATA: B_COMP_MAIN_T,
/** @description competition (main) | show / hide main modal information */
showModal: boolean = false,
- /** @description competition (main) | view type */
- modalViewType: 'confirm' | 'insufficient' | 'geo-restriction' | 'not-authenticated' = 'confirm',
/** @description competition (main) | disabled buttons */
disabledJoinBtn: boolean = true
;
@@ -213,7 +213,7 @@
-->
{#if showModal}
-
- {#if isViewMobile}
+ {/if}
-
-
-
-
-
- {#if WIDGET_DATA?.competition?.data?.status != 'pending'}
-
+
-
+
+
+
+
{#if showModal}
-
-
+
+
+
+
+
-
+
+
+ {/if}
+
+
-
+
+
+
+ {#if isViewMobile}
+
+
+
+ >
+
+
+
- {B_SAP_D3_TEAM_M?.[$sessionStore?.serverLang]}
-
-
-
+ {B_SAP_D3_TEAM_M?.[$sessionStore?.serverLang]}
+
+
+
+
+
+ {WIDGET_DATA?.team_name ?? ''}
+
+
+
+
+
+
+
+
+
+ {WIDGET_T_DATA?.term_is_going_to_a ?? 'is going to'}
+
+
+
+
+
+
+
+
+ {#if prediction_type == 'win'}
+ {WIDGET_T_DATA?.prediction?.[1] ?? 'Win'}
+ {:else if prediction_type == 'loose'}
+ {WIDGET_T_DATA?.prediction?.[2] ?? 'Lose'}
+ {:else}
+ {WIDGET_T_DATA?.prediction?.x ?? 'Draw'}
+ {/if}
+
+
+
+
+
+
+
+ {#if WIDGET_DATA?.competition?.data?.status != 'pending' && !isViewMobile}
+
+ {WIDGET_DATA?.team_name ?? ''} +
+ ++ {WIDGET_T_DATA?.term_is_going_to_a ?? 'is going to'} +
+ + +
+
+
+
+
+
+ + {#if prediction_type == 'win'} + {WIDGET_T_DATA?.prediction?.[1] ?? 'Win'} + {:else if prediction_type == 'loose'} + {WIDGET_T_DATA?.prediction?.[2] ?? 'Lose'} + {:else} + {WIDGET_T_DATA?.prediction?.x ?? 'Draw'} + {/if} +
+ ++ {WIDGET_T_DATA?.title_prob ?? 'Probability'} +
+ +
+ 
50 ? icon_probability_green : icon_probability_red}
+ alt='probability_icon'
+ title='Probability'
+ loading='lazy'
+ />
+
+
+ + {toDecimalFix(mirrorProbability, 0)}% +
+ +
+
+
+
+ {#if !isViewMobile}
+
+
+
+
+
+ {WIDGET_T_DATA?.title_prob ?? 'Probability'}
+
+
+
+
+ {toDecimalFix(mirrorProbability, 0)}%
+
+
+ 50 ? icon_probability_green : icon_probability_red}
+ alt='probability_icon'
+ title='Probability'
+ loading='lazy'
+ />
+
+
+
+
+ {/if}
+
+
+
+
+
+ {WIDGET_T_DATA?.title_entry_fee ?? 'Entry Fee'}
+
+
+
- {WIDGET_DATA?.team_name ?? ''}
-
+ {WIDGET_DATA?.competition?.data?.entry_fee ?? ''} BTA
+
+ (${WIDGET_DATA?.competition?.data?.entry_fee ?? ''})
+
+
-
+
- {WIDGET_T_DATA?.term_is_going_to_a ?? 'is going to'}
-
+
+
+ {WIDGET_T_DATA?.title_total_prize ?? 'Total prize'}
+
+
+
+
+ {#if !counterTotalAnimated}
+ {toDecimalFix((WIDGET_DATA?.competition?.data?.total_prize - WIDGET_DATA?.competition?.data?.betarena_commission), 2, true) ?? ''} BTA
+ {:else}
+ {toDecimalFix(counterTotalPrize, 2, true)} BTA
+ {/if}
+
+
+ {#if !counterTotalAnimated}
+ (${toDecimalFix((WIDGET_DATA?.competition?.data?.total_prize - WIDGET_DATA?.competition?.data?.betarena_commission), 2, true) ?? ''})
+ {:else}
+ (${toDecimalFix(counterTotalPrize, 2, true)})
+ {/if}
+
+
+
+
+
+ {#if WIDGET_DATA?.competition?.data?.status != 'pending' && isViewMobile}
+
+
+
+
+ {/if}
+
+
+ + {WIDGET_T_DATA?.title_prob ?? 'Probability'} +
+ +
+ 50 ? icon_probability_green : icon_probability_red}
+ alt='probability_icon'
+ title='Probability'
+ loading='lazy'
+ />
+
+
+ + {toDecimalFix(mirrorProbability, 0)}% +
+ +
+
+
- + {WIDGET_T_DATA?.title_entry_fee ?? 'Entry Fee'} +
+ +- {WIDGET_DATA?.team_name ?? ''} - + {WIDGET_DATA?.competition?.data?.entry_fee ?? ''} BTA + + (${WIDGET_DATA?.competition?.data?.entry_fee ?? ''}) + +
+
- {WIDGET_T_DATA?.term_is_going_to_a ?? 'is going to'}
-
+
+
+ {WIDGET_T_DATA?.title_total_prize ?? 'Total prize'}
+
+
+
+
+ {#if !counterTotalAnimated}
+ {toDecimalFix((WIDGET_DATA?.competition?.data?.total_prize - WIDGET_DATA?.competition?.data?.betarena_commission), 2, true) ?? ''} BTA
+ {:else}
+ {toDecimalFix(counterTotalPrize, 2, true)} BTA
+ {/if}
+
+
+ {#if !counterTotalAnimated}
+ (${toDecimalFix((WIDGET_DATA?.competition?.data?.total_prize - WIDGET_DATA?.competition?.data?.betarena_commission), 2, true) ?? ''})
+ {:else}
+ (${toDecimalFix(counterTotalPrize, 2, true)})
+ {/if}
+
+
+
+
+
+ {WIDGET_T_DATA?.title_total_prize ?? 'Total prize'} +
+ ++ + {#if !counterTotalAnimated} + {toDecimalFix((WIDGET_DATA?.competition?.data?.total_prize - WIDGET_DATA?.competition?.data?.betarena_commission), 2, true) ?? ''} BTA + {:else} + {toDecimalFix(counterTotalPrize, 2, true)} BTA + {/if} + + + {#if !counterTotalAnimated} + (${toDecimalFix((WIDGET_DATA?.competition?.data?.total_prize - WIDGET_DATA?.competition?.data?.betarena_commission), 2, true) ?? ''}) + {:else} + (${toDecimalFix(counterTotalPrize, 2, true)}) + {/if} + + +
+ +
+
+
-
-
+
+ 0
+ ? ((WIDGET_DATA?.competition?.data?.participants?.no?.length * WIDGET_DATA?.competition?.data?.entry_fee) - (WIDGET_DATA?.competition?.data?.betarena_commission))
+ : 0
+ ) ?? 0
+ }
+ winnerGroup={WIDGET_DATA?.competition?.data?.winner_group}
+ viewType={'yes'}
+ participantList={WIDGET_DATA?.competition?.data?.participants?.yes}
+ {participantsMap}
+ />
+
+
+ 0
+ ? ((WIDGET_DATA?.competition?.data?.participants?.yes?.length * WIDGET_DATA?.competition?.data?.entry_fee) - (WIDGET_DATA?.competition?.data?.betarena_commission))
+ : 0
+ ) ?? 0
+ }
+ winnerGroup={WIDGET_DATA?.competition?.data?.winner_group}
+ viewType={'no'}
+ participantList={WIDGET_DATA?.competition?.data?.participants?.no}
+ {participantsMap}
+ />
+
+
+
+
+
+
+
@@ -685,13 +1190,6 @@ COMPETITION MAIN
-
+ >
+ Type
+
- - {#if prediction_type == 'win'} - {WIDGET_T_DATA?.prediction?.[1] ?? 'Win'} - {:else if prediction_type == 'loose'} - {WIDGET_T_DATA?.prediction?.[2] ?? 'Lose'} - {:else} - {WIDGET_T_DATA?.prediction?.x ?? 'Draw'} - {/if} + + Single Predictor
+
- {#if WIDGET_DATA?.competition?.data?.prediction == '1'}
- {toDecimalFix(WIDGET_DATA?.fixture?.probabilities?.home, 0)}%
- {:else if WIDGET_DATA?.competition?.data?.prediction == '2'}
- {toDecimalFix(WIDGET_DATA?.fixture?.probabilities?.away, 0)}%
- {:else}
- {toDecimalFix(WIDGET_DATA?.fixture?.probabilities?.draw, 0)}%
+
+
+ {WIDGET_DATA?.competition?.data?.participants?.yes?.length ?? 0} + {WIDGET_T_DATA?.title_participants ?? translationObject?.participants} +
+ + {#if WIDGET_DATA?.competition?.data?.participants?.yes?.length > 0} + +
+
+ {#each WIDGET_DATA?.competition?.data?.participants?.yes?.slice(0, (isViewTablet ? 3 : 5)) ?? [] as uid}
+
+ ?.profile_photo "Partitipant_1")
+
+ {/each}
+
+
+
{/if}
- {WIDGET_T_DATA?.title_prob ?? 'probability'}
-
+
+
-
-
-
{#if
(!isJoinedThis || isJoinedNotThis)
@@ -313,11 +276,22 @@ PARTICIPANTS VOTE LIST
class:color-grey={isJoinedNotThis || competitionStatus != 'pending' || disabledJoinBtn}
disabled={isJoinedNotThis || competitionStatus != 'pending' || disabledJoinBtn}
>
- {viewType == 'yes' ? (WIDGET_T_DATA?.title_join_yes ?? 'Yes') : (WIDGET_T_DATA?.title_join_no ?? 'No')}
+ 
+ Join {viewType == 'yes' ? (WIDGET_T_DATA?.title_join_yes ?? 'Yes') : (WIDGET_T_DATA?.title_join_no ?? 'No')}
{:else}
@@ -393,27 +367,31 @@ PARTICIPANTS VOTE LIST
-
{WIDGET_T_DATA?.title_pool_prize ?? translationObject?.pool_prize}
@@ -424,7 +402,6 @@ PARTICIPANTS VOTE LIST s-16 color-black-2 w-500 - m-t-5 " > {toDecimalFix(totalPrize, 2, true)} BTA @@ -447,60 +424,35 @@ PARTICIPANTS VOTE LIST
{#if
(!isJoinedThis || isJoinedNotThis)
@@ -277,7 +277,7 @@ POOL SELECTION ➡ MAIN
>
{:else}
@@ -302,18 +302,18 @@ POOL SELECTION ➡ MAIN
"
class:green=
{
- isJoinedThis && !['canceled', 'finished'].includes(competitionStatus)
- || competitionStatus == 'finished' && winnerGroup == viewType
+ (isJoinedThis && !['canceled', 'finished'].includes(competitionStatus))
+ || (competitionStatus == 'finished' && winnerGroup == viewType)
}
class:disabled=
{
competitionStatus == 'canceled'
- || competitionStatus == 'finished' && winnerGroup != viewType
+ || (competitionStatus == 'finished' && winnerGroup != viewType)
}
>
{#if competitionStatus == 'finished' && winnerGroup == viewType}
![]()
+ {#if isJoinedThis && !['canceled', 'finished'].includes(competitionStatus)}
+
+ {/if}
+
+
+
diff --git a/src/lib/components/page/fixture/competition/assets/icon-grey-thumbs-down.svg b/src/lib/components/page/fixture/competition/assets/icon-grey-thumbs-down.svg
deleted file mode 100755
index 6ae0614dd..000000000
--- a/src/lib/components/page/fixture/competition/assets/icon-grey-thumbs-down.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/src/lib/components/page/fixture/competition/assets/icon-orange-thumbs-down.svg b/src/lib/components/page/fixture/competition/assets/icon-orange-thumbs-down.svg
deleted file mode 100755
index c2719eca1..000000000
--- a/src/lib/components/page/fixture/competition/assets/icon-orange-thumbs-down.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/lib/components/page/fixture/competition/assets/icon-orange-thumbs-up.svg b/src/lib/components/page/fixture/competition/assets/icon-orange-thumbs-up.svg
deleted file mode 100755
index 2356e2c99..000000000
--- a/src/lib/components/page/fixture/competition/assets/icon-orange-thumbs-up.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/lib/components/page/fixture/competition/assets/icon-thumbs-down-grey.svg b/src/lib/components/page/fixture/competition/assets/icon-thumbs-down-grey.svg
new file mode 100644
index 000000000..02c2d95bd
--- /dev/null
+++ b/src/lib/components/page/fixture/competition/assets/icon-thumbs-down-grey.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/lib/components/page/fixture/competition/assets/icon-red-thumbs-down.svg b/src/lib/components/page/fixture/competition/assets/icon-thumbs-down-red.svg
old mode 100755
new mode 100644
similarity index 100%
rename from src/lib/components/page/fixture/competition/assets/icon-red-thumbs-down.svg
rename to src/lib/components/page/fixture/competition/assets/icon-thumbs-down-red.svg
diff --git a/src/lib/components/page/fixture/competition/assets/icon-green-thumbs-up.svg b/src/lib/components/page/fixture/competition/assets/icon-thumbs-up-green.svg
old mode 100755
new mode 100644
similarity index 100%
rename from src/lib/components/page/fixture/competition/assets/icon-green-thumbs-up.svg
rename to src/lib/components/page/fixture/competition/assets/icon-thumbs-up-green.svg
diff --git a/src/lib/components/page/fixture/competition/assets/icon-thumbs-up-grey.svg b/src/lib/components/page/fixture/competition/assets/icon-thumbs-up-grey.svg
new file mode 100644
index 000000000..16adf8b2c
--- /dev/null
+++ b/src/lib/components/page/fixture/competition/assets/icon-thumbs-up-grey.svg
@@ -0,0 +1,4 @@
+
diff --git a/static/app.css b/static/app.css
index 98f538cd4..8d3a13cfa 100644
--- a/static/app.css
+++ b/static/app.css
@@ -161,6 +161,7 @@ p {
--dark-theme-1-2-shade: #737373;
--dark-theme-1-3-shade: #999999;
--dark-theme-1-4-shade: #383838;
+ --dark-theme-1-7-shade: #313131;
--dark-theme-1-5-shade: #161616;
--dark-theme-1-5-shade-o-0-2: rgba(22, 22, 22, 0.2);
/*
@@ -830,7 +831,7 @@ FLEX DISPLAYS
*/
.flex-start
{
- align-items: flex-start;
+ align-items: flex-start !important;
}
.row-space-out {
display: flex;
From 04002a9f41ea7a7833db16f76b2abf3ebf9cf84b Mon Sep 17 00:00:00 2001
From: MigBash <20924663+migbash@users.noreply.github.com>
Date: Thu, 19 Oct 2023 02:15:20 +0100
Subject: [PATCH 31/47] #1764 :: fix
---
src/lib/components/_main_/header/Header.svelte | 1 +
.../competition/Competition-Pool-Selection.svelte | 11 +++++------
src/lib/store/session.ts | 1 +
src/lib/types/types.scores.d.ts | 5 +++++
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/lib/components/_main_/header/Header.svelte b/src/lib/components/_main_/header/Header.svelte
index 3a799b9cf..d8a3fce39 100644
--- a/src/lib/components/_main_/header/Header.svelte
+++ b/src/lib/components/_main_/header/Header.svelte
@@ -474,6 +474,7 @@
($sessionStore.livescoreShowCalendar && isViewMobile)
|| $sessionStore.withdrawModal
|| $sessionStore.showUserguide1
+ || $sessionStore.isShowFixtureCompetitionJoinModal
;
$: if (if_R_4)
{
diff --git a/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte b/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
index da26b7f1e..1be079a56 100755
--- a/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
+++ b/src/lib/components/page/fixture/competition/Competition-Pool-Selection.svelte
@@ -32,6 +32,7 @@
import userBetarenaSettings from '$lib/store/user-settings.js';
import { checkNull, toDecimalFix } from '$lib/utils/platform-functions.js';
import { translationObject } from '$lib/utils/translation.js';
+ import sessionStore from '$lib/store/session.js';
import CompModalMultiple from '../../../shared/COMP-Modal-Multiple.svelte';
@@ -88,8 +89,6 @@
let
/** @augments B_COMP_MAIN_T */
WIDGET_T_DATA: B_COMP_MAIN_T,
- /** @description competition (main) | show / hide main modal information */
- showModal: boolean = false,
/** @description competition (main) | disabled buttons */
disabledJoinBtn: boolean = true
;
@@ -136,7 +135,7 @@
{
if (!browser) return;
- showModal = false
+ $sessionStore.isShowFixtureCompetitionJoinModal = false;
// ▓▓ [🐞]
// alert('Joining Competition');
@@ -215,13 +214,13 @@
-{#if showModal}
+{#if $sessionStore.isShowFixtureCompetitionJoinModal}
showModal = false}
+ on:closeModal={() => $sessionStore.isShowFixtureCompetitionJoinModal = false}
on:confirmEntry={() => joinCompetition()}
/>
{/if}
@@ -270,7 +269,7 @@
w-500
btn-primary-v2
"
- on:click={() => showModal = true}
+ on:click={() => $sessionStore.isShowFixtureCompetitionJoinModal = true}
class:disabled={isJoinedNotThis || competitionStatus != 'pending' || disabledJoinBtn}
class:color-grey={isJoinedNotThis || competitionStatus != 'pending' || disabledJoinBtn}
disabled={isJoinedNotThis || competitionStatus != 'pending' || disabledJoinBtn}
diff --git a/src/lib/store/session.ts b/src/lib/store/session.ts
index ea0fd458f..0fa1f84f5 100644
--- a/src/lib/store/session.ts
+++ b/src/lib/store/session.ts
@@ -31,6 +31,7 @@ const sessionStoreObj: Platform_Session =
showUserguide1: false,
showUserguide1Conf: false,
showFixtureCompetition: false,
+ isShowFixtureCompetitionJoinModal: false,
// ### NOTE:
// ### variables for language handle.
lang_intent: undefined,
diff --git a/src/lib/types/types.scores.d.ts b/src/lib/types/types.scores.d.ts
index 749c78152..bdf1776cb 100644
--- a/src/lib/types/types.scores.d.ts
+++ b/src/lib/types/types.scores.d.ts
@@ -228,6 +228,11 @@ export interface Platform_Session
* 📌 Toggle `visibility` (show/hide) of Fixture Competition (widget) access.
*/
showFixtureCompetition?: boolean;
+ /**
+ * @description
+ * 📌 Toggle `visibility` (show/hide) of Fixture Competition (widget) Modal View.
+ */
+ isShowFixtureCompetitionJoinModal?: boolean;
// ◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️◼️
// NOTE: SPORTBOOK DATA ◼️
From 008fa6b144502b120565669f9a1c748077d130ea Mon Sep 17 00:00:00 2001
From: MigBash <20924663+migbash@users.noreply.github.com>
Date: Thu, 19 Oct 2023 02:20:21 +0100
Subject: [PATCH 32/47] #1770 :: fix / feat
---
.../competition/Competition-Main.svelte | 584 +++++++++---------
1 file changed, 294 insertions(+), 290 deletions(-)
diff --git a/src/lib/components/page/fixture/competition/Competition-Main.svelte b/src/lib/components/page/fixture/competition/Competition-Main.svelte
index 97b3d0f0f..06bf398e9 100755
--- a/src/lib/components/page/fixture/competition/Competition-Main.svelte
+++ b/src/lib/components/page/fixture/competition/Competition-Main.svelte
@@ -579,187 +579,316 @@
- 50 ? icon_probability_green : icon_probability_red}
+ alt='probability_icon'
+ title='Probability'
+ loading='lazy'
+ />
+
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {B_SAP_D3_TEAM_M?.[$sessionStore?.serverLang]} +
+ ++ {WIDGET_T_DATA?.term_is_going_to_a ?? 'is going to'} +
+ +
+
+
+
+
+ >
-
+ - {B_SAP_D3_TEAM_M?.[$sessionStore?.serverLang]} + {WIDGET_DATA?.team_name ?? ''}
-- {WIDGET_T_DATA?.term_is_going_to_a ?? 'is going to'} -
++ {#if prediction_type == 'win'} + {WIDGET_T_DATA?.prediction?.[1] ?? 'Win'} + {:else if prediction_type == 'loose'} + {WIDGET_T_DATA?.prediction?.[2] ?? 'Lose'} + {:else} + {WIDGET_T_DATA?.prediction?.x ?? 'Draw'} + {/if} +
+ +
+ {#if isViewMobile}
-
+
+ {/if}
+
+ - {WIDGET_DATA?.team_name ?? ''} -
+ ++ {WIDGET_T_DATA?.title_prob ?? 'Probability'} +
+ +
+ 50 ? icon_probability_green : icon_probability_red}
+ alt='probability_icon'
+ title='Probability'
+ loading='lazy'
+ />
+
+
+ + {toDecimalFix(mirrorProbability, 0)}% +
+ +
+
+
+ {#if !isViewMobile}
+
-
+ >
+ {WIDGET_T_DATA?.title_prob ?? 'Probability'}
+
-
+ - {#if prediction_type == 'win'} - {WIDGET_T_DATA?.prediction?.[1] ?? 'Win'} - {:else if prediction_type == 'loose'} - {WIDGET_T_DATA?.prediction?.[2] ?? 'Lose'} - {:else} - {WIDGET_T_DATA?.prediction?.x ?? 'Draw'} - {/if} -
- -+ {toDecimalFix(mirrorProbability, 0)}% +
-
- {WIDGET_T_DATA?.title_prob ?? 'Probability'}
+ {WIDGET_T_DATA?.title_entry_fee ?? 'Entry Fee'}
-
- {/if}
-
-
- 50 ? icon_probability_green : icon_probability_red}
- alt='probability_icon'
- title='Probability'
- loading='lazy'
- />
-
+ (${WIDGET_DATA?.competition?.data?.entry_fee ?? ''})
+
+
- {toDecimalFix(mirrorProbability, 0)}% -
- -
-
-
- {#if !isViewMobile}
-
+ {/if}
- {WIDGET_T_DATA?.title_prob ?? 'Probability'}
+ {WIDGET_T_DATA?.title_total_prize ?? 'Total prize'}
-
- {/if}
-
-
-
- 50 ? icon_probability_green : icon_probability_red}
- alt='probability_icon'
- title='Probability'
- loading='lazy'
- />
-
+
- {toDecimalFix(mirrorProbability, 0)}% -
+ {#if !counterTotalAnimated} + (${toDecimalFix((WIDGET_DATA?.competition?.data?.total_prize - WIDGET_DATA?.competition?.data?.betarena_commission), 2, true) ?? ''}) + {:else} + (${toDecimalFix(counterTotalPrize, 2, true)}) + {/if} + -
-
-
- - {WIDGET_T_DATA?.title_entry_fee ?? 'Entry Fee'} -
- -- {WIDGET_DATA?.competition?.data?.entry_fee ?? ''} BTA - - (${WIDGET_DATA?.competition?.data?.entry_fee ?? ''}) - -
-
-
-
+ - {WIDGET_T_DATA?.title_total_prize ?? 'Total prize'} -
- -- - {#if !counterTotalAnimated} - {toDecimalFix((WIDGET_DATA?.competition?.data?.total_prize - WIDGET_DATA?.competition?.data?.betarena_commission), 2, true) ?? ''} BTA - {:else} - {toDecimalFix(counterTotalPrize, 2, true)} BTA - {/if} - - - {#if !counterTotalAnimated} - (${toDecimalFix((WIDGET_DATA?.competition?.data?.total_prize - WIDGET_DATA?.competition?.data?.betarena_commission), 2, true) ?? ''}) - {:else} - (${toDecimalFix(counterTotalPrize, 2, true)}) - {/if} - - -
- -
-
- {/if}
-
-
-
+ - Type -
-- - Single Predictor -
++ Type +
-+ + Single Predictor +
+ +