fix: #1096 (auth); (profile); dir / struct (up);

Betarena · Mar 9, 2023 · 83258f8 · 83258f8
1 parent c36817f
commit 83258f8
Show file tree

Hide file tree

Showing 29 changed files with 28 additions and 125 deletions.
diff --git a/src/lib/components/_main_/header/Header.svelte b/src/lib/components/_main_/header/Header.svelte
@@ -14,7 +14,7 @@ COMPONENT JS - BASIC
 	import {
 		getUserLocation,
 		getUserLocationFromIP
-	} from '$lib/geoJs/init';
+	} from '$lib/geo-js/init';
 	import { dlog, dlogv2, NB_W_STY, NB_W_TAG, NB_W_TOG } from '$lib/utils/debug';
 	import arrow_down_fade from './assets/arrow-down-fade.svg';
 	import arrow_down from './assets/arrow-down.svg';
@@ -29,8 +29,8 @@ COMPONENT JS - BASIC
 	import profile_avatar from './assets/profile-avatar.svg';
 	import light_icon_theme from './assets/theme-light-icon.svg';
 
-	import type { GeoJsResponse } from '$lib/models/geojs-types';
 	import type { Cache_Single_Lang_Header_Translation_Response } from '$lib/models/_main_/navbar/types';
+	import type { GeoJsResponse } from '$lib/types/geojs-types';
 
 	import { db_firestore } from '$lib/firebase/init';
 	import { sessionStore } from '$lib/store/session';

diff --git a/src/lib/components/page/fixture/lineups/Lineups_Widget.svelte b/src/lib/components/page/fixture/lineups/Lineups_Widget.svelte
@@ -38,7 +38,7 @@
 	import LineupVectorTablet from './Lineup_Vector_Tablet.svelte';
 
 	import { REDIS_CACHE_LINEUPS_DATA_4 } from '$lib/graphql/fixtures/lineups/query';
-	import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+	import { initGrapQLClient } from '$lib/graphql/init';
 	import { viewport_change } from '$lib/utils/platform-functions';
 	import no_visual from './assets/no_visual.svg';
 	import no_visual_dark from './assets/no_visual_dark.svg';

diff --git a/src/lib/components/page/fixture/probabilities/Probability_Widget.svelte b/src/lib/components/page/fixture/probabilities/Probability_Widget.svelte
@@ -14,7 +14,7 @@
 	import { db_real } from '$lib/firebase/init';
 	import { get_odds } from '$lib/firebase/votes';
 	import { REDIS_CACHE_FIXTURE_PROBABILITIES_0 } from '$lib/graphql/fixtures/probabilities/query';
-	import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+	import { initGrapQLClient } from '$lib/graphql/init';
 	import { userBetarenaSettings } from '$lib/store/user-settings';
 	import { getImageBgColor } from '$lib/utils/color_thief';
 	import {

diff --git a/src/lib/components/page/fixture/votes/Vote_Widget.svelte b/src/lib/components/page/fixture/votes/Vote_Widget.svelte
@@ -17,7 +17,7 @@
 		HASURA_FIXTURE_VOTES_DATA_0,
 		HASURA_FIXTURE_VOTES_INIT_UPDATE
 	} from '$lib/graphql/fixtures/votes/query';
-	import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+	import { initGrapQLClient } from '$lib/graphql/init';
 	import { userBetarenaSettings } from '$lib/store/user-settings';
 	import {
 		fixtureVote,

diff --git a/src/lib/components/page/home/featured_match/_FeaturedMatch_Widget.svelte b/src/lib/components/page/home/featured_match/_FeaturedMatch_Widget.svelte
@@ -15,7 +15,7 @@
 	// [ℹ] external `exports` imports;
 	import { getTargetFixtureOdds } from '$lib/firebase/index';
 	import { db_real } from '$lib/firebase/init';
-	import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+	import { initGrapQLClient } from '$lib/graphql/init';
 	import { UPDATE_MATCH_FIXTURE_VOTES } from '$lib/graphql/mutation';
 	import { userBetarenaSettings } from '$lib/store/user-settings';
 	import { fixtureVote } from '$lib/store/vote_fixture';

diff --git a/src/lib/geoJs/init.ts → src/lib/geo-js/init.ts b/src/lib/geoJs/init.ts → src/lib/geo-js/init.ts
@@ -5,7 +5,7 @@
  */
 import { get } from '$lib/api/utils';
 
-import type { GeoJsResponse } from '$lib/models/geojs-types';
+import type { GeoJsResponse } from '$lib/types/types.geojs';
 
 export async function getUserLocation(): Promise<GeoJsResponse> {
 	const response = await get(

diff --git a/src/lib/graphql/_main_/auth/query.ts b/src/lib/graphql/_main_/auth/query.ts
diff --git a/src/lib/graphql/init_graphQL.ts → src/lib/graphql/init.ts b/src/lib/graphql/init_graphQL.ts → src/lib/graphql/init.ts
diff --git a/src/lib/graphql/profile/query.ts b/src/lib/graphql/profile/query.ts
diff --git a/src/lib/models/_main_/auth/types.ts b/src/lib/models/_main_/auth/types.ts
diff --git a/src/lib/models/profile/account-setting/types.ts b/src/lib/models/profile/account-setting/types.ts
diff --git a/src/lib/store/user-settings.ts b/src/lib/store/user-settings.ts
@@ -2,7 +2,7 @@
 // ... contains the TRANSLATION LANG SELECTED by the USER;
 // ... ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-import type { GeoJsResponse } from '$lib/models/geojs-types';
+import type { GeoJsResponse } from '$lib/types/types.geojs';
 import type { User } from 'firebase/auth';
 import { writable } from 'svelte/store';
 

diff --git a/src/lib/models/geojs-types.ts → src/lib/types/types.geojs.ts b/src/lib/models/geojs-types.ts → src/lib/types/types.geojs.ts
diff --git a/src/routes/[[lang=lang]]/[sport]/[fixture=fixture]/+page.ts b/src/routes/[[lang=lang]]/[sport]/[fixture=fixture]/+page.ts
@@ -1,11 +1,11 @@
 import { error } from '@sveltejs/kit';
 import type { PageLoad } from './$types';
 
-import type { GeoJsResponse } from '$lib/models/geojs-types';
 import type {
   REDIS_CACHE_SINGLE_fixtures_page_info_response,
   REDIS_CACHE_SINGLE_general_countries_translation
 } from '$lib/models/_main_/pages_and_seo/types';
+import type { GeoJsResponse } from '$lib/types/types.geojs';
 import { dlog, errlog, ERROR_CODE_INVALID, ERROR_CODE_PRELOAD, FIXTURE_PAGE_ERROR_MSG, PAGE_INVALID_MSG } from '$lib/utils/debug';
 
 /** @type {import('./$types').PageLoad} */

diff --git a/src/routes/api/hasura/_main_/auth/+server.ts b/src/routes/api/hasura/_main_/auth/+server.ts
@@ -1,13 +1,13 @@
 import { json } from '@sveltejs/kit';
 import { performance } from 'perf_hooks';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 
 import { BETARENA_SCORES_AUTH_TRANSLATION } from '$lib/graphql/_main_/auth/query';
 import type { BETARENA_HASURA_auth_translations } from '$lib/models/hasura';
 import type {
-	BETARENA_HASURA_auth_query,
-	REDIS_CACHE_SINGLE_auth_translation
+  BETARENA_HASURA_auth_query,
+  REDIS_CACHE_SINGLE_auth_translation
 } from '$lib/models/_main_/auth/types';
 
 // [ℹ] debug info

diff --git a/src/routes/api/hasura/fixture/about/+server.ts b/src/routes/api/hasura/fixture/about/+server.ts
@@ -2,7 +2,7 @@
 
 import { json } from '@sveltejs/kit';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 import { ABT_F_get_target_fixture } from '@betarena/scores-lib/dist/functions/func.about.js';
 import type { B_ABT_D } from '@betarena/scores-lib/types/about';
 

diff --git a/src/routes/api/hasura/fixture/content/+server.ts b/src/routes/api/hasura/fixture/content/+server.ts
@@ -2,7 +2,7 @@
 
 import { json } from '@sveltejs/kit';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 
 import { CONT_F_get_target_fixture } from '@betarena/scores-lib/dist/functions/func.content.js';
 

diff --git a/src/routes/api/hasura/fixture/head-2-head/+server.ts b/src/routes/api/hasura/fixture/head-2-head/+server.ts
@@ -2,7 +2,7 @@
 
 import { json } from '@sveltejs/kit';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 
 import { dev } from '$app/environment';
 

diff --git a/src/routes/api/hasura/fixture/incidents/+server.ts b/src/routes/api/hasura/fixture/incidents/+server.ts
@@ -2,7 +2,7 @@
 
 import { json } from '@sveltejs/kit';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 
 import { INC_F_data_main, INC_F_generate_historic_fixtures_map, INC_F_get_target_fixture } from '@betarena/scores-lib/dist/functions/func.incidents.js';
 

diff --git a/src/routes/api/hasura/fixture/lineups/+server.ts b/src/routes/api/hasura/fixture/lineups/+server.ts
@@ -2,7 +2,7 @@
 
 import { json } from '@sveltejs/kit';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 
 import { LIN_F_data_main, LIN_F_generate_historic_fixtures_map, LIN_F_generate_players_map, LIN_F_get_target_fixture, LIN_F_get_target_player_data } from '@betarena/scores-lib/dist/functions/func.lineups.js';
 

diff --git a/src/routes/api/hasura/fixture/probabilities/+server.ts b/src/routes/api/hasura/fixture/probabilities/+server.ts
@@ -2,7 +2,7 @@
 
 import { json } from '@sveltejs/kit';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 
 import { PR_F_get_target_fixture, PR_F_get_widget_translations, PR_F_translations_main } from '@betarena/scores-lib/dist/functions/func.probabilities.js';
 import type { B_PR_T, PR_Fixture } from '@betarena/scores-lib/types/probabilities';

diff --git a/src/routes/api/hasura/fixture/scoreboard/+server.ts b/src/routes/api/hasura/fixture/scoreboard/+server.ts
@@ -2,7 +2,7 @@
 
 import { json } from '@sveltejs/kit';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 
 
 import { B_FS_compile_data, B_FS_generate_historic_fixtures_map, B_FS_generate_leagues_tournaments_map, B_FS_get_target_leagues, B_SF_get_target_fixture } from '@betarena/scores-lib/dist/functions/func.scoreboard.js';

diff --git a/src/routes/api/hasura/fixture/statistics/+server.ts b/src/routes/api/hasura/fixture/statistics/+server.ts
@@ -2,7 +2,7 @@
 
 import { json } from '@sveltejs/kit';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 import { ST_F_data_main, ST_F_generate_historic_fixtures_map, ST_F_get_target_fixture } from '@betarena/scores-lib/dist/functions/func.statistics.js';
 
 //#endregion ➤ Package Imports

diff --git a/src/routes/api/hasura/fixture/votes/+server.ts b/src/routes/api/hasura/fixture/votes/+server.ts
@@ -2,7 +2,7 @@
 
 import { json } from '@sveltejs/kit';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 
 import { VOT_F_data_main, VOT_F_get_target_fixture } from '@betarena/scores-lib/dist/functions/func.votes.js';
 

diff --git a/src/routes/api/hasura/home/livescores-v2/+server.ts b/src/routes/api/hasura/home/livescores-v2/+server.ts
@@ -1,6 +1,6 @@
 import { json } from '@sveltejs/kit';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 import { generate_historic_fixtures_day_group_map, generate_leagues_map, generate_tournaments_map, get_target_date_fixtures, get_target_leagues } from '@betarena/scores-lib/dist/functions/func.livescores-v2.js';
 import type { B_LS2_D, LS2_C_FixtureDateGroup } from '@betarena/scores-lib/types/livescores-v2';
 

diff --git a/src/routes/api/hasura/league/fixtures-odds/+server.ts b/src/routes/api/hasura/league/fixtures-odds/+server.ts
@@ -1,6 +1,6 @@
 //#region ➤ Package Imports
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 import { json } from '@sveltejs/kit';
 
 import {

diff --git a/src/routes/api/hasura/league/top-players/+server.ts b/src/routes/api/hasura/league/top-players/+server.ts
@@ -2,7 +2,7 @@
 
 import { json } from '@sveltejs/kit';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 import { extract_playerId_and_teamId, generateTeamsAndPlayersMap, generate_top_players_data, getTargetSeasonPlayersInfo, get_target_teams_players_data } from '@betarena/scores-lib/dist/functions/func.top-players.js';
 import type { TP_Season_Top_Player } from '@betarena/scores-lib/types/top-players';
 

diff --git a/src/routes/api/hasura/profile/+server.ts b/src/routes/api/hasura/profile/+server.ts
@@ -1,11 +1,11 @@
 import { json } from '@sveltejs/kit';
 import { performance } from 'perf_hooks';
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 import { SCORES_PROFILE_TRANSLATIONS_DATA_1 } from '$lib/graphql/profile/query';
 import type {
-	BETARENA_HASURA_profile_query,
-	REDIS_CACHE_SINGLE_profile_translation
+  BETARENA_HASURA_profile_query,
+  REDIS_CACHE_SINGLE_profile_translation
 } from '$lib/models/profile/account-setting/types';
 
 // [ℹ] debug info

diff --git a/src/routes/api/hasura/server._TEMPLATE_.ts b/src/routes/api/hasura/server._TEMPLATE_.ts
@@ -11,7 +11,7 @@
 
 //#region ➤ Package Imports
 
-import { initGrapQLClient } from '$lib/graphql/init_graphQL';
+import { initGrapQLClient } from '$lib/graphql/init';
 
 //#endregion ➤ Package Imports