Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking β€œSign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/profile page/issue 1022/user profile page work #1067

Merged
merged 179 commits into from
Feb 21, 2023
Merged
Changes from 1 commit
Commits
Show all changes
179 commits
Select commit Hold shift + click to select a range
4d38a7f
`update` Makefile
migbash Feb 2, 2023
b91de3f
chore: update gitignore
migbash Feb 8, 2023
6b36920
chore: update makefile
migbash Feb 8, 2023
fc87ef2
chore: update template svelte widget;
migbash Feb 8, 2023
82c814f
feat: add firestore; add firebase-storage;
migbash Feb 8, 2023
f18129f
feat: add menu-widget on profile;
migbash Feb 8, 2023
67c2473
feat: add profile widget assets;
migbash Feb 8, 2023
e1af74b
feat: update app.css;
migbash Feb 8, 2023
87a17c2
feat: add account widget; add dashboard widget;
migbash Feb 8, 2023
ac10e2f
feat: update debug func;
migbash Feb 8, 2023
58dc328
feat: add username-gen method;
migbash Feb 8, 2023
7bed367
feat: update hasura types on profile_trans;
migbash Feb 8, 2023
fd510a5
feat: create new file for main component func.
migbash Feb 8, 2023
c8346e0
feat: add types - query - route profile data get;
migbash Feb 8, 2023
f941b5e
feat: profile page layout; profile page pre-load;
migbash Feb 8, 2023
bafe97e
chore: update tsconfig; update ref-readme;
migbash Feb 8, 2023
aa94e7f
feat: update app.css;
migbash Feb 8, 2023
5ada26d
feat: update menu-widget cross-platform;
migbash Feb 8, 2023
03c2184
feat: update app.css;
migbash Feb 8, 2023
59bcdb5
feat: update platform-functions;
migbash Feb 8, 2023
7acdfe5
feat: update assets for profile page components;
migbash Feb 8, 2023
14d9978
feat: account widget responsivness;
migbash Feb 8, 2023
92be726
feat: polishing for main menu widget styles;
migbash Feb 8, 2023
3747ad6
feat: dashboard responsivness;
migbash Feb 9, 2023
e8c6686
feat: update platform main user-settings stores;
migbash Feb 9, 2023
2adc7c1
doc: updating README;
migbash Feb 9, 2023
2fb50a2
doc: renaming widgets files;
migbash Feb 9, 2023
82c5cb1
feat: settings modals; settings profile cropper;
migbash Feb 9, 2023
8f92227
feat: renaming dashboard widget; rename others (+)
migbash Feb 9, 2023
e1e0a9d
feat: new assets added;
migbash Feb 9, 2023
d14413d
feat: layout for profile change to grid;
migbash Feb 9, 2023
4f22a44
feat: update auth-widget;
migbash Feb 9, 2023
2ab4a94
doc: rename main header;
migbash Feb 9, 2023
5db6018
feat: profile navbar create;
migbash Feb 9, 2023
f5d23dd
doc: clear up code in +layout.svelte;
migbash Feb 9, 2023
8068506
feat: update for danger btn; add primary btn fade;
migbash Feb 9, 2023
764e80c
feat: added menu opt hover effects;
migbash Feb 9, 2023
4b2e6d1
fix: #940
migbash Feb 9, 2023
ae58768
fix: #944
migbash Feb 9, 2023
ffca40b
fix: #945
migbash Feb 9, 2023
a7be416
fix: #565
migbash Feb 10, 2023
2dddb09
fix: #286
migbash Feb 10, 2023
f7a0d9b
fix: #998
migbash Feb 10, 2023
6f8f70d
fix: #998
migbash Feb 10, 2023
9afa592
fix: #993
migbash Feb 10, 2023
ae6cf19
fix: #1008
migbash Feb 10, 2023
9ceda3c
chore: aesthetic tournament/incident widget;
migbash Feb 10, 2023
1d88693
doc: updated debug functions;
migbash Feb 10, 2023
27576ef
fix: #1009
migbash Feb 10, 2023
f6239ae
fix: #1000 - 5XX page; #1000 - images to png;
migbash Feb 12, 2023
92556db
doc: update eslint; update prettier;
migbash Feb 12, 2023
af8b135
doc: update prettier; update README;
migbash Feb 12, 2023
7e5182b
doc: update /+layout.ts aesthetics;
migbash Feb 12, 2023
cd382aa
doc: update /+layout.svelte aesthetics;
migbash Feb 12, 2023
7cde708
doc: update prettier;
migbash Feb 12, 2023
8ad285e
doc: update package.json for removal bull bullmq;
migbash Feb 12, 2023
852314c
doc: update hooks.server.ts;
migbash Feb 12, 2023
1e9313a
doc: update README-DEV;
migbash Feb 12, 2023
989b897
feat: aesthetic app.html; add %lang% to app.html;
migbash Feb 12, 2023
79e81fd
doc: update prettier;
migbash Feb 12, 2023
bcb1cf9
feat: update hooks.server.ts for lang detection;
migbash Feb 12, 2023
7d55258
doc: update README-DEV;
migbash Feb 12, 2023
34ee57b
fix: remove +layout.svelte use of <html lang={}>;
migbash Feb 12, 2023
6820918
feat: enhance debug.ts of platform in preload msg;
migbash Feb 12, 2023
f82ec6b
feat: +layout.ts docs - aesth - promises;
migbash Feb 12, 2023
49ccb30
feat: clean/update (en) +page.ts - +page.svelte;
migbash Feb 13, 2023
fce91eb
doc: hooks.server.ts
migbash Feb 13, 2023
93829ba
feat: prettier on widget-main; update types;
migbash Feb 13, 2023
b9db56e
chore: clean up leagues-table / best-goalscorers;
migbash Feb 13, 2023
a997ea4
feat: update profile-modal select for mobile;
migbash Feb 13, 2023
25dba97
chore: update package.json scripts;
migbash Feb 13, 2023
829b539
chore: formatting with prettier;
migbash Feb 13, 2023
5950ade
chore: update packages @sveltekit - vite - adnode;
migbash Feb 13, 2023
753d0d1
fix: #1000 - images width-heigth;
migbash Feb 13, 2023
a8c7b32
chore: duplicate /(en) for /(lang) pages;
migbash Feb 13, 2023
46dfa20
feat: update correct $page.route.id use;
migbash Feb 13, 2023
01c74e3
doc: update prettier;
migbash Feb 13, 2023
0a30212
chore: update package.json for plugin removal;
migbash Feb 13, 2023
62476fa
feat: update new data-preload for sveltekit 1.5.5;
migbash Feb 13, 2023
c2ea56d
chore: update global-types;
migbash Feb 13, 2023
c586b0a
chore: update debug-logs;
migbash Feb 13, 2023
149c116
feat: update correct $page.route.id use;
migbash Feb 13, 2023
22af964
chore: update debug-logs master file control;
migbash Feb 13, 2023
7167f24
doc: update prettier;
migbash Feb 13, 2023
bf658c1
doc: update prettier version;
migbash Feb 13, 2023
619191d
fix: #1000 - (scaled-down) images to png;
migbash Feb 13, 2023
21ff7bf
chore: update debug-logs;
migbash Feb 13, 2023
79389ae
feat: update cache endpoints for prob-h2h trans;
migbash Feb 13, 2023
f5e3ba6
doc: update types for fixture-pages-info;
migbash Feb 13, 2023
0eaadf0
test: promises in load() and update widget data;
migbash Feb 13, 2023
1969c11
test: all fixed - updating;
migbash Feb 14, 2023
4c6c2b6
chore: transfer copy to /lang/fixture w/promise;
migbash Feb 14, 2023
e573d19
feat: console.log() to debug.ts cont. update;
migbash Feb 14, 2023
ca83529
feat: update scripts-package.json
migbash Feb 14, 2023
f24d8e3
feat: update for pealoading data intents sessions;
migbash Feb 14, 2023
eb149cd
chore: update debug-master file;
migbash Feb 14, 2023
a8bbaeb
chore: update fixture/+page.ts (count.) logs geo;
migbash Feb 14, 2023
30636ec
test: add detached endpoint for client-server IP;
migbash Feb 14, 2023
b025986
test: add detached endpoint for client-server IP;
migbash Feb 14, 2023
888a44f
test: add detached endpoint layout.server.ts init;
migbash Feb 14, 2023
4995418
test: add detached endpoint layout.server.ts mod;
migbash Feb 14, 2023
cdc613a
test: add detached endpoint layout.server.ts mod;
migbash Feb 14, 2023
19d3179
test: add detached endpoint layout.server.ts mod;
migbash Feb 14, 2023
65ee346
test: server-heroku.js / layout.server.ts mod;
migbash Feb 14, 2023
f3dac26
test: page.server.ts mod;
migbash Feb 14, 2023
b3e3ab0
test: server-heroku.js mod;
migbash Feb 14, 2023
83ce865
test: layout to client mod; del page.server;
migbash Feb 14, 2023
6b94836
test: layou.ts mod;
migbash Feb 14, 2023
a586f0d
doc: update README-DEV;
migbash Feb 14, 2023
ef46d00
feat: update AuthWidget get/check user firestore;
migbash Feb 14, 2023
ee75acb
feat: updae WidgetSettings username & doc update;
migbash Feb 14, 2023
d66a763
feat: update lang urls for profile page;
migbash Feb 14, 2023
69e76ef
feat: update main-layout nav transaltions handle;
migbash Feb 14, 2023
d524aa9
feat: update /u/[profile] page layout & widgets;
migbash Feb 14, 2023
997d9bc
feat: add darkmode to profile page widgets;
migbash Feb 14, 2023
6d2f43a
feat: update navbar correct ui for profile page;
migbash Feb 14, 2023
74a25b2
chore: footer update comments;
migbash Feb 14, 2023
f2ee0de
feat: revert Moralis to it's current state of auth;
migbash Feb 14, 2023
ecec26b
feat: update header for side-nav on profile page;
migbash Feb 14, 2023
9bd5f6c
feat: dark mode modals + btn-hollow; pic-add nav;
migbash Feb 14, 2023
53c922a
hot-fix: update darkmode colors on profile;
migbash Feb 14, 2023
bc04197
feat: update user profile route title page;
migbash Feb 14, 2023
28e2a19
feat: update OpenGraph types in main;
migbash Feb 15, 2023
f9cf008
doc: update debug (file);
migbash Feb 15, 2023
e969c5f
doc: update debug logs handle func;
migbash Feb 15, 2023
811d092
feat: (major) remove duplicate route for a locale;
migbash Feb 15, 2023
3687a24
feat: moving fixture page layout to components;
migbash Feb 15, 2023
b240486
fix: correct new route.id rename;
migbash Feb 15, 2023
afa8d80
feat: (major) remove duplicate route for a locale;
migbash Feb 15, 2023
4779f4e
doc: update for lang-platform detect func;
migbash Feb 15, 2023
d8d9fb1
feat: remove cache control from (layout);
migbash Feb 15, 2023
145343c
fix: #1041;
migbash Feb 15, 2023
2005989
chore: update debug logs;
migbash Feb 15, 2023
2dd1723
chore: update debug logs fixutre/vote;
migbash Feb 15, 2023
c4e6855
fix: #1007;
migbash Feb 15, 2023
f849ca2
chore: update commens fixture/+page.ts
migbash Feb 15, 2023
af0f9b3
fix: #1042;
migbash Feb 15, 2023
f8ba790
feat: (tournaments) #1034;
migbash Feb 15, 2023
4d1814f
fix: #940;
migbash Feb 15, 2023
82d989b
fix: #944;
migbash Feb 15, 2023
5bd24e1
fix: #1044 | 1,2,3,5,7,8,9,0,10,11,12;
migbash Feb 15, 2023
f5a54d0
chore: update makefile;
migbash Feb 15, 2023
8769d3d
fix: #1044 | 4,8 (update)
migbash Feb 15, 2023
329b9af
doc: update debug logs;
migbash Feb 16, 2023
f6dcc0d
fix: #1044;
migbash Feb 16, 2023
05a80e4
fix: #998;
migbash Feb 16, 2023
c4949bd
fix: #1007;
migbash Feb 16, 2023
96b2d7d
fix: #940
migbash Feb 16, 2023
2e9ffc2
hot-fix: tablet profile page menu cahnge overflow;
migbash Feb 16, 2023
2c0638c
fix: #1044 - picture-profile update events;
migbash Feb 16, 2023
e793060
fix: #1044;
migbash Feb 16, 2023
7707745
fix: #1044 cont.;
migbash Feb 16, 2023
ef3a423
fix: #1044 cont. - restriction on profile-route;
migbash Feb 16, 2023
7e877c3
fix: #1044 cont. - transaltions;
migbash Feb 16, 2023
6f58d97
fix: #1009;
migbash Feb 16, 2023
4a3090b
fix: #1044 (cont);
migbash Feb 17, 2023
aa7a064
fix: #1058;
migbash Feb 17, 2023
c49cd2a
fix: #1044 (translations);
migbash Feb 17, 2023
643ffa2
fix: #1044 (translations);
migbash Feb 18, 2023
c0a3246
fix: #1058 (update);
migbash Feb 18, 2023
89aa36a
fix: #1058 (update);
migbash Feb 18, 2023
5735b36
fix: #1044 (upload-limit);
migbash Feb 20, 2023
cae59f6
fix: #1060;
migbash Feb 20, 2023
ea7b5ea
chore: data reduce (fixture) revert;
migbash Feb 20, 2023
5e5df85
fix: #1020;
migbash Feb 20, 2023
6401990
doc: README-DEV update; TEMPLATE (comp);
migbash Feb 20, 2023
6c4aad4
fix: #1040;
migbash Feb 20, 2023
4ead326
fix: #1044;
migbash Feb 20, 2023
2f0205c
fix: #1020 (mobile);
migbash Feb 20, 2023
0b1b318
fix: #1061;
migbash Feb 21, 2023
052b833
fix: #1020 (mobile-detect);
migbash Feb 21, 2023
9c8498f
fix: #1061;
migbash Feb 21, 2023
e7effb8
fix: #1066;
migbash Feb 21, 2023
bffaf1f
fix: #1020;
migbash Feb 21, 2023
ea8755f
fix: #1020;
migbash Feb 21, 2023
3ed3623
hot-fix: Dockerfile python V update;
migbash Feb 21, 2023
d615427
hot-fix: deepsource issues;
migbash Feb 21, 2023
73cfe0f
doc: update vscode/settings.json
migbash Feb 21, 2023
516be2f
doc: update secrets;
migbash Feb 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: #286
  • Loading branch information
migbash committed Feb 10, 2023
commit 2dddb09fd91c33ad5e9c47ffc89ce9295748a03c
100 changes: 56 additions & 44 deletions src/lib/components/home/featured_match/_FeaturedMatch_Widget.svelte
Original file line number Diff line number Diff line change
@@ -34,7 +34,6 @@

// [β„Ή] main component variables;
export let FEATURED_MATCH_WIDGET_DATA_SEO: Cache_Single_Lang_Featured_Match_Translation_Response;
export let FEATURED_MATCH_WIDGET_DATA_MAIN: FixtureResponse;

// [β„Ή] intercept-key data;
let FEATURED_MATCH_WIDGET_DATA: FixtureResponse;
@@ -98,10 +97,9 @@
let userGeo: string = $userBetarenaSettings.country_bookmaker.toString().toLowerCase()

const response: FixtureResponse = await get('api/cache/home/featured_match?geoPos='+userGeo)
// const response: FixtureResponse = FEATURED_MATCH_WIDGET_DATA_MAIN;

// [β„Ή] if response is null [NO FEATURED-MATCH]
if (response == null || response == undefined) {
if (response == undefined) {
// [β„Ή] decalre state;
nomatches = true;
// [β„Ή] return null;
@@ -436,68 +434,82 @@

<div>

<!-- [β„Ή] SEO-DATA-LOADED
<!--
[β„Ή] SEO-DATA-LOADED
-->
{#if !loaded && !nomatches}
<!-- [β„Ή] iterate over the data to find the correc language
-->
<div id="seo-featured-match-box">
<p>{FEATURED_MATCH_WIDGET_DATA_SEO.widget_title}</p>
<p>{FEATURED_MATCH_WIDGET_DATA_SEO.vote}</p>
<p>{FEATURED_MATCH_WIDGET_DATA_SEO.assists}</p>
<p>{FEATURED_MATCH_WIDGET_DATA_SEO.rating}</p>
<p>{FEATURED_MATCH_WIDGET_DATA_SEO.player}</p>
<p>{FEATURED_MATCH_WIDGET_DATA_SEO.matches}</p>
<p>{FEATURED_MATCH_WIDGET_DATA_SEO.goals}</p>
<div
id="seo-featured-match-box">
<p>{FEATURED_MATCH_WIDGET_DATA_SEO?.widget_title}</p>
<p>{FEATURED_MATCH_WIDGET_DATA_SEO?.vote}</p>
<p>{FEATURED_MATCH_WIDGET_DATA_SEO?.assists}</p>
<p>{FEATURED_MATCH_WIDGET_DATA_SEO?.rating}</p>
<p>{FEATURED_MATCH_WIDGET_DATA_SEO?.player}</p>
<p>{FEATURED_MATCH_WIDGET_DATA_SEO?.matches}</p>
<p>{FEATURED_MATCH_WIDGET_DATA_SEO?.goals}</p>
</div>
{/if}

<!-- [β„Ή] NO FEATURED MATCHES AVAILABLE PLACEHOLDER
<!--
[β„Ή] NO FEATURED MATCHES AVAILABLE PLACEHOLDER
-->
{#if nomatches && !loaded}
<!-- [β„Ή] title of the widget
<!--
[β„Ή] title of the widget
-->
<h2
class="s-20 m-b-10 w-500 color-white"
style="margin-top: 0px;">
<h2
class="
s-20
m-b-10
w-500
color-white
"
style="margin-top: 0px;">
{FEATURED_MATCH_WIDGET_DATA_SEO.widget_title}
</h2>

<!-- [β„Ή] no-matches-avaiable-placeholder container
<!--
[β„Ή] no-matches-avaiable-placeholder container
-->
<div
<div
id='featured-no-match-box'
class='row-space-start'
class:dark-background-1={$userBetarenaSettings.theme == 'Dark'}>

<!-- [β„Ή] no-matches-visual
<!--
[β„Ή] no-matches-visual
-->
{#if $userBetarenaSettings.theme == 'Dark'}
<img
src={no_featured_match_visual_dark}
alt="no-featured-match-visual_dark"
width="80px" height="80px"
class='m-r-20'
/>
{:else}
<img
src={no_featured_match_visual}
alt="no-featured-match-visual"
width="80px" height="80px"
class='m-r-20'
/>
{/if}

<!-- [β„Ή] container w/ text
<img
src={$userBetarenaSettings.theme == 'Dark' ? no_featured_match_visual_dark : no_featured_match_visual}
alt="No widget visual icon"
width="80"
height="80"
class='m-r-20'
/>
<!--
[β„Ή] container w/ text
-->
<div>
<p class='s-16 m-b-8 w-500'> No Matches Available </p>
<p class='s-16 color-grey w-400'> Sorry, at this time there is no featured match available! </p>
<p
class='
s-16
m-b-8
w-500
'>
{FEATURED_MATCH_WIDGET_DATA_SEO?.place_holder?.info}
</p>
<p
class='
s-16
color-grey
w-400
'>
{FEATURED_MATCH_WIDGET_DATA_SEO?.place_holder?.no_matches}
</p>
</div>
</div>
{/if}

<!-- [β„Ή] FEATURED MATCH WIDGET
<!--
[β„Ή] FEATURED MATCH WIDGET
-->
{#if !nomatches && !refresh}
<!-- [β„Ή] widget loading
1 change: 1 addition & 0 deletions src/lib/graphql/query.ts
Original file line number Diff line number Diff line change
@@ -85,6 +85,7 @@ export const GET_FEATURED_MATCH_TRANSLATION = gql`
vote
winnings
widget_title
place_holder
}
}
`;
31 changes: 4 additions & 27 deletions src/lib/models/home/featured_match/interface-fixture.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ScoresTournamentsUrls } from '../hasura';
import type { ScoresTournamentsUrls } from '../../hasura';
import type { SelectedFixture_LiveOdds_Response } from './firebase-real-db-interface';
import type { BestPlayers_Data, SelectedFixutre } from './response_models';
import type { BestPlayers_Data, SelectedFixutre, TranslationsResponse } from './response_models';

/**
* INTERFACE
@@ -83,30 +83,7 @@ export interface FixtureResponse {
* [β„Ή] Featured Match Cache Interfaces
*/

export interface Cache_Single_Lang_Featured_Match_Translation_Response {
export interface Cache_Single_Lang_Featured_Match_Translation_Response
extends TranslationsResponse {
lang: string;

assists: string;
bookmaker: string;
bet: string;
fair_odds: string;
goals: string;
home_win: string;
market: string;
market_name: string;
market_type: string;
matches: string;
odds: string;
place_bet: string;
player: string;
players: string;
stake: string;
rating: string;
probability: string;
streams: string;
type: string;
value_bet: string;
vote: string;
winnings: string;
widget_title: string;
}
57 changes: 29 additions & 28 deletions src/lib/models/home/featured_match/response_models.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { BETARENA_HASURA_scores_tournaments } from '../hasura';
import type { BETARENA_HASURA_scores_tournaments } from '../../hasura';
import type { FixtureResponse, MatchVotes } from './interface-fixture';

/**
@@ -54,34 +54,35 @@ export interface BestPlayers_Data {
visitor_team_rating_player_2: number;
}

/**
*
*/
export interface TranslationsResponse {
assists: string;
bookmaker: string;
bet: string;
fair_odds: string;
goals: string;
home_win: string;
lang: string;
market: string;
market_name: string;
market_type: string;
matches: string;
odds: string;
place_bet: string;
player: string;
players: string;
stake: string;
rating: string;
probability: string;
streams: string;
type: string;
value_bet: string;
vote: string;
winnings: string;
widget_title: string;
assists: string;
bookmaker: string;
bet: string;
fair_odds: string;
goals: string;
home_win: string;
lang: string;
market: string;
market_name: string;
market_type: string;
matches: string;
odds: string;
place_bet: string;
player: string;
players: string;
stake: string;
rating: string;
probability: string;
streams: string;
type: string;
value_bet: string;
vote: string;
winnings: string;
widget_title: string;
place_holder: {
no_matches: string
info: string
}
}

/**