From 1369ee6b3e1f7e115e56977e620084cf2ba73aed Mon Sep 17 00:00:00 2001 From: MigBash <20924663+migbash@users.noreply.github.com> Date: Tue, 21 Feb 2023 12:19:43 +0000 Subject: [PATCH] Dev (#1068) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * `hot-fix` for #974 * 🔥hot fix/prod h2h issues (#982) * `update` README.md * `issue` #972 #976 * `issue` #972 * `deepsource` JS-0357 * `deepsource` JS-0128 * `deepsource` JS-0051 * `deepsource` JS-0116 * `deepsource` JS-0246 * `deepsource` JS-0241 * `deepsource` JS-0241 * `deepsource` JS-0123 * `deepsource` JS-0356 * Update/fixture odds status ns 2 (#985) * `hot-fix` for #974 (#975) * `🔥hot-fix` to PROD (#983) * `hot-fix` for #974 * 🔥hot fix/prod h2h issues (#982) * `update` README.md * `issue` #972 #976 * `issue` #972 * `deepsource` JS-0357 * `deepsource` JS-0128 * `deepsource` JS-0051 * `deepsource` JS-0116 * `deepsource` JS-0246 * `deepsource` JS-0241 * `deepsource` JS-0241 * `deepsource` JS-0123 * `deepsource` JS-0356 * issue #957 * Enhance/feature docker deploy (#1011) * `update` logs for `PROD` server * `update` for `Makefile` * `update` for `.dockerignore` * `setup` of `Docker` development env * `update` for `package.json` with `scripts:` * `.gitignore` update * `update` for `Docker` in `PROD` deployment * `update` Makefile * `update` for `README.md` * `update` express server for `https` * add `new` deploy script with `Github Actions` * `update` github actions test * `revert` for `http` only support * `update` for `Makefile` * `update` for `deploy.yml` * `revert` for `http` only support * `add` for `https` deploy * `update` - `Makefile` * `update` - `my-server.js` * issue `990` * issue `990` - `V1` * issue #949 * `update` packages * `update` for `github/actions` * issue #986 * `logs` update * `update` for `settings.json` * `update` issue #986 * `update` for `mobile` view `auth` * `revert` express for `heroku` * `revert` express for `heroku` * `revert` express for `heroku` * `revert` for `DEV` test `heroku` * `revert` for `DEV` test `heroku` * `revert` for `DEV` test `heroku` * `add` back `AuthWidget` * issue #1004 * issue #1004 * issue #1004 `checkout` * `update` example widget * issue #1004 * issue #1004 `dark-mode` hovers * issue #1004 `🐞 debug` * issue #1004 `🐞 debug` * issue #1004 * issue #1004 `🐞 debug update` * `revert` to `PROD` of `express-server` * `deepsource` JS-0239 * `deepsource` JS-0239 * `deepsource` JS-0242 * `deepsource` JS-T1001 * Enhance/translations and wallet issues and other (#1030) * issue #1006 #1021 * `update` .github/deploy script * issue #1019 * `renaming` * `aesthetic` `doc` * `update` for `docker:dev` + `package.json` scripts * `update` with `main` * `update` settings.json * issue #951 * issue #951 * issue #951 * issue #951 `redundant` code * issue #951 * issue #1028 * issue #951 `styles` update * `deepsource` JS-0128 * `update` documentations * issue #1018 * `update` Makefile * `update` Makefile * Feature/profile page/issue 1022/user profile page work (#1067) * `update` Makefile * chore: update gitignore * chore: update makefile * chore: update template svelte widget; * feat: add firestore; add firebase-storage; * feat: add menu-widget on profile; * feat: add profile widget assets; * feat: update app.css; * feat: add account widget; add dashboard widget; * feat: update debug func; * feat: add username-gen method; * feat: update hasura types on profile_trans; * feat: create new file for main component func. * feat: add types - query - route profile data get; * feat: profile page layout; profile page pre-load; * chore: update tsconfig; update ref-readme; * feat: update app.css; * feat: update menu-widget cross-platform; * feat: update app.css; * feat: update platform-functions; * feat: update assets for profile page components; * feat: account widget responsivness; * feat: polishing for main menu widget styles; * feat: dashboard responsivness; * feat: update platform main user-settings stores; * doc: updating README; * doc: renaming widgets files; * feat: settings modals; settings profile cropper; * feat: renaming dashboard widget; rename others (+) * feat: new assets added; * feat: layout for profile change to grid; * feat: update auth-widget; * doc: rename main header; * feat: profile navbar create; * doc: clear up code in +layout.svelte; * feat: update for danger btn; add primary btn fade; * feat: added menu opt hover effects; * fix: #940 * fix: #944 * fix: #945 * fix: #565 * fix: #286 * fix: #998 * fix: #998 * fix: #993 * fix: #1008 * chore: aesthetic tournament/incident widget; * doc: updated debug functions; * fix: #1009 * fix: #1000 - 5XX page; #1000 - images to png; * doc: update eslint; update prettier; * doc: update prettier; update README; * doc: update /+layout.ts aesthetics; * doc: update /+layout.svelte aesthetics; * doc: update prettier; * doc: update package.json for removal bull bullmq; * doc: update hooks.server.ts; * doc: update README-DEV; * feat: aesthetic app.html; add %lang% to app.html; * doc: update prettier; * feat: update hooks.server.ts for lang detection; * doc: update README-DEV; * fix: remove +layout.svelte use of ; * feat: enhance debug.ts of platform in preload msg; * feat: +layout.ts docs - aesth - promises; * feat: clean/update (en) +page.ts - +page.svelte; * doc: hooks.server.ts * feat: prettier on widget-main; update types; * chore: clean up leagues-table / best-goalscorers; * feat: update profile-modal select for mobile; * chore: update package.json scripts; * chore: formatting with prettier; * chore: update packages @sveltekit - vite - adnode; * fix: #1000 - images width-heigth; * chore: duplicate /(en) for /(lang) pages; * feat: update correct $page.route.id use; * doc: update prettier; * chore: update package.json for plugin removal; * feat: update new data-preload for sveltekit 1.5.5; * chore: update global-types; * chore: update debug-logs; * feat: update correct $page.route.id use; * chore: update debug-logs master file control; * doc: update prettier; * doc: update prettier version; * fix: #1000 - (scaled-down) images to png; * chore: update debug-logs; * feat: update cache endpoints for prob-h2h trans; * doc: update types for fixture-pages-info; * test: promises in load() and update widget data; * test: all fixed - updating; * chore: transfer copy to /lang/fixture w/promise; * feat: console.log() to debug.ts cont. update; * feat: update scripts-package.json * feat: update for pealoading data intents sessions; * chore: update debug-master file; * chore: update fixture/+page.ts (count.) logs geo; * test: add detached endpoint for client-server IP; * test: add detached endpoint for client-server IP; * test: add detached endpoint layout.server.ts init; * test: add detached endpoint layout.server.ts mod; * test: add detached endpoint layout.server.ts mod; * test: add detached endpoint layout.server.ts mod; * test: server-heroku.js / layout.server.ts mod; * test: page.server.ts mod; * test: server-heroku.js mod; * test: layout to client mod; del page.server; * test: layou.ts mod; * doc: update README-DEV; * feat: update AuthWidget get/check user firestore; * feat: updae WidgetSettings username & doc update; * feat: update lang urls for profile page; * feat: update main-layout nav transaltions handle; * feat: update /u/[profile] page layout & widgets; * feat: add darkmode to profile page widgets; * feat: update navbar correct ui for profile page; * chore: footer update comments; * feat: revert Moralis to it's current state of auth; * feat: update header for side-nav on profile page; * feat: dark mode modals + btn-hollow; pic-add nav; * hot-fix: update darkmode colors on profile; * feat: update user profile route title page; * feat: update OpenGraph types in main; * doc: update debug (file); * doc: update debug logs handle func; * feat: (major) remove duplicate route for a locale; * feat: moving fixture page layout to components; * fix: correct new route.id rename; * feat: (major) remove duplicate route for a locale; * doc: update for lang-platform detect func; * feat: remove cache control from (layout); * fix: #1041; * chore: update debug logs; * chore: update debug logs fixutre/vote; * fix: #1007; * chore: update commens fixture/+page.ts * fix: #1042; * feat: (tournaments) #1034; * fix: #940; * fix: #944; * fix: #1044 | 1,2,3,5,7,8,9,0,10,11,12; * chore: update makefile; * fix: #1044 | 4,8 (update) * doc: update debug logs; * fix: #1044; * fix: #998; * fix: #1007; * fix: #940 * hot-fix: tablet profile page menu cahnge overflow; * fix: #1044 - picture-profile update events; * fix: #1044; * fix: #1044 cont.; * fix: #1044 cont. - restriction on profile-route; * fix: #1044 cont. - transaltions; * fix: #1009; * fix: #1044 (cont); * fix: #1058; * fix: #1044 (translations); * fix: #1044 (translations); * fix: #1058 (update); * fix: #1058 (update); * fix: #1044 (upload-limit); * fix: #1060; * chore: data reduce (fixture) revert; * fix: #1020; * doc: README-DEV update; TEMPLATE (comp); * fix: #1040; * fix: #1044; * fix: #1020 (mobile); * fix: #1061; * fix: #1020 (mobile-detect); * fix: #1061; * fix: #1066; * fix: #1020; * fix: #1020; * hot-fix: Dockerfile python V update; * hot-fix: deepsource issues; * doc: update vscode/settings.json * doc: update secrets; --- .eslintignore | 13 + .eslintrc.cjs | 2 +- .github/workflows/docker-image.yml | 38 +- .gitignore | 5 +- .prettierignore | 13 + .prettierrc | 12 +- .vscode/settings.json | 45 +- ...E_WIDGET.svelte => TEMPLATE-WIDGET.svelte} | 14 + Dockerfile | 2 +- Dockerfile.dev | 2 +- Makefile | 22 +- README-DEV.md | 57 +- README.md | 3 + docker-compose.dev.yml | 5 + docker-compose.yml | 5 + package-lock.json | 26217 +++++++++------- package.json | 45 +- server-heroku.js | 28 +- src/app.css | 167 +- src/app.d.ts | 28 + src/app.html | 154 +- src/global.d.ts | 13 - src/hooks.server.ts | 174 +- src/lib/api/utils.ts | 103 +- src/lib/components/_Email_subscribe.svelte | 224 +- src/lib/components/_Offline_alert.svelte | 3 +- src/lib/components/_Platform_alert.svelte | 67 +- src/lib/components/_Splash_screen.svelte | 24 +- .../components/_main_/auth/Auth_Widget.svelte | 2732 +- .../components/_main_/footer/_Footer.svelte | 1642 +- .../components/_main_/header/Header.svelte | 2682 ++ .../components/_main_/header/_Header.svelte | 2191 -- .../fixtures_page/about/About_Loader.svelte | 261 +- .../fixtures_page/about/About_Widget.svelte | 664 +- .../about/loaders/Loader_Bottom_Btn.svelte | 11 +- .../about/loaders/Loader_FAQ_Row.svelte | 28 +- .../about/loaders/Loader_Row.svelte | 68 +- .../content/Content_Loader.svelte | 306 +- .../content/Content_Widget.svelte | 1013 +- .../content/loaders/Loader_Bottom_Btn.svelte | 11 +- .../content/loaders/Loader_Tab_News.svelte | 90 +- .../loaders/mobile/Loader_Info_Row.svelte | 42 +- .../loaders/mobile/Loader_Media.svelte | 9 +- .../loaders/tablet/Loader_Info_Row.svelte | 54 +- .../loaders/tablet/Loader_Media.svelte | 11 +- .../head-2-head/Fixture_Stats_Box.svelte | 494 +- .../head-2-head/Head_2_Head_Loader.svelte | 463 +- .../head-2-head/Head_2_Head_Widget.svelte | 2303 +- .../loaders/mobile/Loader_Odds_Box_L.svelte | 36 +- .../loaders/mobile/Loader_Odds_Box_R.svelte | 36 +- .../loaders/mobile/Loader_Past_Fixture.svelte | 92 +- .../mobile/Loader_Progress_Bar_Box_L.svelte | 36 +- .../mobile/Loader_Progress_Bar_Box_R.svelte | 37 +- .../loaders/mobile/Loader_Team_Icon.svelte | 26 +- .../mobile/Loader_Top_Stats_Box.svelte | 78 +- .../mobile/Loader_Top_Widget_Text.svelte | 26 +- .../loaders/tablet/Loader_Odds_Box_L.svelte | 36 +- .../loaders/tablet/Loader_Odds_Box_R.svelte | 36 +- .../loaders/tablet/Loader_Past_Fixture.svelte | 91 +- .../tablet/Loader_Top_Progress_Bar.svelte | 26 +- .../tablet/Loader_Top_Stats_Box.svelte | 78 +- .../Loader_Top_Widget_Team_Info_L.svelte | 37 +- .../Loader_Top_Widget_Team_Info_R.svelte | 37 +- .../tablet/Loader_Top_Widget_Text.svelte | 26 +- .../incidents/Incident_Row.svelte | 718 +- .../incidents/Incidents_Loader.svelte | 128 +- .../incidents/Incidents_Widget.svelte | 1272 +- .../incidents/loaders/Loader_Incident.svelte | 8 +- .../incidents/loaders/Loader_Team_Left.svelte | 8 +- .../loaders/Loader_Team_Right.svelte | 8 +- .../lineups/Lineup_Player_Row.svelte | 660 +- .../lineups/Lineup_Player_Visual.svelte | 439 +- .../lineups/Lineup_Vector_Mobile.svelte | 16 +- .../lineups/Lineup_Vector_Mobile_Away.svelte | 16 +- .../lineups/Lineup_Vector_Tablet.svelte | 29 +- .../lineups/Lineups_Loader.svelte | 267 +- .../lineups/Lineups_Widget.svelte | 3619 ++- .../loaders/mobile/Loader_Pitch_Vector.svelte | 16 +- .../loaders/mobile/Loader_Team_Row.svelte | 12 +- .../loaders/mobile/Loader_Team_Sel_Row.svelte | 13 +- .../loaders/tablet/Loader_Pitch_Vector.svelte | 29 +- .../tablet/Loader_Team_Row_Left.svelte | 12 +- .../tablet/Loader_Team_Row_Right.svelte | 12 +- .../probabilities/Probability_Loader.svelte | 507 +- .../probabilities/Probability_Widget.svelte | 2855 +- .../loaders/mobile/Loader_Main_Std.svelte | 26 +- .../loaders/mobile/Loader_Prob_Btn.svelte | 26 +- .../loaders/tablet/Loader_Bet_Site.svelte | 26 +- .../loaders/tablet/Loader_Prob_Btn.svelte | 26 +- .../loaders/tablet/Loader_Team_Box.svelte | 48 +- .../scoreboard/Scoreboard_Loader.svelte | 249 +- .../scoreboard/Scoreboard_Widget.svelte | 5248 ++-- .../scoreboard/assets/banner-mobile.png | Bin 0 -> 48121 bytes .../scoreboard/assets/banner-mobile.svg | 10 - .../scoreboard/assets/banner-tablet.png | Bin 0 -> 104906 bytes .../scoreboard/assets/banner-tablet.svg | 10 - .../scoreboard/assets/banner.png | Bin 0 -> 184747 bytes .../scoreboard/assets/banner.svg | 10 - .../loaders/desktop/Loader_Bottom.svelte | 117 +- .../loaders/desktop/Loader_Middle.svelte | 39 +- .../loaders/desktop/Loader_Team.svelte | 37 +- .../loaders/desktop/Loader_Top.svelte | 29 +- .../loaders/mobile/Loader_Bottom.svelte | 47 +- .../loaders/mobile/Loader_Middle.svelte | 39 +- .../loaders/mobile/Loader_Team.svelte | 35 +- .../loaders/mobile/Loader_Top.svelte | 28 +- .../standings/Standings-Loader.svelte | 303 +- .../standings/Standings-Team-Row.svelte | 635 +- .../standings/Standings-Widget.svelte | 1714 +- .../loaders/desktop/Loader-Bottom.svelte | 29 +- .../loaders/desktop/Loader-Head.svelte | 29 +- .../loaders/desktop/Loader-Row-Left.svelte | 48 +- .../loaders/desktop/Loader-Row-Right.svelte | 141 +- .../loaders/desktop/Loader-ViewSel.svelte | 23 +- .../loaders/mobile/Loader-Bottom.svelte | 29 +- .../loaders/mobile/Loader-Head.svelte | 28 +- .../loaders/mobile/Loader-Row-Left-M.svelte | 36 +- .../loaders/mobile/Loader-Row-Right-M.svelte | 85 +- .../loaders/mobile/Loader-Table-View.svelte | 29 +- .../mobile/Loader-ViewSel-Right.svelte | 26 +- .../loaders/mobile/Loader-ViewSel.svelte | 70 +- .../statistics/Statistics_Loader.svelte | 138 +- .../statistics/Statistics_Row.svelte | 198 +- .../statistics/Statistics_Widget.svelte | 1250 +- .../loaders/Loader_Center_Block.svelte | 4 +- .../statistics/loaders/Loader_Team.svelte | 4 +- .../loaders/Loader_Team_Stat.svelte | 4 +- .../fixtures_page/votes/Vote_Loader.svelte | 178 +- .../fixtures_page/votes/Vote_Widget.svelte | 2251 +- .../votes/loaders/mobile/Loader_Vote.svelte | 36 +- .../votes/loaders/tablet/Loader_Vote.svelte | 37 +- .../_Best_Goalscorer_Row.svelte | 558 +- .../_Best_Goalscorers_Widget.svelte | 651 +- ...st_Goalscorers_Widget_ContentLoader.svelte | 235 +- .../loaders/_Placeholder_Table_Row.svelte | 27 +- .../loaders/desktop/_Placeholder_Row.svelte | 90 +- .../loaders/mobile/_Placeholder_Row.svelte | 88 +- .../loaders/tablet/_Placeholder_Row.svelte | 88 +- .../_FeaturedBettingSitesWidget.svelte | 664 +- ...edBettingSitesWidget_ContentLoading.svelte | 136 +- .../_FeaturedSiteRow.svelte | 708 +- .../assets/_BronzeCup.svelte | 457 +- .../assets/_GoldCup.svelte | 478 +- .../assets/_SilverCup.svelte | 835 +- .../loaders/_BronzeCup.svelte | 552 +- .../loaders/_GoldCup.svelte | 552 +- .../loaders/_SilverCup.svelte | 985 +- .../loaders/desktop/_Placeholder_Row.svelte | 100 +- .../loaders/mobile/_Placeholder_Row.svelte | 53 +- .../loaders/tablet/_Placeholder_Row.svelte | 100 +- .../_FeaturedMatch_ContentLoading.svelte | 51 +- .../_FeaturedMatch_Widget.svelte | 2949 +- .../desktop/_Placeholder_BestPlayers.svelte | 60 +- .../desktop/_Placeholder_LeagueInfo.svelte | 8 +- .../desktop/_Placeholder_TvStations.svelte | 44 +- .../desktop/_Placeholder_ValueBets.svelte | 52 +- .../desktop/_Placeholder_VisualVote.svelte | 64 +- .../mobile/_Placeholder_BestPlayers.svelte | 36 +- .../mobile/_Placeholder_LeagueInfo.svelte | 8 +- .../mobile/_Placeholder_TvStations.svelte | 20 +- .../mobile/_Placeholder_ValueBets.svelte | 40 +- .../mobile/_Placeholder_VisualVote.svelte | 68 +- .../tablet/_Placeholder_BestPlayers.svelte | 60 +- .../tablet/_Placeholder_LeagueInfo.svelte | 8 +- .../tablet/_Placeholder_TvStations.svelte | 56 +- .../tablet/_Placeholder_ValueBets.svelte | 52 +- .../tablet/_Placeholder_VisualVote.svelte | 64 +- .../home/league_list/LeagueList_Loader.svelte | 128 +- .../league_list/_LeagueList_Widget.svelte | 1674 +- .../home/league_list/_NoResults.svelte | 44 +- .../home/league_list/assets/_Africa.svelte | 47 +- .../home/league_list/assets/_Asia.svelte | 65 +- .../assets/_North_Central_America.svelte | 47 +- .../league_list/assets/_South_America.svelte | 47 +- .../home/league_list/assets/_World.svelte | 40 +- .../league_list/loaders/Loader_Row.svelte | 11 +- .../_League_Table_Team_Row.svelte | 339 +- .../_League_Table_Widget_ContentLoader.svelte | 155 +- .../_Leagues_Table_Widget.svelte | 868 +- .../loaders/_Placeholder_Row.svelte | 67 +- .../_LiveScores_Widget.svelte | 2276 +- .../loaders/_Placeholder_Livescores.svelte | 152 +- .../home/seo_block_homepage/_SEO_Block.svelte | 371 +- .../_SEO_Block_ContentLoader.svelte | 146 +- .../loaders/desktop/_Placeholder_Row.svelte | 115 +- .../loaders/mobile/_Placeholder_Row.svelte | 117 +- .../loaders/tablet/_Placeholder_Row.svelte | 115 +- .../components/page/fixture/Breadcrumb.svelte | 136 + src/lib/components/page/fixture/Layout.svelte | 597 + .../page/profile/Modal-ConnectWallet.svelte | 318 + .../page/profile/Modal-DeleteAccount.svelte | 216 + .../profile/Modal-ProfilePictureCrop.svelte | 771 + src/lib/components/page/profile/Navbar.svelte | 312 + .../profile/Widget-AccountSettings.svelte | 887 + .../page/profile/Widget-Dashboard.svelte | 265 + .../page/profile/Widget-MenuOpt-Row.svelte | 345 + .../page/profile/Widget-MenuOpt.svelte | 352 + .../page/profile/assets/Dashboard.png | Bin 0 -> 2117 bytes .../components/page/profile/assets/alert.svg | 3 + .../page/profile/assets/arrow-down-fade.svg | 3 + .../page/profile/assets/arrow-down.svg | 3 + .../page/profile/assets/arrow-up.svg | 3 + .../page/profile/assets/betarena-logo.svg | 15 + .../page/profile/assets/calendar.svg | 6 + .../components/page/profile/assets/edit.svg | 11 + .../page/profile/assets/home-select.svg | 7 + .../components/page/profile/assets/home.svg | 4 + .../page/profile/assets/icon-check.svg | 3 + .../assets/metamask-percent-ration-dark.png | Bin 0 -> 25269 bytes .../assets/metamask-percent-ration.png | Bin 0 -> 50073 bytes .../profile/assets/metamask-volume-dark.png | Bin 0 -> 13154 bytes .../page/profile/assets/metamask-volume.png | Bin 0 -> 70262 bytes .../page/profile/assets/metamask.svg | 14 + .../profile/assets/nft-marketshare-dark.png | Bin 0 -> 21209 bytes .../page/profile/assets/nft-marketshare.png | Bin 0 -> 45660 bytes .../page/profile/assets/profile-avatar.svg | 13 + .../page/profile/assets/settings-select.svg | 15 + .../page/profile/assets/settings.svg | 15 + .../page/profile/assets/theme-light-icon.svg | 11 + .../page/profile/assets/total-volume-dark.png | Bin 0 -> 4172 bytes .../page/profile/assets/total-volume.png | Bin 0 -> 11869 bytes .../components/page/profile/assets/wallet.svg | 3 + .../about_block/_About_Block.svelte | 721 +- .../_About_Block_ContentLoader.svelte | 217 +- .../desktop/_Placeholder_FAQ_Row.svelte | 28 +- .../loaders/desktop/_Placeholder_Row.svelte | 68 +- .../fixtures_odds/_Fixture_Odds_Widget.svelte | 6404 ++-- .../_Fixture_Odds_Widget_ContentLoader.svelte | 174 +- .../desktop/_Placeholder_Body_Main.svelte | 463 +- .../loaders/desktop/_Placeholder_Head.svelte | 30 +- .../desktop/_Placeholder_Left_Head.svelte | 41 +- .../desktop/_Placeholder_Right_Head.svelte | 57 +- .../mobile/_Placeholder_Body_Main.svelte | 487 +- .../mobile/_Placeholder_Head_Low.svelte | 30 +- .../mobile/_Placeholder_Head_Mid.svelte | 68 +- .../mobile/_Placeholder_Head_Top.svelte | 30 +- .../league_info/_LeagueInfo_Widget.svelte | 3515 ++- .../_LeagueInfo_Widget_ContentLoader.svelte | 133 +- .../league_info/assets/_World.svelte | 40 +- .../loaders/desktop/_Placeholder_Left.svelte | 192 +- .../loaders/desktop/_Placeholder_Right.svelte | 66 +- .../mobile/_Placeholder_Whole_M.svelte | 243 +- .../loaders/tablet/_Placeholder_Left.svelte | 226 +- .../_Placeholder_Left_Bottom_Row.svelte | 117 +- .../_Placeholder_Left_Middle_Row.svelte | 48 +- .../tablet/_Placeholder_Left_Top_Row.svelte | 93 +- .../loaders/tablet/_Placeholder_Right.svelte | 33 +- .../_Placeholder_Right_Middle_Row.svelte | 27 +- .../tablet/_Placeholder_Right_Top_Row.svelte | 25 +- .../league_info_2/_LeagueInfo_Widget_2.svelte | 747 +- .../_LeagueInfo_Widget_2_ContentLoader.svelte | 59 +- .../loaders/_Placeholder_Body_Main.svelte | 151 +- .../loaders/_Placeholder_Head.svelte | 40 +- .../standings/_Standings_Team_Row.svelte | 1054 +- .../standings/_Standings_Widget.svelte | 3125 +- .../_Standings_Widget_ContentLoader.svelte | 310 +- .../desktop/_Placeholder_Bottom.svelte | 29 +- .../loaders/desktop/_Placeholder_Head.svelte | 29 +- .../desktop/_Placeholder_Row_Left.svelte | 48 +- .../desktop/_Placeholder_Row_Right.svelte | 202 +- .../desktop/_Placeholder_ViewSel.svelte | 23 +- .../loaders/mobile/_Placeholder_Bottom.svelte | 29 +- .../loaders/mobile/_Placeholder_Head.svelte | 28 +- .../mobile/_Placeholder_Row_Left_M.svelte | 38 +- .../mobile/_Placeholder_Row_Right_M.svelte | 87 +- .../mobile/_Placeholder_Table_View.svelte | 29 +- .../mobile/_Placeholder_ViewSel.svelte | 29 +- .../top_players/_Top_Player_Row.svelte | 435 +- .../top_players/_Top_Players_Widget.svelte | 1362 +- .../_Top_Players_Widget_ContentLoader.svelte | 174 +- .../loaders/_Placeholder_Left_Row.svelte | 68 +- .../loaders/_Placeholder_Right_Row.svelte | 27 +- .../loaders/_Placeholder_Table_Row.svelte | 29 +- .../loaders/_Placeholder_Top_Table_Row.svelte | 29 +- .../firebase/featured_betting_sites/index.ts | 30 +- src/lib/firebase/fixtures_odds/index.ts | 140 +- .../firebase/fixtures_page/lineups/index.ts | 32 +- src/lib/firebase/index.ts | 178 +- src/lib/firebase/init.ts | 45 +- src/lib/firebase/livescores_football/index.ts | 49 +- src/lib/firebase/scoreboard/index.ts | 109 +- src/lib/firebase/votes/index.ts | 87 +- src/lib/geoJs/init.ts | 16 +- src/lib/graphql/_main_/auth/query.ts | 38 +- src/lib/graphql/_main_/header/query.ts | 32 +- src/lib/graphql/_main_/pages_and_seo/query.ts | 266 +- src/lib/graphql/fixtures/about/query.ts | 184 +- src/lib/graphql/fixtures/content/query.ts | 274 +- src/lib/graphql/fixtures/head-2-head/query.ts | 204 +- src/lib/graphql/fixtures/incidents/query.ts | 223 +- src/lib/graphql/fixtures/lineups/query.ts | 321 +- .../graphql/fixtures/probabilities/query.ts | 98 +- src/lib/graphql/fixtures/scoreboard/query.ts | 291 +- src/lib/graphql/fixtures/statistics/query.ts | 219 +- src/lib/graphql/fixtures/votes/query.ts | 93 +- src/lib/graphql/home/best_goalscorer/query.ts | 45 +- .../home/featured_betting_sites/query.ts | 17 +- src/lib/graphql/home/league_list/query.ts | 65 +- src/lib/graphql/home/leagues_table/query.ts | 130 +- src/lib/graphql/home/seo_block/query.ts | 17 +- src/lib/graphql/init_graphQL.ts | 14 +- src/lib/graphql/mutation.ts | 6 +- src/lib/graphql/profile/query.ts | 18 + src/lib/graphql/query.ts | 140 +- .../tournaments/fixtures_odds/query.ts | 415 +- .../graphql/tournaments/league-info/query.ts | 314 +- src/lib/graphql/tournaments/query.ts | 192 +- .../graphql/tournaments/standings/query.ts | 374 +- .../graphql/tournaments/top_players/query.ts | 333 +- src/lib/models/_main_/auth/types.ts | 28 +- src/lib/models/_main_/footer/types.ts | 58 +- src/lib/models/_main_/navbar/types.ts | 88 +- src/lib/models/_main_/pages_and_seo/types.ts | 143 +- src/lib/models/firebase.ts | 1080 +- src/lib/models/fixtures/about/types.ts | 62 +- src/lib/models/fixtures/content/types.ts | 70 +- src/lib/models/fixtures/head-2-head/types.ts | 77 +- src/lib/models/fixtures/incidents/types.ts | 123 +- src/lib/models/fixtures/lineups/types.ts | 208 +- .../models/fixtures/probabilities/types.ts | 70 +- src/lib/models/fixtures/scoreboard/types.ts | 175 +- src/lib/models/fixtures/statistics/types.ts | 104 +- src/lib/models/fixtures/votes/types.ts | 73 +- src/lib/models/hasura.ts | 3198 +- src/lib/models/home/best_goalscorer/types.ts | 137 +- .../firebase-real-db-interface.ts | 143 +- .../home/featured_match/interface-fixture.ts | 57 +- .../home/featured_match/response_models.ts | 136 +- src/lib/models/home/league_list/types.ts | 141 +- src/lib/models/home/leagues_table/types.ts | 88 +- .../models/home/live_scores_football/types.ts | 12 +- src/lib/models/home/seo_block/types.ts | 24 +- .../models/profile/account-setting/types.ts | 27 + src/lib/models/sportmonks.ts | 79 +- .../models/tournaments/fixtures_odds/types.ts | 218 +- .../models/tournaments/league-info/types.ts | 139 +- src/lib/models/tournaments/standings/types.ts | 240 +- .../models/tournaments/top_players/types.ts | 115 +- src/lib/redis/init.ts | 25 +- src/lib/redis/init_dev.ts | 25 +- src/lib/store/session.ts | 38 +- src/lib/store/user-settings.ts | 368 +- src/lib/store/vote_fixture.ts | 134 +- src/lib/utils/color_thief.ts | 84 +- src/lib/utils/dates.ts | 26 +- src/lib/utils/debug.ts | 268 +- src/lib/utils/languages.ts | 407 +- src/lib/utils/platform-functions.ts | 57 + src/params/fixture.js | 4 +- src/params/lang.js | 4 +- src/routes/+error.svelte | 48 +- src/routes/+layout.svelte | 340 +- src/routes/+layout.ts | 192 +- src/routes/+page.svelte | 417 - src/routes/+page.ts | 332 - src/routes/[[lang=lang]]/+page.svelte | 260 + src/routes/[[lang=lang]]/+page.ts | 125 + .../[sport]/+page.svelte | 0 src/routes/[[lang=lang]]/[sport]/+page.ts | 35 + .../[sport]/[country]/+page.svelte | 0 .../[[lang=lang]]/[sport]/[country]/+page.ts | 35 + .../[country]/[league_name]/+page.svelte | 523 + .../[sport]/[country]/[league_name]/+page.ts | 177 + .../[sport]/[fixture=fixture]/+page.svelte | 11 + .../[sport]/[fixture=fixture]/+page.ts | 345 + src/routes/[lang=lang]/+page.svelte | 418 - src/routes/[lang=lang]/+page.ts | 331 - src/routes/[lang=lang]/[sport]/+page.ts | 38 - .../[lang=lang]/[sport]/[country]/+page.ts | 38 - .../[country]/[league_name]/+page.svelte | 425 - .../[sport]/[country]/[league_name]/+page.ts | 232 - .../[sport]/[fixture=fixture]/+page.svelte | 624 - .../[sport]/[fixture=fixture]/+page.ts | 466 - src/routes/[sport]/+page.svelte | 0 src/routes/[sport]/+page.ts | 33 - src/routes/[sport]/[country]/+page.svelte | 0 src/routes/[sport]/[country]/+page.ts | 27 - .../[country]/[league_name]/+page.svelte | 425 - .../[sport]/[country]/[league_name]/+page.ts | 232 - .../[sport]/[fixture=fixture]/+page.svelte | 624 - src/routes/[sport]/[fixture=fixture]/+page.ts | 466 - src/routes/api/cache/_main_/footer/+server.ts | 28 +- src/routes/api/cache/_main_/navbar/+server.ts | 32 +- .../api/cache/_main_/pages_and_seo/+server.ts | 103 +- .../api/cache/fixtures/about/+server.ts | 22 +- .../api/cache/fixtures/content/+server.ts | 22 +- .../api/cache/fixtures/head-2-head/+server.ts | 25 + .../api/cache/fixtures/incidents/+server.ts | 28 +- .../api/cache/fixtures/lineups/+server.ts | 25 +- .../cache/fixtures/probabilities/+server.ts | 25 + .../api/cache/fixtures/scoreboard/+server.ts | 28 +- .../api/cache/fixtures/statistics/+server.ts | 28 +- .../api/cache/fixtures/votes/+server.ts | 14 +- .../api/cache/home/best_goalscorer/+server.ts | 33 +- .../home/featured_betting_sites/+server.ts | 35 +- .../api/cache/home/featured_match/+server.ts | 41 +- .../api/cache/home/league_list/+server.ts | 30 +- .../api/cache/home/leagues_table/+server.ts | 33 +- .../api/cache/home/live_scores/+server.ts | 43 +- .../api/cache/home/seo_block/+server.ts | 13 +- src/routes/api/cache/std_main.ts | 181 +- .../tournaments/fixtures_odds/+server.ts | 25 +- .../cache/tournaments/league_info/+server.ts | 14 +- .../cache/tournaments/sportbook/+server.ts | 34 +- .../cache/tournaments/standings/+server.ts | 27 +- .../cache/tournaments/top_players/+server.ts | 25 +- src/routes/api/hasura/_main_/auth/+server.ts | 69 +- .../api/hasura/fixtures/about/+server.ts | 84 +- .../api/hasura/fixtures/content/+server.ts | 68 +- .../hasura/fixtures/head-2-head/+server.ts | 444 +- .../api/hasura/fixtures/incidents/+server.ts | 166 +- .../api/hasura/fixtures/lineups/+server.ts | 900 +- .../hasura/fixtures/probabilities/+server.ts | 180 +- .../api/hasura/fixtures/scoreboard/+server.ts | 358 +- .../api/hasura/fixtures/statistics/+server.ts | 139 +- .../api/hasura/fixtures/votes/+server.ts | 171 +- src/routes/api/hasura/profile/+server.ts | 82 + .../tournaments/fixture_odds/+server.ts | 1005 +- .../fixture_odds/league/+server.ts | 1080 +- .../hasura/tournaments/top_players/+server.ts | 1028 +- .../u/[view]/[lang=lang]/+page.server.ts | 63 + src/routes/u/[view]/[lang=lang]/+page.svelte | 138 + src/service-worker.ts | 52 +- tsconfig.json | 6 +- vite.config.js | 15 +- 425 files changed, 79315 insertions(+), 59647 deletions(-) create mode 100644 .eslintignore create mode 100644 .prettierignore rename CONTRIBUTING/{EXAMPLE_WIDGET.svelte => TEMPLATE-WIDGET.svelte} (66%) create mode 100644 src/app.d.ts delete mode 100644 src/global.d.ts create mode 100644 src/lib/components/_main_/header/Header.svelte delete mode 100644 src/lib/components/_main_/header/_Header.svelte create mode 100644 src/lib/components/fixtures_page/scoreboard/assets/banner-mobile.png delete mode 100644 src/lib/components/fixtures_page/scoreboard/assets/banner-mobile.svg create mode 100644 src/lib/components/fixtures_page/scoreboard/assets/banner-tablet.png delete mode 100644 src/lib/components/fixtures_page/scoreboard/assets/banner-tablet.svg create mode 100644 src/lib/components/fixtures_page/scoreboard/assets/banner.png delete mode 100644 src/lib/components/fixtures_page/scoreboard/assets/banner.svg create mode 100644 src/lib/components/page/fixture/Breadcrumb.svelte create mode 100644 src/lib/components/page/fixture/Layout.svelte create mode 100644 src/lib/components/page/profile/Modal-ConnectWallet.svelte create mode 100644 src/lib/components/page/profile/Modal-DeleteAccount.svelte create mode 100644 src/lib/components/page/profile/Modal-ProfilePictureCrop.svelte create mode 100644 src/lib/components/page/profile/Navbar.svelte create mode 100644 src/lib/components/page/profile/Widget-AccountSettings.svelte create mode 100644 src/lib/components/page/profile/Widget-Dashboard.svelte create mode 100644 src/lib/components/page/profile/Widget-MenuOpt-Row.svelte create mode 100644 src/lib/components/page/profile/Widget-MenuOpt.svelte create mode 100644 src/lib/components/page/profile/assets/Dashboard.png create mode 100644 src/lib/components/page/profile/assets/alert.svg create mode 100644 src/lib/components/page/profile/assets/arrow-down-fade.svg create mode 100644 src/lib/components/page/profile/assets/arrow-down.svg create mode 100644 src/lib/components/page/profile/assets/arrow-up.svg create mode 100644 src/lib/components/page/profile/assets/betarena-logo.svg create mode 100644 src/lib/components/page/profile/assets/calendar.svg create mode 100644 src/lib/components/page/profile/assets/edit.svg create mode 100644 src/lib/components/page/profile/assets/home-select.svg create mode 100644 src/lib/components/page/profile/assets/home.svg create mode 100644 src/lib/components/page/profile/assets/icon-check.svg create mode 100644 src/lib/components/page/profile/assets/metamask-percent-ration-dark.png create mode 100644 src/lib/components/page/profile/assets/metamask-percent-ration.png create mode 100644 src/lib/components/page/profile/assets/metamask-volume-dark.png create mode 100644 src/lib/components/page/profile/assets/metamask-volume.png create mode 100644 src/lib/components/page/profile/assets/metamask.svg create mode 100644 src/lib/components/page/profile/assets/nft-marketshare-dark.png create mode 100644 src/lib/components/page/profile/assets/nft-marketshare.png create mode 100644 src/lib/components/page/profile/assets/profile-avatar.svg create mode 100644 src/lib/components/page/profile/assets/settings-select.svg create mode 100644 src/lib/components/page/profile/assets/settings.svg create mode 100644 src/lib/components/page/profile/assets/theme-light-icon.svg create mode 100644 src/lib/components/page/profile/assets/total-volume-dark.png create mode 100644 src/lib/components/page/profile/assets/total-volume.png create mode 100644 src/lib/components/page/profile/assets/wallet.svg create mode 100644 src/lib/graphql/profile/query.ts create mode 100644 src/lib/models/profile/account-setting/types.ts create mode 100644 src/lib/utils/platform-functions.ts delete mode 100644 src/routes/+page.svelte delete mode 100644 src/routes/+page.ts create mode 100644 src/routes/[[lang=lang]]/+page.svelte create mode 100644 src/routes/[[lang=lang]]/+page.ts rename src/routes/{[lang=lang] => [[lang=lang]]}/[sport]/+page.svelte (100%) create mode 100644 src/routes/[[lang=lang]]/[sport]/+page.ts rename src/routes/{[lang=lang] => [[lang=lang]]}/[sport]/[country]/+page.svelte (100%) create mode 100644 src/routes/[[lang=lang]]/[sport]/[country]/+page.ts create mode 100644 src/routes/[[lang=lang]]/[sport]/[country]/[league_name]/+page.svelte create mode 100644 src/routes/[[lang=lang]]/[sport]/[country]/[league_name]/+page.ts create mode 100644 src/routes/[[lang=lang]]/[sport]/[fixture=fixture]/+page.svelte create mode 100644 src/routes/[[lang=lang]]/[sport]/[fixture=fixture]/+page.ts delete mode 100644 src/routes/[lang=lang]/+page.svelte delete mode 100644 src/routes/[lang=lang]/+page.ts delete mode 100644 src/routes/[lang=lang]/[sport]/+page.ts delete mode 100644 src/routes/[lang=lang]/[sport]/[country]/+page.ts delete mode 100644 src/routes/[lang=lang]/[sport]/[country]/[league_name]/+page.svelte delete mode 100644 src/routes/[lang=lang]/[sport]/[country]/[league_name]/+page.ts delete mode 100644 src/routes/[lang=lang]/[sport]/[fixture=fixture]/+page.svelte delete mode 100644 src/routes/[lang=lang]/[sport]/[fixture=fixture]/+page.ts delete mode 100644 src/routes/[sport]/+page.svelte delete mode 100644 src/routes/[sport]/+page.ts delete mode 100644 src/routes/[sport]/[country]/+page.svelte delete mode 100644 src/routes/[sport]/[country]/+page.ts delete mode 100644 src/routes/[sport]/[country]/[league_name]/+page.svelte delete mode 100644 src/routes/[sport]/[country]/[league_name]/+page.ts delete mode 100644 src/routes/[sport]/[fixture=fixture]/+page.svelte delete mode 100644 src/routes/[sport]/[fixture=fixture]/+page.ts create mode 100644 src/routes/api/cache/fixtures/head-2-head/+server.ts create mode 100644 src/routes/api/cache/fixtures/probabilities/+server.ts create mode 100644 src/routes/api/hasura/profile/+server.ts create mode 100644 src/routes/u/[view]/[lang=lang]/+page.server.ts create mode 100644 src/routes/u/[view]/[lang=lang]/+page.svelte diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 000000000..38972655f --- /dev/null +++ b/.eslintignore @@ -0,0 +1,13 @@ +.DS_Store +node_modules +/build +/.svelte-kit +/package +.env +.env.* +!.env.example + +# Ignore files for PNPM, NPM and YARN +pnpm-lock.yaml +package-lock.json +yarn.lock diff --git a/.eslintrc.cjs b/.eslintrc.cjs index fba386194..3ccf435f0 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -10,7 +10,7 @@ module.exports = { }, parserOptions: { sourceType: 'module', - ecmaVersion: 2019 + ecmaVersion: 2020 }, env: { browser: true, diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 717f8cb15..535f55fbc 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -2,28 +2,44 @@ # ... GITHUB ACIONS CI/CD WORKFLOW ... # .................................... name: Docker Image CI -# ... when to trigger this project +# [ℹ] NOTE:when to trigger this project on: push: branches: [main, dev] pull_request: branches: [main, dev] -# ... declaring ENV variables to be used in the project-CI/CD +# [ℹ] NOTE: declaring ENV variables to be +# [ℹ] NOTE: used in the project-CI/CD env: + # [ℹ] other + PORT: ${{secrets.PORT}} + # [ℹ] hasura VITE_HASURA_DB_URL: ${{secrets.VITE_HASURA_DB_URL}} VITE_HASURA_DB_TOKEN: ${{secrets.VITE_HASURA_DB_TOKEN}} + # [ℹ] firebase VITE_FIREBASE_DB_API_KEY: ${{secrets.VITE_FIREBASE_DB_API_KEY }} VITE_FIREBASE_DB_AUTH_DOMAIN: ${{secrets.VITE_FIREBASE_DB_AUTH_DOMAIN}} VITE_FIREBASE_DB_PROJECT_ID: ${{secrets.VITE_FIREBASE_DB_PROJECT_ID}} VITE_FIREBASE_DB_DATABASE_URL: ${{secrets.VITE_FIREBASE_DB_DATABASE_URL}} - VITE_REDIS_CONNECTION_URL: ${{secrets.VITE_REDIS_CONNECTION_URL}} -# ... JOBS TO DO WITH GITHUB WORFLOWS; + VITE_FIREBASE_DB_STORAGE_BUCKET: ${{secrets.VITE_FIREBASE_DB_STORAGE_BUCKET}} + VITE_FIREBASE_DB_AUTH_DOMAIN_MAIN: ${{secrets.VITE_FIREBASE_DB_AUTH_DOMAIN_MAIN}} + VITE_FIREBASE_DB_PROJECT_ID_MAIN: ${{secrets.VITE_FIREBASE_DB_PROJECT_ID_MAIN}} + VITE_FIREBASE_DB_DATABASE_URL_MAIN: ${{secrets.VITE_FIREBASE_DB_DATABASE_URL_MAIN}} + # [ℹ] redis + VITE_REDIS_HOST: ${{secrets.VITE_REDIS_HOST}} + VITE_REDIS_PORT: ${{secrets.VITE_REDIS_PORT}} + VITE_REDIS_PASS: ${{secrets.VITE_REDIS_PASS}} + VITE_REDIS_CACHE_DB: ${{secrets.VITE_REDIS_CACHE_DB}} + VITE_REDIS_BULL_DB: ${{secrets.VITE_REDIS_BULL_DB}} + # [ℹ] discord + VITE_DISCORD_OAUTH_URL: ${{secrets.VITE_DISCORD_OAUTH_URL}} +# [ℹ] NOTE: JOBS TO DO WITH GITHUB WORFLOWS; jobs: build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - # ... instantiate a `.env` file for the JOB to access; + # [ℹ] instantiate a `.env` file for the JOB to access; - name: create env file run: | touch .env @@ -33,8 +49,16 @@ jobs: echo VITE_FIREBASE_DB_AUTH_DOMAIN="${{secrets.VITE_FIREBASE_DB_AUTH_DOMAIN}}" >> .env echo VITE_FIREBASE_DB_PROJECT_ID="${{secrets.VITE_FIREBASE_DB_PROJECT_ID}}" >> .env echo VITE_FIREBASE_DB_DATABASE_URL="${{secrets.VITE_FIREBASE_DB_DATABASE_URL}}" >> .env - echo VITE_REDIS_CONNECTION_URL="${{secrets.VITE_REDIS_CONNECTION_URL}}" >> .env - # ... build the DOCKER IMAGE CONTAINER; + echo VITE_FIREBASE_DB_STORAGE_BUCKET="${{secrets.VITE_FIREBASE_DB_STORAGE_BUCKET}}" >> .env + echo VITE_FIREBASE_DB_AUTH_DOMAIN_MAIN="${{secrets.VITE_FIREBASE_DB_AUTH_DOMAIN_MAIN}}" >> .env + echo VITE_FIREBASE_DB_PROJECT_ID_MAIN="${{secrets.VITE_FIREBASE_DB_PROJECT_ID_MAIN}}" >> .env + echo VITE_FIREBASE_DB_DATABASE_URL_MAIN="${{secrets.VITE_FIREBASE_DB_DATABASE_URL_MAIN}}" >> .env + echo VITE_REDIS_HOST="${{secrets.VITE_REDIS_HOST}}" >> .env + echo VITE_REDIS_PORT="${{secrets.VITE_REDIS_PORT}}" >> .env + echo VITE_REDIS_PASS="${{secrets.VITE_REDIS_PASS}}" >> .env + echo VITE_REDIS_CACHE_DB="${{secrets.VITE_REDIS_CACHE_DB}}" >> .env + echo VITE_REDIS_BULL_DB="${{secrets.VITE_REDIS_BULL_DB}}" >> .env + # [ℹ] build the DOCKER IMAGE CONTAINER; - name: Build the Docker image run: | docker build . --file Dockerfile --tag my-image-name:$(date +%s) diff --git a/.gitignore b/.gitignore index 859f2f131..f8034d458 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,7 @@ certs/* .env WEBSITE-DEV-README.md -datalog/ \ No newline at end of file +datalog/ + +# [PERSONAL] +.vscode/ \ No newline at end of file diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..38972655f --- /dev/null +++ b/.prettierignore @@ -0,0 +1,13 @@ +.DS_Store +node_modules +/build +/.svelte-kit +/package +.env +.env.* +!.env.example + +# Ignore files for PNPM, NPM and YARN +pnpm-lock.yaml +package-lock.json +yarn.lock diff --git a/.prettierrc b/.prettierrc index ff2677efd..5bf51dcac 100644 --- a/.prettierrc +++ b/.prettierrc @@ -2,5 +2,13 @@ "useTabs": true, "singleQuote": true, "trailingComma": "none", - "printWidth": 100 -} + "singleAttributePerLine": true, + "bracketSameLine": false, + "printWidth": 120, + "plugins": ["prettier-plugin-svelte"], + "pluginSearchDirs": ["."], + "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }], + "svelteSortOrder" : "scripts-options-markup-styles", + "svelteStrictMode": false, + "svelteAllowShorthand": true +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 0f58ae0e4..ed52430d8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,9 +2,9 @@ // DOC: https://stackoverflow.com/questions/64365300/how-can-i-remove-unused-imports-declarations-from-the-entire-project-of-react-ty // DOC: https://stackoverflow.com/questions/46722701/is-there-a-way-to-remove-unused-imports-and-declarations-from-angular-2 "editor.codeActionsOnSave": { - "source.fixAll": true, - "source.organizeImports": true, - "source.sortMembers": true + // "source.fixAll": true, + // "source.organizeImports": true, + // "source.sortMembers": true }, // NOTE: custom highlighter for data "todohighlight.keywords": [ @@ -38,5 +38,42 @@ "backgroundColor": "red", "overviewRulerColor": "grey" } - ] + ], + // DOC: https://discord.com/channels/457912077277855764/1036919129782878218 + // DOC: https://discord.com/channels/457912077277855764/1036369208721813554 + "svelte.plugin.svelte.compilerWarnings": { + "a11y-click-events-have-key-events": "ignore", + "a11y-aria-attributes": "ignore", + "a11y-incorrect-aria-attribute-type": "ignore", + "a11y-unknown-aria-attribute": "ignore", + "a11y-hidden": "ignore", + "a11y-misplaced-role": "ignore", + "a11y-unknown-role": "ignore", + "a11y-no-abstract-role": "ignore", + "a11y-no-redundant-roles": "ignore", + "a11y-role-has-required-aria-props": "ignore", + "a11y-accesskey": "ignore", + "a11y-autofocus": "ignore", + "a11y-misplaced-scope": "ignore", + "a11y-positive-tabindex": "ignore", + "a11y-invalid-attribute": "ignore", + "a11y-missing-attribute": "ignore", + "a11y-img-redundant-alt": "ignore", + "a11y-label-has-associated-control": "ignore", + "a11y-media-has-caption": "ignore", + "a11y-distracting-elements": "ignore", + "a11y-structure": "ignore", + "a11y-mouse-events-have-key-events": "ignore", + "a11y-missing-content": "ignore", + }, + // DOC: https://stackoverflow.com/a/49777201/8421215 + "editor.folding": true, + "editor.showFoldingControls": "always", + "editor.foldingStrategy": "indentation", + "editor.foldingImportsByDefault": true, + // DOC: https://marketplace.visualstudio.com/items?itemName=maptz.regionfolder + "maptz.regionfolder": { + "collapseAllRegions": true, + "collapseDefaultRegionsOnOpen": true + } } \ No newline at end of file diff --git a/CONTRIBUTING/EXAMPLE_WIDGET.svelte b/CONTRIBUTING/TEMPLATE-WIDGET.svelte similarity index 66% rename from CONTRIBUTING/EXAMPLE_WIDGET.svelte rename to CONTRIBUTING/TEMPLATE-WIDGET.svelte index aa7292b89..accbe0e90 100644 --- a/CONTRIBUTING/EXAMPLE_WIDGET.svelte +++ b/CONTRIBUTING/TEMPLATE-WIDGET.svelte @@ -4,6 +4,14 @@ COMPONENT JS (w/ TS) - - - - - - - + + + + %sveltekit.head% - -
%sveltekit.body%
+ +
+ %sveltekit.body% +
- \ No newline at end of file + diff --git a/src/global.d.ts b/src/global.d.ts deleted file mode 100644 index 6dd6bf078..000000000 --- a/src/global.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -/// - -interface Web3_Providers -extends import('ethers').providers.ExternalProvider { - isCoinbaseWallet: boolean; - isCoinbaseBrowser: boolean; -} - -interface Window { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - gtag: unknown; - ethereum: unknown; -} \ No newline at end of file diff --git a/src/hooks.server.ts b/src/hooks.server.ts index dba21d8d4..ba3db7e62 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -1,68 +1,93 @@ import { v4 as uuid } from '@lukeed/uuid'; import cookie from 'cookie'; -import type { Handle } from '@sveltejs/kit'; -// https://dev.to/krowemoh/sveltekit-hooks-2bii -// https://dev.to/kudadam/sveltekit-hooks-everything-you-need-to-know-3l39 -// https://rodneylab.com/sveltekit-session-cookies/ -// https://stackoverflow.com/questions/71105799/sveltekit-pass-data-from-server-to-browser -// https://github.com/sveltejs/kit/pull/3993 -// https://stackoverflow.com/questions/69066169/how-to-implement-cookie-authentication-sveltekit-mongodb -// https://blog.logrocket.com/authentication-svelte-using-cookies/ +import { dlog } from '$lib/utils/debug'; +import { platfrom_lang_ssr } from '$lib/utils/platform-functions'; +import type { + Handle, + RequestEvent +} from '@sveltejs/kit'; -export const handle: Handle = async ({ event, resolve }) => { +/** + * @description + * DOC: REF: [3] + * @param param0 + * @returns + */ +export const handle: Handle = async ({ + event, + resolve +}) => { + // https://github.com/sveltejs/kit/issues/4873 + // const clientAddress = !prerendering ? await event.clientAddress : ''; // incorrect-IP + // const clientAddressv2 = !prerendering ? event : '' // no-working - // https://github.com/sveltejs/kit/issues/4873 - // const clientAddress = !prerendering ? await event.clientAddress : ''; // incorrect-IP - // const clientAddressv2 = !prerendering ? event : '' // no-working - - // ----------------- - // [ℹ] before endpoint call + // ----------------- + // [ℹ] before endpoint call + // ----------------- - // [ℹ] getting cookies from request headers - all requests have cookies on them - const cookies = cookie.parse(event.request.headers.get('cookie') || ''); + // [ℹ] getting cookies from request headers + // [ℹ] all requests have cookies on them + const cookies = cookie.parse( + event.request.headers.get('cookie') || '' + ); - // [ℹ] assign "locals" context from "cookie" - // [ℹ] or, load defaults + // [ℹ] assign "locals" context from "cookie" + // [ℹ] or, load defaults event.locals.user = cookies.betarenaCOOKIE || { - userid: uuid(), - // originIP: event.request.headers['x-forwarded-for'] || - // event.request.socket.remoteAddress || - // null - // originIP: clientAddress, - // geoPos: !prerendering ? (await getUserLocationFromIP(clientAddress)) : '', - lang: 'en', - theme: 'Light', - }; + userid: uuid(), + // originIP: event.request.headers['x-forwarded-for'] || + // event.request.socket.remoteAddress || + // null + // originIP: clientAddress, + // geoPos: !prerendering ? (await getUserLocationFromIP(clientAddress)) : '', + lang: 'en', + theme: 'Light' + }; + dlog(event?.locals?.user); - // [🐛] debug - // console.log('event.locals.user', event.locals.user); + // [ℹ] assign "locals" context from "cookie" + // [ℹ] or, load defaults + event.locals.betarenaUser = cookies.betarenaCookieLoggedIn || null; + dlog(event?.locals?.betarenaUser); - // TODO https://github.com/sveltejs/kit/issues/1046 + // TODO: https://github.com/sveltejs/kit/issues/1046 // if (event.url.searchParams.has('_method')) { // event.method = event.url.searchParams.get('_method').toUpperCase(); // } - // ----------------- - // [ℹ] endpoint call + // ----------------- + // [ℹ] endpoint call + // ----------------- - const response = await resolve(event); + // [ℹ] past use with cookies-template + // const response = await resolve(event); + // [ℹ] new with response of + // DOC: https://github.com/sveltejs/kit/issues/3091 + const response = await resolve(event, { + transformPageChunk: ({ html }) => + html.replace('%lang%', get_lang(event)) + }); - // ----------------- - // [ℹ] after endpoint call + // ----------------- + // [ℹ] after endpoint call + // ----------------- - // [ℹ] if this is the first time the user has visited this app, + // [ℹ] if this is the first time the user has visited this app, if (!cookies.betarenaCOOKIE) { // [ℹ] set a cookie so that we recognise them when they return - response.headers.set('Set-Cookie', cookie.serialize( - 'betarenaCOOKIE', // 'name' - JSON.stringify(event.locals.user), // 'value' - { - path: '/', - httpOnly: true, - maxAge: 60 * 60 * 24 * 7 // 1 week - } - )); + response.headers.set( + 'Set-Cookie', + cookie.serialize( + 'betarenaCOOKIE', // 'name' + JSON.stringify(event.locals.user), // 'value' + { + path: '/', + httpOnly: true, + maxAge: 60 * 60 * 24 * 7 // 1 week + } + ) + ); } return response; @@ -70,21 +95,44 @@ export const handle: Handle = async ({ event, resolve }) => { /** @type {import('@sveltejs/kit').GetSession} */ export function getSession(event) { + return event?.locals?.user + ? { + user: { + // [ℹ] only include properties needed client-side — + // [ℹ] exclude anything else attached to the user + // [ℹ] like access tokens etc + userid: event.locals.user.userid, + originIP: event.locals.user.originIP, + geoPos: event.locals.user.geoPos, + lang: event.locals.user.lang, + theme: event.locals.user.theme + } + } + : {}; +} + +/** @type {import('@sveltejs/kit').GetSession} */ +export function getSignedInUser(event) { + return event?.locals?.betarenaUser + ? true + : false + ; +} - return event?.locals?.user - ? - { - user: { - // [ℹ] only include properties needed client-side — - // [ℹ] exclude anything else attached to the user - // [ℹ] like access tokens etc - userid: event.locals.user.userid, - originIP: event.locals.user.originIP, - geoPos: event.locals.user.geoPos, - lang: event.locals.user.lang, - theme: event.locals.user.theme - } - } - : - {}; -} \ No newline at end of file +/** + * @description obtains the current platform translation + * as a hook.server.ts method/function + * @param {RequestEvent>>} event + * @returns {string} language + */ +function get_lang( + event: RequestEvent>> +): string { + const lang = platfrom_lang_ssr( + event?.route.id, + event?.error, // FIXME: event.error does not exist in a hook + event?.params?.lang + ); + dlog(`HOOKS | get_lang: ${lang}`, true); + return lang; +} diff --git a/src/lib/api/utils.ts b/src/lib/api/utils.ts index 051ca6eea..0aea94c7c 100644 --- a/src/lib/api/utils.ts +++ b/src/lib/api/utils.ts @@ -1,5 +1,5 @@ -import { dev } from "$app/environment"; -import { logErrorGroup } from "$lib/utils/debug"; +import { dev } from '$app/environment'; +import { logErrorGroup } from '$lib/utils/debug'; /** * EXPORT @@ -11,21 +11,29 @@ import { logErrorGroup } from "$lib/utils/debug"; * @param endpoint * @returns */ - export async function get(endpoint: string): Promise { - // curcanavigate CORS issues - // endpoint = 'https://cors-anywhere.herokuapp.com/' + endpoint // comment this out before subemission, - // ... - return await fetch(endpoint, { - method: 'GET' - }).then((response) => { - // ... verify if the response is error-free - if (!response.ok) { - if (dev) logErrorGroup ("utils [DEV]", `response: ${response}`) - throw new Error('Network response was not ok'); - } - // ... return the data - return response.json(); - }); +export async function get( + endpoint: string +): Promise { + // curcanavigate CORS issues + // endpoint = 'https://cors-anywhere.herokuapp.com/' + endpoint // comment this out before subemission, + // ... + return await fetch(endpoint, { + method: 'GET' + }).then((response) => { + // ... verify if the response is error-free + if (!response.ok) { + if (dev) + logErrorGroup( + 'utils [DEV]', + `response: ${response}` + ); + throw new Error( + 'Network response was not ok' + ); + } + // ... return the data + return response.json(); + }); } /** @@ -33,32 +41,41 @@ import { logErrorGroup } from "$lib/utils/debug"; * Used as a PROXY on the website * to handle requests correctly and * in-line with the CORS requirements. - * + * * A POST request is used to appropietly * pass data from the client-to-the-backend. - * - * @param {*} path - * @param {*} data - * @returns -*/ -export async function post(path, data): Promise { - // ... - return await fetch(path, { - method: 'POST', - credentials: 'include', - body: JSON.stringify(data), - mode: 'cors', - headers: { - 'Accept': 'application/json', - 'Content-Type': 'application/json', - }, - }).then((response) => { - // ... verify if the response is error-free - if (!response.ok) { - if (dev) logErrorGroup ("utils [DEV]", `response: ${response}`) - throw new Error('Network response was not ok'); - } - // ... return the data - return response.json() - }) + * + * @param {*} path + * @param {*} data + * @returns + */ +export async function post( + path, + data +): Promise { + // ... + return await fetch(path, { + method: 'POST', + credentials: 'include', + body: JSON.stringify(data), + mode: 'cors', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json' + } + }).then((response) => { + // ... verify if the response is error-free + if (!response.ok) { + if (dev) + logErrorGroup( + 'utils [DEV]', + `response: ${response}` + ); + throw new Error( + 'Network response was not ok' + ); + } + // ... return the data + return response.json(); + }); } diff --git a/src/lib/components/_Email_subscribe.svelte b/src/lib/components/_Email_subscribe.svelte index c7cb84c04..f4f26dea7 100644 --- a/src/lib/components/_Email_subscribe.svelte +++ b/src/lib/components/_Email_subscribe.svelte @@ -2,13 +2,12 @@ COMPONENT JS - BASIC [TypeScript Written] =================== --> - {#if $sessionStore.newsletterPopUpShow} -
$sessionStore.newsletterPopUpShow = false} - in:fade /> - -
- - close-svg $sessionStore.newsletterPopUpShow = false} /> - - {#if server_side_language == 'en'} - -