- 
+
+
+
+
A full-fledged open source solution for data labeling
{% include 'users/new-ui/user_tips.html' %} -
+
Brought to you by
- 
+
+
+
+
diff --git a/label_studio/users/templates/users/user_account.html b/label_studio/users/templates/users/user_account.html
index c20eca96f139..d8b583f99b98 100644
--- a/label_studio/users/templates/users/user_account.html
+++ b/label_studio/users/templates/users/user_account.html
@@ -100,57 +100,57 @@
+
+
diff --git a/label_studio/users/views.py b/label_studio/users/views.py
index d3c958f76d07..a3465927c59a 100644
--- a/label_studio/users/views.py
+++ b/label_studio/users/views.py
@@ -45,7 +45,10 @@ def user_signup(request):
# checks if the URL is a safe redirection.
if not next_page or not url_has_allowed_host_and_scheme(url=next_page, allowed_hosts=request.get_host()):
- next_page = reverse('projects:project-index')
+ if flag_set('fflag_all_feat_dia_1777_ls_homepage_short'):
+ next_page = reverse('main')
+ else:
+ next_page = reverse('projects:project-index')
user_form = forms.UserSignupForm()
organization_form = OrganizationSignupForm()
@@ -105,7 +108,10 @@ def user_login(request):
# checks if the URL is a safe redirection.
if not next_page or not url_has_allowed_host_and_scheme(url=next_page, allowed_hosts=request.get_host()):
- next_page = reverse('projects:project-index')
+ if flag_set('fflag_all_feat_dia_1777_ls_homepage_short'):
+ next_page = reverse('main')
+ else:
+ next_page = reverse('projects:project-index')
login_form = load_func(settings.USER_LOGIN_FORM)
form = login_form()
diff --git a/web/.gitignore b/web/.gitignore
index 826c9d84514f..aa895eebf506 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -6,6 +6,7 @@ tmp
# dependencies
node_modules
+dist
# IDEs and editors
/.idea
diff --git a/web/.stylelintrc.json b/web/.stylelintrc.json
index b14abcd5a139..f85d1a259049 100644
--- a/web/.stylelintrc.json
+++ b/web/.stylelintrc.json
@@ -1,10 +1,12 @@
{
- "extends": "stylelint-config-standard-scss",
+ "extends": ["stylelint-config-tailwindcss/scss", "stylelint-config-standard-scss"],
"rules": {
"selector-class-pattern": null,
"custom-property-pattern": null,
"no-descending-specificity": null,
+ "function-no-unknown": null,
"scss/no-global-function-names": null,
+ "scss/function-no-unknown": null,
"selector-pseudo-class-no-unknown": [
true,
{
diff --git a/web/apps/labelstudio/src/app/App.jsx b/web/apps/labelstudio/src/app/App.jsx
index b689f6620b53..7f65003089c3 100644
--- a/web/apps/labelstudio/src/app/App.jsx
+++ b/web/apps/labelstudio/src/app/App.jsx
@@ -12,17 +12,27 @@ import { MultiProvider } from "../providers/MultiProvider";
import { ProjectProvider } from "../providers/ProjectProvider";
import { RoutesProvider } from "../providers/RoutesProvider";
import { DRAFT_GUARD_KEY, DraftGuard, draftGuardCallback } from "../components/DraftGuard/DraftGuard";
-import "./App.scss";
import { AsyncPage } from "./AsyncPage/AsyncPage";
import ErrorBoundary from "./ErrorBoundary";
-import { RootPage } from "./RootPage";
import { FF_OPTIC_2, FF_UNSAVED_CHANGES, FF_PRODUCT_TOUR, isFF } from "../utils/feature-flags";
import { TourProvider } from "@humansignal/core";
import { ToastProvider, ToastViewport } from "@humansignal/ui";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { JotaiProvider, JotaiStore } from "../utils/jotai-store";
import { CurrentUserProvider } from "../providers/CurrentUser";
+import { RootPage } from "./RootPage";
+import "@humansignal/ui/src/tailwind.css";
+import "./App.scss";
const baseURL = new URL(APP_SETTINGS.hostname || location.origin);
export const UNBLOCK_HISTORY_MESSAGE = "UNBLOCK_HISTORY";
+const queryClient = new QueryClient({
+ defaultOptions: {
+ queries: {
+ refetchOnWindowFocus: false,
+ },
+ },
+});
const browserHistory = createBrowserHistory({
basename: baseURL.pathname || "/",
@@ -57,6 +67,8 @@ const App = ({ content }) => {
{% endblock %}
+
+