From bcbe35b43661cc3487d6c82a380f9dcb0c6b69ae Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 19 Mar 2024 19:19:08 +0300
Subject: [PATCH] classnames refactoring + small ui fixes
---
rsconcept/frontend/src/components/ui/Checkbox.tsx | 2 +-
.../frontend/src/components/ui/CheckboxTristate.tsx | 2 +-
rsconcept/frontend/src/components/ui/FlexColumn.tsx | 4 +---
rsconcept/frontend/src/components/ui/Label.tsx | 4 ++--
rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx | 3 +--
.../DlgConstituentaTemplate/DlgConstituentaTemplate.tsx | 3 +--
rsconcept/frontend/src/dialogs/DlgCreateCst.tsx | 3 +--
rsconcept/frontend/src/dialogs/DlgCreateVersion.tsx | 3 +--
.../frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx | 4 ++--
.../dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx | 8 ++++----
.../src/dialogs/DlgInlineSynthesis/SchemaTab.tsx | 2 +-
rsconcept/frontend/src/pages/CreateRSFormPage.tsx | 4 ++--
rsconcept/frontend/src/pages/LoginPage.tsx | 4 ++--
rsconcept/frontend/src/pages/PasswordChangePage.tsx | 3 +--
.../EditorConstituenta/ConstituentaToolbar.tsx | 2 +-
.../RSFormPage/EditorConstituenta/ControlsOverlay.tsx | 1 +
.../RSFormPage/EditorConstituenta/FormConstituenta.tsx | 3 +--
.../RSFormPage/EditorRSExpression/RSEditControls.tsx | 2 +-
.../src/pages/RSFormPage/EditorRSForm/FormRSForm.tsx | 8 ++------
.../pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx | 4 ++--
rsconcept/frontend/src/pages/RegisterPage.tsx | 4 ++--
rsconcept/frontend/src/pages/RestorePasswordPage.tsx | 3 +--
.../frontend/src/pages/UserProfilePage/EditorProfile.tsx | 3 +--
rsconcept/frontend/src/styling/styles.css | 8 ++++++++
rsconcept/frontend/src/utils/constants.ts | 9 +--------
25 files changed, 42 insertions(+), 54 deletions(-)
diff --git a/rsconcept/frontend/src/components/ui/Checkbox.tsx b/rsconcept/frontend/src/components/ui/Checkbox.tsx
index 74c84d0d..1636e81f 100644
--- a/rsconcept/frontend/src/components/ui/Checkbox.tsx
+++ b/rsconcept/frontend/src/components/ui/Checkbox.tsx
@@ -76,7 +76,7 @@ function Checkbox({
) : null}
- {label ? {label} : null}
+ {label ? {label} : null}
);
}
diff --git a/rsconcept/frontend/src/components/ui/CheckboxTristate.tsx b/rsconcept/frontend/src/components/ui/CheckboxTristate.tsx
index 64261ce7..7a4cd07e 100644
--- a/rsconcept/frontend/src/components/ui/CheckboxTristate.tsx
+++ b/rsconcept/frontend/src/components/ui/CheckboxTristate.tsx
@@ -84,7 +84,7 @@ function CheckboxTristate({
) : null}
- {label ? {label} : null}
+ {label ? {label} : null}
);
}
diff --git a/rsconcept/frontend/src/components/ui/FlexColumn.tsx b/rsconcept/frontend/src/components/ui/FlexColumn.tsx
index 5d19e5d2..dd822a2e 100644
--- a/rsconcept/frontend/src/components/ui/FlexColumn.tsx
+++ b/rsconcept/frontend/src/components/ui/FlexColumn.tsx
@@ -1,14 +1,12 @@
import clsx from 'clsx';
-import { classnames } from '@/utils/constants';
-
import { CProps } from '../props';
export interface FlexColumnProps extends CProps.Div {}
function FlexColumn({ className, children, ...restProps }: FlexColumnProps) {
return (
-
+
{children}
);
diff --git a/rsconcept/frontend/src/components/ui/Label.tsx b/rsconcept/frontend/src/components/ui/Label.tsx
index 6db68ddf..5dcb25b8 100644
--- a/rsconcept/frontend/src/components/ui/Label.tsx
+++ b/rsconcept/frontend/src/components/ui/Label.tsx
@@ -12,13 +12,13 @@ function Label({ text, className, ...restProps }: LabelProps) {
}
if (restProps.htmlFor) {
return (
-