Skip to content

Commit f8563c4

Browse files
Merge pull request #220 from NoRiskClient/@feat/website-things
@feat/website things
2 parents c9c38bf + 9e80981 commit f8563c4

14 files changed

Lines changed: 29 additions & 27 deletions

File tree

src-tauri/src/minecraft/api/norisk_api.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@ impl NoRiskApi {
11281128
is_experimental: bool,
11291129
) -> Result<()> {
11301130
let base_url = Self::get_api_base(is_experimental);
1131-
let url = format!("{}/auth/bridge/confirm", base_url);
1131+
let url = format!("{}/launcher/auth/bridge/confirm", base_url);
11321132

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

src/App.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ export function App() {
208208
if (result.success) {
209209
toast.success(t("deep_link.auth.success"));
210210
} else {
211+
console.error("[App.tsx] Auth bridge confirm failed:", result.message);
211212
toast.error(t("deep_link.auth.error"));
212213
}
213214
} catch (e) {
@@ -238,6 +239,7 @@ export function App() {
238239
if (message === "not_logged_in") {
239240
toast.error(t("deep_link.auth.not_logged_in"));
240241
} else {
242+
console.error("[App.tsx] Auth bridge confirm failed:", message);
241243
toast.error(t("deep_link.auth.error"));
242244
}
243245
}

src/components/modals/CreditsModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export function CreditsModal({ isOpen, onClose }: CreditsModalProps) {
6161
</div>
6262
<div className="flex items-center gap-2">
6363
<div className="text-right mr-3">
64-
<p className="text-white/80 font-minecraft text-lg lowercase tracking-wide" title="(sirknubble did it better)">
64+
<p className="text-white/80 font-minecraft text-lg lowercase tracking-wide">
6565
{t('credits_modal.ui_frontend')}
6666
</p>
6767
</div>
@@ -113,7 +113,7 @@ export function CreditsModal({ isOpen, onClose }: CreditsModalProps) {
113113
<Button
114114
variant="ghost"
115115
className="flex items-center gap-2 px-6 py-3 border border-[#ffffff20] hover:bg-white/5 transition-colors"
116-
onClick={() => handleOpenUrl("https://blog.norisk.gg/open-source-licenses/")}
116+
onClick={() => handleOpenUrl("https://norisk.gg/licenses")}
117117
>
118118
<Icon icon="solar:external-link-bold" className="w-5 h-5" />
119119
<span className="font-minecraft text-lg lowercase">{t('credits_modal.view_licenses')}</span>

src/components/modals/TermsOfServiceModal.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function TermsOfServiceModal({ isOpen }: TermsOfServiceModalProps) {
2222

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

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

117-
<div className="text-center text-sm text-gray-400">
118-
<p>
117+
<div className="text-center text-2xl text-gray-400 flex justify-center">
118+
<p style={{lineHeight: 0.8, maxWidth: 600}}>
119119
{t('tos.withdraw_notice')}
120120
</p>
121121
</div>

src/components/tabs/SettingsTab.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ export function SettingsTab() {
953953
variant="ghost"
954954
size="sm"
955955
onClick={() => {
956-
openExternalUrl("https://blog.norisk.gg/open-source-licenses/")
956+
openExternalUrl("https://norisk.gg/licenses")
957957
}}
958958
icon={<Icon icon="solar:external-link-bold" className="w-5 h-5" />}
959959
>

src/i18n/translations/de.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@
234234
"tos.button.view_full_terms": "Vollständige Bedingungen anzeigen",
235235
"tos.toast.accepted": "Nutzungsbedingungen akzeptiert!",
236236
"tos.toast.privacy_opened": "Datenschutzrichtlinie wurde im Browser geöffnet!",
237-
"tos.toast.privacy_failed": "Datenschutzrichtlinie konnte nicht geöffnet werden. Bitte besuche blog.norisk.gg/privacy-policy/ manuell.",
237+
"tos.toast.privacy_failed": "Datenschutzrichtlinie konnte nicht geöffnet werden. Bitte besuche www.norisk.gg/privacy manuell.",
238238
"tos.toast.terms_opened": "Nutzungsbedingungen wurden im Browser geöffnet!",
239-
"tos.toast.terms_failed": "Bedingungen konnten nicht geöffnet werden. Bitte besuche blog.norisk.gg/en/terms-of-use/ manuell.",
239+
"tos.toast.terms_failed": "Bedingungen konnten nicht geöffnet werden. Bitte besuche www.norisk.gg/tos manuell.",
240240

241241
"child_protection.title": "Microsoft-Konto Einschränkung",
242242
"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.",

src/i18n/translations/en.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@
234234
"tos.button.view_full_terms": "View Full Terms",
235235
"tos.toast.accepted": "Terms of Service accepted!",
236236
"tos.toast.privacy_opened": "Privacy Policy opened in your browser!",
237-
"tos.toast.privacy_failed": "Could not open Privacy Policy. Please visit blog.norisk.gg/privacy-policy/ manually.",
237+
"tos.toast.privacy_failed": "Could not open Privacy Policy. Please visit www.norisk.gg/privacy manually.",
238238
"tos.toast.terms_opened": "Terms of Service opened in your browser!",
239-
"tos.toast.terms_failed": "Could not open Terms. Please visit blog.norisk.gg/en/terms-of-use/ manually.",
239+
"tos.toast.terms_failed": "Could not open Terms. Please visit www.norisk.gg/tos manually.",
240240

241241
"child_protection.title": "Microsoft Account Restriction",
242242
"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.",

src/i18n/translations/es.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@
234234
"tos.button.view_full_terms": "Ver Términos Completos",
235235
"tos.toast.accepted": "¡Términos de Servicio aceptados!",
236236
"tos.toast.privacy_opened": "¡Política de Privacidad abierta en tu navegador!",
237-
"tos.toast.privacy_failed": "No se pudo abrir la Política de Privacidad. Por favor visita blog.norisk.gg/privacy-policy/ manualmente.",
237+
"tos.toast.privacy_failed": "No se pudo abrir la Política de Privacidad. Por favor visita www.norisk.gg/privacy manualmente.",
238238
"tos.toast.terms_opened": "¡Términos de Servicio abiertos en tu navegador!",
239-
"tos.toast.terms_failed": "No se pudieron abrir los Términos. Por favor visita blog.norisk.gg/en/terms-of-use/ manualmente.",
239+
"tos.toast.terms_failed": "No se pudieron abrir los Términos. Por favor visita www.norisk.gg/tos manualmente.",
240240

241241
"child_protection.title": "Restricción de Cuenta Microsoft",
242242
"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.",

src/i18n/translations/fr.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@
234234
"tos.button.view_full_terms": "Voir les Conditions Complètes",
235235
"tos.toast.accepted": "Conditions d'Utilisation acceptées !",
236236
"tos.toast.privacy_opened": "Politique de Confidentialité ouverte dans votre navigateur !",
237-
"tos.toast.privacy_failed": "Impossible d'ouvrir la Politique de Confidentialité. Veuillez visiter blog.norisk.gg/privacy-policy/ manuellement.",
237+
"tos.toast.privacy_failed": "Impossible d'ouvrir la Politique de Confidentialité. Veuillez visiter www.norisk.gg/privacy manuellement.",
238238
"tos.toast.terms_opened": "Conditions d'Utilisation ouvertes dans votre navigateur !",
239-
"tos.toast.terms_failed": "Impossible d'ouvrir les Conditions. Veuillez visiter blog.norisk.gg/en/terms-of-use/ manuellement.",
239+
"tos.toast.terms_failed": "Impossible d'ouvrir les Conditions. Veuillez visiter www.norisk.gg/tos manuellement.",
240240

241241
"child_protection.title": "Restriction du Compte Microsoft",
242242
"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.",

src/i18n/translations/it.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@
234234
"tos.button.view_full_terms": "Visualizza termini completi",
235235
"tos.toast.accepted": "Termini di servizio accettati!",
236236
"tos.toast.privacy_opened": "Privacy Policy aperta nel browser!",
237-
"tos.toast.privacy_failed": "Impossibile aprire Privacy Policy. Visita manualmente blog.norisk.gg/privacy-policy/.",
237+
"tos.toast.privacy_failed": "Impossibile aprire Privacy Policy. Visita manualmente www.norisk.gg/privacy.",
238238
"tos.toast.terms_opened": "Termini di servizio aperti nel browser!",
239-
"tos.toast.terms_failed": "Impossibile aprire i Termini. Visita manualmente blog.norisk.gg/en/terms-of-use/.",
239+
"tos.toast.terms_failed": "Impossibile aprire i Termini. Visita manualmente www.norisk.gg/tos.",
240240

241241
"child_protection.title": "Restrizione account Microsoft",
242242
"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.",

0 commit comments

Comments
 (0)