diff --git a/.env.example b/.env.example index 47d1a1e3..34502a20 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,5 @@ -MAIN_VITE_STEAMGRIDDB_API_KEY=YOUR_API_KEY MAIN_VITE_API_URL=API_URL +MAIN_VITE_AUTH_URL=AUTH_URL +MAIN_VITE_STEAMGRIDDB_API_KEY=YOUR_API_KEY MAIN_VITE_SENTRY_DSN=YOUR_SENTRY_DSN SENTRY_AUTH_TOKEN= diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85a7fe1f..5cc4aa4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,6 +41,7 @@ jobs: yarn build:linux env: MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_API_URL }} + MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_AUTH_URL }} SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} MAIN_VITE_SENTRY_DSN: ${{ vars.MAIN_VITE_SENTRY_DSN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -50,6 +51,7 @@ jobs: run: yarn build:win env: MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_API_URL }} + MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_AUTH_URL }} SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} MAIN_VITE_SENTRY_DSN: ${{ vars.MAIN_VITE_SENTRY_DSN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e21acfcb..96b6a08d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,6 +43,7 @@ jobs: yarn build:linux env: MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_API_URL }} + MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_AUTH_URL }} SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} MAIN_VITE_SENTRY_DSN: ${{ vars.MAIN_VITE_SENTRY_DSN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -52,6 +53,7 @@ jobs: run: yarn build:win env: MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_API_URL }} + MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_AUTH_URL }} SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} MAIN_VITE_SENTRY_DSN: ${{ vars.MAIN_VITE_SENTRY_DSN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index 734a9836..a9fd7786 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hydralauncher", - "version": "2.1.6", + "version": "2.1.7", "description": "Hydra", "main": "./out/main/index.js", "author": "Los Broxas", diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json index 312b1870..784da11e 100644 --- a/src/locales/en/translation.json +++ b/src/locales/en/translation.json @@ -311,6 +311,7 @@ "report_reason_violence": "Violence", "report_reason_spam": "Spam", "report_reason_other": "Other", - "profile_reported": "Profile reported" + "profile_reported": "Profile reported", + "your_friend_code": "Your friend code:" } } diff --git a/src/locales/pt-BR/translation.json b/src/locales/pt-BR/translation.json index 168e5b5f..fcb18659 100644 --- a/src/locales/pt-BR/translation.json +++ b/src/locales/pt-BR/translation.json @@ -315,6 +315,7 @@ "report_reason_violence": "Violência", "report_reason_spam": "Spam", "report_reason_other": "Outro", - "profile_reported": "Perfil reportado" + "profile_reported": "Perfil reportado", + "your_friend_code": "Seu código de amigo:" } } diff --git a/src/locales/pt-PT/translation.json b/src/locales/pt-PT/translation.json index 7e16f762..85c1a3c5 100644 --- a/src/locales/pt-PT/translation.json +++ b/src/locales/pt-PT/translation.json @@ -275,6 +275,7 @@ "no_pending_invites": "Não tens convites de amizade pendentes", "no_blocked_users": "Não tens nenhum utilizador bloqueado", "friend_code_copied": "Código de amigo copiado", - "image_process_failure": "Falha ao processar a imagem" + "image_process_failure": "Falha ao processar a imagem", + "your_friend_code": "Seu código de amigo:" } } diff --git a/src/main/services/window-manager.ts b/src/main/services/window-manager.ts index 5a8824fd..905e4b65 100644 --- a/src/main/services/window-manager.ts +++ b/src/main/services/window-manager.ts @@ -106,7 +106,7 @@ export class WindowManager { }); authWindow.loadURL( - `https://auth.hydralauncher.gg/?${searchParams.toString()}` + `${import.meta.env.MAIN_VITE_AUTH_URL}/?${searchParams.toString()}` ); authWindow.once("ready-to-show", () => { diff --git a/src/main/vite-env.d.ts b/src/main/vite-env.d.ts index ff518e82..41f54e24 100644 --- a/src/main/vite-env.d.ts +++ b/src/main/vite-env.d.ts @@ -3,6 +3,7 @@ interface ImportMetaEnv { readonly MAIN_VITE_STEAMGRIDDB_API_KEY: string; readonly MAIN_VITE_API_URL: string; + readonly MAIN_VITE_AUTH_URL: string; readonly MAIN_VITE_SENTRY_DSN: string; } diff --git a/src/renderer/src/pages/shared-modals/user-friend-modal/user-friend-modal.tsx b/src/renderer/src/pages/shared-modals/user-friend-modal/user-friend-modal.tsx index 26c63abc..d827fa20 100644 --- a/src/renderer/src/pages/shared-modals/user-friend-modal/user-friend-modal.tsx +++ b/src/renderer/src/pages/shared-modals/user-friend-modal/user-friend-modal.tsx @@ -81,7 +81,7 @@ export const UserFriendModal = ({ alignItems: "center", }} > -

Seu código de amigo:

+

{t("your_friend_code")}