fix(merge):Revert "chore(merge): Merge branch 'master' into feat/account/restyle"

This reverts commit 865730f, reversing
changes made to 4f864c8.

Author: huzaifaedhi22

src/app/components/_/AppLink.vue

@@ -41,8 +41,8 @@ const emit = defineEmits<{
 // computations
 const classes = computed(() => {
   return [
-    'rounded',
-    ...(props.isColored ? ['text-accent-strong dark:text-link-bright'] : []),
+    'rounded-sm',
+    ...(props.isColored ? ['text-link-dark dark:text-link-bright'] : []),
     ...(props.isDisabled ? ['disabled'] : []),
     ...(props.isUnderlined ? ['underline'] : []),
   ].join(' ')

src/app/components/button/ButtonColored.vue

@@ -3,9 +3,15 @@
     :aria-label="ariaLabel"
     class="justify-center rounded-md px-4 py-2 font-medium"
     :class="
-      variant === 'primary'
-        ? 'bg-accent-fancy from-blue-500 to-blue-600 text-text-bright hover:bg-accent-strong dark:from-blue-300 dark:to-blue-400 dark:text-text-dark'
-        : 'bg-accent-weak text-accent-strong hover:bg-accent-mid dark:border dark:border-gray-600 dark:bg-inherit dark:text-text-bright dark:hover:bg-black/30'
+      [
+        ...(isPrimary
+          ? [
+              'text-text-bright dark:text-text-dark bg-gradient-to-tr from-blue-500 to-blue-600 dark:from-blue-300 dark:to-blue-400',
+            ]
+          : [
+              'text-text-dark dark:text-text-bright border border-gray-300 hover:bg-black/5 dark:border-gray-600 dark:hover:bg-black/30',
+            ]),
+      ].join(' ')
     "
     :disabled="disabled"
     :to="props.to"
@@ -29,15 +35,14 @@ export interface Props {
   ariaLabel: string
   disabled?: boolean
   isExternal?: boolean
-  variant?: 'primary' | 'accent'
+  isPrimary?: boolean
   to?: RouteLocationRaw
   type?: 'button' | 'reset' | 'submit'
 }
-
 const props = withDefaults(defineProps<Props>(), {
   disabled: false,
   isExternal: undefined,
-  variant: 'primary', // default variant
+  isPrimary: true,
   to: undefined,
   type: 'button',
 })

src/app/components/button/ButtonConfirm.vue

@@ -12,10 +12,9 @@
     <div class="flex flex-col">
       <div class="flex min-h-0 flex-col gap-6">
         <slot />
-        <div class="flex flex-col justify-between">
+        <div class="flex flex-col items-center justify-between">
           <ButtonColored
             :aria-label="submitName || t('submit')"
-            :is-primary="false"
             :class="{
               'animate-shake': $error,
             }"

src/app/components/footer/Footer.vue

@@ -1,5 +1,15 @@
 <template>
   <div class="flex flex-col items-center gap-4">
+    <ButtonColored
+      :is-primary="false"
+      :aria-label="t('register')"
+      :to="localePath('session-create')"
+    >
+      {{ t('signIn') }}
+      <template #prefix>
+        <IHeroiconsArrowLeft />
+      </template>
+    </ButtonColored>
     <Form
       :errors="api.errors"
       :errors-pg-ids="{
@@ -10,7 +20,7 @@
       form-class="w-full"
       :is-form-sent="isFormSent"
       :submit-name="t('register')"
-      @submit.prevent="handleSubmit"
+      @submit.prevent="submit"
     >
       <FormInputUsername
         :form-input="v$.username"
@@ -37,86 +47,45 @@
         </FormInputStateInfo>
       </template>
     </Form>
-
-    <AppLink
-      :to="localePath('session-create')"
-      :is-underlined="true"
-      :is-colored="true"
-    >
-      {{ t('alreadyHaveAnAccount') }}
-    </AppLink>
-
-    <!-- Modals -->
-    <ModalPrivacyPolicy
-      v-model="privacyModalOpen"
-      @open-general-terms="openGeneralTerms"
-    />
-
-    <ModalGeneralTerms v-model="generalTermsModalOpen" @accepted="submit" />
   </div>
 </template>
 
 <script setup lang="ts">
 import { useVuelidate } from '@vuelidate/core'
-import { useCreateLegalTermAcceptanceMutation } from '~~/gql/documents/mutations/account/accountLegalTermAcceptance'
 import { useAccountRegistrationMutation } from '~~/gql/documents/mutations/account/accountRegistration'
 
 const { locale, t } = useI18n()
 const localePath = useLocalePath()
 const fireAlert = useFireAlert()
 const store = useMaevsiStore()
 
-const privacyModalOpen = ref(false)
-const generalTermsModalOpen = ref(false)
-
+// api data
 const accountRegistrationMutation = useAccountRegistrationMutation()
 const api = getApiData([accountRegistrationMutation])
 
+// data
 const form = reactive({
   captcha: ref<string>(),
   emailAddress: ref<string>(),
   password: ref<string>(),
   username: ref<string>(),
 })
-
 const isFormSent = ref(false)
 
-// Methods
-const submit = async (termId: string) => {
+// methods
+const submit = async () => {
+  if (!(await isFormValid({ v$, isFormSent }))) return
+
   store.turnstileToken = form.captcha
 
-  const accountResult = await accountRegistrationMutation.executeMutation({
+  const result = await accountRegistrationMutation.executeMutation({
     emailAddress: form.emailAddress || '',
     language: locale.value,
     password: form.password || '',
     username: form.username || '',
   })
 
-  if (accountResult.error) {
-    return
-  }
-
-  const accountUuid = accountResult.data?.accountRegistration?.uuid
-  if (!accountUuid) {
-    console.error('No account UUID received')
-    return
-  }
-
-  const legalTermAcceptanceMutation = useCreateLegalTermAcceptanceMutation()
-
-  const acceptanceResult = await legalTermAcceptanceMutation.executeMutation({
-    input: {
-      legalTermAcceptance: {
-        accountId: accountUuid,
-        legalTermId: termId,
-      },
-    },
-  })
-
-  if (acceptanceResult.error) {
-    console.error('Legal term acceptance error:', acceptanceResult.error)
-    return
-  }
+  if (result.error || !result.data) return
 
   await fireAlert({
     level: 'success',
@@ -125,16 +94,6 @@ const submit = async (termId: string) => {
   })
 }
 
-const handleSubmit = async () => {
-  if (!(await isFormValid({ v$, isFormSent }))) return
-
-  privacyModalOpen.value = true
-}
-
-const openGeneralTerms = () => {
-  generalTermsModalOpen.value = true
-}
-
 // vuelidate
 const rules = {
   captcha: VALIDATION_CAPTCHA(),
@@ -145,7 +104,6 @@ const rules = {
   password: VALIDATION_PASSWORD(),
   emailAddress: VALIDATION_EMAIL_ADDRESS({ isRequired: true }),
 }
-
 const v$ = useVuelidate(rules, form)
 </script>
 
@@ -157,13 +115,13 @@ de:
   register: Registrieren
   registrationSuccessBody: Verifiziere deinen Account über den Link in der E-Mail, die du in Kürze erhalten wirst.
   registrationSuccessTitle: Verifizierungs-E-Mail gesendet.
-  alreadyHaveAnAccount: 'Du hast bereits ein Konto? Anmelden'
+  signIn: Stattdessen anmelden
 en:
   accountDeletionNotice: "You'll be able to delete your account at any time."
   postgres22023: Your password is too short! Think of a longer one.
   postgres23505: This username or email address is already in use! Think of a new name or try signing in instead.
-  register: Sign Up
+  register: Register
   registrationSuccessBody: Verify your account using the verification link sent to you by email.
   registrationSuccessTitle: Verification email sent.
-  alreadyHaveAnAccount: Already have an account? Log in
+  signIn: Sign in instead
 </i18n>

src/app/components/form/Form.vue

@@ -1,5 +1,15 @@
 <template>
   <div class="flex flex-col items-center gap-4">
+    <ButtonColored
+      :is-primary="false"
+      :aria-label="t('register')"
+      :to="localePath('account-create')"
+    >
+      {{ t('register') }}
+      <template #prefix>
+        <IHeroiconsArrowRight />
+      </template>
+    </ButtonColored>
     <Form
       :errors="api.errors"
       :errors-pg-ids="{
@@ -46,21 +56,7 @@
         </ButtonColored>
       </template>
     </Form>
-    <div class="flex w-full flex-col justify-between">
-      <ButtonColored
-        variant="accent"
-        :aria-label="t('register')"
-        :to="localePath('account-create')"
-        class="w-full"
-      >
-        {{ t('register') }}
-      </ButtonColored>
-    </div>
-    <AppLink
-      :to="localePath('account-password-reset-request')"
-      :is-underlined="true"
-      :is-colored="true"
-    >
+    <AppLink :to="localePath('account-password-reset-request')">
       {{ t('passwordReset') }}
     </AppLink>
   </div>
@@ -144,14 +140,14 @@ de:
   passwordReset: Passwort zurücksetzen
   postgres55000: Deine E-Mail-Adresse ist noch nicht verifiziert! Schau in dein E-Mail-Postfach, ggf. auch in den Spam-Ordner, oder kontaktiere den Support.
   postgresP0002: Anmeldung fehlgeschlagen! Hast du dich schon registriert? Überprüfe deine Eingaben auf Schreibfehler oder kontaktiere den Support.
-  register: Konto erstellen
+  register: Stattdessen registrieren
   signIn: Anmelden
 en:
   contactSupport: Contact support
   jwtStoreFail: Failed to store the authentication data!
-  passwordReset: I forgot my password
+  passwordReset: Reset password
   postgres55000: Your email address has not been verified yet! Check your email inbox, including the spam folder if necessary, or contact support.
   postgresP0002: Login failed! Have you registered yet? Check your input for spelling mistakes or contact support.
-  register: Create an account
+  register: Register instead
   signIn: Sign in
 </i18n>