Merge branch 'main' of https://github.com/PenguinMod/PenguinMod-Home

Author: RedMan13

src/lib/Event/Component.svelte

@@ -3,7 +3,7 @@
     import Language from "../../resources/language.js";
     import EventPages from "../../resources/markdown/events/pages.js";
 
-    const isHavingEvent = true;
+    const isHavingEvent = false;
     const eventName = "All The Mods 2026";
     const eventPath = "allthemods2026";
     

src/routes/+page.svelte

@@ -745,18 +745,15 @@
                 <div class="category-news">
                     <div class="category-news-content">
                         <h2 style="margin-block:4px;">
-                            All The Mods Game Jam!
+                            All The Mods Game Jam has ended!
                         </h2>
                         <div style="width:100%">
                             <p>
-                                We've partnered with many different Scratch mods (featuring PenguinMod, TurboWarp, and more)
-                                to run a game jam across multiple communities!
-                                <br />
-                                Please see the event page for details on how to participate!
-                            </p>
-                            <p style="margin-block-start:4px;">
-                                <a href="https://penguinmod.com/events/allthemods2026">All The Mods 2026</a>
+                                Thanks for participating in the event! Rankings will be announced on <a href="https://itch.io/jam/all-the-mods-game-jam">itch.io</a>. See you soon!
                             </p>
+                            <a href="https://itch.io/jam/all-the-mods-game-jam">
+                                All The Mods on itch.io
+                            </a>
                             <img
                                 src="/events/news/allthemods2026.webp?r=1"
                                 alt="All The Mods 2026"

src/routes/oauthchangepasswordintermediate/+page.svelte

@@ -1,6 +1,6 @@
 <script>
     import { onMount } from "svelte";
-    import { browser } from '$app/environment';
+    import { browser } from "$app/environment";
 
     import { PUBLIC_API_URL, PUBLIC_STUDIO_URL } from "$env/static/public";
 
@@ -40,7 +40,7 @@
         { name: "password.requirement.symbol", value: false },
     ];
 
-    function changePasswordRedirect() {
+    async function changePasswordRedirect() {
         if (!browser) return;
 
         // get url params
@@ -63,11 +63,20 @@
                 throw new Error("Invalid method");
         }
 
-        url += `?at=${accessToken}&password=${password}`;
+        const { username, token } = await fetch(url, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({ at: accessToken, password }),
+        }).then((res) => res.json());
 
-        location.href = url;
+        localStorage.setItem("token", token);
+        localStorage.setItem("username", username);
+
+        location.href = "/";
     }
-    const changePasswordRedirectSafe = () => {
+    const changePasswordRedirectSafe = async () => {
         if (!canChangePassword) {
             alert(
                 TranslationHandler.textSafe(
@@ -82,7 +91,7 @@
         if (changingPassword) return;
         changingPassword = true;
 
-        changePasswordRedirect();
+        await changePasswordRedirect();
     };
 
     async function checkIfValid() {

src/routes/profile/+page.svelte

@@ -333,6 +333,8 @@
             }
         }
 
+        fetchProfile();
+
         page.subscribe((v) => {
             if (!v.url.searchParams.get("user") || !user) return;
             if (

src/routes/resetpassword/+page.svelte

@@ -1,6 +1,6 @@
 <script>
     import { onMount } from "svelte";
-    
+
     // Components
     import NavigationBar from "$lib/NavigationBar/NavigationBar.svelte";
     import NavigationMargin from "$lib/NavigationBar/NavMargin.svelte";
@@ -44,19 +44,27 @@
     let passwordValid = false;
 
     const passwordRequirements = [
-        {name: "password.requirement.length", value: false},
-        {name: "password.requirement.casing", value: false},
-        {name: "password.requirement.number", value: false},
-        {name: "password.requirement.symbol", value: false},
-    ]
+        { name: "password.requirement.length", value: false },
+        { name: "password.requirement.casing", value: false },
+        { name: "password.requirement.number", value: false },
+        { name: "password.requirement.symbol", value: false },
+    ];
 
     async function checkIfValid() {
-        const passwordDoesNotMeetLength = password.length < 8 || password.length > 50;
-        const passwordMeetsTextInclude = password.match(/[a-z]/) && password.match(/[A-Z]/);
+        const passwordDoesNotMeetLength =
+            password.length < 8 || password.length > 50;
+        const passwordMeetsTextInclude =
+            password.match(/[a-z]/) && password.match(/[A-Z]/);
         const passwordHasNumber = !!password.match(/[0-9]/);
         const passwordMeetsSpecialInclude = !!password.match(/[^a-z0-9]/i);
 
-        const passwordCheck = passwordDoesNotMeetLength || !(passwordMeetsTextInclude && passwordMeetsSpecialInclude && passwordHasNumber);
+        const passwordCheck =
+            passwordDoesNotMeetLength ||
+            !(
+                passwordMeetsTextInclude &&
+                passwordMeetsSpecialInclude &&
+                passwordHasNumber
+            );
 
         passwordRequirements[0].value = !passwordDoesNotMeetLength;
         passwordRequirements[1].value = passwordMeetsTextInclude;
@@ -81,13 +89,16 @@
     function resetPassword() {
         resetingPassword = true;
         Authentication.resetPassword(email, state, password)
-            .then(() => {
+            .then((token) => {
+                localStorage.setItem("token", token);
                 resetingPassword = false;
-                alert(TranslationHandler.textSafe(
-                    "password.update.success",
-                    currentLang,
-                    "Password changed successfully!"
-                ));
+                alert(
+                    TranslationHandler.textSafe(
+                        "password.update.success",
+                        currentLang,
+                        "Password changed successfully!",
+                    ),
+                );
                 location.href = "/";
             })
             .catch((error) => {
@@ -96,29 +107,35 @@
             });
     }
 </script>
-    
+
 <svelte:head>
     <title>PenguinMod - Reset Password</title>
     <meta name="title" content="PenguinMod - Reset Password" />
     <meta property="og:title" content="PenguinMod - Reset Password" />
     <meta property="twitter:title" content="PenguinMod - Reset Password" />
-    <meta name="description" content="Reset your password for PenguinMod to regain access to your account with a new password" />
-    <meta property="twitter:description" content="Reset your password for PenguinMod to regain access to your account with a new password" />
-    <meta property="og:url" content="https://penguinmod.com/resetpassword">
-    <meta property="twitter:url" content="https://penguinmod.com/resetpassword">
+    <meta
+        name="description"
+        content="Reset your password for PenguinMod to regain access to your account with a new password"
+    />
+    <meta
+        property="twitter:description"
+        content="Reset your password for PenguinMod to regain access to your account with a new password"
+    />
+    <meta property="og:url" content="https://penguinmod.com/resetpassword" />
+    <meta
+        property="twitter:url"
+        content="https://penguinmod.com/resetpassword"
+    />
 </svelte:head>
-    
+
 <NavigationBar />
 
 <div class="main">
     <NavigationMargin />
 
     <main>
         <div class="profile-section">
-            <img
-                src="/account/profile_sheet.png"
-                alt="Profiles"
-            />
+            <img src="/account/profile_sheet.png" alt="Profiles" />
         </div>
         <h1 style="margin-block:4px">PenguinMod</h1>
         <p>
@@ -128,7 +145,7 @@
                 lang={currentLang}
             />
         </p>
-            
+
         <span class="input-title">
             <LocalizedText
                 text="Password"
@@ -142,13 +159,13 @@
                 placeholder={TranslationHandler.textSafe(
                     "account.fields.password.placeholder",
                     currentLang,
-                    "Remember to write it down!"
+                    "Remember to write it down!",
                 )}
                 data-valid={passwordValid}
                 maxlength="50"
                 on:input={passwordInputChanged}
-                on:focusin={() => focused = true}
-                on:focusout={() => focused = false}
+                on:focusin={() => (focused = true)}
+                on:focusout={() => (focused = false)}
             />
             <button
                 class="password-show invert-on-dark"
@@ -160,7 +177,11 @@
             <ChecksBox items={passwordRequirements} />
         {/if}
 
-        <button class="create-acc" data-canReset={canResetPassword} on:click={resetPassword}>
+        <button
+            class="create-acc"
+            data-canReset={canResetPassword}
+            on:click={resetPassword}
+        >
             {#if resetingPassword}
                 <LoadingSpinner icon="/loading_white.png" />
             {:else}
@@ -173,7 +194,7 @@
         </button>
     </main>
 </div>
-    
+
 <style>
     * {
         font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -241,7 +262,7 @@
         background: #111;
         color: white;
     }
-    
+
     main input[data-valid="true"] {
         border-color: rgb(0, 187, 0) !important;
     }
@@ -257,13 +278,13 @@
         height: calc(100% - 8px);
         border: 0;
         background: transparent;
-        background-image: url('account/showpassword.svg');
+        background-image: url("account/showpassword.svg");
         background-size: 100% 100%;
         opacity: 0.7;
         cursor: pointer;
     }
     .password-show[data-visible="true"] {
-        background-image: url('account/hidepassword.svg');
+        background-image: url("account/hidepassword.svg");
         background-size: 100% 100%;
     }
     :global(body.dark-mode) .invert-on-dark {
@@ -288,27 +309,27 @@
         padding: 4px 8px;
         width: 60%;
         margin-top: 4px;
-        
+
         display: flex;
         flex-direction: row;
         align-items: center;
         justify-content: center;
         border: 1px solid rgba(0, 0, 0, 0.2);
         font-size: 18px;
     }
-    
-    .create-acc[data-canReset=true] {
+
+    .create-acc[data-canReset="true"] {
         background: #00c3ff;
         cursor: pointer;
         color: white;
     }
 
-    :global(body.dark-mode) .create-acc[data-canReset=false] {
+    :global(body.dark-mode) .create-acc[data-canReset="false"] {
         background: #9c9c9c;
         color: rgb(255, 255, 255);
     }
 
-    .create-acc[data-canReset=false] {
+    .create-acc[data-canReset="false"] {
         background: #9c9c9c;
         color: rgb(255, 255, 255);
         cursor: not-allowed;
@@ -331,25 +352,32 @@
     }
 
     @keyframes profile-scroll {
-        0%, 10% {
+        0%,
+        10% {
             transform: translateX(0);
         }
-        15%, 25% {
+        15%,
+        25% {
             transform: translateX(-96px);
         }
-        30%, 40% {
+        30%,
+        40% {
             transform: translateX(-192px);
         }
-        45%, 55% {
+        45%,
+        55% {
             transform: translateX(-288px);
         }
-        60%, 70% {
+        60%,
+        70% {
             transform: translateX(-384px);
         }
-        75%, 85% {
+        75%,
+        85% {
             transform: translateX(-480px);
         }
-        90%, 100% {
+        90%,
+        100% {
             transform: translateX(-480px);
         }
     }