From 5aaf902919c4b1530d2043b80cb6f6fbf52760c1 Mon Sep 17 00:00:00 2001 From: IRBorisov <8611739+IRBorisov@users.noreply.github.com> Date: Tue, 26 Dec 2023 14:23:51 +0300 Subject: [PATCH] Fix spelling via spellchecker --- README.md | 4 +- rsconcept/backend/apps/rsform/models.py | 8 ++-- rsconcept/backend/apps/rsform/serializers.py | 2 +- .../backend/apps/rsform/tests/t_utils.py | 2 +- rsconcept/backend/apps/rsform/views.py | 2 +- rsconcept/backend/apps/users/admin.py | 2 +- rsconcept/backend/apps/users/apps.py | 2 +- rsconcept/backend/apps/users/serializers.py | 6 +-- rsconcept/backend/apps/users/urls.py | 2 +- rsconcept/backend/apps/users/views.py | 2 +- rsconcept/backend/cctext/ruparser.py | 6 +-- rsconcept/backend/cctext/syntax.py | 4 +- rsconcept/backend/project/settings.py | 4 +- rsconcept/frontend/src/App.tsx | 2 +- .../components/DataTable/PaginationTools.tsx | 2 +- .../src/components/ExpectedAnonymous.tsx | 2 +- .../frontend/src/components/Help/HelpAPI.tsx | 4 +- .../src/components/Help/HelpButton.tsx | 2 +- .../src/components/Help/HelpLibrary.tsx | 2 +- .../frontend/src/components/Help/HelpMain.tsx | 4 +- .../Help/HelpTerminologyControl.tsx | 2 +- .../src/components/Help/InfoTopic.tsx | 2 +- .../src/components/Navigation/Navigation.tsx | 7 ++- .../components/Navigation/UserDropdown.tsx | 2 +- .../src/components/Navigation/UserMenu.tsx | 2 +- .../components/Shared/ConstituentaBadge.tsx | 6 +-- .../components/Shared/ConstituentaPicker.tsx | 2 +- .../src/components/Shared/GrammemeBadge.tsx | 6 +-- .../src/components/Shared/InfoCstClass.tsx | 4 +- .../src/components/Shared/InfoCstStatus.tsx | 4 +- .../src/context/AccessModeContext.tsx | 2 +- .../frontend/src/context/LibraryContext.tsx | 2 +- ...ationContext.tsx => NavigationContext.tsx} | 10 ++-- .../src/dialogs/DlgCloneLibraryItem.tsx | 2 +- .../DlgConstituentaTemplate.tsx | 2 +- .../DlgEditReference/DlgEditReference.tsx | 2 +- .../dialogs/DlgEditReference/EntityTab.tsx | 2 +- .../DlgEditWordForms/DlgEditWordForms.tsx | 2 +- .../frontend/src/dialogs/DlgGraphParams.tsx | 2 +- rsconcept/frontend/src/dialogs/DlgShowAST.tsx | 4 +- rsconcept/frontend/src/models/language.ts | 22 ++++----- rsconcept/frontend/src/models/library.ts | 4 +- .../{miscelanious.ts => miscellaneous.ts} | 2 +- ...miscelaniousAPI.ts => miscellaneousAPI.ts} | 4 +- rsconcept/frontend/src/models/rsform.ts | 8 ++-- rsconcept/frontend/src/models/rsformAPI.ts | 10 ++-- rsconcept/frontend/src/models/rslang.ts | 8 ++-- .../frontend/src/pages/CreateRSFormPage.tsx | 2 +- rsconcept/frontend/src/pages/HomePage.tsx | 2 +- .../src/pages/LibraryPage/LibraryPage.tsx | 4 +- .../src/pages/LibraryPage/PickerStrategy.tsx | 2 +- .../src/pages/LibraryPage/SearchPanel.tsx | 6 +-- .../src/pages/LibraryPage/ViewLibrary.tsx | 4 +- rsconcept/frontend/src/pages/LoginPage.tsx | 2 +- .../src/pages/ManualsPage/ManualsPage.tsx | 4 +- .../src/pages/ManualsPage/TopicsList.tsx | 2 +- .../src/pages/ManualsPage/ViewTopic.tsx | 2 +- .../ConstituentaToolbar.tsx | 2 +- .../EditorConstituenta/EditorConstituenta.tsx | 4 +- .../EditorRSExpression/EditorRSExpression.tsx | 6 +-- .../EditorRSExpression/StatusBar.tsx | 4 +- .../RSFormPage/EditorRSForm/RSFormStats.tsx | 10 ++-- .../RSFormPage/EditorRSForm/RSFormToolbar.tsx | 2 +- .../RSFormPage/EditorRSList/RSListToolbar.tsx | 2 +- .../EditorTermGraph/EditorTermGraph.tsx | 6 +-- .../EditorTermGraph/GraphSidebar.tsx | 6 +-- .../EditorTermGraph/GraphToolbar.tsx | 2 +- .../RSFormPage/EditorTermGraph/ViewHidden.tsx | 6 +-- .../EditorTermGraph/useGraphFilter.ts | 2 +- .../frontend/src/pages/RSFormPage/RSTabs.tsx | 4 +- .../src/pages/RSFormPage/RSTabsMenu.tsx | 4 +- .../ViewConstituents/ConstituentsSearch.tsx | 10 ++-- .../ViewConstituents/ConstituentsTable.tsx | 2 +- .../ViewConstituents/ViewConstituents.tsx | 2 +- rsconcept/frontend/src/pages/RegisterPage.tsx | 2 +- .../src/pages/RestorePasswordPage.tsx | 2 +- .../pages/UserProfilePage/EditorPassword.tsx | 2 +- .../pages/UserProfilePage/EditorProfile.tsx | 2 +- .../src/pages/UserProfilePage/UserTabs.tsx | 2 +- .../UserProfilePage/ViewSubscriptions.tsx | 2 +- rsconcept/frontend/src/utils/Graph.test.ts | 2 +- rsconcept/frontend/src/utils/codemirror.ts | 6 +-- rsconcept/frontend/src/utils/color.ts | 20 ++++---- rsconcept/frontend/src/utils/constants.ts | 10 ++-- rsconcept/frontend/src/utils/labels.ts | 46 +++++++++---------- rsconcept/frontend/src/utils/selectors.ts | 2 +- rsconcept/frontend/src/utils/utils.tsx | 6 +-- 87 files changed, 201 insertions(+), 196 deletions(-) rename rsconcept/frontend/src/context/{NagivationContext.tsx => NavigationContext.tsx} (92%) rename rsconcept/frontend/src/models/{miscelanious.ts => miscellaneous.ts} (94%) rename rsconcept/frontend/src/models/{miscelaniousAPI.ts => miscellaneousAPI.ts} (83%) diff --git a/README.md b/README.md index b8cab60c..0a996470 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,8 @@ This readme file is used mostly to document project dependencies
   - ESLint
   - Colorize
+  - Code Spell Checker (eng + rus)
+  - Backticks
   
@@ -102,7 +104,7 @@ This readme file is used mostly to document project dependencies - run rsconcept/backend/LocalEnvSetup.ps1 - use VSCode configs in root folder to start developement -## Developement build +## Development build - this build does not use HTTPS and nginx for networking - backend and frontend debugging is supported - hmr (hot updates) for frontend diff --git a/rsconcept/backend/apps/rsform/models.py b/rsconcept/backend/apps/rsform/models.py index 0b81a3b5..06126ebc 100644 --- a/rsconcept/backend/apps/rsform/models.py +++ b/rsconcept/backend/apps/rsform/models.py @@ -238,12 +238,12 @@ class Constituenta(Model): blank=True ) definition_raw: TextField = TextField( - verbose_name='Текстовое определние (с отсылками)', + verbose_name='Текстовое определение (с отсылками)', default='', blank=True ) definition_resolved: TextField = TextField( - verbose_name='Текстовое определние', + verbose_name='Текстовое определение', default='', blank=True ) @@ -501,8 +501,8 @@ class RSForm: def _insert_new(self, data: dict, insert_after: Optional[str]=None) -> 'Constituenta': if insert_after is not None: - cstafter = Constituenta.objects.get(pk=insert_after) - return self.insert_at(cstafter.order + 1, data['alias'], data['cst_type']) + cst_after = Constituenta.objects.get(pk=insert_after) + return self.insert_at(cst_after.order + 1, data['alias'], data['cst_type']) else: return self.insert_last(data['alias'], data['cst_type']) diff --git a/rsconcept/backend/apps/rsform/serializers.py b/rsconcept/backend/apps/rsform/serializers.py index b9955af4..e4eafd3c 100644 --- a/rsconcept/backend/apps/rsform/serializers.py +++ b/rsconcept/backend/apps/rsform/serializers.py @@ -481,7 +481,7 @@ class RSFormTRSSerializer(serializers.Serializer): or self.initial_data['version'] < _TRS_VERSION_MIN \ or self.initial_data['version'] > _TRS_VERSION: raise serializers.ValidationError({ - 'version': 'Некорректная версия файла Экстеор. Пересохраните файл в новой версии' + 'version': 'Некорректная версия файла Экстеор. Сохраните файл в новой версии' }) return attrs diff --git a/rsconcept/backend/apps/rsform/tests/t_utils.py b/rsconcept/backend/apps/rsform/tests/t_utils.py index 2f08cd8d..b7eb7f65 100644 --- a/rsconcept/backend/apps/rsform/tests/t_utils.py +++ b/rsconcept/backend/apps/rsform/tests/t_utils.py @@ -6,7 +6,7 @@ from apps.rsform.utils import apply_pattern, fix_old_references class TestUtils(unittest.TestCase): - ''' Test various utilitiy functions. ''' + ''' Test various utility functions. ''' def test_apply_mapping_patter(self): mapping = {'X101': 'X20'} pattern = re.compile(r'(X[0-9]+)') diff --git a/rsconcept/backend/apps/rsform/views.py b/rsconcept/backend/apps/rsform/views.py index f8ef7dd4..2c7d9f0c 100644 --- a/rsconcept/backend/apps/rsform/views.py +++ b/rsconcept/backend/apps/rsform/views.py @@ -404,7 +404,7 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr ) @action(detail=True, methods=['post']) def resolve(self, request, pk): - ''' Endpoint: Resolve refenrces in text against schema terms context. ''' + ''' Endpoint: Resolve references in text against schema terms context. ''' serializer = s.TextSerializer(data=request.data) serializer.is_valid(raise_exception=True) text = serializer.validated_data['text'] diff --git a/rsconcept/backend/apps/users/admin.py b/rsconcept/backend/apps/users/admin.py index 4793aa56..f5d7fdaa 100644 --- a/rsconcept/backend/apps/users/admin.py +++ b/rsconcept/backend/apps/users/admin.py @@ -1 +1 @@ -''' Admin: User profile and Authentification. ''' +''' Admin: User profile and Authorization. ''' diff --git a/rsconcept/backend/apps/users/apps.py b/rsconcept/backend/apps/users/apps.py index 41e69e08..0376c6a9 100644 --- a/rsconcept/backend/apps/users/apps.py +++ b/rsconcept/backend/apps/users/apps.py @@ -1,4 +1,4 @@ -''' Application: User profile and Authentification. ''' +''' Application: User profile and Authorization. ''' from django.apps import AppConfig diff --git a/rsconcept/backend/apps/users/serializers.py b/rsconcept/backend/apps/users/serializers.py index d2206788..9cc1e4d6 100644 --- a/rsconcept/backend/apps/users/serializers.py +++ b/rsconcept/backend/apps/users/serializers.py @@ -1,4 +1,4 @@ -''' Serializers: User profile and Authentification. ''' +''' Serializers: User profile and Authorization. ''' from django.contrib.auth import authenticate from django.contrib.auth.password_validation import validate_password from rest_framework import serializers @@ -15,7 +15,7 @@ class NonFieldErrorSerializer(serializers.Serializer): class LoginSerializer(serializers.Serializer): - ''' Serializer: User authentification by login/password. ''' + ''' Serializer: User authentication by login/password. ''' username = serializers.CharField( label='Имя пользователя', write_only=True @@ -49,7 +49,7 @@ class LoginSerializer(serializers.Serializer): class AuthSerializer(serializers.Serializer): - ''' Serializer: Authentication data. ''' + ''' Serializer: Authorization data. ''' id = serializers.IntegerField() username = serializers.CharField() is_staff = serializers.BooleanField() diff --git a/rsconcept/backend/apps/users/urls.py b/rsconcept/backend/apps/users/urls.py index 9d9892ac..876e62ac 100644 --- a/rsconcept/backend/apps/users/urls.py +++ b/rsconcept/backend/apps/users/urls.py @@ -1,4 +1,4 @@ -''' Routing: User profile and Authentification. ''' +''' Routing: User profile and Authorization. ''' from django.urls import path from . import views diff --git a/rsconcept/backend/apps/users/views.py b/rsconcept/backend/apps/users/views.py index 6597d4a9..d3e3346d 100644 --- a/rsconcept/backend/apps/users/views.py +++ b/rsconcept/backend/apps/users/views.py @@ -1,4 +1,4 @@ -''' REST API: User profile and Authentification. ''' +''' REST API: User profile and Authorization. ''' from django.contrib.auth import login, logout from rest_framework import status as c diff --git a/rsconcept/backend/cctext/ruparser.py b/rsconcept/backend/cctext/ruparser.py index 6ac70ff1..fbeae269 100644 --- a/rsconcept/backend/cctext/ruparser.py +++ b/rsconcept/backend/cctext/ruparser.py @@ -54,7 +54,7 @@ class Collation: return self.words[self.main_word].get_parse() def get_morpho(self) -> Morphology: - ''' Access parsed main mrophology. ''' + ''' Access parsed main morphology. ''' return self.words[self.main_word].get_morpho() def add_word(self, segment, forms: list, main_form: int, need_coordination: bool = True): @@ -332,8 +332,8 @@ class PhraseParser: output.add_word(segment, forms, main_index, needs_coordination) return segment_score # Alternative: return segment_score - # penalty_suspicoius = 0 if local_max == 0 else (1 - local_sum / local_max) * self._PRIORITY_PENALTY - # return segment_score - penalty_suspicoius + # penalty_suspicious = 0 if local_max == 0 else (1 - local_sum / local_max) * self._PRIORITY_PENALTY + # return segment_score - penalty_suspicious @classmethod def _finalize_coordination(cls, target: Collation): diff --git a/rsconcept/backend/cctext/syntax.py b/rsconcept/backend/cctext/syntax.py index b3bb593d..012b3960 100644 --- a/rsconcept/backend/cctext/syntax.py +++ b/rsconcept/backend/cctext/syntax.py @@ -1,4 +1,4 @@ -''' Russian language synthax incapsulation. ''' +''' Russian language syntax incapsulation. ''' from __future__ import annotations from enum import Enum, unique @@ -56,7 +56,7 @@ class Capitalization(Enum): class RuSyntax: - ''' Russian language synthax parser. ''' + ''' Russian language syntax parser. ''' def __init__(self): pass diff --git a/rsconcept/backend/project/settings.py b/rsconcept/backend/project/settings.py index bb3ab66b..753c212a 100644 --- a/rsconcept/backend/project/settings.py +++ b/rsconcept/backend/project/settings.py @@ -53,7 +53,7 @@ REST_FRAMEWORK = { 'TEST_REQUEST_DEFAULT_FORMAT': 'json', 'DEFAULT_SCHEMA_CLASS': 'drf_spectacular.openapi.AutoSchema', 'DEFAULT_AUTHENTICATION_CLASSES': [ - 'rest_framework.authentication.SessionAuthentication', + 'rest_framework.authentication.SessionAuthorization', ], 'DEFAULT_PERMISSION_CLASSES': [ 'rest_framework.permissions.AllowAny' @@ -80,7 +80,7 @@ MIDDLEWARE = [ 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.auth.middleware.AuthorizationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] diff --git a/rsconcept/frontend/src/App.tsx b/rsconcept/frontend/src/App.tsx index 2883a9aa..4da3370a 100644 --- a/rsconcept/frontend/src/App.tsx +++ b/rsconcept/frontend/src/App.tsx @@ -3,7 +3,7 @@ import { createBrowserRouter, Outlet, RouterProvider } from 'react-router-dom'; import ConceptToaster from './components/ConceptToaster'; import Footer from './components/Footer'; import Navigation from './components/Navigation'; -import { NavigationState } from './context/NagivationContext'; +import { NavigationState } from './context/NavigationContext'; import { useConceptTheme } from './context/ThemeContext'; import CreateRSFormPage from './pages/CreateRSFormPage'; import HomePage from './pages/HomePage'; diff --git a/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx b/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx index ff504b93..6755718b 100644 --- a/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx +++ b/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx @@ -94,4 +94,4 @@ function PaginationTools({ table, paginationOptions, onChangePaginationOp ); } -export default PaginationTools; +export default PaginationTools; \ No newline at end of file diff --git a/rsconcept/frontend/src/components/ExpectedAnonymous.tsx b/rsconcept/frontend/src/components/ExpectedAnonymous.tsx index 1a59466c..49e3a9b3 100644 --- a/rsconcept/frontend/src/components/ExpectedAnonymous.tsx +++ b/rsconcept/frontend/src/components/ExpectedAnonymous.tsx @@ -1,5 +1,5 @@ import { useAuth } from '@/context/AuthContext'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import TextURL from './Common/TextURL'; diff --git a/rsconcept/frontend/src/components/Help/HelpAPI.tsx b/rsconcept/frontend/src/components/Help/HelpAPI.tsx index eacb3bf0..b47d6d46 100644 --- a/rsconcept/frontend/src/components/Help/HelpAPI.tsx +++ b/rsconcept/frontend/src/components/Help/HelpAPI.tsx @@ -7,8 +7,8 @@ function HelpAPI() {

Программный интерфейс Портала

В качестве программного интерфейса сервера используется REST API, реализованный с помощью Django.

На данный момент API находится в разработке, поэтому поддержка внешних запросов не производится.

-

С описанием интерфейса можно ознакомиться .

-

+

С описанием интерфейса можно ознакомиться .

+

); } diff --git a/rsconcept/frontend/src/components/Help/HelpButton.tsx b/rsconcept/frontend/src/components/Help/HelpButton.tsx index e5e410e1..a2053e45 100644 --- a/rsconcept/frontend/src/components/Help/HelpButton.tsx +++ b/rsconcept/frontend/src/components/Help/HelpButton.tsx @@ -2,7 +2,7 @@ import { BiInfoCircle } from 'react-icons/bi'; import ConceptTooltip from '@/components/Common/ConceptTooltip'; import TextURL from '@/components/Common/TextURL'; -import { HelpTopic } from '@/models/miscelanious'; +import { HelpTopic } from '@/models/miscellaneous'; import { CProps } from '../props'; import InfoTopic from './InfoTopic'; diff --git a/rsconcept/frontend/src/components/Help/HelpLibrary.tsx b/rsconcept/frontend/src/components/Help/HelpLibrary.tsx index 0700bb8d..7bd870c8 100644 --- a/rsconcept/frontend/src/components/Help/HelpLibrary.tsx +++ b/rsconcept/frontend/src/components/Help/HelpLibrary.tsx @@ -8,7 +8,7 @@ function HelpLibrary() {

В библиотеки собраны различные концептуальные схемы.

Группировка и классификации схем на данный момент не проводится.

На текущем этапе происходит наполнение Библиотеки концептуальными схемами.

-

Поиск осуществлеяется с помощью инструментов в верхней части страницы.

+

Поиск осуществляется с помощью инструментов в верхней части страницы.

Аттрибут отслеживаемая обозначает отслеживание схемы.

diff --git a/rsconcept/frontend/src/components/Help/HelpMain.tsx b/rsconcept/frontend/src/components/Help/HelpMain.tsx index c34dc4cf..b18f6169 100644 --- a/rsconcept/frontend/src/components/Help/HelpMain.tsx +++ b/rsconcept/frontend/src/components/Help/HelpMain.tsx @@ -15,8 +15,8 @@ function HelpMain() {

В меню пользователя (правый верхний угол) доступно редактирование данных пользователя и изменение цветовой темы.

Поддержка

-

Портал разрабатывается и является проектом с открытым исходным кодом, доступным на .

-

Ваши пожелания по доработке, найденные ошибки и иные предложения можно направлять по email:

+

Портал разрабатывается и является проектом с открытым исходным кодом, доступным на .

+

Ваши пожелания по доработке, найденные ошибки и иные предложения можно направлять по email:

); } diff --git a/rsconcept/frontend/src/components/Help/HelpTerminologyControl.tsx b/rsconcept/frontend/src/components/Help/HelpTerminologyControl.tsx index 342a5ac3..83b0dfca 100644 --- a/rsconcept/frontend/src/components/Help/HelpTerminologyControl.tsx +++ b/rsconcept/frontend/src/components/Help/HelpTerminologyControl.tsx @@ -6,7 +6,7 @@ function HelpTerminologyControl() {

Портал позволяет контролировать употребление терминов, привязанных к сущностям в концептуальных схемах.

Для этого используется механизм текстовых отсылок: использование термина и связывание слов.

При отсылке к термину указывается параметры словоформы так, обеспечивающие корректное согласование слов.

-

Граммема - минимальная единица грамматической информаци, например род, число, падеж.

+

Граммема - минимальная единица грамматической информами, например род, число, падеж.

Словоформа - грамматическая форма словосочетания, которая может меняться в зависимости от его грамматических характеристик.

Лексема - все грамматические формы и словосочетания, связанные с данным словосочетанием.

При работе со словосочетаниями определяется основное слово, которое определяет набор граммем и используется для согласования с другими словами в предложении.

diff --git a/rsconcept/frontend/src/components/Help/InfoTopic.tsx b/rsconcept/frontend/src/components/Help/InfoTopic.tsx index 6933a78b..ae04f41d 100644 --- a/rsconcept/frontend/src/components/Help/InfoTopic.tsx +++ b/rsconcept/frontend/src/components/Help/InfoTopic.tsx @@ -1,4 +1,4 @@ -import { HelpTopic } from '@/models/miscelanious'; +import { HelpTopic } from '@/models/miscellaneous'; import HelpAPI from './HelpAPI'; import HelpConstituenta from './HelpConstituenta'; diff --git a/rsconcept/frontend/src/components/Navigation/Navigation.tsx b/rsconcept/frontend/src/components/Navigation/Navigation.tsx index a348bce9..0e933367 100644 --- a/rsconcept/frontend/src/components/Navigation/Navigation.tsx +++ b/rsconcept/frontend/src/components/Navigation/Navigation.tsx @@ -4,7 +4,7 @@ import { FaSquarePlus } from 'react-icons/fa6'; import { IoLibrary } from 'react-icons/io5'; import { EducationIcon } from '@/components/Icons'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import { useConceptTheme } from '@/context/ThemeContext'; import { animateNavigation } from '@/utils/animations'; @@ -40,7 +40,10 @@ function Navigation () { animate={!noNavigationAnimation ? 'open' : 'closed'} variants={animateNavigation} > -
+
diff --git a/rsconcept/frontend/src/components/Navigation/UserDropdown.tsx b/rsconcept/frontend/src/components/Navigation/UserDropdown.tsx index 89a7e5dc..108dae2f 100644 --- a/rsconcept/frontend/src/components/Navigation/UserDropdown.tsx +++ b/rsconcept/frontend/src/components/Navigation/UserDropdown.tsx @@ -1,7 +1,7 @@ import Dropdown from '@/components/Common/Dropdown'; import DropdownButton from '@/components/Common/DropdownButton'; import { useAuth } from '@/context/AuthContext'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import { useConceptTheme } from '@/context/ThemeContext'; interface UserDropdownProps { diff --git a/rsconcept/frontend/src/components/Navigation/UserMenu.tsx b/rsconcept/frontend/src/components/Navigation/UserMenu.tsx index 5b17c56b..594ff0b7 100644 --- a/rsconcept/frontend/src/components/Navigation/UserMenu.tsx +++ b/rsconcept/frontend/src/components/Navigation/UserMenu.tsx @@ -2,7 +2,7 @@ import { FaCircleUser } from 'react-icons/fa6'; import { InDoorIcon } from '@/components/Icons'; import { useAuth } from '@/context/AuthContext'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import useDropdown from '@/hooks/useDropdown'; import NavigationButton from './NavigationButton'; diff --git a/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx b/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx index 0a17c677..961d6fc5 100644 --- a/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx +++ b/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx @@ -4,7 +4,7 @@ import ConceptTooltip from '@/components/Common/ConceptTooltip'; import ConstituentaTooltip from '@/components/Help/ConstituentaTooltip'; import { IConstituenta } from '@/models/rsform'; import { isMockCst } from '@/models/rsformAPI'; -import { colorfgCstStatus,IColorTheme } from '@/utils/color'; +import { colorFgCstStatus,IColorTheme } from '@/utils/color'; import { describeExpressionStatus } from '@/utils/labels'; interface ConstituentaBadgeProps { @@ -25,8 +25,8 @@ function ConstituentaBadge({ value, prefixID, shortTooltip, theme }: Constituent 'text-center font-semibold whitespace-nowrap' )} style={{ - borderColor: colorfgCstStatus(value.status, theme), - color: colorfgCstStatus(value.status, theme), + borderColor: colorFgCstStatus(value.status, theme), + color: colorFgCstStatus(value.status, theme), backgroundColor: isMockCst(value) ? theme.bgWarning : theme.bgInput }} > diff --git a/rsconcept/frontend/src/components/Shared/ConstituentaPicker.tsx b/rsconcept/frontend/src/components/Shared/ConstituentaPicker.tsx index afd5fa17..696e31c5 100644 --- a/rsconcept/frontend/src/components/Shared/ConstituentaPicker.tsx +++ b/rsconcept/frontend/src/components/Shared/ConstituentaPicker.tsx @@ -3,7 +3,7 @@ import { useEffect, useMemo, useState } from 'react'; import ConceptSearch from '@/components/Common/ConceptSearch'; import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable'; import { useConceptTheme } from '@/context/ThemeContext'; -import { CstMatchMode } from '@/models/miscelanious'; +import { CstMatchMode } from '@/models/miscellaneous'; import { IConstituenta } from '@/models/rsform'; import { matchConstituenta } from '@/models/rsformAPI'; import { prefixes } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/components/Shared/GrammemeBadge.tsx b/rsconcept/frontend/src/components/Shared/GrammemeBadge.tsx index 4644c5ec..dc9b389f 100644 --- a/rsconcept/frontend/src/components/Shared/GrammemeBadge.tsx +++ b/rsconcept/frontend/src/components/Shared/GrammemeBadge.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import { useConceptTheme } from '@/context/ThemeContext'; import { GramData } from '@/models/language'; -import { colorfgGrammeme } from '@/utils/color'; +import { colorFgGrammeme } from '@/utils/color'; import { labelGrammeme } from '@/utils/labels'; interface GrammemeBadgeProps { @@ -22,8 +22,8 @@ function GrammemeBadge({ key, grammeme }: GrammemeBadgeProps) { 'text-sm font-semibold text-center whitespace-nowrap' )} style={{ - borderColor: colorfgGrammeme(grammeme, colors), - color: colorfgGrammeme(grammeme, colors), + borderColor: colorFgGrammeme(grammeme, colors), + color: colorFgGrammeme(grammeme, colors), backgroundColor: colors.bgInput }} > diff --git a/rsconcept/frontend/src/components/Shared/InfoCstClass.tsx b/rsconcept/frontend/src/components/Shared/InfoCstClass.tsx index d7aa2a69..61a8c88c 100644 --- a/rsconcept/frontend/src/components/Shared/InfoCstClass.tsx +++ b/rsconcept/frontend/src/components/Shared/InfoCstClass.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import { useConceptTheme } from '@/context/ThemeContext'; import { CstClass } from '@/models/rsform'; -import { colorbgCstClass } from '@/utils/color'; +import { colorBgCstClass } from '@/utils/color'; import { prefixes } from '@/utils/constants'; import { describeCstClass, labelCstClass } from '@/utils/labels'; @@ -28,7 +28,7 @@ function InfoCstClass({ header }: InfoCstClassProps) { 'border', 'text-center text-sm small-caps font-semibold' )} - style={{backgroundColor: colorbgCstClass(cclass, colors)}} + style={{backgroundColor: colorBgCstClass(cclass, colors)}} > {labelCstClass(cclass)} diff --git a/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx b/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx index db50ecaa..e25c5675 100644 --- a/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx +++ b/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import { useConceptTheme } from '@/context/ThemeContext'; import { ExpressionStatus } from '@/models/rsform'; -import { colorbgCstStatus } from '@/utils/color'; +import { colorBgCstStatus } from '@/utils/color'; import { prefixes } from '@/utils/constants'; import { describeExpressionStatus, labelExpressionStatus } from '@/utils/labels'; @@ -29,7 +29,7 @@ function InfoCstStatus({ title }: InfoCstStatusProps) { 'border', 'text-center text-sm small-caps font-semibold' )} - style={{backgroundColor: colorbgCstStatus(status, colors)}} + style={{backgroundColor: colorBgCstStatus(status, colors)}} > {labelExpressionStatus(status)} diff --git a/rsconcept/frontend/src/context/AccessModeContext.tsx b/rsconcept/frontend/src/context/AccessModeContext.tsx index 54063234..94cb6136 100644 --- a/rsconcept/frontend/src/context/AccessModeContext.tsx +++ b/rsconcept/frontend/src/context/AccessModeContext.tsx @@ -2,7 +2,7 @@ import { createContext, useContext, useState } from 'react'; -import { UserAccessMode } from '@/models/miscelanious'; +import { UserAccessMode } from '@/models/miscellaneous'; interface IAccessModeContext { mode: UserAccessMode diff --git a/rsconcept/frontend/src/context/LibraryContext.tsx b/rsconcept/frontend/src/context/LibraryContext.tsx index 0cba762a..5a5118ef 100644 --- a/rsconcept/frontend/src/context/LibraryContext.tsx +++ b/rsconcept/frontend/src/context/LibraryContext.tsx @@ -5,7 +5,7 @@ import { createContext, useCallback, useContext, useEffect, useState } from 'rea import { ErrorData } from '@/components/InfoError'; import { ILibraryItem } from '@/models/library'; import { matchLibraryItem } from '@/models/libraryAPI'; -import { ILibraryFilter } from '@/models/miscelanious'; +import { ILibraryFilter } from '@/models/miscellaneous'; import { IRSForm, IRSFormCreateData, IRSFormData } from '@/models/rsform'; import { loadRSFormData } from '@/models/rsformAPI'; import { DataCallback, deleteLibraryItem, getLibrary, getRSFormDetails, getTemplates, postCloneLibraryItem, postNewRSForm } from '@/utils/backendAPI'; diff --git a/rsconcept/frontend/src/context/NagivationContext.tsx b/rsconcept/frontend/src/context/NavigationContext.tsx similarity index 92% rename from rsconcept/frontend/src/context/NagivationContext.tsx rename to rsconcept/frontend/src/context/NavigationContext.tsx index 123c8da2..aa72f0cf 100644 --- a/rsconcept/frontend/src/context/NagivationContext.tsx +++ b/rsconcept/frontend/src/context/NavigationContext.tsx @@ -5,7 +5,7 @@ import { useLocation, useNavigate } from 'react-router-dom'; import { globalIDs } from '@/utils/constants'; -interface INagivationContext{ +interface INavigationContext{ push: (path: string) => void replace: (path: string) => void back: () => void @@ -17,9 +17,9 @@ interface INagivationContext{ setIsBlocked: (value: boolean) => void } -const NagivationContext = createContext(null); +const NavigationContext = createContext(null); export const useConceptNavigation = () => { - const context = useContext(NagivationContext); + const context = useContext(NavigationContext); if (!context) { throw new Error('useConceptNavigation has to be used within '); } @@ -95,12 +95,12 @@ export const NavigationState = ({ children }: NavigationStateProps) => { }, [pathname, scrollTop]); return ( - {children} - ); + ); } export function useBlockNavigation(isBlocked: boolean) { diff --git a/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx b/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx index 58534c5a..27a19db9 100644 --- a/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx +++ b/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx @@ -9,7 +9,7 @@ import Modal, { ModalProps } from '@/components/Common/Modal'; import TextArea from '@/components/Common/TextArea'; import TextInput from '@/components/Common/TextInput'; import { useLibrary } from '@/context/LibraryContext'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import { ILibraryItem } from '@/models/library'; import { IRSFormCreateData } from '@/models/rsform'; import { classnames } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx index 268171e5..37d680be 100644 --- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx +++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx @@ -9,7 +9,7 @@ import Modal, { ModalProps } from '@/components/Common/Modal'; import Overlay from '@/components/Common/Overlay'; import HelpButton from '@/components/Help/HelpButton'; import usePartialUpdate from '@/hooks/usePartialUpdate'; -import { HelpTopic } from '@/models/miscelanious'; +import { HelpTopic } from '@/models/miscellaneous'; import { CstType, ICstCreateData, IRSForm } from '@/models/rsform'; import { inferTemplatedType, substituteTemplateArgs } from '@/models/rslangAPI'; import { classnames } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx index 93f9997e..14ff23fe 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx @@ -9,7 +9,7 @@ import Modal from '@/components/Common/Modal'; import Overlay from '@/components/Common/Overlay'; import HelpButton from '@/components/Help/HelpButton'; import { ReferenceType } from '@/models/language'; -import { HelpTopic } from '@/models/miscelanious'; +import { HelpTopic } from '@/models/miscellaneous'; import { IConstituenta } from '@/models/rsform'; import { labelReferenceType } from '@/utils/labels'; diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx index 5ca163d8..dd266188 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx @@ -9,7 +9,7 @@ import ConstituentaPicker from '@/components/Shared/ConstituentaPicker'; import SelectGrammeme from '@/components/Shared/SelectGrammeme'; import { ReferenceType } from '@/models/language'; import { parseEntityReference, parseGrammemes } from '@/models/languageAPI'; -import { CstMatchMode } from '@/models/miscelanious'; +import { CstMatchMode } from '@/models/miscellaneous'; import { IConstituenta } from '@/models/rsform'; import { matchConstituenta } from '@/models/rsformAPI'; import { prefixes } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx index 3c196514..fe6f05e9 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx @@ -14,7 +14,7 @@ import SelectGrammeme from '@/components/Shared/SelectGrammeme'; import useConceptText from '@/hooks/useConceptText'; import { Grammeme, ITextRequest, IWordForm, IWordFormPlain } from '@/models/language'; import { parseGrammemes, wordFormEquals } from '@/models/languageAPI'; -import { HelpTopic } from '@/models/miscelanious'; +import { HelpTopic } from '@/models/miscellaneous'; import { IConstituenta, TermForm } from '@/models/rsform'; import { IGrammemeOption, SelectorGrammemesList, SelectorGrammems } from '@/utils/selectors'; diff --git a/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx b/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx index 25bba18d..34a08ae6 100644 --- a/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx +++ b/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx @@ -3,7 +3,7 @@ import Checkbox from '@/components/Common/Checkbox'; import Modal, { ModalProps } from '@/components/Common/Modal'; import usePartialUpdate from '@/hooks/usePartialUpdate'; -import { GraphFilterParams } from '@/models/miscelanious'; +import { GraphFilterParams } from '@/models/miscellaneous'; import { CstType } from '@/models/rsform'; import { labelCstType } from '@/utils/labels'; diff --git a/rsconcept/frontend/src/dialogs/DlgShowAST.tsx b/rsconcept/frontend/src/dialogs/DlgShowAST.tsx index 552969ca..f46a337b 100644 --- a/rsconcept/frontend/src/dialogs/DlgShowAST.tsx +++ b/rsconcept/frontend/src/dialogs/DlgShowAST.tsx @@ -7,7 +7,7 @@ import Modal, { ModalProps } from '@/components/Common/Modal'; import { useConceptTheme } from '@/context/ThemeContext'; import { SyntaxTree } from '@/models/rslang'; import { graphDarkT, graphLightT } from '@/utils/color'; -import { colorbgSyntaxTree } from '@/utils/color'; +import { colorBgSyntaxTree } from '@/utils/color'; import { resources } from '@/utils/constants'; import { labelSyntaxTree } from '@/utils/labels'; @@ -28,7 +28,7 @@ function DlgShowAST({ hideWindow, syntaxTree, expression }: DlgShowASTProps) { () => syntaxTree.map(node => ({ id: String(node.uid), label: labelSyntaxTree(node), - fill: colorbgSyntaxTree(node, colors), + fill: colorBgSyntaxTree(node, colors), })), [syntaxTree, colors]); const edges: GraphEdge[] = useMemo( diff --git a/rsconcept/frontend/src/models/language.ts b/rsconcept/frontend/src/models/language.ts index bfa69cbd..731614ad 100644 --- a/rsconcept/frontend/src/models/language.ts +++ b/rsconcept/frontend/src/models/language.ts @@ -67,7 +67,7 @@ export enum Grammeme { /** * Represents part of speech language concept. * - * Implemented as a list of mututally exclusive {@link Grammeme}s. + * Implemented as a list of mutually exclusive {@link Grammeme}s. */ export const PartOfSpeech = [ Grammeme.NOUN, Grammeme.ADJF, Grammeme.ADJS, Grammeme.COMP, @@ -79,7 +79,7 @@ export const PartOfSpeech = [ /** * Represents gender language concept. * - * Implemented as a list of mututally exclusive {@link Grammeme}s. + * Implemented as a list of mutually exclusive {@link Grammeme}s. */ export const Gender = [ Grammeme.masc, Grammeme.femn, Grammeme.neut @@ -88,7 +88,7 @@ export const Gender = [ /** * Represents case language concept. * - * Implemented as a list of mututally exclusive {@link Grammeme}s. + * Implemented as a list of mutually exclusive {@link Grammeme}s. */ export const Case = [ Grammeme.nomn, Grammeme.gent, Grammeme.datv, @@ -98,49 +98,49 @@ export const Case = [ /** * Represents plurality language concept. * - * Implemented as a list of mututally exclusive {@link Grammeme}s. + * Implemented as a list of mutually exclusive {@link Grammeme}s. */ export const Plurality = [Grammeme.sing, Grammeme.plur]; /** * Represents verb perfectivity language concept. * - * Implemented as a list of mututally exclusive {@link Grammeme}s. + * Implemented as a list of mutually exclusive {@link Grammeme}s. */ export const Perfectivity = [Grammeme.perf, Grammeme.impf]; /** * Represents verb transitivity language concept. * - * Implemented as a list of mututally exclusive {@link Grammeme}s. + * Implemented as a list of mutually exclusive {@link Grammeme}s. */ export const Transitivity = [Grammeme.tran, Grammeme.intr]; /** * Represents verb mood language concept. * - * Implemented as a list of mututally exclusive {@link Grammeme}s. + * Implemented as a list of mutually exclusive {@link Grammeme}s. */ export const Mood = [Grammeme.indc, Grammeme.impr]; /** * Represents verb self-inclusion language concept. * - * Implemented as a list of mututally exclusive {@link Grammeme}s. + * Implemented as a list of mutually exclusive {@link Grammeme}s. */ export const Inclusion = [Grammeme.incl, Grammeme.excl]; /** * Represents verb voice language concept. * - * Implemented as a list of mututally exclusive {@link Grammeme}s. + * Implemented as a list of mutually exclusive {@link Grammeme}s. */ export const Voice = [Grammeme.actv, Grammeme.pssv]; /** * Represents verb tense language concept. * - * Implemented as a list of mututally exclusive {@link Grammeme}s. + * Implemented as a list of mutually exclusive {@link Grammeme}s. */ export const Tense = [ Grammeme.pres, @@ -151,7 +151,7 @@ export const Tense = [ /** * Represents verb person language concept. * - * Implemented as a list of mututally exclusive {@link Grammeme}s. + * Implemented as a list of mutually exclusive {@link Grammeme}s. */ export const Person = [ Grammeme.per1, diff --git a/rsconcept/frontend/src/models/library.ts b/rsconcept/frontend/src/models/library.ts index 25090a6d..eab68199 100644 --- a/rsconcept/frontend/src/models/library.ts +++ b/rsconcept/frontend/src/models/library.ts @@ -4,7 +4,7 @@ /** * Represents user detailed information. - * Some information should only be accesible to authorized users + * Some information should only be accessible to authorized users */ export interface IUser { id: number | null @@ -23,7 +23,7 @@ export interface ICurrentUser extends Pick { password: string diff --git a/rsconcept/frontend/src/models/miscelanious.ts b/rsconcept/frontend/src/models/miscellaneous.ts similarity index 94% rename from rsconcept/frontend/src/models/miscelanious.ts rename to rsconcept/frontend/src/models/miscellaneous.ts index eb7606b2..0cf59e67 100644 --- a/rsconcept/frontend/src/models/miscelanious.ts +++ b/rsconcept/frontend/src/models/miscellaneous.ts @@ -1,5 +1,5 @@ /** - * Module: Miscellanious frontend model types. Future tagets for refactoring aimed at extracting modules. + * Module: Miscellaneous frontend model types. Future targets for refactoring aimed at extracting modules. */ /** diff --git a/rsconcept/frontend/src/models/miscelaniousAPI.ts b/rsconcept/frontend/src/models/miscellaneousAPI.ts similarity index 83% rename from rsconcept/frontend/src/models/miscelaniousAPI.ts rename to rsconcept/frontend/src/models/miscellaneousAPI.ts index cbceacd3..c5db449d 100644 --- a/rsconcept/frontend/src/models/miscelaniousAPI.ts +++ b/rsconcept/frontend/src/models/miscellaneousAPI.ts @@ -1,7 +1,7 @@ /** - * Module: API for miscellanious frontend model types. Future tagets for refactoring aimed at extracting modules. + * Module: API for miscellaneous frontend model types. Future targets for refactoring aimed at extracting modules. */ -import { DependencyMode } from './miscelanious'; +import { DependencyMode } from './miscellaneous'; import { IConstituenta, IRSForm } from './rsform'; diff --git a/rsconcept/frontend/src/models/rsform.ts b/rsconcept/frontend/src/models/rsform.ts index ef3762c2..b354b9e5 100644 --- a/rsconcept/frontend/src/models/rsform.ts +++ b/rsconcept/frontend/src/models/rsform.ts @@ -21,7 +21,7 @@ export enum CstType { THEOREM = 'theorem' } -// CstType constant for category dividers in TemplateSchemas. TODO: create separate sctructure for templates +// CstType constant for category dividers in TemplateSchemas. TODO: create separate structure for templates export const CATEGORY_CST_TYPE = CstType.THEOREM; /** @@ -47,7 +47,7 @@ export enum ExpressionStatus { } /** - * Represents word form for natural languange. + * Represents word form for natural language. */ export interface TermForm { text: string @@ -143,9 +143,9 @@ export interface IRSFormStats { count_all: number count_errors: number count_property: number - count_incalc: number + count_incalculable: number - count_termin: number + count_text_term: number count_definition: number count_convention: number diff --git a/rsconcept/frontend/src/models/rsformAPI.ts b/rsconcept/frontend/src/models/rsformAPI.ts index 97d214a2..d491ae80 100644 --- a/rsconcept/frontend/src/models/rsformAPI.ts +++ b/rsconcept/frontend/src/models/rsformAPI.ts @@ -5,7 +5,7 @@ import { Graph } from '@/utils/Graph'; import { TextMatcher } from '@/utils/utils'; -import { CstMatchMode } from './miscelanious'; +import { CstMatchMode } from './miscellaneous'; import { CATEGORY_CST_TYPE, CstClass, CstType, ExpressionStatus, IConstituenta, IRSForm, IRSFormData @@ -28,9 +28,9 @@ export function loadRSFormData(input: IRSFormData): IRSForm { count_all: 0, count_errors: 0, count_property: 0, - count_incalc: 0, + count_incalculable: 0, - count_termin: 0, + count_text_term: 0, count_definition: 0, count_convention: 0, @@ -51,11 +51,11 @@ export function loadRSFormData(input: IRSFormData): IRSForm { (sum, cst) => sum + (cst.parse?.status === ParsingStatus.INCORRECT ? 1 : 0) || 0, 0), count_property: result.items.reduce( (sum, cst) => sum + (cst.parse?.valueClass === ValueClass.PROPERTY ? 1 : 0) || 0, 0), - count_incalc: result.items.reduce( + count_incalculable: result.items.reduce( (sum, cst) => sum + ((cst.parse?.status === ParsingStatus.VERIFIED && cst.parse?.valueClass === ValueClass.INVALID) ? 1 : 0) || 0, 0), - count_termin: result.items.reduce( + count_text_term: result.items.reduce( (sum, cst) => (sum + (cst.term_raw ? 1 : 0) || 0), 0), count_definition: result.items.reduce( (sum, cst) => (sum + (cst.definition_raw ? 1 : 0) || 0), 0), diff --git a/rsconcept/frontend/src/models/rslang.ts b/rsconcept/frontend/src/models/rslang.ts index 54516309..ca617e2a 100644 --- a/rsconcept/frontend/src/models/rslang.ts +++ b/rsconcept/frontend/src/models/rslang.ts @@ -206,7 +206,7 @@ export enum TokenID { export enum RSErrorType { unknownSymbol = 33283, syntax = 33792, - missingParanthesis = 33798, + missingParenthesis = 33798, missingCurlyBrace = 33799, invalidQuantifier = 33800, expectedArgDeclaration = 33812, @@ -230,10 +230,10 @@ export enum RSErrorType { invalidProjectionTuple = 34833, invalidProjectionSet = 34834, invalidEnumeration = 34835, - ivalidBinding = 34836, + invalidBinding = 34836, localOutOfScope = 34837, - invalidElementPredicat = 34838, - invalidArgsArtity = 34840, + invalidElementPredicate = 34838, + invalidArgsArity = 34840, invalidArgumentType = 34841, invalidEqualsEmpty = 34842, globalStructure = 34844, diff --git a/rsconcept/frontend/src/pages/CreateRSFormPage.tsx b/rsconcept/frontend/src/pages/CreateRSFormPage.tsx index e74fd154..d700117c 100644 --- a/rsconcept/frontend/src/pages/CreateRSFormPage.tsx +++ b/rsconcept/frontend/src/pages/CreateRSFormPage.tsx @@ -16,7 +16,7 @@ import TextInput from '@/components/Common/TextInput'; import InfoError from '@/components/InfoError'; import RequireAuth from '@/components/RequireAuth'; import { useLibrary } from '@/context/LibraryContext'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import { LibraryItemType } from '@/models/library'; import { IRSFormCreateData } from '@/models/rsform'; import { classnames, EXTEOR_TRS_FILE, limits, patterns } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/pages/HomePage.tsx b/rsconcept/frontend/src/pages/HomePage.tsx index bc0f5f04..72d2d05e 100644 --- a/rsconcept/frontend/src/pages/HomePage.tsx +++ b/rsconcept/frontend/src/pages/HomePage.tsx @@ -1,7 +1,7 @@ import { useLayoutEffect } from 'react'; import { useAuth } from '@/context/AuthContext'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import { TIMEOUT_UI_REFRESH } from '@/utils/constants'; function HomePage() { diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx index 713bb459..d3c59d49 100644 --- a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx +++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx @@ -6,12 +6,12 @@ import { ConceptLoader } from '@/components/Common/ConceptLoader'; import InfoError from '@/components/InfoError'; import { useAuth } from '@/context/AuthContext'; import { useLibrary } from '@/context/LibraryContext'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import { useConceptTheme } from '@/context/ThemeContext'; import useLocalStorage from '@/hooks/useLocalStorage'; import useQueryStrings from '@/hooks/useQueryStrings'; import { ILibraryItem } from '@/models/library'; -import { ILibraryFilter, LibraryFilterStrategy } from '@/models/miscelanious'; +import { ILibraryFilter, LibraryFilterStrategy } from '@/models/miscellaneous'; import SearchPanel from './SearchPanel'; import ViewLibrary from './ViewLibrary'; diff --git a/rsconcept/frontend/src/pages/LibraryPage/PickerStrategy.tsx b/rsconcept/frontend/src/pages/LibraryPage/PickerStrategy.tsx index e702e4cb..0bed6d84 100644 --- a/rsconcept/frontend/src/pages/LibraryPage/PickerStrategy.tsx +++ b/rsconcept/frontend/src/pages/LibraryPage/PickerStrategy.tsx @@ -8,7 +8,7 @@ import DropdownCheckbox from '@/components/Common/DropdownCheckbox'; import SelectorButton from '@/components/Common/SelectorButton'; import { useAuth } from '@/context/AuthContext'; import useDropdown from '@/hooks/useDropdown'; -import { LibraryFilterStrategy } from '@/models/miscelanious'; +import { LibraryFilterStrategy } from '@/models/miscellaneous'; import { prefixes } from '@/utils/constants'; import { describeLibraryFilter, labelLibraryFilter } from '@/utils/labels'; diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx index 7a3703e5..168c4a14 100644 --- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx +++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx @@ -4,9 +4,9 @@ import clsx from 'clsx'; import { useCallback } from 'react'; import ConceptSearch from '@/components/Common/ConceptSearch'; -import { useConceptNavigation } from '@/context/NagivationContext'; -import { ILibraryFilter } from '@/models/miscelanious'; -import { LibraryFilterStrategy } from '@/models/miscelanious'; +import { useConceptNavigation } from '@/context/NavigationContext'; +import { ILibraryFilter } from '@/models/miscellaneous'; +import { LibraryFilterStrategy } from '@/models/miscellaneous'; import PickerStrategy from './PickerStrategy'; diff --git a/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx b/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx index eba47463..8c6614ad 100644 --- a/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx +++ b/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx @@ -8,11 +8,11 @@ import TextURL from '@/components/Common/TextURL'; import DataTable, { createColumnHelper } from '@/components/DataTable'; import HelpButton from '@/components/Help/HelpButton'; import { useAuth } from '@/context/AuthContext'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import { useUsers } from '@/context/UsersContext'; import useLocalStorage from '@/hooks/useLocalStorage'; import { ILibraryItem } from '@/models/library'; -import { HelpTopic } from '@/models/miscelanious'; +import { HelpTopic } from '@/models/miscellaneous'; import ItemIcons from './ItemIcons'; diff --git a/rsconcept/frontend/src/pages/LoginPage.tsx b/rsconcept/frontend/src/pages/LoginPage.tsx index f998a18d..9af42ee2 100644 --- a/rsconcept/frontend/src/pages/LoginPage.tsx +++ b/rsconcept/frontend/src/pages/LoginPage.tsx @@ -10,7 +10,7 @@ import TextURL from '@/components/Common/TextURL'; import ExpectedAnonymous from '@/components/ExpectedAnonymous'; import InfoError, { ErrorData } from '@/components/InfoError'; import { useAuth } from '@/context/AuthContext'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import useQueryStrings from '@/hooks/useQueryStrings'; import { IUserLoginData } from '@/models/library'; import { classnames, resources } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx b/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx index 522fff9f..bec2ec32 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx @@ -1,9 +1,9 @@ 'use client'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import { useConceptTheme } from '@/context/ThemeContext'; import useQueryStrings from '@/hooks/useQueryStrings'; -import { HelpTopic } from '@/models/miscelanious'; +import { HelpTopic } from '@/models/miscellaneous'; import TopicsList from './TopicsList'; import ViewTopic from './ViewTopic'; diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx b/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx index 2714666c..6bd78aeb 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; -import { HelpTopic } from '@/models/miscelanious'; +import { HelpTopic } from '@/models/miscellaneous'; import { prefixes } from '@/utils/constants'; import { describeHelpTopic, labelHelpTopic } from '@/utils/labels'; diff --git a/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx b/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx index a1a60815..758eada4 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx @@ -1,5 +1,5 @@ import InfoTopic from '@/components/Help/InfoTopic'; -import { HelpTopic } from '@/models/miscelanious'; +import { HelpTopic } from '@/models/miscellaneous'; interface ViewTopicProps { topic: HelpTopic diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx index 6474df55..6495d24c 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx @@ -7,7 +7,7 @@ import { FiSave } from 'react-icons/fi'; import MiniButton from '@/components/Common/MiniButton'; import Overlay from '@/components/Common/Overlay'; import HelpButton from '@/components/Help/HelpButton'; -import { HelpTopic } from '@/models/miscelanious'; +import { HelpTopic } from '@/models/miscellaneous'; interface ConstituentaToolbarProps { isMutable: boolean diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx index f66e8c10..60c571ca 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx @@ -13,10 +13,10 @@ import ViewConstituents from '../ViewConstituents'; import ConstituentaToolbar from './ConstituentaToolbar'; import FormConstituenta from './FormConstituenta'; -// Max height of content for left enditor pane. +// Max height of content for left editor pane. const UNFOLDED_HEIGHT = '59.1rem'; -// Thershold window width to hide side constituents list. +// Threshold window width to hide side constituents list. const SIDELIST_HIDE_THRESHOLD = 1100; // px interface EditorConstituentaProps { diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx index bcd475c0..755e14d3 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx @@ -63,9 +63,9 @@ function EditorRSExpression({ resetParse(); }, [activeCst, resetParse, toggleReset]); - function handleChange(newvalue: string) { - onChange(newvalue); - setIsModified(newvalue !== activeCst?.definition_formal); + function handleChange(newValue: string) { + onChange(newValue); + setIsModified(newValue !== activeCst?.definition_formal); } function handleCheckExpression(callback?: (parse: IExpressionParse) => void) { diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx index 941e262f..1ba6c1c8 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx @@ -9,7 +9,7 @@ import { ExpressionStatus } from '@/models/rsform'; import { type IConstituenta } from '@/models/rsform'; import { inferStatus } from '@/models/rsformAPI'; import { IExpressionParse, ParsingStatus } from '@/models/rslang'; -import { colorbgCstStatus } from '@/utils/color'; +import { colorBgCstStatus } from '@/utils/color'; import { globalIDs } from '@/utils/constants'; import { labelExpressionStatus } from '@/utils/labels'; @@ -46,7 +46,7 @@ function StatusBar({ isModified, processing, constituenta, parseData, onAnalyze 'cursor-pointer', 'duration-500 transition-colors' )} - style={{backgroundColor: processing ? colors.bgDefault : colorbgCstStatus(status, colors)}} + style={{backgroundColor: processing ? colors.bgDefault : colorBgCstStatus(status, colors)}} data-tooltip-id={globalIDs.tooltip} data-tooltip-content='Проверить определение [Ctrl + Q]' onClick={onAnalyze} diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx index 897c9e5d..dc6bcbd8 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx @@ -25,17 +25,17 @@ function RSFormStats({ stats }: RSFormStatsProps) { label='Неразмерных' text={stats.count_property} /> : null} - {stats.count_incalc !== 0 ? - : null} - setLayout(data?.value ?? SelectorGraphLayout[0].value)} />
); diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx index 1caa92e4..8100bbdb 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx @@ -5,7 +5,7 @@ import { BiCollapse, BiFilterAlt, BiFont, BiFontFamily, BiPlanet, BiPlusCircle, import MiniButton from '@/components/Common/MiniButton'; import Overlay from '@/components/Common/Overlay'; import HelpButton from '@/components/Help/HelpButton'; -import { HelpTopic } from '@/models/miscelanious'; +import { HelpTopic } from '@/models/miscellaneous'; interface GraphToolbarProps { isMutable: boolean diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx index d2586b68..f8a4ec63 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx @@ -4,9 +4,9 @@ import { useCallback, useMemo } from 'react'; import ConstituentaTooltip from '@/components/Help/ConstituentaTooltip'; import { useConceptTheme } from '@/context/ThemeContext'; -import { GraphColoringScheme } from '@/models/miscelanious'; +import { GraphColoringScheme } from '@/models/miscellaneous'; import { IRSForm } from '@/models/rsform'; -import { colorbgGraphNode } from '@/utils/color'; +import { colorBgGraphNode } from '@/utils/color'; import { prefixes } from '@/utils/constants'; interface ViewHiddenProps { @@ -56,7 +56,7 @@ function ViewHidden({
toggleSelection(cstID)} diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/useGraphFilter.ts b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/useGraphFilter.ts index e33e2c1f..17767668 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/useGraphFilter.ts +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/useGraphFilter.ts @@ -1,6 +1,6 @@ import { useLayoutEffect, useMemo, useState } from 'react'; -import { GraphFilterParams } from '@/models/miscelanious'; +import { GraphFilterParams } from '@/models/miscellaneous'; import { CstType, IRSForm } from '@/models/rsform'; import { Graph } from '@/utils/Graph'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx index 8f2f57eb..16d1b26d 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx @@ -15,7 +15,7 @@ import InfoError, { ErrorData } from '@/components/InfoError'; import { useAccessMode } from '@/context/AccessModeContext'; import { useAuth } from '@/context/AuthContext'; import { useLibrary } from '@/context/LibraryContext'; -import { useBlockNavigation, useConceptNavigation } from '@/context/NagivationContext'; +import { useBlockNavigation, useConceptNavigation } from '@/context/NavigationContext'; import { useRSForm } from '@/context/RSFormContext'; import { useConceptTheme } from '@/context/ThemeContext'; import DlgCloneLibraryItem from '@/dialogs/DlgCloneLibraryItem'; @@ -26,7 +26,7 @@ import DlgEditWordForms from '@/dialogs/DlgEditWordForms'; import DlgRenameCst from '@/dialogs/DlgRenameCst'; import DlgUploadRSForm from '@/dialogs/DlgUploadRSForm'; import useQueryStrings from '@/hooks/useQueryStrings'; -import { UserAccessMode } from '@/models/miscelanious'; +import { UserAccessMode } from '@/models/miscellaneous'; import { IConstituenta, ICstCreateData, ICstRenameData, ICstUpdateData, TermForm } from '@/models/rsform'; import { EXTEOR_TRS_FILE, prefixes, TIMEOUT_UI_REFRESH } from '@/utils/constants'; import { createAliasFor } from '@/utils/misc'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx index bc63bb1c..b8651cf6 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx @@ -9,10 +9,10 @@ import Dropdown from '@/components/Common/Dropdown'; import DropdownButton from '@/components/Common/DropdownButton'; import { useAccessMode } from '@/context/AccessModeContext'; import { useAuth } from '@/context/AuthContext'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import { useRSForm } from '@/context/RSFormContext'; import useDropdown from '@/hooks/useDropdown'; -import { UserAccessMode } from '@/models/miscelanious'; +import { UserAccessMode } from '@/models/miscellaneous'; import { describeAccessMode, labelAccessMode } from '@/utils/labels'; interface RSTabsMenuProps { diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx index 55514633..e38545b7 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx @@ -9,13 +9,13 @@ import DropdownButton from '@/components/Common/DropdownButton'; import SelectorButton from '@/components/Common/SelectorButton'; import useDropdown from '@/hooks/useDropdown'; import useLocalStorage from '@/hooks/useLocalStorage'; -import { CstMatchMode, DependencyMode } from '@/models/miscelanious'; -import { applyGraphFilter } from '@/models/miscelaniousAPI'; +import { CstMatchMode, DependencyMode } from '@/models/miscellaneous'; +import { applyGraphFilter } from '@/models/miscellaneousAPI'; import { IConstituenta, IRSForm } from '@/models/rsform'; import { createMockConstituenta, matchConstituenta } from '@/models/rsformAPI'; import { extractGlobals } from '@/models/rslangAPI'; import { prefixes } from '@/utils/constants'; -import { describeCstMathchMode, describeCstSource, labelCstMathchMode, labelCstSource } from '@/utils/labels'; +import { describeCstMatchMode, describeCstSource, labelCstMatchMode, labelCstSource } from '@/utils/labels'; interface ConstituentsSearchProps { schema?: IRSForm @@ -87,7 +87,7 @@ function ConstituentsSearch({ schema, activeID, activeExpression, setFiltered }: title='Настройка атрибутов для фильтрации' className='h-full' icon={} - text={labelCstMathchMode(filterMatch)} + text={labelCstMatchMode(filterMatch)} onClick={matchModeMenu.toggle} /> @@ -99,7 +99,7 @@ function ConstituentsSearch({ schema, activeID, activeExpression, setFiltered }: key={`${prefixes.cst_match_mode_list}${index}`} onClick={() => handleMatchModeChange(matchMode)} > -

{labelCstMathchMode(matchMode)}: {describeCstMathchMode(matchMode)}

+

{labelCstMatchMode(matchMode)}: {describeCstMatchMode(matchMode)}

); })}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx index dd975234..2d46f87e 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx @@ -63,7 +63,7 @@ function ConstituentsTable({ }), columnHelper.accessor(cst => describeConstituenta(cst), { diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx index 012ae98d..fded4fdb 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx @@ -10,7 +10,7 @@ import { animateSideView } from '@/utils/animations'; import ConstituentsSearch from './ConstituentsSearch'; import ConstituentsTable from './ConstituentsTable'; -// Height that should be left to accomodate navigation panel + bottom margin +// Height that should be left to accommodate navigation panel + bottom margin const LOCAL_NAVIGATION_H = '2.1rem'; // Window width cutoff for expression show diff --git a/rsconcept/frontend/src/pages/RegisterPage.tsx b/rsconcept/frontend/src/pages/RegisterPage.tsx index 3f608f16..8a87000b 100644 --- a/rsconcept/frontend/src/pages/RegisterPage.tsx +++ b/rsconcept/frontend/src/pages/RegisterPage.tsx @@ -16,7 +16,7 @@ import TextURL from '@/components/Common/TextURL'; import ExpectedAnonymous from '@/components/ExpectedAnonymous'; import InfoError from '@/components/InfoError'; import { useAuth } from '@/context/AuthContext'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import { type IUserSignupData } from '@/models/library'; import { classnames, globalIDs, patterns } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/pages/RestorePasswordPage.tsx b/rsconcept/frontend/src/pages/RestorePasswordPage.tsx index 01794b7e..45b9a83b 100644 --- a/rsconcept/frontend/src/pages/RestorePasswordPage.tsx +++ b/rsconcept/frontend/src/pages/RestorePasswordPage.tsx @@ -5,7 +5,7 @@ function RestorePasswordPage() { return (

Автоматическое восстановление пароля не доступно.

-

Возможно восстановление пароля через обращение на

+

Возможно восстановление пароля через обращение на

); } diff --git a/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx b/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx index a9bded79..32ffb5cb 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx @@ -10,7 +10,7 @@ import SubmitButton from '@/components/Common/SubmitButton'; import TextInput from '@/components/Common/TextInput'; import InfoError, { ErrorData } from '@/components/InfoError'; import { useAuth } from '@/context/AuthContext'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import { IUserUpdatePassword } from '@/models/library'; function ProcessError({error}: {error: ErrorData}): React.ReactElement { diff --git a/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx b/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx index 015e1771..f3060adf 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx @@ -6,7 +6,7 @@ import { toast } from 'react-toastify'; import SubmitButton from '@/components/Common/SubmitButton'; import TextInput from '@/components/Common/TextInput'; -import { useBlockNavigation } from '@/context/NagivationContext'; +import { useBlockNavigation } from '@/context/NavigationContext'; import { useUserProfile } from '@/context/UserProfileContext'; import { IUserUpdateData } from '@/models/library'; import { classnames } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx index 2f4cba72..3b82345d 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx @@ -37,7 +37,7 @@ function UserTabs() {
: diff --git a/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx b/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx index a57cbd18..eaf6fae4 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx @@ -5,7 +5,7 @@ import { useMemo } from 'react'; import { useIntl } from 'react-intl'; import DataTable, { createColumnHelper } from '@/components/DataTable'; -import { useConceptNavigation } from '@/context/NagivationContext'; +import { useConceptNavigation } from '@/context/NavigationContext'; import { ILibraryItem } from '@/models/library'; import { animateSideView } from '@/utils/animations'; diff --git a/rsconcept/frontend/src/utils/Graph.test.ts b/rsconcept/frontend/src/utils/Graph.test.ts index 8d79ba0c..80ce482f 100644 --- a/rsconcept/frontend/src/utils/Graph.test.ts +++ b/rsconcept/frontend/src/utils/Graph.test.ts @@ -1,6 +1,6 @@ import { Graph } from './Graph'; -describe('Testing Graph constuction', () => { +describe('Testing Graph construction', () => { test('empty Graph should be empty', () => { const graph = new Graph(); expect(graph.nodes.size).toBe(0); diff --git a/rsconcept/frontend/src/utils/codemirror.ts b/rsconcept/frontend/src/utils/codemirror.ts index ef97f1ce..f49206ac 100644 --- a/rsconcept/frontend/src/utils/codemirror.ts +++ b/rsconcept/frontend/src/utils/codemirror.ts @@ -10,7 +10,7 @@ import { IEntityReference, ISyntacticReference } from '@/models/language'; import { parseGrammemes } from '@/models/languageAPI'; import { IConstituenta } from '@/models/rsform'; -import { colorfgGrammeme,IColorTheme } from './color'; +import { colorFgGrammeme,IColorTheme } from './color'; import { describeConstituentaTerm, labelCstTypification, labelGrammeme } from './labels'; /** @@ -210,8 +210,8 @@ export function domTooltipEntityReference(ref: IEntityReference, cst: IConstitue 'text-sm text-center whitespace-nowrap' ); gram.style.borderWidth = '1px'; - gram.style.borderColor = colorfgGrammeme(gramStr, colors); - gram.style.color = colorfgGrammeme(gramStr, colors); + gram.style.borderColor = colorFgGrammeme(gramStr, colors); + gram.style.color = colorFgGrammeme(gramStr, colors); gram.style.fontWeight = '600'; gram.style.backgroundColor = colors.bgInput; gram.innerText = labelGrammeme(gramStr); diff --git a/rsconcept/frontend/src/utils/color.ts b/rsconcept/frontend/src/utils/color.ts index 62fe643b..10602d4b 100644 --- a/rsconcept/frontend/src/utils/color.ts +++ b/rsconcept/frontend/src/utils/color.ts @@ -3,7 +3,7 @@ */ import { GramData, Grammeme, NounGrams, PartOfSpeech, VerbGrams } from '@/models/language'; -import { GraphColoringScheme } from '@/models/miscelanious'; +import { GraphColoringScheme } from '@/models/miscellaneous'; import { CstClass, ExpressionStatus, IConstituenta } from '@/models/rsform'; import { ISyntaxTreeNode, TokenID } from '@/models/rslang'; @@ -301,7 +301,7 @@ export const bracketsDarkT = { /** * Determines background color for {@link ISyntaxTreeNode} based on its type. */ -export function colorbgSyntaxTree(node: ISyntaxTreeNode, colors: IColorTheme): string { +export function colorBgSyntaxTree(node: ISyntaxTreeNode, colors: IColorTheme): string { switch (node.typeID) { case TokenID.PUNC_DEFINE: case TokenID.PUNC_STRUCT: @@ -383,7 +383,7 @@ export function colorbgSyntaxTree(node: ISyntaxTreeNode, colors: IColorTheme): s /** * Determines background color for {@link ExpressionStatus}. */ -export function colorbgCstStatus(status: ExpressionStatus, colors: IColorTheme): string { +export function colorBgCstStatus(status: ExpressionStatus, colors: IColorTheme): string { switch (status) { case ExpressionStatus.VERIFIED: return colors.bgGreen; case ExpressionStatus.INCORRECT: return colors.bgRed; @@ -397,7 +397,7 @@ export function colorbgCstStatus(status: ExpressionStatus, colors: IColorTheme): /** * Determines foreground color for {@link ExpressionStatus}. */ -export function colorfgCstStatus(status: ExpressionStatus, colors: IColorTheme): string { +export function colorFgCstStatus(status: ExpressionStatus, colors: IColorTheme): string { switch (status) { case ExpressionStatus.VERIFIED: return colors.fgGreen; case ExpressionStatus.INCORRECT: return colors.fgRed; @@ -411,7 +411,7 @@ export function colorfgCstStatus(status: ExpressionStatus, colors: IColorTheme): /** * Determines background color for {@link IConstituenta} depending on its {@link CstClass}. */ -export function colorbgCstClass(cstClass: CstClass, colors: IColorTheme): string { +export function colorBgCstClass(cstClass: CstClass, colors: IColorTheme): string { switch (cstClass) { case CstClass.BASIC: return colors.bgGreen; case CstClass.DERIVED: return colors.bgBlue; @@ -423,7 +423,7 @@ export function colorbgCstClass(cstClass: CstClass, colors: IColorTheme): string /** * Determines background color for {@link GramData}. */ -export function colorbgGrammeme(gram: GramData, colors: IColorTheme): string { +export function colorBgGrammeme(gram: GramData, colors: IColorTheme): string { if (PartOfSpeech.includes(gram as Grammeme)) { return colors.bgBlue; } @@ -439,7 +439,7 @@ export function colorbgGrammeme(gram: GramData, colors: IColorTheme): string { /** * Determines foreground color for {@link GramData}. */ -export function colorfgGrammeme(gram: GramData, colors: IColorTheme): string { +export function colorFgGrammeme(gram: GramData, colors: IColorTheme): string { if (PartOfSpeech.includes(gram as Grammeme)) { return colors.fgBlue; } @@ -459,12 +459,12 @@ export function colorfgGrammeme(gram: GramData, colors: IColorTheme): string { /** * Determines graph color for {@link IConstituenta}. */ -export function colorbgGraphNode(cst: IConstituenta, coloringScheme: GraphColoringScheme, colors: IColorTheme): string { +export function colorBgGraphNode(cst: IConstituenta, coloringScheme: GraphColoringScheme, colors: IColorTheme): string { if (coloringScheme === 'type') { - return colorbgCstClass(cst.cst_class, colors); + return colorBgCstClass(cst.cst_class, colors); } if (coloringScheme === 'status') { - return colorbgCstStatus(cst.status, colors); + return colorBgCstStatus(cst.status, colors); } return ''; } \ No newline at end of file diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts index 87ee8dce..bd67f52d 100644 --- a/rsconcept/frontend/src/utils/constants.ts +++ b/rsconcept/frontend/src/utils/constants.ts @@ -56,7 +56,7 @@ export const youtube = { }; /** - * Classname combinations. + * Tailwind CSS combinations. * Note: using clsx in conjunction with tailwindCss is preferred to creating custom CSS */ export const classnames = { @@ -74,9 +74,9 @@ export const urls = { intro_video: 'https://www.youtube.com/watch?v=0Ty9mu9sOJo', full_course: 'https://www.youtube.com/playlist?list=PLGe_JiAwpqu1C70ruQmCm_OWTWU3KJwDo', - gitrepo: 'https://github.com/IRBorisov/ConceptPortal', - mailportal: 'mailto:portal@acconcept.ru', - restapi: 'https://api.portal.acconcept.ru' + git_repo: 'https://github.com/IRBorisov/ConceptPortal', + mail_portal: 'mailto:portal@acconcept.ru', + restAPI: 'https://api.portal.acconcept.ru' }; /** @@ -96,7 +96,7 @@ export const globalIDs = { export const prefixes = { page_size: 'page-size-', cst_list: 'cst-list-', - cst_sidetable: 'cst-sidetable-', + cst_side_table: 'cst-side-table-', cst_hidden_list: 'cst-hidden-list-', cst_modal_list: 'cst-modal-list-', cst_template_ist: 'cst-template-list-', diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts index 5b4555a1..cc821f1e 100644 --- a/rsconcept/frontend/src/utils/labels.ts +++ b/rsconcept/frontend/src/utils/labels.ts @@ -5,12 +5,12 @@ * Description is a long description used in tooltips. */ import { GramData,Grammeme, ReferenceType } from '@/models/language'; -import { CstMatchMode, DependencyMode, HelpTopic, LibraryFilterStrategy, UserAccessMode } from '@/models/miscelanious'; +import { CstMatchMode, DependencyMode, HelpTopic, LibraryFilterStrategy, UserAccessMode } from '@/models/miscellaneous'; import { CstClass, CstType, ExpressionStatus, IConstituenta } from '@/models/rsform'; import { IArgumentInfo, IRSErrorDescription, ISyntaxTreeNode, ParsingStatus, RSErrorType, TokenID } from '@/models/rslang'; /** - * Generates desription for {@link IConstituenta}. + * Generates description for {@link IConstituenta}. */ export function describeConstituenta(cst: IConstituenta): string { if (cst.cst_type === CstType.STRUCTURED) { @@ -31,7 +31,7 @@ export function describeConstituenta(cst: IConstituenta): string { } /** - * Generates desription for term of a given {@link IConstituenta}. + * Generates description for term of a given {@link IConstituenta}. */ export function describeConstituentaTerm(cst?: IConstituenta): string { if (!cst) { @@ -145,7 +145,7 @@ export function describeToken(id: TokenID): string { /** * Retrieves label for {@link CstMatchMode}. */ -export function labelCstMathchMode(mode: CstMatchMode): string { +export function labelCstMatchMode(mode: CstMatchMode): string { switch (mode) { case CstMatchMode.ALL: return 'общий'; case CstMatchMode.EXPR: return 'выражение'; @@ -158,7 +158,7 @@ export function labelCstMathchMode(mode: CstMatchMode): string { /** * Retrieves description for {@link CstMatchMode}. */ -export function describeCstMathchMode(mode: CstMatchMode): string { +export function describeCstMatchMode(mode: CstMatchMode): string { switch (mode) { case CstMatchMode.ALL: return 'искать во всех атрибутах'; case CstMatchMode.EXPR: return 'искать в формальных выражениях'; @@ -190,7 +190,7 @@ export function describeCstSource(mode: DependencyMode): string { case DependencyMode.ALL: return 'все конституенты'; case DependencyMode.EXPRESSION: return 'идентификаторы из выражения'; case DependencyMode.OUTPUTS: return 'прямые ссылки на текущую'; - case DependencyMode.INPUTS: return 'пярмые ссылки из текущей'; + case DependencyMode.INPUTS: return 'прямые ссылки из текущей'; case DependencyMode.EXPAND_OUTPUTS: return 'опосредованные ссылки на текущую'; case DependencyMode.EXPAND_INPUTS: return 'опосредованные ссылки из текущей'; } @@ -218,16 +218,16 @@ export function describeLibraryFilter(strategy: LibraryFilterStrategy): string { case LibraryFilterStrategy.MANUAL: return 'Отображать все схемы'; case LibraryFilterStrategy.COMMON: return 'Отображать общедоступные схемы'; case LibraryFilterStrategy.CANONICAL: return 'Отображать стандартные схемы'; - case LibraryFilterStrategy.PERSONAL: return 'Отображать подписки и владеемые схемы'; + case LibraryFilterStrategy.PERSONAL: return 'Отображать подписки и собственные схемы'; case LibraryFilterStrategy.SUBSCRIBE: return 'Отображать подписки'; - case LibraryFilterStrategy.OWNED: return 'Отображать владеемые схемы'; + case LibraryFilterStrategy.OWNED: return 'Отображать собственные схемы'; } } /** * Retrieves label for graph layout mode. */ -export const mapLableLayout: Map = +export const mapLabelLayout: Map = new Map([ ['forceatlas2', 'Граф: Атлас 2D'], ['forceDirected2d', 'Граф: Силы 2D'], @@ -263,7 +263,7 @@ export function labelExpressionStatus(status: ExpressionStatus): string { case ExpressionStatus.INCORRECT: return 'ошибка'; case ExpressionStatus.INCALCULABLE: return 'невычислимо'; case ExpressionStatus.PROPERTY: return 'неразмерное'; - case ExpressionStatus.UNKNOWN: return 'непроверено'; + case ExpressionStatus.UNKNOWN: return 'не проверено'; case ExpressionStatus.UNDEFINED: return 'N/A'; } } @@ -310,7 +310,7 @@ export function describeHelpTopic(topic: HelpTopic): string { case HelpTopic.MAIN: return 'Общая справка по порталу'; case HelpTopic.LIBRARY: return 'Описание работы с библиотекой схем'; case HelpTopic.RSFORM: return 'Описание работы с описанием схемы'; - case HelpTopic.CSTLIST: return 'Описание работы со списком конституентт'; + case HelpTopic.CSTLIST: return 'Описание работы со списком конституент'; case HelpTopic.CONSTITUENTA: return 'Описание редактирования конституенты'; case HelpTopic.GRAPH_TERM: return 'Описание работы с графом термов схемы'; case HelpTopic.RSTEMPLATES: return 'Описание работы с Банком выражений>'; @@ -325,8 +325,8 @@ export function describeHelpTopic(topic: HelpTopic): string { /** * Retrieves label for {@link CstType}. */ -export function labelCstType(type: CstType): string { - switch (type) { +export function labelCstType(target: CstType): string { + switch (target) { case CstType.BASE: return 'Базисное множество'; case CstType.CONSTANT: return 'Константное множество'; case CstType.STRUCTURED: return 'Родовая структура'; @@ -341,8 +341,8 @@ export function labelCstType(type: CstType): string { /** * Retrieves label for {@link ReferenceType}. */ -export function labelReferenceType(type: ReferenceType): string { - switch(type) { +export function labelReferenceType(target: ReferenceType): string { + switch(target) { case ReferenceType.ENTITY: return 'Использование термина'; case ReferenceType.SYNTACTIC: return 'Связывание слов'; } @@ -351,8 +351,8 @@ export function labelReferenceType(type: ReferenceType): string { /** * Retrieves label for {@link CstClass}. */ -export function labelCstClass(cclass: CstClass): string { - switch (cclass) { +export function labelCstClass(target: CstClass): string { + switch (target) { case CstClass.BASIC: return 'базовый'; case CstClass.DERIVED: return 'производный'; case CstClass.STATEMENT: return 'утверждение'; @@ -363,8 +363,8 @@ export function labelCstClass(cclass: CstClass): string { /** * Retrieves description for {@link CstClass}. */ -export function describeCstClass(cclass: CstClass): string { - switch (cclass) { +export function describeCstClass(target: CstClass): string { + switch (target) { case CstClass.BASIC: return 'неопределяемое понятие, требует конвенции'; case CstClass.DERIVED: return 'выводимое понятие, задаваемое определением'; case CstClass.STATEMENT: return 'утверждение формальной логики'; @@ -562,7 +562,7 @@ export function describeRSError(error: IRSErrorDescription): string { return `Неизвестный символ: ${error.params[0]}`; case RSErrorType.syntax: return 'Неопределенная синтаксическая ошибка'; - case RSErrorType.missingParanthesis: + case RSErrorType.missingParenthesis: return 'Некорректная конструкция языка родов структур, проверьте структуру выражения'; case RSErrorType.missingCurlyBrace: return "Пропущен символ '}'"; @@ -608,13 +608,13 @@ export function describeRSError(error: IRSErrorDescription): string { return `τ(Pri(a)) = ℬ𝒞i𝔇τ(a). Некорректная типизация аргумента: ${error.params[0]}`; case RSErrorType.invalidEnumeration: return `Типизация аргументов перечисления не совпадает: ${error.params[0]} != ${error.params[1]}`; - case RSErrorType.ivalidBinding: + case RSErrorType.invalidBinding: return `Количество переменных в кортеже не соответствует размерности декартова произведения`; case RSErrorType.localOutOfScope: return `Использование имени переменной вне области действия: ${error.params[0]}`; - case RSErrorType.invalidElementPredicat: + case RSErrorType.invalidElementPredicate: return `Несоответствие типизаций операндов для оператора: ${error.params[0]}${error.params[1]}${error.params[2]}`; - case RSErrorType.invalidArgsArtity: + case RSErrorType.invalidArgsArity: return `Неверное число аргументов терм-функции: ${error.params[0]} != ${error.params[1]}`; case RSErrorType.invalidArgumentType: return `Типизация аргумента терм-функции не соответствует объявленной: ${error.params[0]} != ${error.params[1]}`; diff --git a/rsconcept/frontend/src/utils/selectors.ts b/rsconcept/frontend/src/utils/selectors.ts index 16a76932..adcd7d64 100644 --- a/rsconcept/frontend/src/utils/selectors.ts +++ b/rsconcept/frontend/src/utils/selectors.ts @@ -5,7 +5,7 @@ import { LayoutTypes } from 'reagraph'; import { type GramData, Grammeme, ReferenceType } from '@/models/language'; import { grammemeCompare } from '@/models/languageAPI'; -import { GraphColoringScheme } from '@/models/miscelanious'; +import { GraphColoringScheme } from '@/models/miscellaneous'; import { CstType } from '@/models/rsform'; import { labelGrammeme, labelReferenceType } from './labels'; diff --git a/rsconcept/frontend/src/utils/utils.tsx b/rsconcept/frontend/src/utils/utils.tsx index 2a1efe1c..2304a90b 100644 --- a/rsconcept/frontend/src/utils/utils.tsx +++ b/rsconcept/frontend/src/utils/utils.tsx @@ -9,7 +9,7 @@ import { AxiosHeaderValue, AxiosResponse } from 'axios'; */ export function assertIsNode(e: EventTarget | null): asserts e is Node { if (e === null || !('nodeType' in e)) { - throw new TypeError(`Expected 'Node' but recieved '${e?.constructor.name ?? 'null'}'`); + throw new TypeError(`Expected 'Node' but received '${e?.constructor.name ?? 'null'}'`); } } @@ -42,7 +42,7 @@ export class TextMatcher { } /** - * Text substitution guided by mapping and regular explression. + * Text substitution guided by mapping and regular expression. */ export function applyPattern(text: string, mapping: { [key: string]: string }, pattern: RegExp): string { if (text === '' || pattern === null) { @@ -65,7 +65,7 @@ export function applyPattern(text: string, mapping: { [key: string]: string }, p } /** - * Check if Axios reponse is html. + * Check if Axios response is html. */ export function isResponseHtml(response?: AxiosResponse) { if (!response) {