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.

Sign up for GitHub

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

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
+646 −446
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 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
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
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions label_studio/users/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,5 @@ def user_account(request):

return render(
request,
'users/user_account.html',
{'settings': settings, 'user': user, 'user_profile_form': form, 'token': token},
'base.html',
)
2 changes: 2 additions & 0 deletions web/apps/labelstudio/src/app/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import ErrorBoundary from "./ErrorBoundary";
import { RootPage } from "./RootPage";
import { FF_OPTIC_2, FF_UNSAVED_CHANGES, isFF } from "../utils/feature-flags";
import { ToastProvider, ToastViewport } from "@humansignal/ui";
import { CurrentUserProvider } from "../providers/CurrentUser";

const baseURL = new URL(APP_SETTINGS.hostname || location.origin);
export const UNBLOCK_HISTORY_MESSAGE = "UNBLOCK_HISTORY";
Expand Down Expand Up @@ -61,6 +62,7 @@ const App = ({ content }) => {
<RoutesProvider key="rotes" />,
<ProjectProvider key="project" />,
<ToastProvider key="toast" />,
<CurrentUserProvider key="current-user" />,
]}
>
<AsyncPage>
Expand Down
Loading
Loading