Skip to content

Conversation

@huzaifaedhi22
Copy link
Contributor

This PR

  • allows users to login with username or email

📝 Checklist

  • All commits follow the Conventional Commit format or I'm fine with a squash merge of this PR
  • The PR's title follows the Conventional Commit format

Copy link
Member

@dargmuesli dargmuesli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

195 files changed look odd, should this PR target beta?

@huzaifaedhi22
Copy link
Contributor Author

Yes this will target beta as we have account restyle changes there.

@huzaifaedhi22 huzaifaedhi22 changed the base branch from main to beta April 10, 2025 09:38
Base automatically changed from beta to main April 10, 2025 13:00
Copy link
Member

@dargmuesli dargmuesli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR needs a rebase

@dargmuesli
Copy link
Member

@huzaifaedhi22 what's the status on this?

dargmuesli and others added 6 commits May 7, 2025 22:20
* feat(tailwind): add accent colors

* feat(button-colored): update secondary style

* feat(form-account-sign-in): update registration button

* feat(tailwind): add accent fancy

* feat(AppLink): update accent color

* feat: update ButtonColored component to accept more styles

* feat(form): update form design to match new one

* chore(i18n): update placeholder text to "Create an account"

* feat(footer): create footer component

* feat(layout): add footer component to default layout

* fix(account): convert route paths to route names in footer component

* chore(tests): update visual regression snapshots

* chore(tests): add visual regression snapshots

* chore(tests): add visual regression test

* feat(account): add modals for privacy policy and general terms acceptance

* feat(button): add confirm button component

* chore(tailwind): add colors to tailwind config

* feat(account-register): add privacy policy and general terms modal to signup flow

* fix: linting errors

* fix(modal): resolve transition issue between modals

* feat(account):add uuid field to accountRegistration mutation response

* feat(account): add acceptLegalTermAcceptance mutation

* feat(account): include legal acceptance mutation in registration flow

* chore(gql): update generated gql files

* feat(account): add terms id to registration flow

* feat(generalTerms): create and use general terms query

* Merge branch 'master' into feat/account/restyle

* fix(lint): typos in graph ql files

* fix(typo) : remove typo

* refactor(query): use nodes instead of edges

* chore(shad-cn): add shad cn dialogue and shadbutton

* chore(colors): add colors from new design

* feat(account): implement updated design for account signup and login

* refactor(empty-lines):remove

* chore(shad-cn): shadcn components index and deps

* feat(modals): use shadcn for modals

* chore(text): update text

* feat(forms): use updated design for forms

* feat(styling): update modals for dark mode

* feat(validator): add validator to allow both username and email to sign in

* chore(colors): add colors

* fix(deps): sync lockfile

* fix(shadcn): use updated import

* fix(shad-button): export as ShadButton to avoid conflict

* fix(css): merge app.css and maevsi.css

* chore(deps): deduplicate dependencies

* fix(turnstile): set token without store

* chore(tests) : update tests

* fix(styles): pass correct color variable

* feat(modals): add back button to modals

* fix(termId): add legal term id to account registration mutation

* feat(pending-verify): add pending verification email page

* chore(gql): update gql files

* refactor(verify): create verify directory instead

* chore(tests): update tests

* chore(tests): add new screenshots

* chore(tests): update tests

* chore(test): update snapshots

* chore(deps): mark compatibility with sqitch v7

* chore: fix back icon

* chore: revert readdition of style utility

* chore: restyle forms

* feat(components): upgrade dialog component

* chore(graphql): update schema

* refactor(graphql): extract legal term fragment

* chore(graphql): reduce returned values for legal term acceptance

* fix(account): revert sign in form input to email

* refactor(utils): sort validation functions

* refactor(components): replace legacy footer

* refactor(components): extract footer button

* feat(form): align sign in and registration

* feat(session): add welcome screen

* feat(components): add button size

* feat(components): add top bar

* feat(form): remove placeholders

* chore: work in layout updates

* chore(deps): upgrade shadcn-nuxt styles

* refactor(legal): extract content component

* feat(legal): update report form link

* refactor(app): reorder components

* fix(app): correct backdrop height

* chore(app): remove nuxt layout comment

* fix(components): correct icon labels

* chore: rework models to stepper

* fix(components): correct button variant

* fix(components): use `span` for typography

* feat(pages): extract legal term page

* chore(sqitch): update to v7.0.0-beta.10

* chore: clean up

---------

Co-authored-by: huzaifaedhi2 <[email protected]>
* **account:** update authentication flow (#1687)

* **account:** update authentication flow ([#1687](#1687)) ([cb1ed21](cb1ed21))
* **platform:** allow for header and cookie key unification ([#1849](#1849)) ([71bf1f4](71bf1f4))
@huzaifaedhi22 huzaifaedhi22 force-pushed the feat/account/emailOrUsername branch from a921031 to d729ff5 Compare May 7, 2025 20:25
@huzaifaedhi22 huzaifaedhi22 requested a review from dargmuesli May 7, 2025 21:57
@dargmuesli dargmuesli force-pushed the feat/account/emailOrUsername branch from bdac338 to dd9e044 Compare May 8, 2025 16:34
Copy link
Member

@dargmuesli dargmuesli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make sure the PRs' diffs look as they should when requesting review

@huzaifaedhi22 huzaifaedhi22 requested a review from dargmuesli May 20, 2025 15:09
Copy link
Member

@dargmuesli dargmuesli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comments from last review above.

@huzaifaedhi22 huzaifaedhi22 requested a review from dargmuesli June 4, 2025 00:55
@huzaifaedhi22 huzaifaedhi22 requested a review from dargmuesli June 18, 2025 23:43
@CLAassistant
Copy link

CLAassistant commented Jun 28, 2025

CLA assistant check
All committers have signed the CLA.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants