From 72590e993d1f8374a863ee74a570032464450a73 Mon Sep 17 00:00:00 2001
From: LightCreator1007 <arunitchakraborty2006@gmail.com>
Date: Fri, 31 Jul 2026 00:08:54 +0530
Subject: [PATCH 1/3] Remove Vuetify from the sign-in page

Replace VCard with StudioRaisedBox, Banner with StudioBanner, and
EmailField / PasswordField with StudioEmailField / StudioPasswordField.
Drop VApp, VLayout and VDivider in favour of plain elements and scoped
styles, and swap VForm for a native form driven by generateFormMixin.

Field errors are surfaced on blur or after a failed submit, preserving
the previous validate-on-blur behaviour. Vuetify spacing and colour
helpers are replaced with scoped CSS and KDS theme tokens.
---
 .../frontend/accounts/pages/AccountsMain.vue  | 390 +++++++++++-------
 1 file changed, 238 insertions(+), 152 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/accounts/pages/AccountsMain.vue b/contentcuration/contentcuration/frontend/accounts/pages/AccountsMain.vue
index 647913874f..cd4b85d5f7 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/AccountsMain.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/AccountsMain.vue
@@ -1,17 +1,13 @@
 <template>
 
-  <VApp>
-    <VLayout
-      fill-height
-      justify-center
-      class="main pt-5"
-    >
-      <div>
-        <!-- Sign in -->
-        <VCard
-          class="pa-4"
-          style="width: 300px; margin: 0 auto"
-        >
+  <div
+    class="page"
+    :style="{ backgroundColor: $themePalette.grey.v_100 }"
+  >
+    <div>
+      <!-- Sign in -->
+      <StudioRaisedBox class="sign-in-card">
+        <template #header>
           <div class="k-logo-container">
             <KLogo
               altText="Kolibri Logo with background"
@@ -19,103 +15,121 @@
               :size="120"
             />
           </div>
-          <h2 class="primary--text py-2 text-xs-center">
-            {{ $tr('kolibriStudio') }}
-          </h2>
-          <Banner
-            :value="loginFailed"
-            :text="$tr('loginFailed')"
-            error
-          />
-          <Banner
-            :value="offline"
-            :text="$tr('loginFailedOffline')"
-            error
-          />
-          <Banner
-            :value="Boolean(nextParam)"
-            :text="$tr('loginToProceed')"
-            class="pb-0 px-0"
-            data-test="loginToProceed"
-          />
-          <VForm
-            ref="form"
-            lazy-validation
-            class="py-3"
-            @submit.prevent="submit"
+          <h1
+            class="notranslate page-title"
+            :style="{ color: $themeTokens.primary }"
           >
-            <EmailField
-              v-model="username"
-              autofocus
-            />
-            <PasswordField
-              v-model="password"
-              :label="$tr('passwordLabel')"
-            />
-            <p>
+            {{ $tr('kolibriStudio') }}
+          </h1>
+        </template>
+        <template #main>
+          <div class="card-body">
+            <StudioBanner
+              v-if="loginFailed"
+              error
+            >
+              {{ $tr('loginFailed') }}
+            </StudioBanner>
+            <StudioBanner
+              v-if="offline"
+              error
+            >
+              {{ $tr('loginFailedOffline') }}
+            </StudioBanner>
+            <StudioBanner
+              v-if="nextParam"
+              data-test="loginToProceed"
+            >
+              {{ $tr('loginToProceed') }}
+            </StudioBanner>
+            <form
+              class="form"
+              @submit.prevent="submit"
+            >
+              <StudioEmailField
+                v-model="username"
+                autofocus
+                :errorMessages="touched.username && errors.username ? [usernameErrorText] : []"
+                :appearanceOverrides="{ maxWidth: '100%' }"
+                @blur="touched.username = true"
+              />
+              <StudioPasswordField
+                v-model="password"
+                :errorMessages="touched.password && errors.password ? [passwordErrorText] : []"
+                :appearanceOverrides="{ maxWidth: '100%' }"
+                @blur="touched.password = true"
+              />
+              <p>
+                <KRouterLink
+                  :to="{ name: 'ForgotPassword' }"
+                  :text="$tr('forgotPasswordLink')"
+                  appearance="basic-link"
+                />
+              </p>
+              <KButton
+                primary
+                class="w-100"
+                :text="$tr('signInButton')"
+                :disabled="offline || busy"
+                type="submit"
+              />
               <KRouterLink
-                :to="{ name: 'ForgotPassword' }"
-                :text="$tr('forgotPasswordLink')"
+                primary
+                class="create-account-link w-100"
+                :text="$tr('createAccountButton')"
+                :to="{ name: 'Create' }"
+                appearance="flat-button"
+              />
+            </form>
+            <hr
+              class="divider"
+              :style="{ borderTopColor: $themeTokens.fineLine }"
+            >
+            <p class="guest-link">
+              <KButton
+                href="/channels/#public"
+                :text="$tr('guestModeLink')"
                 appearance="basic-link"
               />
             </p>
-            <KButton
-              primary
-              class="w-100"
-              :text="$tr('signInButton')"
-              :disabled="offline || busy"
-              type="submit"
-            />
-            <KRouterLink
-              primary
-              class="mt-2 w-100"
-              :text="$tr('createAccountButton')"
-              :to="{ name: 'Create' }"
-              appearance="flat-button"
-            />
-          </VForm>
-          <VDivider />
-          <p class="mt-4 text-xs-center">
-            <KButton
-              href="/channels/#public"
-              :text="$tr('guestModeLink')"
-              appearance="basic-link"
-            />
-          </p>
-        </VCard>
-
-        <!-- Footer -->
-        <LanguageSwitcherList class="mt-3 text-xs-center" />
-
-        <p class="links mt-3 text-xs-center">
-          <span>
-            <KButton
-              :text="$tr('privacyPolicyLink')"
-              appearance="basic-link"
-              @click="showPrivacyPolicy"
-            />
-          </span>
-          <span>
-            <KButton
-              :text="$tr('TOSLink')"
-              appearance="basic-link"
-              @click="showTermsOfService"
-            />
-          </span>
-          <span>
-            <KButton
-              href="https://learningequality.org/"
-              :text="$tr('copyright', { year: new Date().getFullYear() })"
-              appearance="basic-link"
-              iconAfter="openNewTab"
-              target="_blank"
-            />
-          </span>
-        </p>
-      </div>
-    </VLayout>
+          </div>
+        </template>
+      </StudioRaisedBox>
+
+      <!-- Footer -->
+      <LanguageSwitcherList class="language-switcher" />
+
+      <p
+        class="links"
+        :style="{ color: $themePalette.grey.v_700 }"
+      >
+        <span>
+          <KButton
+            :text="$tr('privacyPolicyLink')"
+            appearance="basic-link"
+            @click="showPrivacyPolicy"
+          />
+        </span>
+        <span>
+          <KButton
+            :text="$tr('TOSLink')"
+            appearance="basic-link"
+            @click="showTermsOfService"
+          />
+        </span>
+        <span>
+          <KButton
+            href="https://learningequality.org/"
+            :text="$tr('copyright', { year: new Date().getFullYear() })"
+            appearance="basic-link"
+            iconAfter="openNewTab"
+            target="_blank"
+          />
+        </span>
+      </p>
+    </div>
     <PolicyModals />
-  </VApp>
+  </div>
 
 </template>
 
@@ -123,30 +137,46 @@
 <script>
 
   import { mapActions, mapState } from 'vuex';
-  import EmailField from 'shared/views/form/EmailField';
-  import PasswordField from 'shared/views/form/PasswordField';
-  import Banner from 'shared/views/Banner';
+  import StudioEmailField from '../components/form/StudioEmailField';
+  import StudioPasswordField from '../components/form/StudioPasswordField';
   import PolicyModals from 'shared/views/policies/PolicyModals';
-  import { policies } from 'shared/constants';
+  import StudioBanner from 'shared/views/StudioBanner';
+  import StudioRaisedBox from 'shared/views/StudioRaisedBox';
   import LanguageSwitcherList from 'shared/languageSwitcher/LanguageSwitcherList';
+  import { policies } from 'shared/constants';
+  import commonStrings from 'shared/translator';
+  import { generateFormMixin } from 'shared/mixins';
   import { redirectBrowser } from 'shared/utils/navigation';
 
+  const formMixin = generateFormMixin({
+    username: {
+      required: true,
+      validator: v => Boolean(v && v.trim()) && /.+@.+\..+/.test(v),
+    },
+    password: {
+      required: true,
+    },
+  });
+
   export default {
     name: 'AccountsMain',
     components: {
-      Banner,
-      EmailField,
       LanguageSwitcherList,
-      PasswordField,
       PolicyModals,
+      StudioBanner,
+      StudioEmailField,
+      StudioPasswordField,
+      StudioRaisedBox,
     },
+    mixins: [formMixin],
     data() {
       return {
-        username: '',
-        password: '',
         loginFailed: false,
         busy: false,
-        loginFailedOffline: false,
+        touched: {
+          username: false,
+          password: false,
+        },
       };
     },
     computed: {
@@ -157,6 +187,17 @@
         const params = new URLSearchParams(window.location.search.substring(1));
         return params.get('next');
       },
+      usernameErrorText() {
+        if (!this.username || !this.username.trim()) {
+          /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+          return commonStrings.$tr('fieldRequired');
+        }
+        return this.$tr('validEmailMessage');
+      },
+      passwordErrorText() {
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        return commonStrings.$tr('fieldRequired');
+      },
     },
     methods: {
       ...mapActions(['login']),
@@ -166,41 +207,43 @@
       showPrivacyPolicy() {
         this.$router.push({ query: { showPolicy: policies.PRIVACY } });
       },
-      submit() {
-        if (this.$refs.form.validate()) {
-          this.busy = true;
-          const credentials = {
-            username: this.username,
-            password: this.password,
-          };
-          return this.login(credentials)
-            .then(() => {
-              this.loginFailedOffline = false;
-              this.loginFailed = false;
-              redirectBrowser(this.nextParam || window.Urls.channels());
-            })
-            .catch(err => {
-              this.busy = false;
-              if (err.message === 'Network Error') {
-                this.loginFailedOffline = true;
-              } else if (err.response.status === 405) {
-                this.$router.push({ name: 'AccountNotActivated' });
-              } else {
-                this.loginFailed = true;
-              }
-            });
-        }
-        return Promise.resolve();
+      // eslint-disable-next-line vue/no-unused-properties
+      onValidationFailed() {
+        this.touched.username = true;
+        this.touched.password = true;
+      },
+      // eslint-disable-next-line vue/no-unused-properties
+      onSubmit(formData) {
+        this.busy = true;
+        const credentials = {
+          username: formData.username,
+          password: this.password,
+        };
+        return this.login(credentials)
+          .then(() => {
+            this.loginFailed = false;
+            redirectBrowser(this.nextParam || window.Urls.channels());
+          })
+          .catch(err => {
+            this.busy = false;
+            if (err.message === 'Network Error') {
+              return;
+            } else if (err.response.status === 405) {
+              this.$router.push({ name: 'AccountNotActivated' });
+            } else {
+              this.loginFailed = true;
+            }
+          });
       },
     },
     $trs: {
       kolibriStudio: 'Kolibri Studio',
-      passwordLabel: 'Password',
       forgotPasswordLink: 'Forgot your password?',
       signInButton: 'Sign in',
       createAccountButton: 'Create an account',
       guestModeLink: 'Explore without an account',
       loginFailed: 'Email or password is incorrect',
+      validEmailMessage: 'Please enter a valid email',
       privacyPolicyLink: 'Privacy policy',
       TOSLink: 'Terms of service',
       copyright: '© {year} Learning Equality',
@@ -215,31 +258,74 @@
 
 <style lang="scss" scoped>
 
-  .main {
+  .page {
+    display: flex;
+    justify-content: center;
+    min-height: 100vh;
+    padding-top: 48px;
     overflow: auto;
-    /* stylelint-disable-next-line custom-property-pattern */
-    background-color: var(--v-backgroundColor-base);
+  }
+
+  .sign-in-card {
+    width: 300px;
+    margin: 0 auto;
+  }
+
+  .k-logo-container {
+    display: flex;
+    justify-content: center;
+  }
+
+  .page-title {
+    padding: 8px 0;
+    font-size: 24px;
+    font-weight: bold;
+    text-align: center;
+  }
+
+  .card-body {
+    padding: 0 16px;
+  }
+
+  .form {
+    padding: 16px 0;
+  }
+
+  .create-account-link {
+    margin-top: 8px;
+  }
+
+  .divider {
+    border: 0;
+    border-top: 1px solid;
+  }
+
+  .guest-link {
+    margin-top: 24px;
+    text-align: center;
+  }
+
+  .w-100 {
+    width: 100%;
+  }
+
+  .language-switcher {
+    margin-top: 16px;
+    text-align: center;
   }
 
   .links {
+    margin-top: 16px;
+    text-align: center;
+
     span {
       &:not(:last-child)::after {
         margin: 0 8px 0 12px;
         font-size: 14pt;
-        color: var(--v-grey-base);
         vertical-align: middle;
         content: '•';
       }
     }
   }
 
-  .w-100 {
-    width: 100%;
-  }
-
-  .k-logo-container {
-    display: flex;
-    justify-content: center;
-  }
-
 </style>

From 9cb74758ef39a687e650e8375da9b16b53750245 Mon Sep 17 00:00:00 2001
From: LightCreator1007 <arunitchakraborty2006@gmail.com>
Date: Fri, 31 Jul 2026 00:27:29 +0530
Subject: [PATCH 2/3] Cover sign-in validation, blur errors and offline banner

Extend the sign-in suite for the behaviour introduced by the move to
generateFormMixin: submission is blocked while the form is invalid,
field errors stay hidden until a field is blurred or a submit fails,
and the password is sent without its surrounding whitespace trimmed.
Also assert the offline banner renders.
---
 .../pages/__tests__/accountsMain.spec.js      | 53 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/accounts/pages/__tests__/accountsMain.spec.js b/contentcuration/contentcuration/frontend/accounts/pages/__tests__/accountsMain.spec.js
index 7187a208a4..f19a31b8fc 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/__tests__/accountsMain.spec.js
+++ b/contentcuration/contentcuration/frontend/accounts/pages/__tests__/accountsMain.spec.js
@@ -1,4 +1,4 @@
-import { render, screen, waitFor } from '@testing-library/vue';
+import { fireEvent, render, screen, waitFor } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import VueRouter from 'vue-router';
 import AccountsMain from '../AccountsMain.vue';
@@ -87,6 +87,57 @@ describe('AccountsMain', () => {
     });
   });
 
+  it('should not attempt to log in when the form is invalid', async () => {
+    const loginMock = jest.fn();
+    makeWrapper({ loginMock });
+
+    await user.click(screen.getByRole('button', { name: /sign in/i }));
+
+    expect(loginMock).not.toHaveBeenCalled();
+  });
+
+  it('should not show the email error while the user is still typing', async () => {
+    makeWrapper();
+
+    await user.type(screen.getByLabelText(/email/i), 'not-an-email');
+
+    expect(screen.queryByText('Please enter a valid email')).not.toBeInTheDocument();
+  });
+
+  it('should show the email error once the field loses focus', async () => {
+    makeWrapper();
+    const emailField = screen.getByLabelText(/email/i);
+
+    await user.type(emailField, 'not-an-email');
+    await fireEvent.blur(emailField);
+
+    await waitFor(() => {
+      expect(screen.getByText('Please enter a valid email')).toBeInTheDocument();
+    });
+  });
+
+  it('should show the offline banner when offline', () => {
+    makeWrapper({ online: false });
+
+    expect(screen.getByText(/you seem to be offline/i)).toBeInTheDocument();
+  });
+
+  it('should preserve leading and trailing whitespace in the password', async () => {
+    const loginMock = jest.fn().mockResolvedValue();
+    makeWrapper({ loginMock });
+
+    await user.type(screen.getByLabelText(/email/i), 'test@test.com');
+    await user.type(screen.getByLabelText(/password/i), '  spaced  ');
+    await user.click(screen.getByRole('button', { name: /sign in/i }));
+
+    await waitFor(() => {
+      expect(loginMock).toHaveBeenCalledWith('login', {
+        username: 'test@test.com',
+        password: '  spaced  ',
+      });
+    });
+  });
+
   it('should show error message when login fails', async () => {
     const loginMock = jest.fn().mockRejectedValue({
       response: { status: 401 },

From 51ba973f838a988e2918113e705bfa2099f647f7 Mon Sep 17 00:00:00 2001
From: LightCreator1007 <arunitchakraborty2006@gmail.com>
Date: Fri, 31 Jul 2026 01:00:11 +0530
Subject: [PATCH 3/3] Keep theme--light class on sign-in page root

---
 .../contentcuration/frontend/accounts/pages/AccountsMain.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/accounts/pages/AccountsMain.vue b/contentcuration/contentcuration/frontend/accounts/pages/AccountsMain.vue
index cd4b85d5f7..538f161054 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/AccountsMain.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/AccountsMain.vue
@@ -1,7 +1,7 @@
 <template>
 
   <div
-    class="page"
+    class="page theme--light"
     :style="{ backgroundColor: $themePalette.grey.v_100 }"
   >
     <div>