Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: OPTIC-1359: Account Settings page moved to React #6741

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c96d83b
feat: OPTIC-1359: Account Settings page moved to React
yyassi-heartex Dec 2, 2024
4983f3a
more changes
yyassi-heartex Dec 2, 2024
7cd1986
adding basic structure
yyassi-heartex Dec 2, 2024
0b4b83c
toggling news letter properly
yyassi-heartex Dec 2, 2024
533dff3
more tweaks
yyassi-heartex Dec 2, 2024
9eb203b
extracting input into InputFile
yyassi-heartex Dec 3, 2024
11f5526
adding cursor
yyassi-heartex Dec 3, 2024
18216b6
InputFile behavior in keyboard is now good
yyassi-heartex Dec 3, 2024
a06a2b5
user avatar is updated properly
yyassi-heartex Dec 3, 2024
59cd95e
making sure menubar userpic updates at the same time
yyassi-heartex Dec 3, 2024
3417c54
personalInfo in a good spot
yyassi-heartex Dec 3, 2024
20c1ac1
inprogress tweaks
yyassi-heartex Dec 4, 2024
5e1eb83
preping core to work with pages
yyassi-heartex Dec 4, 2024
afcd43d
Merge branch 'develop' into fb-optic-1359/my-account
yyassi-heartex Jan 3, 2025
d455e72
Merge branch 'develop' into fb-optic-1359/my-account
yyassi-heartex Jan 27, 2025
3b31d74
lint cleanup
yyassi-heartex Jan 27, 2025
dcae61a
adding all needed fields to the token section
yyassi-heartex Jan 27, 2025
ff65ed7
Merge branch 'develop' into fb-optic-1359/my-account
yyassi-heartex Jan 28, 2025
59c35f3
Merge branch 'develop' into fb-optic-1359/my-account
yyassi-heartex Jan 28, 2025
c2fa784
Merge remote-tracking branch 'origin/develop' into fb-optic-1359/my-a…
yyassi-heartex Jan 28, 2025
4bc104b
PAT and MI should be good
yyassi-heartex Jan 28, 2025
3fe36bd
putting all the sections back to a working state
yyassi-heartex Jan 28, 2025
4f6ee83
Merge branch 'develop' into fb-optic-1359/my-account
yyassi-heartex Jan 29, 2025
819aea2
things appear to be functional but we need to unify a bunch of compon…
yyassi-heartex Jan 29, 2025
2b69307
getting navigation to work
yyassi-heartex Jan 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
374 changes: 0 additions & 374 deletions label_studio/users/templates/users/user_account.html

This file was deleted.

5 changes: 2 additions & 3 deletions label_studio/users/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
return redirect(reverse('main'))

form = forms.UserProfileForm(instance=user)
token = Token.objects.get(user=user)
Token.objects.get(user=user)

Check warning on line 142 in label_studio/users/views.py

View check run for this annotation

Codecov / codecov/patch

label_studio/users/views.py#L142

Added line #L142 was not covered by tests

if request.method == 'POST':
form = forms.UserProfileForm(request.POST, instance=user)
Expand All @@ -149,6 +149,5 @@

return render(
request,
'users/user_account.html',
{'settings': settings, 'user': user, 'user_profile_form': form, 'token': token},
'base.html',
)
Loading
Loading