diff --git a/rsconcept/backend/apps/rsform/serializers.py b/rsconcept/backend/apps/rsform/serializers.py index 784b73a8..9e2cf5c0 100644 --- a/rsconcept/backend/apps/rsform/serializers.py +++ b/rsconcept/backend/apps/rsform/serializers.py @@ -326,7 +326,7 @@ class ResolverSerializer(serializers.Serializer): 'input': instance.input, 'output': instance.output, 'refs': [{ - 'type': str(ref.ref.get_type()), + 'type': ref.ref.get_type().value, 'data': self._get_reference_data(ref.ref), 'resolved': ref.resolved, 'pos_input': { diff --git a/rsconcept/backend/apps/rsform/tests/t_views.py b/rsconcept/backend/apps/rsform/tests/t_views.py index c5a68a14..72aa0ecf 100644 --- a/rsconcept/backend/apps/rsform/tests/t_views.py +++ b/rsconcept/backend/apps/rsform/tests/t_views.py @@ -204,7 +204,7 @@ class TestRSFormViewset(APITestCase): self.assertEqual(response.data['input'], '@{1|редкий} @{X1|plur,datv}') self.assertEqual(response.data['output'], 'редким синим слонам') self.assertEqual(len(response.data['refs']), 2) - self.assertEqual(response.data['refs'][0]['type'], str(ReferenceType.syntactic)) + self.assertEqual(response.data['refs'][0]['type'], ReferenceType.syntactic.value) self.assertEqual(response.data['refs'][0]['resolved'], 'редким') self.assertEqual(response.data['refs'][0]['data']['offset'], 1) self.assertEqual(response.data['refs'][0]['data']['nominal'], 'редкий') @@ -212,7 +212,7 @@ class TestRSFormViewset(APITestCase): self.assertEqual(response.data['refs'][0]['pos_input']['finish'], 11) self.assertEqual(response.data['refs'][0]['pos_output']['start'], 0) self.assertEqual(response.data['refs'][0]['pos_output']['finish'], 6) - self.assertEqual(response.data['refs'][1]['type'], str(ReferenceType.entity)) + self.assertEqual(response.data['refs'][1]['type'], ReferenceType.entity.value) self.assertEqual(response.data['refs'][1]['resolved'], 'синим слонам') self.assertEqual(response.data['refs'][1]['data']['entity'], 'X1') self.assertEqual(response.data['refs'][1]['data']['form'], 'plur,datv') diff --git a/rsconcept/frontend/src/App.tsx b/rsconcept/frontend/src/App.tsx index b4c7b1e1..dabdcd51 100644 --- a/rsconcept/frontend/src/App.tsx +++ b/rsconcept/frontend/src/App.tsx @@ -28,7 +28,7 @@ function App () { const mainSize = useMemo( () => { return !noNavigation ? - 'calc(100vh - 12rem)' + 'calc(100vh - 9.2rem)' : '100vh'; }, [noNavigation]); diff --git a/rsconcept/frontend/src/components/Common/Divider.tsx b/rsconcept/frontend/src/components/Common/Divider.tsx index 050fe18c..4ea01383 100644 --- a/rsconcept/frontend/src/components/Common/Divider.tsx +++ b/rsconcept/frontend/src/components/Common/Divider.tsx @@ -6,8 +6,8 @@ interface DividerProps { function Divider({ vertical, margins = 'mx-2' }: DividerProps) { return ( <> - {vertical &&
} - {!vertical && } + {vertical && } + {!vertical && } > ); } diff --git a/rsconcept/frontend/src/components/Footer.tsx b/rsconcept/frontend/src/components/Footer.tsx index 60148088..71f4ca2c 100644 --- a/rsconcept/frontend/src/components/Footer.tsx +++ b/rsconcept/frontend/src/components/Footer.tsx @@ -1,37 +1,24 @@ import { Link } from 'react-router-dom'; import { urls } from '../utils/constants'; -import { GithubIcon } from './Icons'; function Footer() { return ( -