Skip to content

Commit

Permalink
dev-to-prod (#2203)
Browse files Browse the repository at this point in the history 
* [dev] Move logout to ProfilePage (#2192)

* dev: hide intercom (#2190)

* [dev] Move logout to ProfilePage

* dev: logout translations

* Feature/footer redesign/draft/0 (#2196)

* dev: hide intercom (#2190)

* Feature/header redesign/draft/1 (#2191)

* fix: Content section header border

* fix: competition modal

* dev: hide breadcrumbs in PWA

* dev revert unnessery changes

* dev: reemove debugger

* dev: Footer

* dev: Redesigned footer

* Feature/articles/draft/0 (#2197)

* dev: hide intercom (#2190)

* Feature/header redesign/draft/1 (#2191)

* fix: Content section header border

* fix: competition modal

* dev: hide breadcrumbs in PWA

* dev revert unnessery changes

* dev: reemove debugger

* fix: IsPwa ssr (#2194)

* remove console.log

* dev: Articles mobile styles

* fix: competition confirm popup (#2199)

* Feature/articles/draft/1 (#2201)

* dev: stiicky header

* dev: article mobile padding

* Fix/icons/draft/0 (#2202)

* dev add images

* dev: change images sources

* fix(assets): redundant MACOSX assets

[1] ────
Removal of unecessary redundant assets for MACOSX that are used no where in the project.

---------

Co-authored-by: MigBash <[email protected]>
  • Loading branch information
@Izobov @migbash
Izobov and migbash authored Jun 20, 2024
1 parent c58b66a commit d9cd5ba
Show file tree
Hide file tree
Showing 301 changed files with 6,047 additions and 586 deletions.
2 changes: 1 addition & 1 deletion src/hooks.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const customErrorHandler: HandleServerError = async (
(
`${LOG_PREFIX_HOOKS_S} \n ${error} \n ${event}`,
);

console.trace(error)
let
errorMsg: string = 'Whoops!',
errorCode: string = 'x1'
Expand Down
106 changes: 20 additions & 86 deletions src/lib/components/_main_/footer/Footer.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,23 +278,7 @@
/>
</a>

<!--
╭─────
│ > 🖥️ LAPTOP
╰─────
-->
{#if !VIEWPORT_TABLET_INIT[1]}
<p
class=
"
s-14
w-400
color-grey
"
>
© 2021 Betarena All rights reserved
</p>
{/if}


</div>

Expand Down Expand Up @@ -374,73 +358,6 @@

</div>

<!--
╭─────
│ > Subsribe to Newsletter
╰─────
-->
<div
id="{CNAME}⮕newsletter-box"
>
<!--
╭─────
│ > Section Title
╰─────
-->
<p
class=
"
color-white
s-14
w-normal
m-b-8
{VIEWPORT_MOBILE_INIT[1] ? 'text-center' : 'text-left'}
"
>
<TranslationText
key={`${CNAME}/newsletter-box`}
text={translation.terms.subscribe_newsletter}
fallback={'Subscribe to newsletter'}
/>
</p>

<!--
╭─────
│ > Submit Button
╰─────
-->
<button
id="newsletter-subscribe-btn"
class=
"
btn-primary-v2
"
on:click=
{
() =>
{
$sessionStore.currentActiveModal = 'Footer_Newsletter_Modal';
return;
}
}
>
<p
class=
"
color-white
s-14
w-500
"
>
<TranslationText
key={`${CNAME}/unknown`}
text={translation.terms.subscribe_cta}
fallback={'Subsribe'}
/>
</p>
</button>

</div>

<!--
╭─────
Expand Down Expand Up @@ -828,7 +745,23 @@
color-grey
"
>
Second Act
<!--
╭─────
│ > 🖥️ LAPTOP
╰─────
-->
{#if !VIEWPORT_TABLET_INIT[1]}
<span
class=
"
s-14
w-400
color-grey
"
>
© 2021 Betarena All rights reserved
</span>
{/if}

<!--
🖥️ LAPTOP
Expand All @@ -846,7 +779,7 @@
"
class:m-l-10={VIEWPORT_TABLET_INIT[1]}
>
18 Boulevard Montmartre Paris 75009
Second Act 18 Boulevard Montmartre Paris 75009
</span>
</p>

Expand Down Expand Up @@ -921,6 +854,7 @@
grid-row: 1;
/* 🎨 style */
justify-self: center;
align-self: self-start;
img
{
Expand Down
97 changes: 77 additions & 20 deletions src/lib/components/_main_/footer/FooterBottom.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@

<script lang="ts">
// #region ➤ 📦 Package Imports
import sessionStore from "$lib/store/session.js";
import FooterNavigationBlock from "./FooterNavigationBlock.svelte";
import SocialsBlock from "./SocialsBlock.svelte";
import Legal_18ActionBet from "./assets/icon_redisign/legal-18-action-bet.svelte";
import BegambleawareorgBlack from "./assets/icon_redisign/begambleawareorg_black.png";
import BegambleawareorgBlack from "./assets/icon_redisign/gamble_aware.svg";
import BetarenaLogo from "./assets/betarena-logo-full.svg";
// ╭────────────────────────────────────────────────────────────────────────╮
// │ NOTE: │
Expand Down Expand Up @@ -50,24 +51,46 @@
tablet && !mobile
? ["changelog", "about", "roadmap", "status", "terms", "privacy"]
: ["changelog", "status", "about", "terms", "roadmap", "privacy"];
$: isDesktop = $sessionStore.viewportType === "desktop";
// #endregion ➤ 📌 VARIABLES
</script>

<footer class:mobile>
<footer class:mobile class="dark-mode" class:desktop={isDesktop}>
<div class="wrapper">
<SocialsBlock {translation} />
<div class="nav-wrapper">
<FooterNavigationBlock
vertlical={tablet && mobile}
{links}
order={linksOrder}
/>
{#if $sessionStore.viewportType !== "mobile"}
<div class="first-block">
<img
id=""
src={BetarenaLogo}
alt="BetarenaLogo"
title=""
loading="lazy"
/>
{#if isDesktop}
<div class="rights-block">
© 2021 Betarena All rights reserved <br />
Second Act, 18 Boulevard Montmartre Paris 75009
</div>
{/if}
</div>
{/if}
<div class="central-block">
<SocialsBlock {translation} />
<div class="nav-wrapper">
<FooterNavigationBlock
vertlical={tablet && mobile}
{links}
order={linksOrder}
/>
</div>
</div>
<div class="legal-block">
<div class="rights-block">
© 2021 Betarena All rights reserved <br />
Second Act, 18 Boulevard Montmartre Paris 75009
</div>
{#if !isDesktop}
<div class="rights-block">
© 2021 Betarena All rights reserved <br />
Second Act, 18 Boulevard Montmartre Paris 75009
</div>
{/if}
<div class="legal-images">
<Legal_18ActionBet />
<img
Expand All @@ -94,8 +117,8 @@

<style lang="scss">
footer {
border-top: var(--border);
display: flex;
background-color: var(--bg-color);
min-width: 100%;
flex-direction: column;
color: var(--text-color);
Expand All @@ -104,10 +127,14 @@
padding-bottom: 128px;
max-width: 1430px;
width: 100%;
gap: 64px;
display: flex;
flex-direction: column;
margin: auto;
}
.nav-wrapper {
padding: 32px 0;
.nav-wrapper {
margin-top: 34px;
}
}
.legal-block {
Expand All @@ -129,15 +156,45 @@
}
&.mobile {
padding: 40px 25px;
padding-bottom: 132px;
.wrapper {
padding: 40px 25px;
gap: 40px;
}
.nav-wrapper {
padding: 40px 0;
margin-top: 40px;
}
.legal-block {
flex-direction: column-reverse;
align-items: flex-start;
gap: 40px;
}
}
&.desktop {
.wrapper {
flex-direction: row;
justify-content: space-between;
padding: 40px 32px;
padding-bottom: 85px;
.first-block {
display: flex;
flex-direction: column;
justify-content: space-between;
color: var(--text-color-second-dark);
font-size: 12px;
img {
width: 151px;
height: 32px;
}
}
.legal-block {
align-items: flex-end;
}
}
}
}
Expand Down
17 changes: 7 additions & 10 deletions src/lib/components/_main_/footer/FooterRedisign.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
┣──────────────────────────────────────────────────────────────────────────────────┫
│ ➤ Internal Svelte Code Format :|: V.8.0 │
│ ➤ Status :|: 🔒 LOCKED │
│ ➤ Author(s) :|: @migbash │
│ ➤ Author(s) :|: @izobov │
┣──────────────────────────────────────────────────────────────────────────────────┫
│ 📝 Description │
┣──────────────────────────────────────────────────────────────────────────────────┫
Expand All @@ -17,8 +17,6 @@
│ 🟦 Svelte Component JS/TS │
┣──────────────────────────────────────────────────────────────────────────────────┫
│ ➤ HINT: │ Access snippets for '<script> [..] </script>' those found in │
import { B_NAV_T } from './../../../../../../scores-lib/types/navbar.d.ts';
import Linkedin from './assets/icon_redisign/linkedin.svelte';
│ │ '.vscode/snippets.code-snippets' via intellisense using 'doc' │
╰──────────────────────────────────────────────────────────────────────────────────╯
-->
Expand Down Expand Up @@ -50,7 +48,8 @@
import FooterSide from "./FooterSide.svelte";
import FooterBottom from "./FooterBottom.svelte";
import { promiseUrlsPreload } from "$lib/utils/navigation.js";
import { browser } from "$app/environment";
import { browser } from "$app/environment";
import { routeIdContent } from "$lib/constants/paths.js";
// #endregion ➤ 📦 Package Imports
Expand Down Expand Up @@ -85,6 +84,8 @@
export let mobile: boolean, tablet: boolean;
const sideFooter = [routeIdContent];
const /**
* @description
* 📣 Dynamic import variable condition
Expand All @@ -98,8 +99,6 @@
dynamicAssetMap = new Map<IDynamicAssetMap, any>();
$: ({ globalState } = $sessionStore);
$: isPWA = globalState.has("IsPWA");
$: translation = $page.data.B_FOT_T as B_FOT_T;
$: if (browser) loadTranslations($sessionStore.serverLang);
$: linksMap = new Map([
Expand Down Expand Up @@ -249,10 +248,8 @@
╰─────
-->

{#if !mobile && !tablet}
{#if !mobile && !tablet && sideFooter.includes($page.route.id || "")}
<FooterSide links={linksMap} {buyBTAText} {translation} />
{/if}

{#if !isPWA && (tablet || mobile)}
{:else}
<FooterBottom {mobile} {tablet} {translation} links={linksMap} />
{/if}
20 changes: 11 additions & 9 deletions src/lib/components/_main_/footer/SocialsBlock.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@
</script>

<div class="follow-block">
<span class="follow-text">
<TranslationText
key={`${CNAME}/unknown`}
text={translation.terms.follow}
fallback={"Follow us"}
/>
</span>
<span class="follow-text">
<TranslationText
key={`${CNAME}/unknown`}
text={translation.terms.follow}
fallback={"Follow us"}
/>
</span>
<div class="socials-wrapper">
{#each socialNetworkOrder as key}
<a
Expand All @@ -98,11 +98,13 @@
.follow-block {
display: flex;
flex-direction: column;
gap: 16px;
gap: 8px;
.follow-text {
font-size: 14px;
font-size: 12px;
font-weight: 500;
text-transform: uppercase;
color: var(--text-color-second-dark);
}
.socials-wrapper {
Expand Down
Loading

0 comments on commit d9cd5ba

Please sign in to comment.