Skip to content

Commit

Permalink
#1765 :: fix 5/5 :: comment updates; app.css update;
Browse files Browse the repository at this point in the history
  • Loading branch information
migbash committed Oct 19, 2023
1 parent c7d766b commit 0f0a02f
Show file tree
Hide file tree
Showing 10 changed files with 277 additions and 167 deletions.
367 changes: 233 additions & 134 deletions src/lib/components/page/fixture/competition/Competition-Main.svelte

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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
;
Expand Down Expand Up @@ -213,7 +213,7 @@
-->

<!--
MORE INFORMATION / ALERT MODAL
▓▓ Cast vote modal
-->
{#if showModal}
<CompModalMultiple
Expand All @@ -227,15 +227,15 @@ MORE INFORMATION / ALERT MODAL
{/if}

<!--
POOL SELECTION ➡ MAIN
▓▓ Pool Main Component
-->
<div
id="{CNAME}⮕main"
class:dark-background-1={$userBetarenaSettings.theme == 'Dark'}
>

<!--
MORE INFO & VOTE ACTION
▓▓ Further pool info and vote cast.
-->
<div
id="{CNAME}⮕top-row"
Expand All @@ -246,7 +246,7 @@ POOL SELECTION ➡ MAIN
>

<!--
▓▓ POOL SELECTION ➡ PARTICIPANT ACTION BUTTON
▓▓ Participant join and pool prize data.
-->
<div
class=
Expand All @@ -256,7 +256,7 @@ POOL SELECTION ➡ MAIN
>

<!--
BUTTON ➡ JOIN COMPETITION
▓▓ Status Button for competition join.
-->
{#if
(!isJoinedThis || isJoinedNotThis)
Expand All @@ -277,7 +277,7 @@ POOL SELECTION ➡ MAIN
>
<img
id=''
src='{viewType == 'yes' ? icon_thumbs_up_white : icon_thumbs_down_white}'
src='{viewType == 'yes' ? (!isJoinedNotThis ? icon_thumbs_up_white : icon_thumbs_up_grey) : (!isJoinedNotThis ? icon_thumbs_down_white : icon_thumbs_down_grey)}'
alt=''
title=''
loading='lazy'
Expand All @@ -290,7 +290,7 @@ POOL SELECTION ➡ MAIN
</button>

<!--
BOX ➡ STATUS (MANY-CONDITIONS) PILL
▓▓ Status (many) pill state.
-->
{:else}

Expand All @@ -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)
}
>

<!--
WON TROPHY ICON
▓▓ Winner group trophy.
-->
{#if competitionStatus == 'finished' && winnerGroup == viewType}
<img
Expand All @@ -332,7 +332,24 @@ POOL SELECTION ➡ MAIN
{/if}

<!--
STATUS TEXT
▓▓ Target joined vote thumbs.
-->
{#if isJoinedThis && !['canceled', 'finished'].includes(competitionStatus)}
<img
id=''
src='{viewType == 'yes' ? icon_thumbs_up_white : icon_thumbs_down_white}'
alt=''
title=''
loading='lazy'
class=
"
m-r-8
"
/>
{/if}

<!--
▓▓ Target joined status.
-->
<p
class=
Expand Down Expand Up @@ -367,7 +384,7 @@ POOL SELECTION ➡ MAIN
</div>

<!--
▓▓ POOL SELECTION ➡ TOTAL PRIZE FOR 'THIS' VOTE
▓▓ Total pool prize.
-->
<div
class=
Expand Down Expand Up @@ -441,7 +458,6 @@ POOL SELECTION ➡ MAIN
/* 🎨 style */
width: 100%;
background: var(--whitev2);
box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.08);
border-radius: 8px;
overflow: hidden;
}
Expand All @@ -456,8 +472,7 @@ POOL SELECTION ➡ MAIN
.disabled
{
/* 🎨 style */
background-color: var(--whitev2);
opacity: 0.5;
background-color: var(--grey-shade);
}
div.status-pill
{
Expand Down Expand Up @@ -527,7 +542,7 @@ POOL SELECTION ➡ MAIN
.dark-background-1 .disabled
{
/* 🎨 style */
background-color: var(--dark-theme-1);
background-color: var(--dark-theme-1-7-shade) !important;
}
</style>

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion static/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -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);
/*
Expand Down Expand Up @@ -830,7 +831,7 @@ FLEX DISPLAYS
*/
.flex-start
{
align-items: flex-start;
align-items: flex-start !important;
}
.row-space-out {
display: flex;
Expand Down

0 comments on commit 0f0a02f

Please sign in to comment.