Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src-tauri/src/minecraft/api/norisk_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@ impl NoRiskApi {
is_experimental: bool,
) -> Result<()> {
let base_url = Self::get_api_base(is_experimental);
let url = format!("{}/auth/bridge/confirm", base_url);
let url = format!("{}/launcher/auth/bridge/confirm", base_url);

debug!("[NoRisk API] Confirming auth bridge session: {}", session_id);

Expand Down
2 changes: 2 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ export function App() {
if (result.success) {
toast.success(t("deep_link.auth.success"));
} else {
console.error("[App.tsx] Auth bridge confirm failed:", result.message);
toast.error(t("deep_link.auth.error"));
}
} catch (e) {
Expand Down Expand Up @@ -238,6 +239,7 @@ export function App() {
if (message === "not_logged_in") {
toast.error(t("deep_link.auth.not_logged_in"));
} else {
console.error("[App.tsx] Auth bridge confirm failed:", message);
toast.error(t("deep_link.auth.error"));
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/modals/CreditsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export function CreditsModal({ isOpen, onClose }: CreditsModalProps) {
</div>
<div className="flex items-center gap-2">
<div className="text-right mr-3">
<p className="text-white/80 font-minecraft text-lg lowercase tracking-wide" title="(sirknubble did it better)">
<p className="text-white/80 font-minecraft text-lg lowercase tracking-wide">
{t('credits_modal.ui_frontend')}
</p>
</div>
Expand Down Expand Up @@ -113,7 +113,7 @@ export function CreditsModal({ isOpen, onClose }: CreditsModalProps) {
<Button
variant="ghost"
className="flex items-center gap-2 px-6 py-3 border border-[#ffffff20] hover:bg-white/5 transition-colors"
onClick={() => handleOpenUrl("https://blog.norisk.gg/open-source-licenses/")}
onClick={() => handleOpenUrl("https://norisk.gg/licenses")}
>
<Icon icon="solar:external-link-bold" className="w-5 h-5" />
<span className="font-minecraft text-lg lowercase">{t('credits_modal.view_licenses')}</span>
Expand Down
10 changes: 5 additions & 5 deletions src/components/modals/TermsOfServiceModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function TermsOfServiceModal({ isOpen }: TermsOfServiceModalProps) {

const handleOpenPrivacyPolicy = async () => {
try {
await openExternalUrl('https://blog.norisk.gg/en/privacy-policy/');
await openExternalUrl('https://norisk.gg/privacy');
toast.success(t('tos.toast.privacy_opened'));
} catch (error) {
console.error("Failed to open Privacy Policy URL:", error);
Expand All @@ -32,7 +32,7 @@ export function TermsOfServiceModal({ isOpen }: TermsOfServiceModalProps) {

const handleOpenTerms = async () => {
try {
await openExternalUrl('https://blog.norisk.gg/en/terms-of-use/');
await openExternalUrl('https://norisk.gg/tos');
toast.success(t('tos.toast.terms_opened'));
} catch (error) {
console.error("Failed to open Terms URL:", error);
Expand Down Expand Up @@ -65,7 +65,7 @@ export function TermsOfServiceModal({ isOpen }: TermsOfServiceModalProps) {
footer={modalFooter}
closeOnClickOutside={false}
>
<div className="p-6 space-y-6 text-white">
<div className="p-6 space-y-6 text-white" style={{paddingBottom: 0}}>
<div className="text-center space-y-4">
<h3 className="text-3xl font-minecraft text-blue-400 lowercase">
{t('tos.welcome')}
Expand Down Expand Up @@ -114,8 +114,8 @@ export function TermsOfServiceModal({ isOpen }: TermsOfServiceModalProps) {
</Button>
</div>

<div className="text-center text-sm text-gray-400">
<p>
<div className="text-center text-2xl text-gray-400 flex justify-center">
<p style={{lineHeight: 0.8, maxWidth: 600}}>
{t('tos.withdraw_notice')}
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/tabs/SettingsTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ export function SettingsTab() {
variant="ghost"
size="sm"
onClick={() => {
openExternalUrl("https://blog.norisk.gg/open-source-licenses/")
openExternalUrl("https://norisk.gg/licenses")
}}
icon={<Icon icon="solar:external-link-bold" className="w-5 h-5" />}
>
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/translations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@
"tos.button.view_full_terms": "Vollständige Bedingungen anzeigen",
"tos.toast.accepted": "Nutzungsbedingungen akzeptiert!",
"tos.toast.privacy_opened": "Datenschutzrichtlinie wurde im Browser geöffnet!",
"tos.toast.privacy_failed": "Datenschutzrichtlinie konnte nicht geöffnet werden. Bitte besuche blog.norisk.gg/privacy-policy/ manuell.",
"tos.toast.privacy_failed": "Datenschutzrichtlinie konnte nicht geöffnet werden. Bitte besuche www.norisk.gg/privacy manuell.",
"tos.toast.terms_opened": "Nutzungsbedingungen wurden im Browser geöffnet!",
"tos.toast.terms_failed": "Bedingungen konnten nicht geöffnet werden. Bitte besuche blog.norisk.gg/en/terms-of-use/ manuell.",
"tos.toast.terms_failed": "Bedingungen konnten nicht geöffnet werden. Bitte besuche www.norisk.gg/tos manuell.",

"child_protection.title": "Microsoft-Konto Einschränkung",
"child_protection.description": "Es sieht so aus, als hätte dein Microsoft-Konto einen Kinderschutz- oder Datenschutzmodus aktiviert, der Multiplayer-Funktionen einschränkt. Dadurch kann der Launcher den Anmeldeschritt nicht abschließen.",
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@
"tos.button.view_full_terms": "View Full Terms",
"tos.toast.accepted": "Terms of Service accepted!",
"tos.toast.privacy_opened": "Privacy Policy opened in your browser!",
"tos.toast.privacy_failed": "Could not open Privacy Policy. Please visit blog.norisk.gg/privacy-policy/ manually.",
"tos.toast.privacy_failed": "Could not open Privacy Policy. Please visit www.norisk.gg/privacy manually.",
"tos.toast.terms_opened": "Terms of Service opened in your browser!",
"tos.toast.terms_failed": "Could not open Terms. Please visit blog.norisk.gg/en/terms-of-use/ manually.",
"tos.toast.terms_failed": "Could not open Terms. Please visit www.norisk.gg/tos manually.",

"child_protection.title": "Microsoft Account Restriction",
"child_protection.description": "It looks like your Microsoft account has a child protection or privacy mode enabled that restricts multiplayer functionality. Because of this the launcher cannot complete the login step.",
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@
"tos.button.view_full_terms": "Ver Términos Completos",
"tos.toast.accepted": "¡Términos de Servicio aceptados!",
"tos.toast.privacy_opened": "¡Política de Privacidad abierta en tu navegador!",
"tos.toast.privacy_failed": "No se pudo abrir la Política de Privacidad. Por favor visita blog.norisk.gg/privacy-policy/ manualmente.",
"tos.toast.privacy_failed": "No se pudo abrir la Política de Privacidad. Por favor visita www.norisk.gg/privacy manualmente.",
"tos.toast.terms_opened": "¡Términos de Servicio abiertos en tu navegador!",
"tos.toast.terms_failed": "No se pudieron abrir los Términos. Por favor visita blog.norisk.gg/en/terms-of-use/ manualmente.",
"tos.toast.terms_failed": "No se pudieron abrir los Términos. Por favor visita www.norisk.gg/tos manualmente.",

"child_protection.title": "Restricción de Cuenta Microsoft",
"child_protection.description": "Parece que tu cuenta Microsoft tiene un modo de protección infantil o privacidad habilitado que restringe la funcionalidad multijugador. Debido a esto, el launcher no puede completar el paso de inicio de sesión.",
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@
"tos.button.view_full_terms": "Voir les Conditions Complètes",
"tos.toast.accepted": "Conditions d'Utilisation acceptées !",
"tos.toast.privacy_opened": "Politique de Confidentialité ouverte dans votre navigateur !",
"tos.toast.privacy_failed": "Impossible d'ouvrir la Politique de Confidentialité. Veuillez visiter blog.norisk.gg/privacy-policy/ manuellement.",
"tos.toast.privacy_failed": "Impossible d'ouvrir la Politique de Confidentialité. Veuillez visiter www.norisk.gg/privacy manuellement.",
"tos.toast.terms_opened": "Conditions d'Utilisation ouvertes dans votre navigateur !",
"tos.toast.terms_failed": "Impossible d'ouvrir les Conditions. Veuillez visiter blog.norisk.gg/en/terms-of-use/ manuellement.",
"tos.toast.terms_failed": "Impossible d'ouvrir les Conditions. Veuillez visiter www.norisk.gg/tos manuellement.",

"child_protection.title": "Restriction du Compte Microsoft",
"child_protection.description": "Il semble que votre compte Microsoft a un mode de protection parentale ou de confidentialité activé qui restreint la fonctionnalité multijoueur. À cause de cela, le launcher ne peut pas compléter l'étape de connexion.",
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/translations/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@
"tos.button.view_full_terms": "Visualizza termini completi",
"tos.toast.accepted": "Termini di servizio accettati!",
"tos.toast.privacy_opened": "Privacy Policy aperta nel browser!",
"tos.toast.privacy_failed": "Impossibile aprire Privacy Policy. Visita manualmente blog.norisk.gg/privacy-policy/.",
"tos.toast.privacy_failed": "Impossibile aprire Privacy Policy. Visita manualmente www.norisk.gg/privacy.",
"tos.toast.terms_opened": "Termini di servizio aperti nel browser!",
"tos.toast.terms_failed": "Impossibile aprire i Termini. Visita manualmente blog.norisk.gg/en/terms-of-use/.",
"tos.toast.terms_failed": "Impossibile aprire i Termini. Visita manualmente www.norisk.gg/tos.",

"child_protection.title": "Restrizione account Microsoft",
"child_protection.description": "Sembra che il tuo account Microsoft abbia una protezione bambini o modalità privacy abilitata che limita le funzionalità multigiocatore. Per questo motivo il launcher non può completare il login.",
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/translations/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@
"tos.button.view_full_terms": "Zobacz pełny regulamin",
"tos.toast.accepted": "Regulamin zaakceptowany!",
"tos.toast.privacy_opened": "Polityka prywatności otwarta w przeglądarce!",
"tos.toast.privacy_failed": "Nie udało się otworzyć Polityki prywatności. Odwiedź ręcznie blog.norisk.gg/privacy-policy/.",
"tos.toast.privacy_failed": "Nie udało się otworzyć Polityki prywatności. Odwiedź ręcznie www.norisk.gg/privacy.",
"tos.toast.terms_opened": "Regulamin otwarty w przeglądarce!",
"tos.toast.terms_failed": "Nie udało się otworzyć Regulaminu. Odwiedź ręcznie blog.norisk.gg/en/terms-of-use/.",
"tos.toast.terms_failed": "Nie udało się otworzyć Regulaminu. Odwiedź ręcznie www.norisk.gg/tos.",

"child_protection.title": "Ograniczenie konta Microsoft",
"child_protection.description": "Wygląda na to, że Twoje konto Microsoft ma włączoną ochronę rodzicielską lub tryb prywatności, który ogranicza funkcje wieloosobowe. Z tego powodu launcher nie może zakończyć procesu logowania.",
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/translations/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@
"tos.button.view_full_terms": "Ver Termos Completos",
"tos.toast.accepted": "Termos de Serviço aceitos!",
"tos.toast.privacy_opened": "Política de Privacidade aberta no navegador!",
"tos.toast.privacy_failed": "Falha ao abrir Política de Privacidade. Visite manualmente blog.norisk.gg/privacy-policy/.",
"tos.toast.privacy_failed": "Falha ao abrir Política de Privacidade. Visite manualmente www.norisk.gg/privacy.",
"tos.toast.terms_opened": "Termos de Serviço abertos no navegador!",
"tos.toast.terms_failed": "Falha ao abrir termos. Visite manualmente blog.norisk.gg/en/terms-of-use/.",
"tos.toast.terms_failed": "Falha ao abrir termos. Visite manualmente www.norisk.gg/tos.",

"child_protection.title": "Restrição de Conta Microsoft",
"child_protection.description": "Sua conta Microsoft parece ter uma proteção infantil ou modo de privacidade ativo que restringe recursos multiplayer. Por isso, o launcher não consegue completar o login.",
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/translations/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@
"tos.button.view_full_terms": "Показать полные условия",
"tos.toast.accepted": "Условия использования приняты!",
"tos.toast.privacy_opened": "Политика конфиденциальности открыта в браузере!",
"tos.toast.privacy_failed": "Не удалось открыть Политику конфиденциальности. Посетите вручную blog.norisk.gg/privacy-policy/.",
"tos.toast.privacy_failed": "Не удалось открыть Политику конфиденциальности. Посетите вручную www.norisk.gg/privacy.",
"tos.toast.terms_opened": "Условия использования открыты в браузере!",
"tos.toast.terms_failed": "Не удалось открыть условия. Посетите вручную blog.norisk.gg/en/terms-of-use/.",
"tos.toast.terms_failed": "Не удалось открыть условия. Посетите вручную www.norisk.gg/tos.",

"child_protection.title": "Ограничение учётной записи Microsoft",
"child_protection.description": "Похоже, что у вашей учётной записи Microsoft включена защита детей или режим конфиденциальности, который ограничивает многопользовательские функции. Из-за этого лаунчер не может завершить вход.",
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/translations/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@
"tos.button.view_full_terms": "Tam Şartları Görüntüle",
"tos.toast.accepted": "Hizmet Şartları kabul edildi!",
"tos.toast.privacy_opened": "Gizlilik Politikası tarayıcıda açıldı!",
"tos.toast.privacy_failed": "Gizlilik Politikası açılamadı. Manuel olarak blog.norisk.gg/privacy-policy/ adresini ziyaret edin.",
"tos.toast.privacy_failed": "Gizlilik Politikası açılamadı. Manuel olarak www.norisk.gg/privacy adresini ziyaret edin.",
"tos.toast.terms_opened": "Hizmet Şartları tarayıcıda açıldı!",
"tos.toast.terms_failed": "Şartlar açılamadı. Manuel olarak blog.norisk.gg/en/terms-of-use/ adresini ziyaret edin.",
"tos.toast.terms_failed": "Şartlar açılamadı. Manuel olarak www.norisk.gg/tos adresini ziyaret edin.",

"child_protection.title": "Microsoft Hesap Kısıtlaması",
"child_protection.description": "Microsoft hesabınızda çok oyunculu özellikleri kısıtlayan bir çocuk koruması veya gizlilik modu etkin görünüyor. Bu nedenle başlatıcı girişi tamamlayamıyor.",
Expand Down
Loading